Release calc version 2.11.0t8

BUGS

@@ -20,11 +20,11 @@ configuration, try backing them out and see if things get better.
 
 To be sure that your version of calc is up to date, check out:
 
-	http://reality.sgi.com/chongo/calc/calc-download.html
+	http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/calc
+	http://reality.sgi.com/chongo/tech/comp/calc
 
 =-=
 
@@ -46,7 +46,7 @@ When you send your report, please include the following information:
 
     * the type of compiler you were using
 
-    * any compiler warnings or erros that you saw
+    * any compiler warnings or errors that you saw
 
     * cd to the calc source directory, and type:
 
@@ -66,62 +66,42 @@ importantly, fixes (in the form of a context diff patch) to:
 
 =-=
 
-Known problems or mis-features:
+Known bugs:
 
-    * Many of and SEE ALSO sections of help files
-      for builtins are either inconsistent or missing information.
+    None reported.  We are sure some bugs exist.  When you find them,
+    please let us know!  See the above for details on how to report and
+    were to EMail your bug reports and hopefully patches to fix them.
 
-    * Many of the LIBRARY sections are incorrect now that libcalc.a
-      contains most of the calc system.
+=-=
 
-    * There is some places in the source with obscure variable names
-      and not much in the way of comments.  We need some major cleanup
-      and documentation.
+Calc Mis-features:
 
-    * On a Dec Alpha, make check for version 2.11.0t1 core dumps:
+    * The following shell command (written in sh,ksh,bash-like form) works:
 
-	From vandermj@molbio.sbphrd.com  Fri Sep 24 06:15:28 1999
-	Subject: Re: calc version 2.11.0t1
-	Date: Fri, 24 Sep 1999 09:15:02 -0400
+	    calc '/*
+		   * comment
+		   */
+		  print 2+3;'
 
-	It dies as follows:
+      However this (also written in sh,ksh,bash-like form) does not work:
 
-	...
-	1802: a = surd(2,3)
-	1803: a == surd(2,3)
-	1804: surd_value(a) == 2+3i
-	Segmentation fault
+	    echo '/*
+		   * comment
+		   */
+		  print 2+3;' | calc
 
-	dbx shows:
-	signal Segmentation fault at   [objcall:155 +0xc,0x1200507b4]   index = oap->actions[action];
-	(dbx) where
-	>  0 objcall(action = 14, v1 = 0x1400203d0, v2 = 0x1400203e0, v3 = (nil)) ["obj.c":155, 0x1200507b4]
-	   1 comparevalue(v1 = 0x1400203d0, v2 = 0x1400203e0) ["value.c":2329, 0x12007f250]
-	   2 o_eq() ["opcodes.c":2659, 0x12003728c]
-	   3 calculate(fp = 0x14007fce0) ["opcodes.c":3614, 0x12003942c]
-	   4 o_usercall(fp = 0x14007fce0, index = 39, argcount = 0) ["opcodes.c":2602, 0x120037080]
-	   5 calculate(fp = 0x14003bfa0) ["opcodes.c":3622, 0x120039488]
-	   6 evaluate(nestflag = 14) ["codegen.c":210, 0x120028768]
-	   7 getcommands(toplevel = 536864560) ["codegen.c":158, 0x1200285bc]
-	   8 getcommands(toplevel = 536864560) ["codegen.c":122, 0x1200284dc]
-	   9 main() ["calc.c":279, 0x12001f61c]
+      The 2nd example will result in an 'Unterminated comment' error.
 
-      Michel van der List reports that he was using the Dec compiler.
+    * Calc does not support the #! exec method.  For example of the
+      following is placed in an executable file (assume the path to
+      calc is correct) called /tmp/xyzzy:
 
-      However On 25-Sep-99  9:18, Ernest Bowen wrote:
+	    #!/usr/local/bin/calc
+	    /*
+	     * comment
+	     */
+	    print 2+3;
 
-	Last night I downloaded 2.11.0t1 and without changing Makefile
-	or anything else did a make and make check.  Absolutely no
-	reported errors or warnings and the check "passed all tests".
-	The machine I'm using is a Dec 20 alpha running Digitial
-	UNIX V4.0B (Rev 564).
-
-      Ernest Bowen was using gcc.
-
-      We definitely want to hunt down this Dec's cc compiler issue.  It
-      could very well be that gcc is letting something slide where as
-      Dec's cc compiler is compiling it faithfully into core dumping code.
-      The fault could very well be the calc code and not the compiler.
-
-      Any more information on calc core dumps compiled with Dec's cc compiler
-      would be most appreciated!
+      Will result in '"tmp" is undefined' and '"xyzzy" is undefined'
+      error messages because calc considers $0 as an expression to
+      evaluate.

CHANGES

@@ -1,4 +1,181 @@
-Following is the change from calc version 2.11.0t1 to date:
+Following is the change from calc version 2.11.0t8 to date:
+
+    Moved 'wishlist' enhancements from the help/todo file to a new
+    help/wishlist file.  Ordered, by priority, help/todo items into
+    Very High, High and Medium priority items.
+
+    The BUGS file now has a 'bugs' section as well as a 'mis-features'
+    section.
+
+    Improved how calc internally dealt with reading EOF or '\0' characters.
+
+    Calc now allows multiple defines to occur on the same line:
+    (Thanks goes to Ernest Bowen <ernie@turing.une.edu.au>)
+
+	define f8300(x) = x^2; define g8300(x) = 1 - x;
+
+    Improved calc's ability to deal with and recover from errors.
+
+    Added inputlevel() builtin to return the input processing level.
+    In an interact mode, inputlevel() returns 0.  When directly reading 
+    a calc script, inputlevel() returns 1.  When reading a script which
+    in turn reads another script, inputlevel() returns 2.  etc...
+
+    If $CALCRC has more than one file as in file1:file2 and an error
+    occurs in file1, then calc -c will not read file2.
+
+    Fixed some of the old EMail addresses found in calc documentation.
+
+
+Following is the change from calc version 2.11.0t7 to 2.11.0t7.5:
+
+    Calc has some new command line flags / command line meaning:
+    (Thanks goes to Ernest Bowen <ernie@turing.une.edu.au>)
+
+	-i 	Go into interactive mode if possible.
+
+	-c	Continue reading command lines even after an execution
+		error has caused the abandonment of a line
+
+	To understand the -i and -c effects, consider the following
+	file (call it myfile.cal) which has deliberate errors in it:
+
+	    print 1;
+	    mat A[1] = {2,3};
+	    print 2;
+	    epsilon(-1);
+	    print 3;
+
+	calc read myfile
+
+	    Reports an error on the 2nd line and exits; prints 1 only.
+
+	calc -c read myfile
+
+	    Report errors on the 2nd and 4th lines and exits; prints 1,2 and 3.
+
+	calc -i read myfile
+
+	    Report errors on the 2nd and gives you a prompt; prints 1 only.
+
+	calc -i -c read myfile
+
+	    Report errors on the 2nd and 4th and gives you a prompt;
+	    prints 1, 2 and 3.
+
+	cat myfile | calc
+
+	    Reports an error on the 2nd line and exits; prints 1 only.
+
+	cat myfile | calc -c
+
+	    Report errors on the 2nd and 4th lines and exits; prints 1,2 and 3.
+
+	Note that continuation refers to command lines, not to statements.  So:
+
+	    calc -c 'print "start"; mat A[1] = {2,3}; print "end";'
+
+	since it contains no newline, the whole string is compiled,
+	but execution is abandoned when the error is encountered and
+	the string ``end'' is not printed.
+
+	You can use your shell to supply newlines in your command line
+	arguments.  For example in sh, ksh, bash:
+
+	    calc -c 'print "start";
+	    mat A[1] = {2,3};
+	    print "end";'
+
+	will print both ``start'' and ``end''.  C-shell users can do:
+
+	    calc -c 'print "start"; \
+	    mat A[1] = {2,3}; \
+	    print "end";'
+
+	however sh, ksh, bash will not see ``end'' printed because their
+	shell will remove the internal newlines.
+
+    Added display(n) builtin which does almost the same as config("display",n)
+    except that rather than causing an execution with an out-of-range or
+    bad-type argument type, it simply writes a message to stderr.  This
+    also now happens to the errmax() builtin.
+
+    Added qtime.cal to the standard calc library.
+
+    Added another command line flag to calc:
+
+	-d 	Disable display of the opening title and config("lib_debug",0)
+
+	The command:
+
+	    calc 'read qtime; qtime(2)'
+
+	will output something like:
+
+	    qtime(utc_hr_offset) defined
+	    It's nearly ten past six.
+
+	whereas:
+
+	    calc -d 'read qtime; qtime(2)'
+
+	will just say:
+
+	    It's nearly ten past six.
+
+    A call of errmax(-1) will prevent errcount from aborting calc.
+
+    Add the function stoponerror(n) which, as the name implies, controls
+    if calc stop on an error based on the value of n:
+
+	n > 0	stop on error even if -c was given on the command line
+	n == 0	if -c, continue, without -c, stop
+	n < 0	continue on error, even if -c was given on the command line
+
+    Calc compilation now stops at the first scanerror.
+
+    Restored the feature where -p disables the printing of leading tabs
+    as of config("tab",0) had been executed.  So using calc in a pipe:
+
+	calc -p 2+17 | whey
+
+    will write '19' instead of '\t19' to the whey command.
+
+    Updated calc man page and help/usage file to reflect recent
+    command line changes.
+
+    Converted start_done into a general calc run state enum called
+    run_state within the calc source.
+
+    Removed README.OLD.
+
+    Added the Makefile variable ${LCC} to invoke the local c compiler.
+    By default, ${CC} also run the ${LCC} compiler.  The distinction is
+    useful when using something such as purify.  In the case of ${LCC},
+    only the local C compiler is invoked.  In the case of ${CC} a purify
+    compile is invoked.  Only the source that must be compiled and run
+    on the local machine use ${LCC}; everything else uses ${CC}.
+
+    Fixed memory buffer ovreread problem in eatstring() in token.c.
+
+    Fixed memory leaks related to putenv().
+
+    Fixed memory leaks realted to srandom().
+
+    Fixed compilation warnings and problems on BSDI.
+
+    Removed ${CCMAIN} as a variable from the Makefile.  Now files
+    use either ${CFLAGS} for general C source and ${ICFLAGS} for
+    intermediate C source (e.g., special code for building hsrc files).
+
+    The main calc URL is now:
+
+	http://reality.sgi.com/chongo/tech/comp/calc
+
+    Misc calc man page fixes.
+
+
+Following is the change from calc version 2.11.0t1 to 2.11.0t6.3:
 
     Removed the makefile symbol MAIN.  Now forcing all functions to correctly
     be declared main.  To satisfy some old broken compilers, a return 0;
@@ -25,22 +202,19 @@ Following is the change from calc version 2.11.0t1 to date:
     porting calc to C++!  We will NOT support C++ compilation of calc.
     Calc will written ANSI C.  We just compiled with a suggestion from
     Love-Jensen, John <jlove-jensen@globalmt.com> to make calc's version
-    of C a little more to C++ compilers.  Avoiding symbols such as new
-    or try for example.
+    of C a little more to C++ compilers.  We are simply avoiding symbols
+    such as new or try for example.
 
-    Thanks to the efforts of Ernest Bowen <ernie@neumann.une.edu.au> and
-    Dr.D.J.Picton <dave@aps5.ph.bham.ac.uk>, a nasty endian-ness bug
-    in the sha and sha1 hash functions that showed up on machines such
-    as the Sparc was fixed.
-
-    Updated README.FIRST and BUGS to reflect new URLs and addresses.
+    Renamed README to README.OLD.  Renamed README.FIRST to README.
+    Updated README, lib/README and BUGS to reflect new URLs and addresses.
 
     Added a HOWTO.INSTALL file.
 
     Reordered cc Makefile variable sets in the main Makefile.
 
-    Fixed a bug and applied a fix that was reported by Ernest Bowen
-    <ernie@turing.une.edu.au>.  Added regression tests 1103 to 1112.
+    Fixed a bug in hnrmod() and applied a fix that was reported by Ernest
+    Bowen <ernie@turing.une.edu.au>.  Added regression tests 1103 to
+    1112 to confirm the fix.
 
     Fixed a bug in version.c related to MINOR_PATCHs in both the
     empty and non-empty MINOR_PATCH cases.
@@ -70,6 +244,9 @@ Following is the change from calc version 2.11.0t1 to date:
     Fixed a string handling bug discovered by Dr.D.J.Picton
     <dave@aps5.ph.bham.ac.uk> in the custom demo code.
 
+    Fixed a bug in the hnrmod() builtin that was discovered by
+    Ernest Bowen <ernie@neumann.une.edu.au>.
+
     Added FORCE_STDC symbol.  When defined it will force __STDC__ like
     conditions.  Thus for compilers with as the Solaris cc compiler
     that are ANSI-like but still define __STDC__ as 0, one can use
@@ -80,6 +257,113 @@ Following is the change from calc version 2.11.0t1 to date:
 
     The custom.c file is now compiled with full ${CFLAGS}.
 
+    Rewrote command line / argument processing code.  Calc is now
+    using getopt(3) argument processing.
+
+    Fixed a memory leak related to converting strings to numbers
+    in the str2q() function in qio.c.
+
+    Fixed a problem with reading uninitialized memory in the
+    v_subtype of a VALUE in the copyvalue() function in value.c.
+
+    Fixed problems in func.c where temporary VALUEs were not
+    having their v_type elements initialized.
+
+    Fixed a memory leak in qpi() in qtrans.c.
+
+    Fixed a memory leak in math_getdivertedio() in zio.c.
+
+    Fixed a problem with points going beyond the end of allocated
+    memory in addstring() in string.c.
+
+    Fixed a memory leak in zgcdrem(), f_putenv(), zlog() and
+    zlog10() in zfunc.c.
+
+    Fixed a memory leak in zdiv() and zshift() in zmath.c.
+
+    Fixed memory leaks in zsrand() in zrand.c.
+
+    Fixed a memory leak in zsrandom1() in zrandom.c.  Fixed memory
+    leaks associated with replacing the internal random state with
+    another random state.
+
+    Added seed() builtin to return a 64 bit seed for a
+    pseudo-random generator.
+
+    Added functionality from Ernest Bowen <ernie@turing.une.edu.au> to
+    permit nested "= {...}" assignments for lists as well as matrices
+    and objects.  Now one can have a list, matrix or object, some of
+    whose elements are lists, matrices or objects, to any depth of
+    recursion, and assign values to any number of particular elements
+    by an appropriate "initialization" expression.  For example:
+
+	A = mat[2] = {list(1,2), list(3,4,list(5,6))};
+
+    and then assign values to the 6 number elements by:
+
+	A = {{7,8}, {9,10,{11,12}}};
+
+    Closed files that were previously left open from test4600.cal
+    as executed by regress.cal and from opening /dev/null by
+    regress.cal itself.
+
+    Fixed memory leaks from f_strprintf() and f_putenv() in func.c.
+
+    The regress.cal test suite calls freeredc(), freestatics() and
+    freeglobals() at the end of the test suite to free storage
+    consumed during the regression.
+
+    Added custom function custom("pzasusb8", n) and lib/pzasusb8.cal based on
+    Ernest Bowen's diagnostic patch.
+
+    Thanks to the efforts of Ernest Bowen <ernie@neumann.une.edu.au> and
+    Dr.D.J.Picton <dave@aps5.ph.bham.ac.uk>, a nasty endian-ness bug
+    in the sha and sha1 hash functions that showed up on machines such
+    as the Sparc was fixed.
+
+    Added functionality from Ernest Bowen <ernie@turing.une.edu.au>
+    to give arguments as well as function names after definitions when
+    config("lib_debug") >= 0.
+
+    Removed if (config("lib_debug") >= 0) { ... } the ends of most
+    of the calc library scripts because it was redundant with the
+    new config("lib_debug") >= 0 functionality.  Some of the calc
+    library still has a partial section because some useful
+    additional information was being printed:
+
+	chrem.cal	deg.cal	     lucas_tbl.cal   randrun.cal
+	mfactor.cal	mod.cal	     poly.cal	     seedrandom.cal
+	surd.cal	varargs.cal
+
+    Fixed ellip.cal so that its defined function does not conflict with
+    the factor() builtin function.
+
+    Fixed mod.cal so that a defined function does not conflict with
+    the mod() builtin function.
+
+    The regression test suite now reads in most calc libs.  A few
+    libs are not read because they, by design, produce output
+    when read even when config("lib_debug") is set to -1.
+
+    Increased the maximum number of object types that one can define
+    from 10 to 128.
+
+    Added a patch from Ernest Bowen <ernie@turing.une.edu.au>
+    to correctly hash a V_STR value-type that has an \0 byte
+    inside it.
+
+    A patch from Ernest Bowen <ernie@turing.une.edu.au> now defines
+    special meaning to the first 2 bits of config("lib_debug"):
+
+	bit 0 set => messages printed when inputisterminal
+	bit 1 set => messages printed when reading from a file
+
+    The lib/regress.cal regression suite does:
+
+	config("lib_debug", -4);
+
+    to eliminate lib messages (both bit 0 and bit 1 are not set).
+
     Fixed misc compile warnings and notices.
 
 
@@ -3464,9 +3748,6 @@ Following is the change from calc version 2.9.3t8 to 2.9.3t9.2:
 
 Following is the change from calc version 2.9.3t7 to 2.9.3t7:
 
-    WARNING: This patch is an beta test patch by chongo@toad.com
-	     (Landon Curt Noll).
-
     The 'show' command by itself will issue an error message
     that will remind one of the possible show arguments.
     (thanks to Ha S. Lam <hl@kuhep4.phsx.ukans.edu>)
@@ -3514,9 +3795,6 @@ Following is the change from calc version 2.9.3t7 to 2.9.3t7:
 
 Following is the change from calc version 2.9.2 to 2.9.3t7:
 
-    WARNING: This patch is an beta test patch by chongo@toad.com
-	     (Landon Curt Noll).
-
     Calc can now compile on OSF/1, SGI and IBM RS6000 systems.
 
     A number of systems that have both <varargs.h> and <stdarg.h> do

HOWTO.INSTALL

@@ -4,13 +4,11 @@ Installing calc in 4 easy steps:
 
        Here are some Makefile hints:
 
-	   Select a compiler set by commenting in the appropriate
-	   set of cc options.  As shipped the Makefile assumes
-	   a gcc-like environment such as Linux.  
-	   
-	   If a more appropriate cc set if found below, comment 
-	   out the Linux set and comment in that set or edit
-	   the gcc set or the common cc set as needed.
+	   Select a compiler set by commenting in the appropriate set
+	   of cc options.  As shipped the Makefile assumes a gcc-like
+	   environment such as Linux.  If a more appropriate cc set if
+	   found below, comment out the Linux set and comment in that
+	   set or edit the gcc set or the common cc set as needed.
 
 	   You may or may not need RANLIB when building libraries.
 	   As shipped the Makefile assumes RANLIB is needed.
@@ -40,14 +38,18 @@ Installing calc in 4 easy steps:
 	make all
 
 	==> We are interested in any compiler warnings (and errors) that
-	    you may find.  See the BUGS file if you find any.
+	    you may find.  See the BUGS file if you find any compiler
+	    warning or errors.
 
     3) test calc:
 
 	make check
 
-	==> If you run into problems, follow the instructions in the BUGS file
+	==> If you run into problems, follow the BUGS file instructions.
 
     4) install calc:
 
 	make install
+
+We suggest that you might want to read the README file and look at
+the calc help subsystem.  See the README file for details.

Makefile

@@ -352,7 +352,7 @@ CALCPAGER= more
 #CALCPAGER= cat
 #CALCPAGER= less
 
-# Debug/Optimize options for ${CC}
+# Debug/Optimize options for ${CC} and ${LCC}
 #
 #DEBUG= -O
 #DEBUG= -O -g
@@ -393,7 +393,7 @@ NO_SHARED=
 #NO_SHARED= -non_shared
 
 # On some systems where you are disabling dynamic shared libs, you may
-# need to pass a special flag to ${CC} during linking stage.
+# need to pass a special flag to ${CC} and ${LCC} during linking stage.
 #
 #    System type    			    NO_SHARED recommendation
 #
@@ -516,13 +516,12 @@ ALLOW_CUSTOM= -DCUSTOM
 # CFLAGS are all flags given to ${CC} [[often includes CCOPT, CCWARN, CCMISC]]
 # ICFLAGS are given to ${CC} for intermediate progs
 #
-# CCMAIN are flags for ${CC} when files with main() instead of CFLAGS
-#
 # LCFLAGS are CC-style flags for ${LINT}
 # LDFLAGS are flags given to ${CC} for linking .o files
 # ILDFLAGS are flags given to ${CC} for linking .o files for intermediate progs
 #
-# CC is how the the C compiler is invoked
+# LCC how the the C compiler is invoked on locally executed intermediate progs
+# CC is how the the C compiler is invoked (with an optional Purify)
 #
 ###
 #
@@ -540,13 +539,12 @@ CCMISC=
 CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 ICFLAGS= ${CCWARN} ${CCMISC}
 #
-CCMAIN= ${ICFLAGS}
-#
 LCFLAGS=
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
 #
-CC= ${PURIFY} gcc
+LCC= gcc
+CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -562,14 +560,13 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} gcc
-#CC= ${PURIFY} gcc2
+#LCC= gcc
+#LCC= gcc2
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -582,13 +579,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -613,13 +609,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc -n32 -xansi
+#LCC= cc -n32 -xansi
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -638,13 +633,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -657,13 +651,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -682,13 +675,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -702,15 +694,14 @@ CC= ${PURIFY} gcc
 #CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS}
+#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} gcc
+#LCC= gcc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -724,15 +715,14 @@ CC= ${PURIFY} gcc
 #CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS}
+#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
@@ -775,7 +765,7 @@ LIBSRC= addop.c assocfunc.c blkcpy.c block.c byteswap.c \
 	file.c func.c hash.c help.c hist.c input.c jump.c label.c \
 	lib_calc.c lib_util.c listfunc.c matfunc.c math_error.c \
 	md5.c obj.c opcodes.c pix.c poly.c prime.c qfunc.c qio.c \
-	qmath.c qmod.c qtrans.c quickhash.c shs.c shs1.c size.c \
+	qmath.c qmod.c qtrans.c quickhash.c seed.c shs.c shs1.c size.c \
 	string.c symbol.c token.c value.c version.c zfunc.c zio.c \
 	zmath.c zmod.c zmul.c zprime.c zrand.c zrandom.c
 
@@ -789,7 +779,7 @@ LIBOBJS= addop.o assocfunc.o blkcpy.o block.o byteswap.o calcerr.o \
 	file.o func.o hash.o help.o hist.o input.o jump.o label.o \
 	lib_calc.o lib_util.o listfunc.o matfunc.o math_error.o \
 	md5.o obj.o opcodes.o pix.o poly.o prime.o qfunc.o qio.o \
-	qmath.o qmod.o qtrans.o quickhash.o shs.o shs1.o size.o \
+	qmath.o qmod.o qtrans.o quickhash.o seed.o shs.o shs1.o size.o \
 	string.o symbol.o token.o value.o version.o zfunc.o zio.o \
 	zmath.o zmod.o zmul.o zprime.o zrand.o zrandom.o
 
@@ -887,6 +877,7 @@ CUSTOM_PASSDOWN= Q="${Q}" \
     LCFLAGS="${LCFLAGS}" \
     LDFLAGS="${LDFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
+    LCC="${LCC}" \
     CC="${CC}" \
     MAKE_FILE=${MAKE_FILE} \
     SED=${SED} \
@@ -909,11 +900,11 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     CCMISC="${CCMISC}" \
     CFLAGS="${CFLAGS} ${ALLOW_CUSTOM}" \
     ICFLAGS="${ICFLAGS}" \
-    CCMAIN="${CCMAIN}" \
     LCFLAGS="${LCFLAGS}" \
     LDFLAGS="${LDFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     CALC_LIBS="../libcalc.a ../custom/libcustcalc.a" \
+    LCC="${LCC}" \
     CC="${CC}" \
     MAKE_FILE=${MAKE_FILE} \
     SED=${SED} \
@@ -931,7 +922,7 @@ C_SRC= ${LIBSRC} ${CALCSRC} ${UTIL_C_SRC}
 # These files are found (but not built) in the distribution
 #
 DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README \
-	calc.man lint.sed README.FIRST HOWTO.INSTALL ${UTIL_MISC_SRC}
+	calc.man lint.sed HOWTO.INSTALL ${UTIL_MISC_SRC}
 
 # complete list of .o files
 #
@@ -981,7 +972,7 @@ calc.1: calc.man ${MAKE_FILE}
 ##
 
 calc.o: calc.c ${MAKE_FILE}
-	${CC} ${CCMAIN} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
+	${CC} ${CFLAGS} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
 
 custom.o: custom.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c custom.c
@@ -1379,8 +1370,8 @@ longlong.h: longlong.c have_stdlib.h have_string.h ${MAKE_FILE}
 	${Q}echo '' >> longlong.h
 	${Q}echo '/* do we have/want to use a long long type? */' >> longlong.h
 	-${Q}rm -f longlong.o longlong
-	-${Q}${CC} ${CCMAIN} longlong.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} longlong.o -o longlong 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} longlong.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} longlong.o -o longlong 2>/dev/null; true
 	-${Q}${SHELL} -c "./longlong ${LONGLONG_BITS} > ll_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s ll_tmp ]; then \
@@ -1418,8 +1409,8 @@ have_fpos.h: have_fpos.c ${MAKE_FILE}
 	${Q}echo '' >> have_fpos.h
 	${Q}echo '/* do we have fgetpos & fsetpos functions? */' >> have_fpos.h
 	-${Q}rm -f have_fpos.o have_fpos
-	-${Q}${CC} ${HAVE_FPOS} ${CCMAIN} have_fpos.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_fpos.o -o have_fpos 2>/dev/null; true
+	-${Q}${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_fpos > fpos_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s fpos_tmp ]; then \
@@ -1459,8 +1450,8 @@ fposval.h: fposval.c have_fpos.h have_offscl.h have_posscl.h \
 	${Q}echo '' >> fposval.h
 	${Q}echo '/* what are our file position & size types? */' >> fposval.h
 	-${Q}rm -f fposval.o fposval
-	-${Q}${CC} ${CCMAIN} fposval.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} fposval.o -o fposval 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} fposval.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} fposval.o -o fposval 2>/dev/null; true
 	${Q}${SHELL} -c "./fposval fposv_tmp >> fposval.h 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	${Q}echo '' >> fposval.h
@@ -1492,8 +1483,8 @@ have_const.h: have_const.c ${MAKE_FILE}
 	${Q}echo '' >> have_const.h
 	${Q}echo '/* do we have or want const? */' >> have_const.h
 	-${Q}rm -f have_const.o have_const
-	-${Q}${CC} ${CCMAIN} ${HAVE_CONST} have_const.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_const.o -o have_const 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_CONST} have_const.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_const.o -o have_const 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_const > const_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s const_tmp ]; then \
@@ -1531,8 +1522,8 @@ have_offscl.h: have_offscl.c ${MAKE_FILE}
 	${Q}echo '' >> have_offscl.h
 	${Q}echo '' >> have_offscl.h
 	-${Q}rm -f have_offscl.o have_offscl
-	-${Q}${CC} ${CCMAIN} ${HAVE_OFFSCL} have_offscl.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_offscl.o -o have_offscl 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_OFFSCL} have_offscl.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_offscl.o -o have_offscl 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_offscl > offscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s offscl_tmp ]; then \
@@ -1569,8 +1560,8 @@ have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
 	${Q}echo '' >> have_posscl.h
 	${Q}echo '' >> have_posscl.h
 	-${Q}rm -f have_posscl.o have_posscl
-	-${Q}${CC} ${CCMAIN} ${HAVE_POSSCL} have_posscl.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_posscl.o -o have_posscl 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_POSSCL} have_posscl.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_posscl.o -o have_posscl 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_posscl > posscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s posscl_tmp ]; then \
@@ -1621,8 +1612,8 @@ align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE}
 	fi
 	-${Q}if [ X = X${ALIGN32} ]; then \
 	    rm -f align32.o align32; \
-	    ${CC} ${CCMAIN} ${ALIGN32} align32.c -c 2>/dev/null; \
-	    ${CC} ${ILDFLAGS} align32.o -o align32 2>/dev/null; \
+	    ${LCC} ${ICFLAGS} ${ALIGN32} align32.c -c 2>/dev/null; \
+	    ${LCC} ${ILDFLAGS} align32.o -o align32 2>/dev/null; \
 	    ${SHELL} -c "./align32 >align32_tmp 2>/dev/null" >/dev/null 2>&1; \
 	    if [ -s align32_tmp ]; then \
 		cat align32_tmp >> align32.h; \
@@ -1662,8 +1653,8 @@ have_uid_t.h: have_uid_t.c have_unistd.h ${MAKE_FILE}
 	${Q}echo '' >> have_uid_t.h
 	${Q}echo '/* do we have or want uid_t? */' >> have_uid_t.h
 	-${Q}rm -f have_uid_t.o have_uid_t
-	-${Q}${CC} ${CCMAIN} ${HAVE_UID_T} have_uid_t.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_uid_t.o -o have_uid_t 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_UID_T} have_uid_t.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_uid_t.o -o have_uid_t 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_uid_t > uid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s uid_tmp ]; then \
@@ -1701,8 +1692,8 @@ have_newstr.h: have_newstr.c ${MAKE_FILE}
 	${Q}echo '/* do we have or want memcpy(), memset() & strchr()? */' \
 							>> have_newstr.h
 	-${Q}rm -f have_newstr.o have_newstr
-	-${Q}${CC} ${CCMAIN} ${HAVE_NEWSTR} have_newstr.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_newstr.o -o have_newstr 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_NEWSTR} have_newstr.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_newstr.o -o have_newstr 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_newstr > newstr_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s newstr_tmp ]; then \
@@ -1739,8 +1730,8 @@ have_memmv.h: have_memmv.c ${MAKE_FILE}
 	${Q}echo '' >> have_memmv.h
 	${Q}echo '/* do we have or want memmove()? */' >> have_memmv.h
 	-${Q}rm -f have_memmv.o have_memmv
-	-${Q}${CC} ${CCMAIN} ${HAVE_MEMMOVE} have_memmv.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_memmv.o -o have_memmv 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_MEMMOVE} have_memmv.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_memmv.o -o have_memmv 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_memmv > newstr_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s newstr_tmp ]; then \
@@ -1776,8 +1767,9 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	${Q}echo '' >> args.h
 	${Q}echo '' >> args.h
 	-${Q}rm -f have_stdvs.o have_stdvs
-	-${Q}${CC} ${CCMAIN} ${HAVE_VSPRINTF} have_stdvs.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_stdvs.o -o have_stdvs 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_stdvs.c -c \
+		2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_stdvs.o -o have_stdvs 2>/dev/null; true
 	-${Q}if ./have_stdvs >>args.h 2>/dev/null; then \
 	    touch have_args; \
 	else \
@@ -1785,8 +1777,9 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	fi
 	-${Q}if [ ! -f have_args ] && [ X"${HAVE_VSPRINTF}" = X ]; then \
 	    rm -f have_stdvs.o have_stdvs have_varvs.o have_varvs; \
-	    ${CC} ${CCMAIN} -DDONT_HAVE_VSPRINTF have_varvs.c -c 2>/dev/null; \
-	    ${CC} ${ILDFLAGS} have_varvs.o -o have_varvs 2>/dev/null; \
+	    ${LCC} ${ICFLAGS} -DDONT_HAVE_VSPRINTF have_varvs.c -c \
+		    2>/dev/null; \
+	    ${LCC} ${ILDFLAGS} have_varvs.o -o have_varvs 2>/dev/null; \
 	    if ./have_varvs >>args.h 2>/dev/null; then \
 		touch have_args; \
 	    else \
@@ -1865,17 +1858,17 @@ calc_errno.h: calc_errno.c ${MAKE_FILE}
 	    echo 'extern int sys_nerr;		' \
 		 '/* number of system errors */' >> calc_errno.h; \
 	else \
-	    ${CC} ${CCMAIN} -DTRY_ERRNO_NO_DECL \
+	    ${LCC} ${ICFLAGS} -DTRY_ERRNO_NO_DECL \
 		  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 	    if [ -x ./calc_errno ]; then \
 		./calc_errno >> calc_errno.h; \
 	    else \
-		${CC} ${CCMAIN} -DTRY_ERRNO_STD_DECL \
+		${LCC} ${ICFLAGS} -DTRY_ERRNO_STD_DECL \
 		      calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 		if [ -x ./calc_errno ]; then \
 		    ./calc_errno >> calc_errno.h; \
 		else \
-		    ${CC} ${CCMAIN} -DTRY_ERRNO_OLD_DECL \
+		    ${LCC} ${ICFLAGS} -DTRY_ERRNO_OLD_DECL \
 			  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 		    if [ -x ./calc_errno ]; then \
 			./calc_errno >> calc_errno.h; \
@@ -1971,16 +1964,16 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
 ##
 
 endian.o: endian.c have_unistd.h
-	${CC} ${CCMAIN} endian.c -c
+	${LCC} ${ICFLAGS} endian.c -c
 
 endian: endian.o
-	${CC} ${ILDFLAGS} endian.o -o endian
+	${LCC} ${ICFLAGS} endian.o -o endian
 
 longbits.o: longbits.c longlong.h have_unistd.h
-	${CC} ${CCMAIN} longbits.c -c
+	${LCC} ${ICFLAGS} longbits.c -c
 
 longbits: longbits.o
-	${CC} ${ILDFLAGS} longbits.o -o longbits
+	${LCC} ${ICFLAGS} longbits.o -o longbits
 
 ##
 #
@@ -2259,11 +2252,11 @@ bsdilist: ${DISTLIST} ${BUILD_H_SRC} calc.1
 ##
 
 check: all ./lib/regress.cal ${REGRESS_CAL}
-	${CALC_ENV} ./calc -i -q read regress
+	${CALC_ENV} ./calc -d -q read regress
 
 chk: ./lib/regress.cal ${REGRESS_CAL}
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	${CALC_ENV} ./calc -i -q read regress 2>&1 | ${AWK} -f check.awk
+	${CALC_ENV} ./calc -d -q read regress 2>&1 | ${AWK} -f check.awk
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 ##
@@ -2332,10 +2325,10 @@ env:
 	@echo "CCMISC=${CCMISC}"; echo ""
 	@echo "CFLAGS=${CFLAGS}"; echo ""
 	@echo "ICFLAGS=${ICFLAGS}"; echo ""
-	@echo "CCMAIN=${CCMAIN}"; echo ""
 	@echo "LCFLAGS=${LCFLAGS}"; echo ""
 	@echo "LDFLAGS=${LDFLAGS}"; echo ""
 	@echo "ILDFLAGS=${ILDFLAGS}"; echo ""
+	@echo "LCC=${LCC}"; echo ""
 	@echo "CC=${CC}"; echo ""
 	@echo "SHELL=${SHELL}"; echo ""
 	@echo "MAKE=${MAKE}"; echo ""
@@ -2749,6 +2742,7 @@ byteswap.o: longbits.h
 byteswap.o: qmath.h
 byteswap.o: zmath.h
 calc.o: alloc.h
+calc.o: args.h
 calc.o: block.h
 calc.o: byteswap.h
 calc.o: calc.c
@@ -2784,6 +2778,7 @@ calc.o: symbol.h
 calc.o: token.h
 calc.o: value.h
 calc.o: zmath.h
+calc_errno.o: calc_errno.c
 calcerr.o: calcerr.c
 calcerr.o: calcerr.h
 calcerr.o: have_const.h
@@ -2961,6 +2956,7 @@ func.o: alloc.h
 func.o: block.h
 func.o: byteswap.h
 func.o: calc.h
+func.o: calc_errno.h
 func.o: calcerr.h
 func.o: cmath.h
 func.o: config.h
@@ -3327,7 +3323,6 @@ obj.o: symbol.h
 obj.o: value.h
 obj.o: zmath.h
 opcodes.o: alloc.h
-opcodes.o: args.h
 opcodes.o: block.h
 opcodes.o: byteswap.h
 opcodes.o: calc.h
@@ -3512,6 +3507,18 @@ quickhash.o: value.h
 quickhash.o: zmath.h
 quickhash.o: zrand.h
 quickhash.o: zrandom.h
+seed.o: alloc.h
+seed.o: byteswap.h
+seed.o: endian_calc.h
+seed.o: have_malloc.h
+seed.o: have_memmv.h
+seed.o: have_newstr.h
+seed.o: have_stdlib.h
+seed.o: have_string.h
+seed.o: longbits.h
+seed.o: qmath.h
+seed.o: seed.c
+seed.o: zmath.h
 shs.o: align32.h
 shs.o: alloc.h
 shs.o: block.h

README

@@ -1,73 +1,89 @@
-# Copyright (c) 1997 David I. Bell
-# Permission is granted to use, distribute, or modify this source,
-# provided that this copyright notice remains intact.
-#
-# Arbitrary precision calculator.
+Dear calc user,
 
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    NOTE: This is an old historic README.  We recommend that you
-	  read README.FIRST and HOWTO.INSTALL for more info.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+See the HOWTO.INSTALL file for information on how to build and install calc.
 
-I am allowing this calculator to be freely distributed for your enjoyment.
-Like all multi-precision programs, you should not depend absolutely on
-its results, since bugs in such programs can be insidious and only rarely
-show up.
+To be sure that your version of calc is up to date, check out:
 
--dbell-
+	http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
-p.s. By Landon Curt Noll:
+We are interested in any/all feedback on recent versions of calc.
+In particular we would like to hear about:
 
-Building calc in 3 easy steps:
+    * compiler warnings
+    * compile problems
+    * regression test problems (try: make check)
+    * special compile flags/options that you needed
+    * Makefile problems
+    * help file problems
+    * misc nits and typos
 
-    1) Look at the makefile, and adjust it to suit your needs.
+We would like to offer a clean compile across a wide verity of platforms,
+so if you can test on several, so much the better!
 
-       Here are some Makefile hints:
-
-	   In the past, some people have had to adjust the VARARG or
-	   TERMCONTROL because the Makefile cannot always guess
-	   correctly for certain systems.  You may need to play with
-	   these values if you experience problems.
-
-	   The default compiler used is 'cc'.  The default compiler flag
-	   is '-O'.  If you have gcc, or gcc v2 (or better) you should use
-	   that instead.   Some compilers allow for optimization beyond
-	   just -O (gcc v2 has -O2, mips cc has -O3).  You should select
-	   the best flag for speed optimization.  Calc can be cpu intensive
-	   so selecting a quality compiler and good optimization level can
-	   really pay off.
-
-    2) build calc:
-
-	make all
-
-    3) test calc:
-
-	make check
-
- ==>>>If you run into problems, follow the instructions in the BUGS file<<<==
+If you run into problems, see the BUGS file.
 
 =-=
 
-For further reading:
+Calc is distributed with an extensive collection of help files that
+are accessible from the command line.  The following assume that you
+are running calc from the distribution directory or that you have
+installed calc.  In these examples, the ">" is the calc prompt, not
+something that you type in.
 
-    LIBRARY
-    	explains how programs can use libcalc.a to take advantage
-	of the calc multi-precision routines.
+For list of help topics:
+
+    > help
+
+For overview of calc overview:
+
+    > help intro
+    > help overview
+    > help command
+    > help define
+    > help statement
+    > help variable
+
+For list of builtin functions:
+
+    > help builtin
+
+C programmers should note some unexpected differences in the calc syntax:
+
+    > help unexpected
+
+Calc is shipped with a library of calc scripts.  For a list see:
+
+    > help stdlib
+
+=-=
+
+See the file:
 
     help/todo
-	current wish list for calc
+    help/wishlist
 
-    CHANGES
-	recent changes to calc
+or run:
 
-    BUGS
-	known bugs, mis-features and how to report problems
+    calc help todo
+    calc help wishlist
 
-    help/full
-	full set of calc documentation
+for a wish/todo list.  Code contributions are welcome.
 
 =-=
 
-David I. Bell    dbell@auug.org.au
-chongo@toad.com	<Landon Curt Noll -- chongo@toad.com> /\../\
+To join the calc-tester mailing list.  Send a request to:
+
+     calc-tester-request@postofc.corp.sgi.com
+
+Your message body (not the subject) should consist of:
+
+     subscribe calc-tester address
+     end
+     name your_full_name
+
+where ``address'' is your EMail address and ``your_full_name'' is
+your full name.
+
+The calc web site is located at:
+
+	http://reality.sgi.com/chongo/tech/comp/calc

README.FIRST

@@ -1,54 +0,0 @@
-Dear calc user,
-
-See the HOWTO.INSTALL file for information on how to build and install calc.
-
-To be sure that your version of calc is up to date, check out:
-
-	http://reality.sgi.com/chongo/calc/calc-download.html
-
-We are interested in any/all feedback on recent versions of calc.
-In particular we would like to hear about:
-
-    * compiler warnings
-    * compile problems
-    * regression test problems (try: make check)
-    * special compile flags/options that you needed
-    * Makefile problems
-    * help file problems
-    * misc nits and typos
-
-We would like to offer a clean compile across a wide verity of platforms,
-so if you can test on several, so much the better!
-
-If you run into problems, see the BUGS file.
-
-=-=
-
-See the file:
-
-    help/todo
-
-or run:
-
-    calc 'help todo'
-
-for a wish/todo list.  Code contributions are welcome.
-
-=-=
-
-To join the calc-tester mailing list.  Send a request to:
-
-     calc-tester-request@postofc.corp.sgi.com
-
-Your message body (not the subject) should consist of:
-
-     subscribe calc-tester address
-     end
-     name your_full_name
-
-where ``address'' is your EMail address and ``your_full_name'' is
-your full name.
-
-The calc web site is located at:
-
-	http://reality.sgi.com/chongo/calc

addop.c

@@ -135,6 +135,7 @@ endfunc(void)
 {
 	register FUNC *fp;		/* function just finished */
 	unsigned long size;		/* size of just created function */
+	long index;
 
 	if (oldop != OP_RETURN) {
 		addop(OP_UNDEF);
@@ -163,14 +164,23 @@ endfunc(void)
 			size += dumpop(&fp->f_opcodes[size]);
 		}
 	}
+	if ((inputisterminal() && conf->lib_debug & 1) ||
+		(!inputisterminal() && conf->lib_debug & 2)) {
+		printf("%s(", fp->f_name);
+		for (index = 0; index <  fp->f_paramcount; index++) {
+			if (index)
+				putchar(',');
+			printf("%s", paramname(index));
+		}
+		printf(") ");
+		if (functions[newindex])
+			printf("re");
+		printf("defined\n");
+	}
 	if (functions[newindex]) {
 		freenumbers(functions[newindex]);
 		free(functions[newindex]);
-		if (inputisterminal() || conf->lib_debug >= 0)
-			printf("%s() redefined\n", fp->f_name);
 	}
-	else if (inputisterminal() || conf->lib_debug >= 0)
-		printf("%s() defined\n", fp->f_name);
 	functions[newindex] = fp;
 	objuncache();
 }
@@ -228,7 +238,8 @@ rmuserfunc(char *name)
 		return;
 	freenumbers(functions[index]);
 	free(functions[index]);
-	if (!inputisterminal() && conf->lib_debug >= 0)
+	if ((inputisterminal() && conf->lib_debug & 1) ||
+			(!inputisterminal() && conf->lib_debug & 2))
 		printf("%s() undefined\n", name);
 	functions[index] = NULL;
 }
@@ -438,6 +449,11 @@ addop(long op)
 			case OP_GLOBALADDR:
 				diff = 1 + PTR_SIZE;
 				break;
+			case OP_UNDEF:
+				fp->f_opcodecount -= 1;
+				oldop = OP_NOP;
+				oldoldop = OP_NOP;
+				return;
 			default:
 				cut = FALSE;
 			}

align32.c

@@ -3,7 +3,10 @@
  *
  * This file was written by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
+ *
+ *	chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.

blkcpy.c

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  */
 
 #include <stdio.h>

block.c

@@ -27,12 +27,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

block.h

@@ -27,12 +27,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

calc.c

@@ -11,7 +11,6 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
-#include <setjmp.h>
 
 #define CALC_C
 #include "calc.h"
@@ -37,30 +36,11 @@
 #include <stdlib.h>
 #endif
 
-
 /*
- * external and static definitions
- */
-extern int abortlevel;		/* current level of aborts */
-extern BOOL inputwait;		/* TRUE if in a terminal input wait */
-extern jmp_buf jmpbuf;		/* for errors */
-extern int isatty(int tty);	/* TRUE if fd is a tty */
-
-extern int p_flag;		/* TRUE => pipe mode */
-extern int q_flag;		/* TRUE => don't execute rc files */
-extern int u_flag;		/* TRUE => unbuffer stdin and stdout */
-
-extern char *pager;		/* $PAGER or default */
-extern int stdin_tty;		/* TRUE if stdin is a tty */
-extern char *program;		/* our name */
-extern char cmdbuf[];		/* command line expression */
-
-extern char *version(void);	/* return version string */
-
-
-/*
- * forward static functions
+ * static definitions and functions
  */
+static char *usage = "usage: %s [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
+		     "\t[-n] [-p] [-q] [-u] [-v] [[--] calc_cmd ...]\n";
 static void intint(int arg);	/* interrupt routine */
 
 
@@ -70,124 +50,127 @@ static void intint(int arg);	/* interrupt routine */
 int
 main(int argc, char **argv)
 {
-	static char *str;	/* current option string or expression */
 	int want_defhelp = 0;	/* 1=> we only want the default help */
+	int cmdlen;		/* length of the command string */
+	extern char *optarg;	/* option argument */
+	extern int optind;	/* option index */
+	int c;			/* option */
 	long i;
-	char *p;
 
 	/*
 	 * parse args
 	 */
 	program = argv[0];
-	argc--;
-	argv++;
-	while ((argc > 0) && (**argv == '-')) {
-		for (str = &argv[0][1]; *str; str++) switch (*str) {
-			case 'C':
+	while ((c = getopt(argc, argv, "Cehim:npquvcd")) != -1) {
+		switch (c) {
+		case 'C':
 #if defined(CUSTOM)
-				allow_custom = TRUE;
-				break;
-#else
-				fprintf(stderr,
-				    "Calc was built with custom functions "
-				    "disabled, -C usage is disallowed\n");
-				/*
-				 * we are too early in processing to call
-				 * libcalc_call_me_last() - nothing to cleanup
-				 */
-				exit(1);
-#endif /* CUSTOM */
-			case 'e':
-				no_env = TRUE;
-				break;
-			case 'h':
-				want_defhelp = 1;
-				break;
-			case 'i':
-				ign_errmax = TRUE;
-				break;
-			case 'm':
-				if (argv[0][2]) {
-					p = &argv[0][2];
-				} else if (argc > 1) {
-					p = argv[1];
-					argc--;
-					argv++;
-				} else {
-					fprintf(stderr, "-m requires an arg\n");
-					/*
-					 * we are too early in processing to
-					 * call libcalc_call_me_last()
-					 * nothing to cleanup
-					 */
-					exit(1);
-				}
-				if (p[1] != '\0' || *p < '0' || *p > '7') {
-					fprintf(stderr, "unknown -m arg\n");
-					/*
-					 * we are too early in processing to
-					 * call libcalc_call_me_last()
-					 * nothing to cleanup
-					 */
-					exit(1);
-				}
-				allow_read = (((*p-'0') & 04) > 0);
-				allow_write = (((*p-'0') & 02) > 0);
-				allow_exec = (((*p-'0') & 01) > 0);
-				break;
-			case 'n':
-				new_std = TRUE;
-				break;
-			case 'p':
-				p_flag = TRUE;
-				break;
-			case 'q':
-				q_flag = TRUE;
-				break;
-			case 'u':
-				u_flag = TRUE;
-				break;
-			case 'v':
-				printf("%s (version %s)\n",
-				    CALC_TITLE, version());
-				/*
-				 * we are too early in processing to call
-				 * libcalc_call_me_last() - nothing to cleanup
-				 */
-				exit(0);
-			default:
-				fprintf(stderr,
-			"usage: %s [-C] [-e] [-h] [-i] [-m mode] [-n] [-p]\n",
-				    program);
-				fprintf(stderr, "\t[-q] [-u] [calc_cmd ...]\n");
-				/*
-				 * we are too early in processing to call
-				 * libcalc_call_me_last() - nothing to cleanup
-				 */
-				exit(1);
-		}
-		argc--;
-		argv++;
-	}
-	cmdbuf[0] = '\0';
-	str = cmdbuf;
-	while (--argc >= 0) {
-		i = (long)strlen(*argv);
-		if (i+3 >= MAXCMD) {
-			fprintf(stderr, "command in arg list too long\n");
+			allow_custom = TRUE;
+			break;
+#else /* CUSTOM */
 			/*
 			 * we are too early in processing to call
 			 * libcalc_call_me_last() - nothing to cleanup
 			 */
+			fprintf(stderr,
+			    "%s: calc was built with custom functions "
+			    "disabled, -C usage is disallowed\n", program);
+			exit(1);
+#endif /* CUSTOM */
+		case 'e':
+			no_env = TRUE;
+			break;
+		case 'h':
+			want_defhelp = 1;
+			break;
+		case 'i':
+			i_flag = TRUE;
+			break;
+		case 'm':
+			if (optarg[1] == '\0' || *optarg<'0' || *optarg>'7') {
+				/*
+				 * we are too early in processing to
+				 * call libcalc_call_me_last()
+				 * nothing to cleanup
+				 */
+				fprintf(stderr,
+					"%s: unknown -m arg\n", program);
+				exit(1);
+			}
+			allow_read = (((*optarg-'0') & 04) > 0);
+			allow_write = (((*optarg-'0') & 02) > 0);
+			allow_exec = (((*optarg-'0') & 01) > 0);
+			break;
+		case 'n':
+			new_std = TRUE;
+			break;
+		case 'p':
+			p_flag = TRUE;
+			break;
+		case 'q':
+			q_flag = TRUE;
+			break;
+		case 'u':
+			u_flag = TRUE;
+			break;
+		case 'c':
+			c_flag = TRUE;
+			break;
+		case 'd':
+			d_flag = TRUE;
+			break;
+		case 'v':
+			/*
+			 * we are too early in processing to call
+			 * libcalc_call_me_last() - nothing to cleanup
+			 */
+			printf("%s (version %s)\n", CALC_TITLE, version());
+			exit(0);
+		default:
+			/*
+			 * we are too early in processing to call
+			 * libcalc_call_me_last() - nothing to cleanup
+			 */
+			fprintf(stderr, usage, program);
 			exit(1);
 		}
-		*str++ = ' ';
-		strcpy(str, *argv++);
-		str += i;
-		str[0] = '\n';
-		str[1] = '\0';
 	}
-	str = cmdbuf;
+	havecommands = (optind < argc);
+
+	/*
+	 * look at the length of any trailing command args
+	 *
+	 * We make room for the trailing '\0\n' as well as an extra guard byte.
+	 */
+	for (cmdlen=0, i=optind; i < argc; ++i) {
+		/* argument + space separator */
+		cmdlen += strlen(argv[i]) + 1;
+	}
+	if (i > MAXCMD) {
+		/*
+		 * we are too early in processing to call
+		 * libcalc_call_me_last() - nothing to cleanup
+		 */
+		fprintf(stderr,
+			"%s: command in arg list is too long\n", program);
+		exit(1);
+	}
+
+	/*
+	 * We will form a command the remaining args separated by spaces.
+	 */
+	cmdbuf[0] = '\0';
+	if (optind < argc) {
+		strcpy(cmdbuf, argv[optind]);
+		cmdlen = strlen(argv[optind]);
+		for (i=optind+1; i < argc; ++i) {
+			cmdbuf[cmdlen++] = ' ';
+			strcpy(cmdbuf+cmdlen, argv[i]);
+			cmdlen += strlen(argv[i]);
+		}
+		cmdbuf[cmdlen++] = '\n';
+		cmdbuf[cmdlen] = '\0';
+	}
 
 	/*
 	 * unbuffered mode
@@ -201,8 +184,7 @@ main(int argc, char **argv)
 	 * initialize
 	 */
 	libcalc_call_me_first();
-	stdin_tty = TRUE;	/* assume internactive default */
-	conf->tab_ok = TRUE;	/* assume internactive default */
+	stdin_tty = isatty(0);		/* assume stdin is on fd 0 */
 	if (want_defhelp) {
 		givehelp(DEFAULTCALCHELP);
 		libcalc_call_me_last();
@@ -212,39 +194,25 @@ main(int argc, char **argv)
 	/*
 	 * if allowed or needed, print version and setup bindings
 	 */
-	if (str >= cmdbuf+MAXCMD || *str == '\0') {
-		/*
-		 * check for pipe mode and/or non-tty stdin
-		 */
-		if (!p_flag) {
-			stdin_tty = isatty(0);	/* assume stdin is on fd 0 */
-		}
-
-		/*
-		 * empty string arg is no string
-		 */
-		str = NULL;
-
-		/*
-		 * if tty, setup bindings
-		 */
-		if (stdin_tty) {
+	if (!havecommands && stdin_tty) {
+		if (!d_flag) {
 			printf("%s (version %s)\n", CALC_TITLE, version());
 			printf("[%s]\n\n",
 			    "Type \"exit\" to exit, or \"help\" for help.");
-			switch (hist_init(calcbindings)) {
+		}
+		switch (hist_init(calcbindings)) {
 			case HIST_NOFILE:
 				fprintf(stderr,
-				    "Cannot open bindings file \"%s\", %s.\n",
-				     calcbindings, "fancy editing disabled");
+				    "%s: Cannot open bindings file \"%s\", "
+				    "fancy editing disabled.\n",
+				     program, calcbindings);
 				break;
 
 			case HIST_NOTTY:
 				fprintf(stderr,
-					"Cannot set terminal modes, %s.\n",
-					"fancy editing disabled");
+					"%s: Cannot set terminal modes, "
+					"fancy editing disabled\n", program);
 				break;
-			}
 		}
 	}
 
@@ -256,53 +224,106 @@ main(int argc, char **argv)
 		/*
 		 * reset/initialize the computing environment
 		 */
-		if (post_init) {
+		if (post_init)
 			initialize();
-		} else {
-			/* initialize already done, jmpbuf is ready */
-			post_init = TRUE;	
-		}
-
-		/*
-		 * if arg mode or non-tty mode, just do the work and be gone
-		 */
-		if (str || !stdin_tty) {
-			if (q_flag == FALSE && allow_read) {
-				runrcfiles();
-				q_flag = TRUE;
-			}
-			if (str)
-				(void) openstring(str);
-			else
-				(void) openterminal();
-			start_done = TRUE;
-			getcommands(FALSE);
-			libcalc_call_me_last();
-			exit(0);
-		}
-	}
-	/* if in arg mode, we should not get here */
-	if (str) {
-		libcalc_call_me_last();
-		exit(1);
+		post_init = TRUE;
 	}
 
 	/*
-	 * process commands
+	 * (re)establish the interrupt handler
 	 */
-	if (!start_done) {
-		reinitialize();
-	}
 	(void) signal(SIGINT, intint);
-	start_done = TRUE;
-	getcommands(TRUE);
+
+	/*
+	 * execute calc code based on the run state
+	 */
+	if (run_state == RUN_BEGIN) {
+		if (!q_flag && allow_read) {
+			run_state = RUN_RCFILES;
+			runrcfiles();
+		}
+		run_state = RUN_PRE_CMD_ARGS;
+	}
+
+	while (run_state == RUN_RCFILES) {
+		fprintf(stderr, "Error in rcfiles\n");
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(FALSE);
+			closeinput();
+			if (inputisterminal())
+				run_state = RUN_PRE_CMD_ARGS;
+		} else {
+			if ((havecommands && !i_flag) || !stdin_tty)
+				run_state = RUN_EXIT_WITH_ERROR;
+			else
+				run_state = RUN_PRE_CMD_ARGS;
+		}
+	}
+
+	if (run_state == RUN_PRE_CMD_ARGS) {
+		if (havecommands) {
+			run_state = RUN_CMD_ARGS;
+			(void) openstring(cmdbuf, (long) strlen(cmdbuf));
+			getcommands(FALSE);
+			closeinput();
+		}
+		run_state = RUN_PRE_TOP_LEVEL;
+	}
+
+	while (run_state == RUN_CMD_ARGS) {
+		fprintf(stderr, "Error in commands\n");
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(FALSE);
+			closeinput();
+			if (inputlevel() == 0) {
+				getcommands(FALSE);
+				run_state = RUN_PRE_TOP_LEVEL;
+			}
+		} else {
+			closeinput();
+			if (!stdin_tty || !i_flag || p_flag)
+				run_state = RUN_EXIT_WITH_ERROR;
+			else
+				run_state = RUN_PRE_TOP_LEVEL;
+		}
+	}
+
+	if (run_state == RUN_PRE_TOP_LEVEL) {
+		if (stdin_tty && ((havecommands && !i_flag) || p_flag)) {
+			run_state = RUN_EXIT;
+		} else {
+			if (stdin_tty) {
+				reinitialize();
+			} else {
+				resetinput();
+				openterminal();
+			}
+			run_state = RUN_TOP_LEVEL;
+			getcommands(TRUE);
+		}
+	}
+
+	while (run_state == RUN_TOP_LEVEL) {
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(TRUE);
+			if (!inputisterminal())
+				closeinput();
+		} else {
+			if (stdin_tty) {
+				reinitialize();
+				getcommands(TRUE);
+			} else {
+			 	run_state = RUN_EXIT_WITH_ERROR;
+			}
+		}
+	}
 
 	/*
 	 * all done
 	 */
 	libcalc_call_me_last();
-	/* exit(0); */
-	return 0;
+	return (run_state == RUN_EXIT_WITH_ERROR ||
+		run_state == RUN_UNKNOWN) ? 1 : 0;
 }
 
 
@@ -339,7 +360,8 @@ math_error(char *fmt, ...)
 
 	if (funcname && (*funcname != '*'))
 		fprintf(stderr, "\"%s\": ", funcname);
-	if (funcline && ((funcname && (*funcname != '*')) || !inputisterminal()))
+	if (funcline && ((funcname && (*funcname != '*')) ||
+	    !inputisterminal()))
 		fprintf(stderr, "line %ld: ", funcline);
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);

calc.h

@@ -10,6 +10,7 @@
 #if !defined(__CALC_H__)
 #define	__CALC_H__
 
+#include <setjmp.h>
 
 #include "value.h"
 
@@ -37,7 +38,7 @@
 #define	SYMBOLSIZE	256	/* maximum symbol name size */
 #define	MAXINDICES	20	/* maximum number of indices for objects */
 #define	MAXLABELS	100	/* maximum number of user labels in function */
-#define	MAXOBJECTS	10	/* maximum number of object types */
+#define	MAXOBJECTS	128	/* maximum number of object types */
 #define	MAXSTRING	1024	/* maximum size of string constant */
 #define	MAXSTACK	1000	/* maximum depth of evaluation stack */
 #define	MAXFILES	20	/* maximum number of opened files */
@@ -58,6 +59,8 @@
 #define ABORT_MATH	3	/* abort on any math operation */
 #define ABORT_NOW	4	/* abort right away */
 
+#define ERRMAX 20		/* default errmax value */
+
 /*
  * File ids corresponding to standard in, out, error, and when not in use.
  */
@@ -110,7 +113,7 @@ extern void trimconstants(void);
 /*
  * Input routines.
  */
-extern int openstring(char *str);
+extern int openstring(char *str, long num);
 extern int openterminal(void);
 extern int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
 extern char *nextline(void);
@@ -119,12 +122,12 @@ extern void reread(void);
 extern void resetinput(void);
 extern void setprompt(char *);
 extern BOOL inputisterminal(void);
+extern int inputlevel(void);
 extern char *inputname(void);
 extern long linenumber(void);
 extern void runrcfiles(void);
 extern void closeinput(void);
 
-
 /*
  * Other routines.
  */
@@ -138,21 +141,39 @@ extern void libcalc_call_me_first(void);
 extern void libcalc_call_me_last(void);
 extern void showerrors(void);
 
-
 /*
  * Initialization
  */
 extern void initialize(void);
 extern void reinitialize(void);
-
+extern int isatty(int tty);	/* TRUE if fd is a tty */
+extern char *version(void);	/* return version string */
+extern int post_init;		/* TRUE => setjmp for math_error is ready */
 
 /*
- * Global data definitions.
+ * global flags and definitions
  */
+extern int abortlevel;		/* current level of aborts */
+extern BOOL inputwait;		/* TRUE if in a terminal input wait */
+extern jmp_buf jmpbuf;		/* for errors */
+
+extern int p_flag;		/* TRUE => pipe mode */
+extern int q_flag;		/* TRUE => don't execute rc files */
+extern int u_flag;		/* TRUE => unbuffer stdin and stdout */
+extern int d_flag;		/* TRUE => disable heading, lib_debug == 0 */
+extern int c_flag;		/* TRUE => continue after error if permitted */
+extern int i_flag;		/* TRUE => try to go interactive after error */
+extern int stoponerror;		/* >0 => stop, <0 => continue, ==0 => use -c */
+
+extern char *pager;		/* $PAGER or default */
+extern int stdin_tty;		/* TRUE if stdin is a tty */
+extern int havecommands;	/* TRUE if have cmd args) */
+extern char *program;		/* our name */
+extern char cmdbuf[];		/* command line expression */
+
 extern int abortlevel;		/* current level of aborts */
 extern BOOL inputwait;		/* TRUE if in a terminal input wait */
 extern VALUE *stack;		/* execution stack */
-extern int start_done;		/* TRUE => start up processing finished */
 extern int dumpnames;		/* TRUE => dump names rather than indices */
 
 extern char *calcpath;		/* $CALCPATH or default */
@@ -163,15 +184,28 @@ extern char *shell;		/* $SHELL or default */
 extern char *program;		/* our name (argv[0]) */
 
 extern int no_env;	/* TRUE (-e) => ignore env vars on startup */
-extern int ign_errmax;	/* TRUE (-i) => ignore when errcount exceeds errmax */
+extern int errmax;	/* if >= 0, error when errcount exceeds errmax */
 extern int new_std;	/* TRUE (-n) => use newstd configuration */
 
 extern int allow_read;	/* FALSE => may not open any files for reading */
 extern int allow_write;	/* FALSE => may not open any files for writing */
 extern int allow_exec;	/* FALSE => may not execute any commands */
 
-extern int post_init;	/* TRUE => setjmp for math_error is ready */
-
+/*
+ * calc startup and run state
+ */
+typedef enum {
+    RUN_UNKNOWN = -1,		/* unknown or unset start state */
+    RUN_BEGIN = 0,		/* calc execution starts */
+    RUN_RCFILES = 1,		/* rc files being evaluated */
+    RUN_PRE_CMD_ARGS = 2,	/* prepare to evaluate cmd args */
+    RUN_CMD_ARGS = 3,		/* cmd args being evaluated */
+    RUN_PRE_TOP_LEVEL = 4,	/* prepare to start top level activity */
+    RUN_TOP_LEVEL = 5,		/* running at top level */
+    RUN_EXIT = 6,		/* normal exit from calc */
+    RUN_EXIT_WITH_ERROR = 7	/* exit with error */
+} run;
+extern run run_state;
 
 /*
  * calc version information

calc.man

@@ -1,190 +1,356 @@
 .\"
-.\" Copyright (c) 1994 David I. Bell and Landon Curt Noll
+.\" Copyright (c) 1993 David I. Bell and Landon Curt Noll
+.\" Original man page dated 15nov93
+.\" Copyright (c) 1999 David I. Bell and Landon Curt Noll
 .\" Permission is granted to use, distribute, or modify this source,
 .\" provided that this copyright notice remains intact.
 .\"
 .\" calculator by David I. Bell
 .\" man page by Landon Noll
-.TH calc 1 "^..^" "15nov93"
+.TH calc 1 "^..^" "15Oct1999"
 .SH NAME
 calc \- arbitrary precision calculator
 .SH SYNOPSIS
 \fIcalc\fP
-[\fI\-h\fP]
-[\fI\-m mode\fP]
-[\fI\-p\fP]
-[\fI\-q\fP]
-[\fI\-u\fP]
-[\fI\-v\fP]
-[\fIcalc_cmd \&.\|.\|.\fp]
+.RB [ \-c ]
+.RB [ \-C ]
+.RB [ \-d ]
+.RB [ \-e ]
+.RB [ \-h ]
+.RB [ \-i ]
+.RB [ \-m\ \&mode ]
+.br
+.in +5n
+.RB [ \-n ]
+.RB [ \-p ]
+.RB [ \-q ]
+.RB [ \-u ]
+.RB [ \-v ]
+.RB [ calc_cmd\ \&.\|.\|. ]
+.in -5n
 .SH DESCRIPTION
 \&
 .br
 CALC COMMAND LINE
 .PP
+
 .TP
-\fI\-h\fP
-Print a help message.
-This option implies \fI \-q\fP.
-This is equivalent to the calc command \fIhelp help\fP.
-The help facility is disabled unless the \fImode\fP is 5 or 7.
-See \fI\-m\fP below.
-.sp
-.TP
-\fI\-m mode\fP
-This flag sets the permission mode of calc.
-It controls the ability for \fIcalc\fP to open files
-and execute programs.
-\fIMode\fP may be a number from 0 to 7.
-.sp
-The \fImode\fP value is interpreted in a way similar
-to that of the \fRchmod(1)\fP octal mode:
-.sp
-.in +0.5i
+.B \-c
+Continue reading command lines even after an execution
+error has caused the abandonment of a line.
+.sp 1
+For example:
+.sp 1
+.in +5n
 .nf
-0   do not open any file, do not execute progs
-1   do not open any file
-2   do not open files for reading, do not execute progs
-3   do not open files for reading
-4   do not open files for writing, do not execute progs
-5   do not open files for writing
-6   do not execute any program
-7   allow everything (default mode)
+calc read many_errors.cal
 .fi
-.in -0.5i
-.sp
-If one wished to run calc from a privledged user, one might
-want to use \fI\-m 0\fP in an effort to make calc more secure.
-.sp
-\fIMode\fP bits for reading and writing apply only on an open.
+.in -5n
+.sp 1
+will cause
+.B calc
+to abort on the first error, whereas:
+.sp 1
+.in +5n
+.nf
+calc -c read many_errors.cal
+.fi
+.in -5n
+.sp 1
+will
+cause
+.B calc
+to try to process each line being read
+despite the errors that it encounters.
+
+.TP
+.B \-C
+Permit the execution of custom builtin functions.  Without
+this flag, calling the custom() builtin function will
+simply generate an error.
+.sp 1
+Use if this flag may cause
+.B calc
+to execute functions that
+are non-standard and that are not portable.  Custom builtin
+functions are disabled by default for this reason.
+
+.TP
+.B \-d
+Disable the printing of the opening title.  The printing
+of library debug and informational messages is also disabled
+as if \fBconfig("lib_debug", 0)\fP had been executed.
+.sp 1
+For example:
+.sp 1
+.in +5n
+calc 'read qtime; qtime(2)'
+.in -5n
+.sp 1
+will output something like:
+.sp 1
+.in +5n
+.nf
+qtime(utc_hr_offset) defined
+It's nearly ten past six.
+.fi
+.in -5n
+.sp 1
+whereas:
+.sp 1
+.in +5n
+.nf
+calc -d 'read qtime; qtime(2)'
+.fi
+.in -5n
+.sp 1
+will just say:
+.sp 1
+.in +5n
+.nf
+It's nearly ten past six.
+.fi
+.in -5n
+.sp 1
+
+.TP
+.B \-e
+Ignore any environment variables on startup.
+The getenv() builtin will still return values, however.
+
+.TP
+.B \-h
+Print a help message.  This option implies
+.BR \-q .
+This
+is equivalent to the
+.B calc
+command help help.
+The help facility is disabled unless the mode is 5 or 7.
+See
+.BR \-m .
+
+.TP
+.B \-i
+Become interactive if possible.
+Be default, if
+.I calc_cmd
+args are given,
+.B calc
+will execute them and exit.
+This flag args are given,
+.B calc
+will execute them and exit.
+This flag will cause
+.B calc
+to drop into interactive mode after the
+commands are executed.
+.sp 1
+For example:
+.sp 1
+.in +5n
+.nf
+calc 2+5
+.fi
+.in -5n
+.sp 1
+will print the value 7 and exit whereas:
+.sp 1
+.in +5n
+.nf
+calc -i 2+5
+.fi
+.in -5n
+.sp 1
+will print the value 7 and prompt the user for more
+.B calc
+commands.
+
+.TP
+.BR \-m " mode"
+This flag sets the permission mode of
+.BR calc .
+It controls the ability for
+.B calc
+to open files and execute programs.
+Mode may be a number from 0 to 7.
+.sp 1
+The mode value is interpreted in a way similar to that
+of the
+.BR chmod (1)
+octal mode:
+.sp 1
+.in +5n
+.nf
+0  do not open any file, do not execute progs
+1  do not open any file
+2  do not open files for reading, do not execute progs
+3  do not open files for reading
+4  do not open files for writing, do not execute progs
+5  do not open files for writing
+6  do not execute any program
+7  allow everything (default mode)
+.fi
+.in -5n
+.sp 1
+If one wished to run
+.B calc
+from a privileged user, one might want to use
+.B \-m
+0 in an effort to make
+.B calc
+somewhat more secure.
+.sp 1
+Mode bits for reading and writing apply only on an
+open.
 Files already open are not effected.
-Thus if one wanted to use the \fI\-m 0\fP in an effort to make
-\fIcalc\fP more secure, but still wanted to read and write a specific
-file, one might want to do:
-.sp
-.in +0.5i
+Thus if one wanted to use the
+.B \-m
+0 in an effort to make
+.B calc
+somewhat more secure, but still wanted to read and write a specific
+file, one might want to do in
+.BR sh (1),
+.BR ksh (1),
+.BR bash (1)-like
+shells:
+.sp 1
+.in +5n
 .nf
-\fRcalc \-m 0 3<a.file\fP
+calc -m 0 3<a.file
 .fi
-.in -0.5i
-.sp
-Files presented to \fIcalc\fP in this way are opened in an unknown mode.
-\fICalc\fP will attempt to read or write them if directed.
-.sp
-If the \fImode\fP disables opening of files for reading, then
-the startup library scripts are disabled as of \fI\-q\fP was given.
-The reading of key bindings is also disabled when the \fImode\fP
-disables opening of files for reading.
+.in -5n
+.sp 1
+Files presented to
+.B calc
+in this way are opened in an
+unknown mode.
+.B Calc
+will attempt to read or write them if directed.
+.sp 1
+If the mode disables opening of files for reading, then
+the startup library scripts are disabled as of
+.B \-q
+was given.
+The reading of key bindings is also disabled
+when the mode disables opening of files for reading.
+
 .TP
-\fI \-p\fP
-Pipe processing is enabled by use of \-p.  For example:
-.sp
-.in +0.5i
+.B \-n
+Use the new configuration defaults instead of the old
+default classic defaults.
+This flag as the same effect
+as executing \fBconfig("all", "newcfg")\fP at startup time.
+
+.TP
+.B \-p
+Pipe processing is enabled by use of
+.BR \-p .
+For example:
+.sp 1
+.in +5n
 .nf
-\fRecho "print 2^21701\-1, 2^23209\-1" | calc \-p | fizzbin\fP
+calc -p '2^21701-1' | fizzbin
 .fi
-.in -0.5i
-.sp
-In pipe mode, \fIcalc\fP does not prompt, does not print leading tabs
-and does not print the initial header.
+.in -5n
+.sp 1
+In pipe mode,
+.B calc
+does not prompt, does not print leading
+tabs and does not print the initial header.
+The
+.B \-p
+flag overrides
+.BR \-i .
+
 .TP
-\fI \-q\fP
-Disable the use of the \fI$CALCRC\fP startup scripts.
+.B \-q
+Disable the use of the $CALCRC startup scripts.
+
 .TP
-\fI \-u\fP
+.B \-u
 Disable buffering of stdin and stdout.
+
 .TP
-\fI \-v\fP
-Print the version and exit.
+.B \-v
+Print the
+.B calc
+version number and exit.
 .PP
-Without \fIcalc_cmd\fPs, \fIcalc\fP operates interactively.
-If one or more \fIcalc_cmd\fPs are given on the command line,
-\fIcalc\fP will execute them and exit.
-The printing of leading tabs on output is disabled
-as if \fIconfig("tab",0)\fP had been executed.
+Without
+.IR calc_cmd ,
+.B calc
+operates interactively.
+If one or more
+.I calc_cmd
+are given on the command line,
+.B calc
+will execute them and exit.
+If
+.B \-i
+is given,
+.B calc
+will attempt to become interactive
+even of one or more
+.I calc_cmd
+are given on the command line.
 .PP
-Normally on startup, \fIcalc\fP attempts to execute a collection
-of library scripts.
-The environment variable \fI$CALCRC\fP (if non-existent then
-a compiled in value) contains a \fI:\fP separated list of
-startup library scripts.
-No error conditions are produced if these startup library scripts
-are not found.
+Normally on startup,
+.B calc
+attempts to execute a collection of
+library scripts.
+The environment variable $CALCRC (if non-existent
+then a compiled in value) contains a :  separated list of startup
+library scripts.
+No error conditions are produced if these startup
+library scripts are not found.
 .PP
-If the \fImode\fP disables opening of files for reading, then
-the startup library scripts are disabled as of \fI\-q\fP was given
-and \fI$CALCRC\fP as well as the default compiled in value are ignored.
+If the mode disables opening of files for reading, then the startup
+library scripts are disabled as of
+.B \-q
+was given and $CALCRC as well
+as the default compiled in value are ignored.
 .PP
 Filenames are subject to ``~'' expansion (see below).
-The environment variable \fI$CALCPATH\fP (if non-existent then
-a compiled in value) contains a \fI:\fP separated list of search
-directories.
-If a file does not begin with \fI/\fP, \fI~\fP or \fI./\fP,
-then it is searched for under each directory listed in the \fI$CALCPATH\fP.
-It is an error if no such readable file is found.
+The
+environment variable $CALCPATH (if non-existent then a compiled in
+value) contains a : separated list of search directories.
+If a
+file does not begin with /, ~ or ./, then it is searched for under
+each directory listed in the $CALCPATH.
+It is an error if no such
+readable file is found.
 .PP
-Calc treats all open files, other than stdin, stdout and stderr
-as files available for reading and writing.
-One may present calc with an already open file in the following way:
-.sp
-.in +0.5i
+.B Calc
+treats all open files, other than stdin, stdout and
+stderr as files available for reading and writing.
+One may
+present
+.B calc
+with an already open file using
+.BR sh (1),
+.BR ksh (1),
+.BR bash (1)-like
+shells is to:
+.sp 1
+.in +5n
+calc 3<open_file 4<open_file2
+.in -5n
+.sp 1
+For more information use the following
+.B calc
+commands:
+.sp 1
+.in +5n
 .nf
-\fRcalc 3<open_file 4<open_file2\fP
-.fi
-.in -0.5i
-.PP
-For more information use the following calc commands:
-.PP
-.in 1.0i
-help usage
-.br
 help help
-.br
+help overview
+help usage
 help environment
-.in -1.0i
-.PP
-OVERVIEW
-.PP
-\fICalc\fP is arbitrary precision arithmetic system that uses
-a C-like language.
-\fICalc\fP is useful as a calculator, an algorithm prototyped
-and as a mathematical research tool.
-More importantly, \fIcalc\fP provides one with a machine
-independent means of computation.
-.PP
-\fICalc\fP comes with a rich set of builtin mathematical
-and programmatic functions.
-.PP
-\fICalc\fP is distributed with library of scripts.
-Written in the same C-like language, library scripts may be
-read in and executed during a \fIcalc\fP session.
-These library scripts are also provided because they are
-useful and to serve as examples of the \fIcalc\fP language.
-One may further extend \fIcalc\fP thru the
-use of user defined scripts.
-.PP
-Internally calc represents numeric values as fractions reduced to their
-lowest terms.
-The numerators and denominators of these factions may grow to
-arbitrarily large values.
-Numeric values read in are automatically converted into rationals.
-The user need not be aware of this internal representation.
-.PP
-For more information use the following calc commands:
-.PP
-.in 1.0i
-help intro
-.br
-help builtin
-.br
-help stdlib
-.br
-help define
-.br
-show builtins
-.br
-show functions
-.in -1.0i
+help config
+.fi
+.in -5n
+.sp 1
 .PP
 DATA TYPES
 .PP
@@ -199,7 +365,9 @@ multiplication, division, negation, squaring, modulus,
 rounding, exponentiation, equality, comparison, printing
 and so on.
 .PP
-For more information use the following calc commands:
+For more information use the following
+.B calc
+commands:
 .PP
 .in 1.0i
 help types
@@ -220,7 +388,9 @@ procedure.
 Values may be grouped together in a matrix, or into a
 a list that permits stack and queue style operations.
 .PP
-For more information use the following calc commands:
+For more information use the following
+.B calc
+commands:
 .PP
 .in 1.0i
 help variable
@@ -256,7 +426,9 @@ For example:
 ~chongo/lib/fft_multiply.cal
 .in -1.0i
 .PP
-For more information use the following calc command:
+For more information use the following
+.B calc
+command:
 .PP
 .in 1.0i
 help file
@@ -275,7 +447,9 @@ These include commands such as function definition, help,
 reading in library scripts, dump files to a file, error notification,
 configuration control and status.
 .PP
-For more information use the following calc command:
+For more information use the following
+.B calc
+command:
 .PP
 .in 1.0i
 help command
@@ -295,7 +469,8 @@ help config
 .PD 0
 .TP 20
 ${LIBDIR}/*.cal
-library scripts shipped with calc
+library scripts shipped with
+.B calc
 .br
 .sp
 .TP 20
@@ -323,7 +498,9 @@ Default value: ${CALCPATH}
 .TP 5
 CALCRC
 On startup (unless \-h or \-q was given on the command
-line), calc searches for files along this :-separated
+line),
+.B calc
+searches for files along this :-separated
 environment variable.
 .br
 .sp
@@ -333,7 +510,9 @@ Default value: ${CALCRC}
 .TP 5
 CALCBINDINGS
 On startup (unless \fI\-h\fP or \fI\-q\fP was given on the command
-line, or \fI\-m\fP disallows opening files for reading), calc reads
+line, or \fI\-m\fP disallows opening files for reading),
+.B calc
+reads
 key bindings from the filename specified
 by this environment variable.
 .br
@@ -343,9 +522,12 @@ Default value: ${CALCBINDINGS}
 .SH CREDIT
 \&
 .br
-The majority of calc was written by David I. Bell.
+The majority of
+.B calc
+was written by David I. Bell.
 .sp
-Calc archives and calc-tester mailing list maintained by Landon Curt Noll.
+.B Calc
+archives and calc-tester mailing list maintained by Landon Curt Noll.
 .sp
 Thanks for suggestions and encouragement from Peter Miller,
 Neil Justusson, and Landon Noll.
@@ -378,30 +560,27 @@ Copyright (c) 19xx Ernest Bowen and Landon Curt Noll
 Permission is granted to use, distribute, or modify this source,
 provided that this copyright notice remains intact.
 .sp
-Send calc comments, suggestions, bug fixes, enhancements
-and interesting calc scripts that you would like you see included
+Send comments, suggestions, bug fixes, enhancements
+and interesting
+.B calc
+scripts that you would like you see included
 in future distributions to:
 .sp
 .in +0.5i
-dbell@auug.org.au
-.br
-chongo@toad.com
+calc-tester@postofc.corp.sgi.com
 .in -0.5i
 .sp
-Landon Noll maintains the official calc ftp archive at:
+Landon Noll maintains the the
+.B calc
+web site is located at:
 .sp
 .in +0.5i
-ftp://ftp.uu.net/pub/calc
+http://reality.sgi.com/chongo/tech/comp/calc
 .in -0.5i
 .sp
-Alpha test versions, complete with bugs, untested code and
-experimental features may be fetched (if you are brave) under:
-.sp
-.in +0.5i
-http://reality.sgi.com/chongo/calc/
-.in -0.5i
-.sp
-One may join the calc testing group by sending a request to:
+One may join the
+.B calc
+testing group by sending a request to:
 .sp
 .in +0.5i
 calc-tester-request@postofc.corp.sgi.com
@@ -410,14 +589,14 @@ calc-tester-request@postofc.corp.sgi.com
 Your message body (not the subject) should consist of:
 .sp
 .in +0.5i
+.nf
 subscribe calc-tester address
-.br
 end
-.br
 name your_full_name
+.fi
+.in -0.5i
 .sp
 where "address" is your EMail address and "your_full_name"
 is your full name.
-.in -0.5i
 .sp
-Enjoy!
+Share and Enjoy! :\-)

codegen.c

@@ -125,6 +125,7 @@ getcommands(BOOL toplevel)
 			switch (opensearchfile(name,calcpath,CALCEXT,rdonce)) {
 			case 0:
 				getcommands(FALSE);
+				closeinput();
 				break;
 			case 1:
 				/* previously read and -once was given */
@@ -261,6 +262,8 @@ getfunction(void)
 {
 	char *name;		/* parameter name */
 	int type;		/* type of token read */
+	LABEL label;
+	long index;
 
 	(void) tokenmode(TM_DEFAULT);
 	if (gettoken() != T_SYMBOL) {
@@ -276,9 +279,11 @@ getfunction(void)
 	beginfunc(name, FALSE);
 	enterfuncscope();
 	if (gettoken() != T_LEFTPAREN) {
-		scanerror(T_SEMICOLON, "Left parenthesis expected for function");
+		scanerror(T_SEMICOLON,
+			"Left parenthesis expected for function");
 		return;
 	}
+	index = 0;
 	for (;;) {
 		type = gettoken();
 		if (type == T_RIGHTPAREN)
@@ -292,12 +297,22 @@ getfunction(void)
 			case SYM_UNDEFINED:
 			case SYM_GLOBAL:
 			case SYM_STATIC:
-				(void) addparam(name);
+				index = addparam(name);
 				break;
 			default:
 				scanerror(T_NULL, "Parameter \"%s\" is already defined", name);
 		}
 		type = gettoken();
+		if (type == T_ASSIGN) {
+			clearlabel(&label);
+			addopone(OP_PARAMADDR, index);
+			addoplabel(OP_JUMPNN, &label);
+			getopassignment();
+			addop(OP_ASSIGNPOP);
+			setlabel(&label);
+			type = gettoken();
+		}
+
 		if (type == T_RIGHTPAREN)
 			break;
 		if (type != T_COMMA) {
@@ -340,10 +355,6 @@ getsimplebody(void)
 	(void) tokenmode(TM_NEWLINES);
 	(void) getexprlist();
 	addop(OP_RETURN);
-	if (gettoken() != T_SEMICOLON)
-		rescantoken();
-	if (gettoken() != T_NEWLINE)
-		scanerror(T_NULL, "Illegal function definition");
 }
 
 
@@ -598,25 +609,25 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 					scanerror(T_SEMICOLON, "CONTINUE not within FOR, WHILE, or DO");
 					return;
 				}
-				addoplabel(OP_JUMPNE, contlabel);
+				addoplabel(OP_JUMPNZ, contlabel);
 				break;
 			case T_BREAK:
 				if (breaklabel == NULL_LABEL) {
 					scanerror(T_SEMICOLON, "BREAK not within FOR, WHILE, or DO");
 					return;
 				}
-				addoplabel(OP_JUMPNE, breaklabel);
+				addoplabel(OP_JUMPNZ, breaklabel);
 				break;
 			case T_GOTO:
 				if (gettoken() != T_SYMBOL) {
 					scanerror(T_SEMICOLON, "Missing label in goto");
 					return;
 				}
-				addop(OP_JUMPNE);
+				addop(OP_JUMPNZ);
 				addlabel(tokensymbol());
 				break;
 			default:
-				addoplabel(OP_JUMPEQ, &label1);
+				addoplabel(OP_JUMPZ, &label1);
 				rescantoken();
 				getstatement(contlabel, breaklabel, NULL_LABEL, NULL_LABEL);
 				if (gettoken() != T_ELSE) {
@@ -667,7 +678,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 			contlabel = &label1;
 			rescantoken();
 			(void) getexprlist();
-			addoplabel(OP_JUMPNE, &label3);
+			addoplabel(OP_JUMPNZ, &label3);
 			addoplabel(OP_JUMP, breaklabel);
 			if (gettoken() != T_SEMICOLON) {
 				(void) tokenmode(oldmode);
@@ -708,7 +719,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		clearlabel(breaklabel);
 		setlabel(contlabel);
 		getcondition();
-		addoplabel(OP_JUMPEQ, breaklabel);
+		addoplabel(OP_JUMPZ, breaklabel);
 		getstatement(contlabel, breaklabel, NULL_LABEL, NULL_LABEL);
 		addoplabel(OP_JUMP, contlabel);
 		setlabel(breaklabel);
@@ -731,7 +742,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		}
 		setlabel(contlabel);
 		getcondition();
-		addoplabel(OP_JUMPNE, &label3);
+		addoplabel(OP_JUMPNZ, &label3);
 		setlabel(breaklabel);
 		(void) tokenmode(oldmode);
 		return;
@@ -815,6 +826,8 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		printeol = TRUE;
 		for (;;) {
 			switch (gettoken()) {
+				case T_RIGHTPAREN:
+				case T_RIGHTBRACKET:
 				case T_RIGHTBRACE:
 				case T_NEWLINE:
 				case T_EOF:
@@ -1377,6 +1390,21 @@ getassignment (void)
 {
 	int type;		/* type of expression */
 
+	switch(gettoken()) {
+		case T_COMMA:
+		case T_SEMICOLON:
+		case T_NEWLINE:
+		case T_RIGHTPAREN:
+		case T_RIGHTBRACKET:
+		case T_RIGHTBRACE:
+		case T_EOF:
+			addop(OP_UNDEF);
+			rescantoken();
+			return EXPR_RVALUE;
+	}
+
+	rescantoken();
+
 	type = getaltcond();
 
 	switch (gettoken()) {
@@ -1441,7 +1469,7 @@ getaltcond(void)
 	}
 	clearlabel(&donelab);
 	clearlabel(&altlab);
-	addoplabel(OP_JUMPEQ, &altlab);
+	addoplabel(OP_JUMPZ, &altlab);
 	type = getaltcond();
 	if (gettoken() != T_COLON) {
 		scanerror(T_SEMICOLON, "Missing colon for conditional expression");

config.c

@@ -93,7 +93,7 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	FALSE,			/* skip duplicate block output lines */
 	BLK_BASE_HEX,		/* block octet print base */
 	BLK_FMT_HD_STYLE,	/* block output format */
-	0,			/* calc library debug level */
+	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
 	0 			/* user defined debug level */
 };
@@ -128,7 +128,7 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	FALSE,			/* skip duplicate block output lines */
 	BLK_BASE_HEX,		/* block octet print base */
 	BLK_FMT_HD_STYLE,	/* block output format */
-	0,			/* calc library debug level */
+	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
 	0 			/* user defined debug level */
 };
@@ -890,7 +890,7 @@ config_copy(CONFIG *src)
 	/*
 	 * copy over the values
 	 */
-	*dest = *src;
+	memcpy((void *)dest, (void *)src, sizeof(CONFIG));
 
 	/*
 	 * clone the pointer values

config.h

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 
@@ -85,7 +83,7 @@
 
 
 /*
- * config defult symbols
+ * config default symbols
  */
 #define DISPLAY_DEFAULT 20	/* default digits for float display */
 #define EPSILON_DEFAULT "1e-20"	/* allowed error for float calculations */
@@ -95,8 +93,6 @@
 #define MAXPRINT_DEFAULT 16	/* default number of elements printed */
 #define MAXSCANCOUNT 20		/* default max scan errors before an abort */
 
-#define ERRMAX 20		/* default errmax value */
-
 
 /*
  * configuration object

custom.c

@@ -24,12 +24,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 /* these include files are needed regardless of CUSTOM */

custom.h

@@ -28,15 +28,12 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
-
 /*
  * Be careful what you put in this file, upper .c files include
  * this file even when CUSTOM is not defined (ALLOW_CUSTOM is empty).

custom/CUSTOM_CAL

@@ -19,7 +19,7 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# chongo was here	/\../\		chongo@toad.com
+# chongo was here	/\../\		http://reality.sgi.com/chongo
 
 The following custom calc library files are provided because they serve
 as examples of how use the custom interface.  The custom interface

custom/Makefile

@@ -26,12 +26,10 @@
 #
 # Happy bit twiddling,
 #
-#			Landon Curt Noll
+#      Landon Curt Noll
+#      http://reality.sgi.com/chongo
 #
-#			chongo@toad.com
-#			...!{pyramid,sun,uunet}!hoptoad!chongo
-#
-# chongo was here	/\../\
+# chongo <was here> /\../\
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
@@ -41,13 +39,13 @@
 #
 # Put your custom calc library files here.
 #
-CUSTOM_CALC_FILES= argv.cal halflen.cal
+CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal
 
 # The custom help files to install
 #
 # Put your custom help files here.
 #
-CUSTOM_HELP= argv devnull help sysinfo
+CUSTOM_HELP= argv devnull help sysinfo pzasusb8
 
 # Any .h files that are needed by programs that use libcustcalc.a
 #
@@ -63,7 +61,7 @@ CUSTOM_H_SRC=
 #
 # Put your custom .c files here.
 #
-CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c
+CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c
 
 # Any .o files that are needed by program that use libcustcalc.a.
 # Don't put ${REQUIRED_OBJ} files in this list.
@@ -72,7 +70,7 @@ CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c
 #
 # Put your custom .o files here.
 #
-CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o
+CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o
 
 ##############################################################################
 #-=-=-=-=-=-=- Defaults in case you want to build from this dir -=-=-=-=-=-=-#
@@ -590,6 +588,11 @@ c_help.o: ../string.h
 c_help.o: ../value.h
 c_help.o: ../zmath.h
 c_help.o: c_help.c
+c_pzasusb8.o: ../custom.h
+c_pzasusb8.o: ../have_const.h
+c_pzasusb8.o: ../value.h
+c_pzasusb8.o: ../zmath.h
+c_pzasusb8.o: c_pzasusb8.c
 c_sysinfo.o: ../alloc.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h

custom/argv.cal

@@ -10,7 +10,7 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ * chongo was here	/\../\		http://reality.sgi.com/chongo
  */
 /*
  * argv - print information about various args

custom/c_argv.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_devnull.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_help.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_pzasusb8.c

@@ -0,0 +1,70 @@
+/*
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted.
+ *
+ *            Ernest Bowen, following Landon Curt Noll
+ */
+
+#if defined(CUSTOM)
+
+#include <stdio.h>
+
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"
+#include "../zmath.h"
+
+/*
+ * c_pzasusb8 - print numereator of real as if its array of HALFs were
+ *    a string of USB8s
+ *
+ * given:
+ *    count = 1;
+ *    vals[0]   real number;
+ *
+ * returns:
+ *    null
+ */
+/*ARGSUSED*/
+VALUE
+c_pzasusb8(char *name, int count, VALUE **vals)
+{
+	VALUE result;           /* what we will return */
+	ZVALUE z;		/* numerator of the value */
+	long half_cnt;		/* number of HALFs in the numerator */
+	USB8 *h;		/* octet pointer */
+	long half_len;		/* length of a half in octets */
+	long i;
+	long j;
+
+	/*
+	 * arg check
+	 */
+	result.v_type = V_NULL;
+	if (vals[0]->v_type != V_NUM) {
+		math_error("Non-real argument for pzasusb8");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * look at the numerator
+	 */
+	z = vals[0]->v_num->num;
+	half_len = sizeof(HALF);
+	half_cnt = z.len;
+
+	/*
+	 * print the octets
+	 */
+	h = (USB8 *) z.v;
+	for (i=0; i < half_cnt; ++i) {
+		printf("%ld:\t", i);
+		for (j=0; j < half_len; ++j) {
+			printf("%02x", (int)(*h++));
+		}
+		putchar('\n');
+	}
+	return result;
+}
+
+#endif /* CUSTOM */

custom/c_sysinfo.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)
@@ -240,7 +238,7 @@ c_sysinfo(char *name, int count, VALUE **vals)
 		buf = (char *)malloc(strlen((char *)vals[0]->v_str->s_str)+1);
 		for (q = (char *)vals[0]->v_str->s_str, r = buf; *q; ++q, ++r)
 		{
-			if (isascii(*q) && islower(*q)) {
+			if (isascii((int)*q) && islower((int)*q)) {
 				*r = *q - 'a' + 'A';
 			} else {
 				*r = *q;

custom/custtbl.c

@@ -24,12 +24,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 
@@ -59,6 +57,7 @@ extern VALUE c_argv(char*, int, VALUE**);
 extern VALUE c_devnull(char*, int, VALUE**);
 extern VALUE c_help(char*, int, VALUE**);
 extern VALUE c_sysinfo(char*, int, VALUE**);
+extern VALUE c_pzasusb8(char*, int, VALUE**);
 
 
 #endif /* CUSTOM */
@@ -108,6 +107,9 @@ CONST struct custom cust[] = {
 	{ "sysinfo", "return a calc #define value",
 	 0, 1, c_sysinfo },
 
+	{ "pzasusb8", "print ZCALUE as USB8",
+	 0, 1, c_pzasusb8 },
+
 
 #endif /* CUSTOM */
 

custom/halflen.cal

@@ -10,7 +10,7 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ * chongo was here	/\../\		http://reality.sgi.com/chongo
  */
 /*
  * halflen - determine the length of numeric value in HALFs

custom/pzasusb8

@@ -0,0 +1,50 @@
+NAME
+    pzasusb8 - print a number in hex octets
+
+SYNOPSIS
+    custom("pzasusb8", arg)
+
+TYPES
+    arg		real
+
+    return	null
+
+DESCRIPTION
+    This custom function prints out the numerator of a real value
+    in octets.  Each HALF value is printed in a separate line.
+
+    NOTE: The output will vary depending on the size of a HALF
+	  and the byte order of the system.  See:
+
+		custom("sysinfo", "BASEB")
+		custom("sysinfo", "CALC_BYTE_ORDER")
+
+    foe details.
+
+    This custom function is intented for testing of the general
+    custom interface.
+
+EXAMPLE
+    > custom("pzasusb8", 0x01020304050607080910111213141516);
+    0:      13141516
+    1:      09101112
+    2:      05060708
+    3:      01020304
+
+    > custom("pzasusb8", 10^25)
+    0:      4a000000
+    1:      16140148
+    2:      00084595
+
+    > printf("%x\n", 10^25);
+    0x84595161401484a000000
+
+LIMITS
+    calc must be built with ALLOW_CUSTOM= -DCUSTOM
+    calc must be executed with a -C arg.
+
+LIBRARY
+    none
+
+SEE ALSO
+    custom

custom/pzasusb8.cal

@@ -0,0 +1,29 @@
+/*
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted.
+ *
+ *	Ernest Bowen, following Landon Curt Noll
+ */
+
+print "p(n) prints array in which numerator of n is stored as a";
+print "sequence of 2-hex-digits representing unsigned characters.";
+print "h(n) printx n in hex notation.  This should be the same as";
+print "p(n) except for (1) its leading 0x, (2) possible trailing zeros";
+print "in p(n), and (3) the order of the hex-digit pairs.";
+print "The following example show results for n = isqrt(2e100).";
+print "";
+
+define p(n) {custom("pzasusb8", n); print;}
+define h(n) = printf("%x\n", n);
+
+n = isqrt(2e100);
+print "";
+p(n);
+h(n);
+print "";
+print "BASEB: ", custom("sysinfo", "BASEB");
+print "CALC_BYTE_ORDER: ", custom("sysinfo", "CALC_BYTE_ORDER");
+print "BIG_ENDIAN: ", custom("sysinfo", "BIG_ENDIAN");
+print "LITTLE_ENDIAN: ", custom("sysinfo", "LITTLE_ENDIAN");
+print "LONG_BITS: ", custom("sysinfo", "LONG_BITS");
+print "LONGLONG_BITS: ", custom("sysinfo", "LONGLONG_BITS");

file.c

@@ -2271,6 +2271,7 @@ freadnum(FILE *fp, VALUE *valptr)
 			num = newnum;
 			zden = newden;
 		}
+		zfree(div);
 	}
 	q = qalloc();
 	q->num = num;

func.c

@@ -72,6 +72,7 @@ static int strscan(char *s, int count, VALUE **vals);
 static int filescan(FILEID id, int count, VALUE **vals);
 static VALUE f_eval(VALUE *vp);
 static VALUE f_fsize(VALUE *vp);
+static int malloced_putenv(char *str);
 
 
 
@@ -84,6 +85,21 @@ extern void matrandperm(MATRIX *M);
 extern void listrandperm(LIST *lp);
 extern int idungetc(FILEID id, int ch);
 
+extern int stoponerror;
+
+
+/*
+ * malloced environment storage
+ */
+#define ENV_POOL_CHUNK 10	/* env_pool elements to allocate at a time */
+struct env_pool {
+    char *getenv;	/* what getenv() would return, NULL => unused */
+    char *putenv;	/* pointer given to putenv() */
+};
+static int env_pool_cnt = 0;	/* number of env_pool elements in use */
+static int env_pool_max = 0;	/* number of env_pool elements allocated */
+static struct env_pool *e_pool = NULL;	/* env_pool elements */
+
 
 /*
  * if HZ & CLK_TCK are not defined, pick typical values, hope for the best
@@ -137,12 +153,14 @@ f_eval(VALUE *vp)
 	FUNC	*oldfunc;
 	FUNC	*newfunc;
 	VALUE	result;
-	char	*cp;
+	char	*str;
+	long	num;
 
 	if (vp->v_type != V_STR)
 		return error_value(E_EVAL2);
-	cp = vp->v_str->s_str;
-	switch (openstring(cp)) {
+	str = vp->v_str->s_str;
+	num = vp->v_str->s_len;
+	switch (openstring(str, num)) {
 		case -2:
 			return error_value(E_EVAL3);
 		case -1:
@@ -151,6 +169,7 @@ f_eval(VALUE *vp)
 	oldfunc = curfunc;
 	enterfilescope();
 	if (evaluate(TRUE)) {
+		closeinput();
 		exitfilescope();
 		freevalue(stack--);
 		newfunc = curfunc;
@@ -162,6 +181,7 @@ f_eval(VALUE *vp)
 			free(newfunc);
 		return result;
 	}
+	closeinput();
 	exitfilescope();
 	newfunc = curfunc;
 	curfunc = oldfunc;
@@ -209,6 +229,28 @@ f_prompt(VALUE *vp)
 }
 
 
+static VALUE
+f_display(int count, VALUE **vals)
+{
+	long oldvalue;
+	VALUE res;
+
+	oldvalue = conf->outdigits;
+
+	if (count > 0) {
+		if (vals[0]->v_type != V_NUM || qisfrac(vals[0]->v_num) ||
+			qisneg(vals[0]->v_num) || zge31b(vals[0]->v_num->num))
+			fprintf(stderr,
+				 "Out-of-range arg for display ignored\n");
+		else
+			conf->outdigits = qtoi(vals[0]->v_num);
+	}
+	res.v_type = V_NUM;
+	res.v_num = itoq(oldvalue);
+	return res;
+}
+
+
 /*ARGSUSED*/
 static VALUE
 f_null(int count, VALUE **vals)
@@ -230,33 +272,34 @@ f_str(VALUE *vp)
 	switch (vp->v_type) {
 		case V_STR:
 			result.v_str = stringcopy(vp->v_str);
-			return result;
+			break;
 		case V_NULL:
 			result.v_str = slink(&_nullstring_);
-			return result;
+			break;
 		case V_OCTET:
 			result.v_str = charstring(*vp->v_octet);
-			return result;
+			break;
 		case V_NUM:
 			math_divertio();
 			qprintnum(vp->v_num, MODE_DEFAULT);
 			cp = math_getdivertedio();
+			result.v_str = makestring(cp);
 			break;
 		case V_COM:
 			math_divertio();
 			comprint(vp->v_com);
 			cp = math_getdivertedio();
+			result.v_str = makestring(cp);
 			break;
 		default:
 			return error_value(E_STR);
 	}
-	result.v_str = makestring(cp);
 	return result;
 }
 
 
 static VALUE
-f_name (VALUE *vp)
+f_name(VALUE *vp)
 {
 	VALUE result;
 	char *cp;
@@ -767,6 +810,13 @@ f_nextcand(int count, NUMBER **vals)
 }
 
 
+static NUMBER *
+f_seed(void)
+{
+	return pseudo_seed();
+}
+
+
 static NUMBER *
 f_rand(int count, NUMBER **vals)
 {
@@ -1242,6 +1292,7 @@ minlistitems(LIST *lp)
 	VALUE min;
 
 	min.v_type = V_NULL;
+	term.v_type = V_NULL;
 
 	for (ep = lp->l_first; ep; ep = ep->e_next) {
 		vp = &ep->e_value;
@@ -1291,6 +1342,7 @@ maxlistitems(LIST *lp)
 	VALUE max;
 
 	max.v_type = V_NULL;
+	term.v_type = V_NULL;
 
 	for (ep = lp->l_first; ep; ep = ep->e_next) {
 		vp = &ep->e_value;
@@ -1339,6 +1391,8 @@ f_min(int count, VALUE **vals)
 	VALUE rel;
 
 	min.v_type = V_NULL;
+	term.v_type = V_NULL;
+
 	while (count-- > 0) {
 		vp = *vals++;
 		switch(vp->v_type) {
@@ -1390,6 +1444,7 @@ f_max(int count, VALUE **vals)
 	VALUE rel;
 
 	max.v_type = V_NULL;
+	term.v_type = V_NULL;
 
 	while (count-- > 0) {
 		vp = *vals++;
@@ -1494,6 +1549,7 @@ sumlistitems(LIST *lp)
 	VALUE sum;
 
 	sum.v_type = V_NULL;
+	term.v_type = V_NULL;
 
 	for (ep = lp->l_first; ep; ep = ep->e_next) {
 		vp = &ep->e_value;
@@ -1534,6 +1590,8 @@ f_sum(int count, VALUE **vals)
 	VALUE *vp;
 
 	sum.v_type = V_NULL;
+	term.v_type = V_NULL;
+
 	while (count-- > 0) {
 		vp = *vals++;
 		switch(vp->v_type) {
@@ -4376,11 +4434,7 @@ f_errno(int count, VALUE **vals)
 			math_error("errno argument out of range");
 			/*NOTREACHED*/
 		}
-		newerr = z1tol(vp->v_num->num);
-		if (newerr >= 32768) {
-			math_error("errno argument out of range");
-			/*NOTREACHED*/
-		}
+		newerr = (int) ztoi(vp->v_num->num);
 	}
 	olderr = set_errno(newerr);
 
@@ -4407,7 +4461,7 @@ f_errcount(int count, VALUE **vals)
 			math_error("errcount argument out of range");
 			/*NOTREACHED*/
 		}
-		newcount = z1tol(vp->v_num->num);
+		newcount = (int) ztoi(vp->v_num->num);
 	}
 	oldcount = set_errcount(newcount);
 
@@ -4420,23 +4474,21 @@ f_errcount(int count, VALUE **vals)
 static VALUE
 f_errmax(int count, VALUE **vals)
 {
-	int newmax, oldmax;
+	int oldmax;
 	VALUE *vp;
 	VALUE result;
 
-	newmax = -1;
+	oldmax = errmax;
 	if (count > 0) {
 		vp = vals[0];
 
-		/* arg must be an integer */
 		if (vp->v_type != V_NUM || qisfrac(vp->v_num) ||
-		qisneg(vp->v_num) || zge31b(vp->v_num->num)) {
-			math_error("errcount argument out of range");
-			/*NOTREACHED*/
-		}
-		newmax = z1tol(vp->v_num->num);
+				zge31b(vp->v_num->num))
+			fprintf(stderr,
+				 "Out-of-range arg for errmax ignored\n");
+		else
+			errmax = (int) ztoi(vp->v_num->num);
 	}
-	oldmax = set_errmax(newmax);
 
 	result.v_type = V_NUM;
 	result.v_num = itoq((long) oldmax);
@@ -4444,6 +4496,30 @@ f_errmax(int count, VALUE **vals)
 }
 
 
+static VALUE
+f_stoponerror(int count, VALUE **vals)
+{
+	int oldval;
+	VALUE *vp;
+	VALUE result;
+
+	oldval = stoponerror;
+	if (count > 0) {
+		vp = vals[0];
+
+		if (vp->v_type != V_NUM || qisfrac(vp->v_num) ||
+				zge31b(vp->v_num->num))
+			fprintf(stderr,
+				 "Out-of-range arg for stoponerror ignored\n");
+		else
+			stoponerror = (int) ztoi(vp->v_num->num);
+	}
+
+	result.v_type = V_NUM;
+	result.v_num = itoq((long) oldval);
+	return result;
+}
+
 static VALUE
 f_fclose(int count, VALUE **vals)
 {
@@ -5169,11 +5245,14 @@ f_strprintf(int count, VALUE **vals)
 	math_divertio();
 	i = idprintf(FILEID_STDOUT, vals[0]->v_str->s_str,
 		 count - 1, vals + 1);
-	if (i)
+	if (i) {
+		free(math_getdivertedio());
 		return error_value(E_STRPRINTF2);
+	}
 	cp = math_getdivertedio();
 	result.v_type = V_STR;
 	result.v_str = makenewstring(cp);
+	free(cp);
 	return result;
 }
 
@@ -5814,6 +5893,17 @@ f_isatty(VALUE *vp)
 }
 
 
+static VALUE
+f_inputlevel (void)
+{
+	VALUE result;
+
+	result.v_type = V_NUM;
+	result.v_num = itoq((long) inputlevel());
+	return result;
+}
+
+
 static VALUE
 f_access(int count, VALUE **vals)
 {
@@ -5916,7 +6006,7 @@ f_putenv(int count, VALUE **vals)
 
 	/* return putenv result */
 	result.v_type = V_NUM;
-	result.v_num = itoq((long) putenv(putenv_str));
+	result.v_num = itoq((long) malloced_putenv(putenv_str));
 	return result;
 }
 
@@ -6786,6 +6876,8 @@ static CONST struct builtin builtins[] = {
 	 "digit at specified decimal place of number"},
 	{"digits", 1, 1, 0, OP_NOP, f_digits, 0,
 	 "number of digits in number"},
+	{"display", 0, 1, 0, OP_NOP, 0, f_display,
+	 "number of decimal digits for displaying numbers"},
 	{"dp", 2, 2, 0, OP_NOP, 0, f_dp,
 	 "dot product of two vectors"},
 	{"epsilon", 0, 1, 0, OP_SETEPSILON, 0, 0,
@@ -6896,6 +6988,8 @@ static CONST struct builtin builtins[] = {
 	 "integral log of a number base 2"},
 	{"im", 1, 1, 0, OP_IM, 0, 0,
 	 "imaginary part of complex number"},
+	{"inputlevel", 0, 0, 0, OP_NOP, 0, f_inputlevel,
+	 "current input depth"},
 	{"insert", 2, IN, FA, OP_NOP, 0, f_listinsert,
 	 "insert values c ... into list a at position b"},
 	{"int", 1, 1, 0, OP_INT, qint, 0,
@@ -7136,6 +7230,8 @@ static CONST struct builtin builtins[] = {
 	 "sec of a within accuracy b"},
 	{"sech", 1, 2, 0, OP_NOP, 0, f_sech,
 	 "hyperbolic secant of a within accuracy b"},
+	{"seed", 0, 0, 0, OP_NOP, f_seed, 0,
+	 "return a 64 bit seed for a psuedo-random generator"},
 	{"segment", 2, 3, 0, OP_NOP, 0, f_segment,
 	 "specified segment of specified list"},
 	{"select", 2, 2, 0, OP_NOP, 0, f_select,
@@ -7166,6 +7262,8 @@ static CONST struct builtin builtins[] = {
 	 "seed the random() function"},
 	{"ssq", 1, IN, 0, OP_NOP, 0, f_ssq,
 	 "sum of squares of values"},
+	{"stoponerror", 0, 1, 0, OP_NOP, 0, f_stoponerror,
+	 "assign value to stoponerror flag"},
 	{"str", 1, 1, 0, OP_NOP, 0, f_str,
 	 "simple value converted to string"},
 	{"strcat", 1,IN, 0, OP_NOP, 0, f_strcat,
@@ -7454,4 +7552,145 @@ showerrors(void)
 }
 
 
+/*
+ * malloced_putenv - Keep track of malloced environment variable storage
+ *
+ * given:
+ *	str	a malloced string which will be given to putenv
+ *
+ * returns:
+ *	putenv() return value
+ *
+ * NOTE: The caller MUST pass a string that the caller has previously malloced.
+ */
+static int
+malloced_putenv(char *str)
+{
+	char *value;	/* location of the value part of the str argument */
+	char *old_val;	/* previously stored (or inherited) env value */
+	int found_cnt;	/* number of active env_pool entries found */
+	struct env_pool *new;	/* new e_pool */
+	int i;
+
+	/*
+	 * firewall
+	 */
+	if (str == NULL) {
+		math_error("malloced_putenv given a NULL pointer!!");
+		/*NOTREACHED*/
+	}
+	if (str[0] == '=') {
+		math_error("malloced_putenv = is first character in string!!");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * determine the place where getenv would return
+	 */
+	value = strchr(str, '=');
+	if (value == NULL) {
+		math_error("malloced_putenv = not found in string!!");
+		/*NOTREACHED*/
+	}
+	++value;
+
+	/*
+	 * lookup for an existing environment value
+	 */
+	*(value-1) = '\0';
+	old_val = getenv(str);
+	*(value-1) = '=';
+
+	/*
+	 * If we have the value in our environment, look for a
+	 * previously malloced string and free it
+	 */
+	if (old_val != NULL && env_pool_cnt > 0) {
+		for (i=0, found_cnt=0;
+		     i < env_pool_max && found_cnt < env_pool_cnt;
+		     ++i) {
+
+			/* skip an unused entry */
+			if (e_pool[i].getenv == NULL) {
+			    continue;
+			}
+			++found_cnt;
+
+			/* look for the 1st match */
+			if (e_pool[i].getenv == value) {
+
+				/* found match, free the storage */
+				if (e_pool[i].putenv != NULL) {
+					free(e_pool[i].putenv);
+				}
+				e_pool[i].getenv = NULL;
+				--env_pool_cnt;
+				break;
+			}
+		}
+	}
+
+	/*
+	 * ensure that we have room in the e_pool
+	 */
+	if (env_pool_max == 0) {
+
+		/* allocate an initial pool (with one extra guard value) */
+		new = (struct env_pool *)malloc((ENV_POOL_CHUNK+1) *
+						sizeof(struct env_pool));
+		if (new == NULL) {
+			math_error("malloced_putenv malloc failed");
+			/*NOTREACHED*/
+		}
+		e_pool = new;
+		env_pool_max = ENV_POOL_CHUNK;
+		for (i=0; i <= ENV_POOL_CHUNK; ++i) {
+			e_pool[i].getenv = NULL;
+		}
+
+	} else if (env_pool_cnt >= env_pool_max) {
+
+		/* expand the current pool (with one extra guard value) */
+		new = (struct env_pool *)realloc(e_pool,
+					     (env_pool_max+ENV_POOL_CHUNK+1) *
+					     sizeof(struct env_pool));
+		if (new == NULL) {
+			math_error("malloced_putenv realloc failed");
+			/*NOTREACHED*/
+		}
+		e_pool = new;
+		for (i=env_pool_max; i <= env_pool_max + ENV_POOL_CHUNK; ++i) {
+			e_pool[i].getenv = NULL;
+		}
+		env_pool_max += ENV_POOL_CHUNK;
+	}
+
+	/*
+	 * store our data into the first e_pool entry
+	 */
+	for (i=0; i < env_pool_max; ++i) {
+
+		/* skip used entries */
+		if (e_pool[i].getenv != NULL) {
+			continue;
+		}
+
+		/* store in this free entry and stop looping */
+		e_pool[i].getenv = value;
+		e_pool[i].putenv = str;
+		++env_pool_cnt;
+		break;
+	}
+	if (i >= env_pool_max) {
+		math_error("malloced_putenv missed unused entry!!");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * finally, do the putenv action
+	 */
+	return putenv(str);
+}
+
+
 #endif /* FUNCLIST */

hash.c

@@ -391,8 +391,8 @@ hash_zvalue(int type, ZVALUE zval, HASH *state)
 	 */
 	if (zval.len > full_lim) {
 		for (j=0; j < zval.len-full_lim-1; j += 2) {
-			half[j] = zval.v[full_lim+i+1];
-			half[j+1] = zval.v[full_lim+i];
+			half[j] = zval.v[full_lim+j+1];
+			half[j+1] = zval.v[full_lim+j];
 		}
 		if (j < zval.len-full_lim) {
 			half[j] = (HALF)0;
@@ -562,7 +562,7 @@ hash_complex(int type, void *c, HASH *state)
 
 
 /*
- * hash_str - hash a string
+ * hash_str - hash a null-terminated string
  *
  * given:
  *	type	- hash type (see hash.h)
@@ -606,6 +606,47 @@ hash_str(int type, char *str, HASH *state)
 }
 
 
+/*
+ * hash_STR - hash a STRING
+ *
+ * given:
+ *	type	- hash type (see hash.h)
+ *	str	- the STRING
+ *	state	- the state to hash or NULL
+ *
+ * returns:
+ *	the new state
+ */
+HASH *
+hash_STR(int type, STRING *str, HASH *state)
+{
+	/*
+	 * initialize if state is NULL
+	 */
+	if (state == NULL) {
+		state = hash_init(type, NULL);
+	}
+
+	/*
+	 * setup for the string hash
+	 */
+	if (!state->bytes) {
+		(state->chkpt)(state);
+		state->bytes = TRUE;
+	}
+
+	/*
+	 * hash the string
+	 */
+	(state->update)(state, (USB8*) str->s_str, (USB32) str->s_len);
+
+	/*
+	 * all done
+	 */
+	return state;
+}
+
+
 /*
  * hash_usb8 - hash an array of USB8s
  *
@@ -720,7 +761,7 @@ hash_value(int type, void *v, HASH *state)
 		/* strings have no setup */
 
 		/* hash this type */
-		state = hash_str(type, value->v_str->s_str, state);
+		state = hash_STR(type, value->v_str, state);
 		break;
 
 	case V_MAT:

help/Makefile

@@ -74,7 +74,7 @@ STD_HELP_FILES_12= archive
 
 BLT_HELP_FILES_13= bugs changes
 
-STD_HELP_FILES_14= contrib credit todo
+STD_HELP_FILES_14= contrib credit wishlist todo
 
 # These files are used in the following order to construct full
 #
@@ -124,7 +124,7 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	pmod polar poly pop popcnt power prevcand prevprime printf prompt \
 	protect ptest push putenv quo quomod rand randbit random randombit \
 	randperm rcin rcmul rcout rcpow rcsq re remove reverse rewind rm root \
-	round rsearch runtime saveval scale scan scanf search sec sech \
+	round rsearch runtime saveval scale scan scanf search sec sech seed \
 	segment select sgn sha sha1 sin sinh size sizeof sort sqrt srand \
 	srandom ssq str strcat strerror strlen strpos strprintf strscan \
 	strscanf substr sum swap system tail tan tanh test time trunc xor

help/archive

@@ -7,7 +7,7 @@ Where to get the the latest versions of calc
     Alpha test versions, complete with bugs, untested code and
     experimental features may be fetched (if you are brave) under:
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
     One may join the calc testing group by sending a request to:
 
@@ -22,10 +22,7 @@ Where to get the the latest versions of calc
     where "address" is your EMail address and "your_full_name"
     is your full name.
 
-    See:
+Landon Curt Noll
+http://reality.sgi.com/chongo
 
-	http://prime.corp.sgi.com/csp/ioccc/noll/noll.html#calc
-
-    for details.
-
-Landon Curt Noll <chongo@toad.com> /\oo/\
+chongo <was here> /\../\

help/contrib

@@ -8,7 +8,7 @@ We welcome and encourage you to send us:
 Prior to doing so, you should consider trying your changes on the most
 recent alpha test code.  To obtain the most recent code, look under
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
 You should also consider joining the calc testing group by sending a
 request to:
@@ -45,4 +45,7 @@ Thanks for considering submitting code to calc.  Calc is a collective
 work by a number of people.  It would not be what it is today without
 your efforts and submissions!
 
-Landon Curt Noll <chongo@toad.com> /\oo/\
+Landon Curt Noll
+http://reality.sgi.com/chongo
+
+chongo <was here> /\../\

help/credit

@@ -34,17 +34,17 @@ Credits
     interesting calc scripts that you would like you see included in
     future distributions to:
 
-	    dbell@auug.org.au
-	    chongo@toad.com
+	calc-tester@postofc.corp.sgi.com
 
-    Landon Noll maintains the official calc ftp archive at:
+    Landon Noll maintains the official calc http/ftp archive at:
 
-	ftp://ftp.uu.net/pub/calc
+	ftp://reality.sgi.com/users/chongo/src/calc
+	http://reality.sgi.com/chongo/src/calc/
 
     Alpha test versions, complete with bugs, untested code and
     experimental features may be fetched (if you are brave) under:
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
     One may join the calc testing group by sending a request to:
 

help/environment

@@ -8,7 +8,7 @@ Environment variables
 	If this variable does not exist, a compiled value
 	is used.  Typically compiled in value is:
 
-		    .:./lib:~/lib:${LIBDIR}/calc
+		    .:./lib:~/lib:${LIBDIR}/calc:${LIBDIR}/custom
 
 	where ${LIBDIR} is usually:
 

help/help

@@ -42,7 +42,8 @@ following topics:
     changes		recent changes to calc
     contrib		how to contribute scripts, code or custom functions
     credit		who wrote calc and who helped
-    todo		needed enhancements and wish list
+    todo		list of priority action items for calc
+    wishlist		wish list of future enhancements of calc
 
     full		all of the above (in the above order)
 

help/isrand

@@ -25,7 +25,7 @@ LIBRARY
     none
 
 SEE ALSO
-    rand, srand, randbit,
+    seed, rand, srand, randbit,
     isassoc, isatty, isblk, isconfig, isdefined, iserror, iseven, isfile,
     ishash, isident, isint, islist, ismat, ismult, isnull, isnum, isobj,
     isobjtype, isodd, isprime, israndom, isreal, isrel,

help/israndom

@@ -27,7 +27,7 @@ LIBRARY
     none
 
 SEE ALSO
-    random, srandom, randombit,
+    seed, random, srandom, randombit,
     isassoc, isatty, isblk, isconfig, isdefined, iserror, iseven, isfile,
     ishash, isident, isint, islist, ismat, ismult, isnull, isnum, isobj,
     isobjtype, isodd, isprime, isrand, isreal, isrel,

help/overview

@@ -44,7 +44,7 @@
 
     for and overview of the help system.  The command:
 
-	    help builtins
+	    help builtin
 
     provides information on built-in mathematical functions, whereas:
 
@@ -67,6 +67,10 @@
     It contains information about differences between C and calc
     that may surprize you.
 
+    To learn about calc library files that are shipped with calc, try:
+
+	    help stdlib
+
     A full and extensive overview of calc may be obtained by:
 
 	    help full

help/rand

@@ -230,4 +230,4 @@ LIBRARY
     long irand(long max)
 
 SEE ALSO
-    srand, randbit, isrand, random, srandom, israndom
+    seed, srand, randbit, isrand, random, srandom, israndom

help/randbit

@@ -40,4 +40,4 @@ LIBRARY
     void zrand(long cnt, ZVALUE *res)
 
 SEE ALSO
-    srand, randbit, isrand, random, srandom, israndom
+    seed, srand, randbit, isrand, random, srandom, israndom

help/random

@@ -154,4 +154,4 @@ LIBRARY
     long irandom(long max)
 
 SEE ALSO
-    srand, randbit, isrand, rand, srandom, israndom
+    seed, srand, randbit, isrand, rand, srandom, israndom

help/randombit

@@ -39,4 +39,4 @@ LIBRARY
     void zrandom(long cnt, ZVALUE *res)
 
 SEE ALSO
-    srand, randbit, isrand, rand, srandom, israndom
+    seed, srand, randbit, isrand, rand, srandom, israndom

help/seed

@@ -0,0 +1,52 @@
+NAME
+    seed - return a value that may be used to seed a pseudo-random generator
+
+SYNOPSIS
+    seed()
+
+TYPES
+    return	integer
+
+DESCRIPTION
+    Generate a pseudo-random seed based on a collection of system and process
+    information.  The seed() builtin function returns a value:
+
+		0 <= seed < 2^64
+
+    IMPORTANT WARNING:
+
+	It should be pointed out that the information collected by seed
+	is almost certainly non-chaotic.  This function is likely not
+	suitable for applications (such as cryptographic applications)
+	where the unpredictability of seeds is critical.  For such critical
+	applications, lavarand should be used.  Seed:
+
+		http://lavarand.sgi.com
+
+	for information about seeding a pseudo-random number generator
+	(such as rand() or random()) with the cryptographic hash of the
+	digitization of chaotic system.
+
+    Given the above warning, this builtin function produces a seed that is
+    suitable for most applications that desire a different pseudo-random
+    sequence each time they are run.
+
+    The return value of this builtin function should NOT be considered
+    a random or pseudo-random value.  The return value should be used
+    as an argument to a seed function such as srand() or srandom().
+
+EXAMPLE
+    > print srand(seed())
+    RAND state
+
+    > print srandom(seed())
+    RAND state
+
+LIMITS
+    none
+
+LIBRARY
+    NUMBER *pseudo_seed(void)
+
+SEE ALSO
+    seed, srand, randbit, isrand, rand, random, srandom, israndom

help/srand

@@ -148,4 +148,4 @@ LIBRARY
     RAND *zsetrand(RAND *state)
 
 SEE ALSO
-    srandom, randbit, isrand, random, srandom, israndom
+    seed, srandom, randbit, isrand, random, srandom, israndom

help/srandom

@@ -337,4 +337,4 @@ LIBRARY
     RAND *zsetrandom(RAND *state)
 
 SEE ALSO
-    srand, randbit, isrand, random, srandom, israndom
+    seed, srand, randbit, isrand, random, srandom, israndom

help/todo

@@ -1,183 +1,71 @@
-Needed enhancements
+Calc Todo Items:
 
-    Send calc comments, suggestions, bug fixes, enhancements and
-    interesting calc scripts that you would like you see included in
-    future distributions to:
+    The following items should be addressed sometime in the short to
+    medium term future, if not before the next release.
 
-	    dbell@auug.org.au
-	    chongo@toad.com
+    Code contributions are welcome.  Send patches to:
 
-    The following items are in the calc wish list.  Programs like this
-    can be extended and improved forever.
+	    calc-tester@postofc.corp.sgi.com
 
-    *  In general use faster algorithms for large numbers when they
-       become known.  In particular, look at better algorithms for
-       very large numbers -- multiply, square and mod in particular.
+    See also the 'wishlist' help files for the calc enhancement wish list.
 
-    *  Implement an autoload feature.  Associate a calc library filename
-       with a function or global variable.  On the first reference of
-       such item, perform an automatic load of that file.
+=-=
 
-    *  Add error handling statements, so that QUITs, errors from the
-       'eval' function, division by zeroes, and so on can be caught.
-       This should be done using syntax similar to:
+Very High priority items:
 
-		ONERROR statement DO statement;
+    * Write the help file for the inputlevel() builtin function.
 
-       Something like signal isn't versatile enough.
+    * Write the help file for the display() builtin function.
 
-    *  Add a debugging capability so that functions can be single stepped,
-       breakpoints inserted, variables displayed, and so on.
+    * Write the help file for the stoponerror() builtin function.
 
-    *  Figure out how to write all variables out to a file, including
-       deeply nested arrays, lists, and objects.
+    * Update the errmax about the meaning of errmax(-1).
 
-       Add the ability to read and write a value in some binary form.
-       Clearly this is easy for non-neg integers.  The question of
-       everything else is worth pondering.
+    * Document the new meanings for bit values and the sign of
+      of config("lib_debug") in the appropriate help file(s).
 
-    *  Eliminate the need for the define keyword by doing smarter parsing.
+    * Fix any 'Known bugs' as noted in the BUGS file or as
+      displayed by 'calc help bugs'.
 
-    *  Allow results of a command (or all commands) to be re-directed to a
-       file or piped into a command.
+=-=
 
-    *  Add some kind of #include and #define facility.  Perhaps use
-       the C pre-processor itself?
+High priority items:
 
-    *  Support a more general input and output base mode other than
-       just dec, hex or octal.
+    * Verify, complete or fix the 'SEE ALSO' help file sections.
 
-    *  Implement a form of symbolic algebra.  Work on this has already
-       begun.  This will use backquotes to define expressions, and new
-       functions will be able to act on expressions.  For example:
+    * Verify, complete or fix the 'LIBRARY' help file sections.
 
-	    x = `hello * strlen(mom)`;
-	    x = sub(x, `hello`, `hello + 1`);
-	    x = sub(x, `hello`, 10, `mom`, "curds");
-	    eval(x);
+    * Verify, complete or fix the 'LIMITS' help file sections.
 
-       prints 55.
+    * Verify, complete or fix the 'SYNOPSIS' and 'TYPES' help file sections.
 
-    *  Place the results of previous commands into a parallel history list.
-       Add a binding that returns the saved result of the command so
-       that one does not need to re-execute a previous command simply
-       to obtain its value.
+    * Where reasonable, be sure that regress.cal tests builtin functions.
 
-       If you have a command that takes a very long time to execute,
-       it would be nice if you could get at its result without having
-       to spend the time to reexecute it.
+    * Perform a code coverage analysis of the 'make check' action
+      and improve the coverage (within reason) of the regress.cal suite.
 
-    *  Add a binding to delete a value from the history list.
+    * Create a Linux rpm (Red Hat Package Manager) package for calc.
 
-       One may need to remove a large value from the history list if
-       it is very large.  Deleting the value would replace the history
-       entry with a null value.
+    * Address, if possible and reasonable, any Calc Mis-features
+      as noted in the BUGS file or as displayed by 'calc help bugs'.
 
-    *  Add a binding to delete a command from the history list.
+    * The shell script that is currently constructed to display a help
+      file (in help.c) is a gross hack.  That code should be replaced
+      with code that looks for the help file in the pre-defined help
+      directories.  When the specific help file is found and opened,
+      then a $PAGER should be forked and execed after doing things such
+      as closing open file descriptors that the $PAGER does not need.
 
-       Since you can delete values, you might as well be able to
-       delete commands.
+    * Inspect changes made since the last major calc release (the
+      initial x.y.z version ... prior to any t sub-version) to help
+      ensure that they have not introduced new or re-introduced old bugs
+      into calc.
 
-    *  All one to alter the size of the history list thru config().
+=-=
 
-       In some cases, 256 values is too small, in others it is too large.
+Medium priority items:
 
-    *  Add a builtin that returns a value from the history list.
-       As an example:
-
-	    histval(-10)
-
-       returns the 10th value on the history value list, if such
-       a value is in the history list (null otherwise).  And:
-
-	    histval(23)
-
-       return the value of the 23rd command given to calc, if
-       such a value is in the history list (null otherwise).
-
-       It would be very helpful to use the history values in
-       subsequent equations.
-
-    *  Add a builtin that returns command as a string from the
-       history list.  As an example:
-
-	    history(-10)
-
-       returns a string containing the 10th command on the
-       history list, if a such a value is in the history list
-       (empty string otherwise).  And:
-
-	    history(23)
-
-       return the string containing the 23rd command given to calc, if
-       such a value is in the history list (empty string otherwise).
-
-       One could use the eval() function to re-evaluate the command.
-
-    *  Allow one to optionally restore the command number to calc
-       prompts.  When going back in the history list, indicate the
-       command number that is being examined.
-
-       The command number was a useful item.  When one is scanning the
-       history list, knowing where you are is hard without it.  It can
-       get confusing when the history list wraps or when you use
-       search bindings.  Command numbers would be useful in
-       conjunction with positive args for the history() and histval()
-       functions as suggested above.
-
-    *  Add a builtin that returns the current command number.
-       For example:
-
-	    cmdnum()
-
-       returns the current command number.
-
-       This would allow one to tag a value in the history list.  One
-       could save the result of cmdnum() in a variable and later use
-       it as an arg to the histval() or history() functions.
-
-    *  Add a factoring builtin functions.  Provide functions that perform
-       multiple polynomial quadratic sieves, elliptic curve, difference
-       of two squares, N-1 factoring as so on.  Provide a easy general
-       factoring builtin (say factor(foo)) that would attempt to apply
-       whatever process was needed based on the value.
-
-       Factoring builtins would return a matrix of factors.
-
-       It would be handy to configure, via config(), the maximum time
-       that one should try to factor a number.  By default the time
-       should be infinite.  If one set the time limit to a finite
-       value and the time limit was exceeded, the factoring builtin
-       would return whatever if had found thus far, even if no new
-       factors had been found.
-
-       Another factoring configuration interface, via config(), that
-       is needed would be to direct the factoring builtins to return
-       as soon as a factor was found.
-
-    *  Allow one to config calc break up long output lines.
-
-       The command:  calc '2^100000'  will produce one very long
-       line.  Many times this is reasonable.  Long output lines
-       are a problem for some utilities.  It would be nice if one
-       could configure, via config(), calc to fold long lines.
-
-       By default, calc should continue to produce long lines.
-
-       One option to config should be to specify the length to
-       fold output.  Another option should be to append a trailing
-       \ on folded lines (as some symbolic packages use).
-
-    *  Allow one to use the READ and WRITE commands inside a function.
-
-    *  Remove or increase limits on factor(), lfactor(), isprime(),
-       nextprime(), and prevprime().  Currently these functions cannot
-       search for factors > 2^32.
-
-    *  Add read -once -try "filename" which would do nothing
-       if "filename" was not a readable file.
-
-    *  Complete the use of CONST where appropirate:
+    * Complete the use of CONST where appropriate:
 
 	CONST is beginning to be used with read-only tables and some
 	function arguments.  This allows certain compilers to better
@@ -196,48 +84,10 @@ Needed enhancements
 	at by 'fizbin' and the HALF array pointer at by 'data' should be
 	treated as read-only.
 
-    * Blocks should have the following features:
-
-        + read/write to/from files (ala fread/fwrite)
-
-	+ misc memory functions (ala memcpy, memcmp, memset,
-	  memchr, etc.)
-
-	+ scatter and gather functions (to send every n-th octet
-	  to another block and to copy from n blocks, the 1st
-	  then 2nd then 3rd ... octets)
-
-    * Printing of blocks should be under the control of the
-      config() interface.  This should allow one to select
-      from any of the following formats:
-
-	+ as one long string
-
-	+ as a series of lines (< 80 chars wide)
-
-	+ in od command style (offset: value value value ...)
-
-	+ in hex dump style (offset: val val val val ...  3hf.Uas.c)
-
-    * In addition one should be able to control the following
-      aspects of printing blocks via the config() interface:
-
-	+ base (hex, octal, char, base 2)
-
-	+ amount of data (the first n octets or the entire block)
-
-	+ skipping printing of duplicate print lines (ala od)
-
-	+ have the ability to print the block as raw data
-
     * It is overkill to have nearly everything wind up in libcalc.a.
 
-      One should make available a the fundimental math operations
+      One should make available a the fundamental math operations
       on ZVALUE, NUMBER and perhaps COMPLEX (without all of the
       other stuff) in a separate library.
 
-    * improve the coverage in the 'SEE ALSO' help file lists
-
-    * where reasonable, be sure that regress.cal tests builtin functions
-
-    * clean the source code and document it better
+    * Clean the source code and document it better.

help/usage

@@ -2,7 +2,22 @@ Calc command line
 
     Calc has the following command line:
 
-	calc [-C] [-e] [-h] [-i] [-m mode] [-n] [-p] [-q] [-u] [calc_cmd ...]
+	calc [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]
+	     [-n] [-p] [-q] [-u] [-v] [calc_cmd ...]
+
+	-c  Continue reading command lines even after an execution
+	    error has caused the abandonment of a line.
+
+	    For example:
+
+		calc read many_errors.cal
+
+	    will cause calc to abort on the first error, whereas:
+
+		calc -c read many_errors.cal
+
+	    will cause calc to try to process each line being read
+	    despite the errors that it encounters.
 
 	-C  Permit the execution of custom builtin functions.  Without
 	    this flag, calling the custom() builtin function will
@@ -12,6 +27,27 @@ Calc command line
 	    are non-standard and that are not portable.  Custom builtin
 	    functions are disabled by default for this reason.
 
+	-d  Disable the printing of the opening title.  The printing
+	    of library debug and informational messages is also disabled
+	    as if config("lib_debug",0) had been executed.
+
+	    For example:
+
+		calc 'read qtime; qtime(2)'
+
+	    will output something like:
+
+		qtime(utc_hr_offset) defined
+		It's nearly ten past six.
+
+	    whereas:
+
+		calc -d 'read qtime; qtime(2)'
+
+	    will just say:
+
+		It's nearly ten past six.
+
 	-e  Ignore any environment variables on startup.  The
 	    getenv() builtin will still return values, however.
 
@@ -19,7 +55,21 @@ Calc command line
 	    is equivalent to the calc command help help.  The help
 	    facility is disabled unless the mode is 5 or 7.  See -m.
 
-	-i  Do not about if the error count exceeds maxerr().
+	-i  Become interactive if possible.  Be default, if calc_cmd
+	    args are given, calc will execute them and exit.  This flag
+	    will cause calc to drop into interactive mode after the
+	    commands are executed.
+
+	    For example:
+
+		calc 2+5
+
+	    will print the value 7 and exit whereas:
+
+		calc -i 2+5
+
+	    will print the value 7 and prompt the user for more
+	    calc commands.
 
 	-m mode
 	   This flag sets the permission mode of calc.  It
@@ -38,7 +88,7 @@ Calc command line
 		6  do not execute any program
 		7  allow everything (default mode)
 
-	   If one wished to run calc from a privledged user, one
+	   If one wished to run calc from a privileged user, one
 	   might want to use -m 0 in an effort to make calc more
 	   secure.
 
@@ -46,7 +96,7 @@ Calc command line
 	   open.  Files already open are not effected. Thus if one
 	   wanted to use the -m 0 in an effort to make calc more
 	   secure, but still wanted to read and write a specific
-	   file, one might want to do:
+	   file, one might want to do in sh, ksh, bash-like shells:
 
 		     calc -m 0 3<a.file
 
@@ -59,25 +109,28 @@ Calc command line
 	   given.  The reading of key bindings is also disabled
 	   when the mode disables opening of files for reading.
 
-	-n  Use the new configutation defaults instead of the old
+	-n  Use the new configuration defaults instead of the old
 	    default classic defaults.  This flag as the same effect
 	    as executing config("all", "newcfg") at startup time.
 
 	-p  Pipe processing is enabled by use of -p.  For example:
 
-		     echo "print 2^21701-1, 2^23209-1" | calc -p | fizzbin
+		     calc -p '2^21701-1' | fizzbin
 
-	    In pipe mode, calc does not prompt, does not print
-	    leading tabs and does not print the initial header.
+	    In pipe mode, calc does not prompt, does not print leading
+	    tabs and does not print the initial header.  The -p flag
+	    overrides -i.
 
 	-q  Disable the use of the $CALCRC startup scripts.
 
 	-u  Disable buffering of stdin and stdout.
 
+	-v  Print calc version number and exit.
+
     Without `calc_cmd', calc operates interactively.  If one or more
     `calc_cmd' are given on the command line, calc will execute them and
-    exit.  The printing of leading tabs on output is disabled as if
-    config("tab",0) had been executed.
+    exit.  If -i is given, calc will attempt to become interactive
+    even of one or more `calc_cmd' are given on the command line.
 
     Normally on startup, calc attempts to execute a collection of
     library scripts.  The environment variable $CALCRC (if non-existent
@@ -98,7 +151,8 @@ Calc command line
 
     Calc treats all open files, other than stdin, stdout and
     stderr as files available for reading and writing. One may
-    present calc with an already open file in the following way:
+    present calc with an already open file using sh, ksh or bash-like
+    shells is to:
 
         calc 3<open_file 4<open_file2
 

help/wishlist

@@ -0,0 +1,215 @@
+Calc Enhancement Wish List:
+
+    Send calc comments, suggestions, bug fixes, enhancements and
+    interesting calc scripts that you would like you see included in
+    future distributions to:
+
+		calc-tester@postofc.corp.sgi.com
+
+    The following items are in the calc wish list.  Programs like this
+    can be extended and improved forever.
+
+    See the 'todo' help file for higher priority todo items.
+
+=-=
+
+    *  In general use faster algorithms for large numbers when they
+       become known.  In particular, look at better algorithms for
+       very large numbers -- multiply, square and mod in particular.
+
+    *  Implement an autoload feature.  Associate a calc library filename
+       with a function or global variable.  On the first reference of
+       such item, perform an automatic load of that file.
+
+    *  Add error handling statements, so that QUITs, errors from the
+       'eval' function, division by zeroes, and so on can be caught.
+       This should be done using syntax similar to:
+
+		ONERROR statement DO statement;
+
+       Something like signal isn't versatile enough.
+
+    *  Add a debugging capability so that functions can be single stepped,
+       breakpoints inserted, variables displayed, and so on.
+
+    *  Figure out how to write all variables out to a file, including
+       deeply nested arrays, lists, and objects.
+
+       Add the ability to read and write a value in some binary form.
+       Clearly this is easy for non-neg integers.  The question of
+       everything else is worth pondering.
+
+    *  Eliminate the need for the define keyword by doing smarter parsing.
+
+    *  Allow results of a command (or all commands) to be re-directed to a
+       file or piped into a command.
+
+    *  Add some kind of #include and #define facility.  Perhaps use
+       the C pre-processor itself?
+
+    *  Support a more general input and output base mode other than
+       just dec, hex or octal.
+
+    *  Implement a form of symbolic algebra.  Work on this has already
+       begun.  This will use backquotes to define expressions, and new
+       functions will be able to act on expressions.  For example:
+
+	    x = `hello * strlen(mom)`;
+	    x = sub(x, `hello`, `hello + 1`);
+	    x = sub(x, `hello`, 10, `mom`, "curds");
+	    eval(x);
+
+       prints 55.
+
+    *  Place the results of previous commands into a parallel history list.
+       Add a binding that returns the saved result of the command so
+       that one does not need to re-execute a previous command simply
+       to obtain its value.
+
+       If you have a command that takes a very long time to execute,
+       it would be nice if you could get at its result without having
+       to spend the time to reexecute it.
+
+    *  Add a binding to delete a value from the history list.
+
+       One may need to remove a large value from the history list if
+       it is very large.  Deleting the value would replace the history
+       entry with a null value.
+
+    *  Add a binding to delete a command from the history list.
+
+       Since you can delete values, you might as well be able to
+       delete commands.
+
+    *  All one to alter the size of the history list thru config().
+
+       In some cases, 256 values is too small, in others it is too large.
+
+    *  Add a builtin that returns a value from the history list.
+       As an example:
+
+	    histval(-10)
+
+       returns the 10th value on the history value list, if such
+       a value is in the history list (null otherwise).  And:
+
+	    histval(23)
+
+       return the value of the 23rd command given to calc, if
+       such a value is in the history list (null otherwise).
+
+       It would be very helpful to use the history values in
+       subsequent equations.
+
+    *  Add a builtin that returns command as a string from the
+       history list.  As an example:
+
+	    history(-10)
+
+       returns a string containing the 10th command on the
+       history list, if a such a value is in the history list
+       (empty string otherwise).  And:
+
+	    history(23)
+
+       return the string containing the 23rd command given to calc, if
+       such a value is in the history list (empty string otherwise).
+
+       One could use the eval() function to re-evaluate the command.
+
+    *  Allow one to optionally restore the command number to calc
+       prompts.  When going back in the history list, indicate the
+       command number that is being examined.
+
+       The command number was a useful item.  When one is scanning the
+       history list, knowing where you are is hard without it.  It can
+       get confusing when the history list wraps or when you use
+       search bindings.  Command numbers would be useful in
+       conjunction with positive args for the history() and histval()
+       functions as suggested above.
+
+    *  Add a builtin that returns the current command number.
+       For example:
+
+	    cmdnum()
+
+       returns the current command number.
+
+       This would allow one to tag a value in the history list.  One
+       could save the result of cmdnum() in a variable and later use
+       it as an arg to the histval() or history() functions.
+
+    *  Add a factoring builtin functions.  Provide functions that perform
+       multiple polynomial quadratic sieves, elliptic curve, difference
+       of two squares, N-1 factoring as so on.  Provide a easy general
+       factoring builtin (say factor(foo)) that would attempt to apply
+       whatever process was needed based on the value.
+
+       Factoring builtins would return a matrix of factors.
+
+       It would be handy to configure, via config(), the maximum time
+       that one should try to factor a number.  By default the time
+       should be infinite.  If one set the time limit to a finite
+       value and the time limit was exceeded, the factoring builtin
+       would return whatever if had found thus far, even if no new
+       factors had been found.
+
+       Another factoring configuration interface, via config(), that
+       is needed would be to direct the factoring builtins to return
+       as soon as a factor was found.
+
+    *  Allow one to config calc break up long output lines.
+
+       The command:  calc '2^100000'  will produce one very long
+       line.  Many times this is reasonable.  Long output lines
+       are a problem for some utilities.  It would be nice if one
+       could configure, via config(), calc to fold long lines.
+
+       By default, calc should continue to produce long lines.
+
+       One option to config should be to specify the length to
+       fold output.  Another option should be to append a trailing
+       \ on folded lines (as some symbolic packages use).
+
+    *  Allow one to use the READ and WRITE commands inside a function.
+
+    *  Remove or increase limits on factor(), lfactor(), isprime(),
+       nextprime(), and prevprime().  Currently these functions cannot
+       search for factors > 2^32.
+
+    *  Add read -once -try "filename" which would do nothing
+       if "filename" was not a readable file.
+
+    * Blocks should have the following features:
+
+        + read/write to/from files (ala fread/fwrite)
+
+	+ misc memory functions (ala memcpy, memcmp, memset,
+	  memchr, etc.)
+
+	+ scatter and gather functions (to send every n-th octet
+	  to another block and to copy from n blocks, the 1st
+	  then 2nd then 3rd ... octets)
+
+    * Printing of blocks should be under the control of the
+      config() interface.  This should allow one to select
+      from any of the following formats:
+
+	+ as one long string
+
+	+ as a series of lines (< 80 chars wide)
+
+	+ in od command style (offset: value value value ...)
+
+	+ in hex dump style (offset: val val val val ...  3hf.Uas.c)
+
+    * In addition one should be able to control the following
+      aspects of printing blocks via the config() interface:
+
+	+ base (hex, octal, char, base 2)
+
+	+ amount of data (the first n octets or the entire block)
+
+	+ skipping printing of duplicate print lines (ala od)
+
+	+ have the ability to print the block as raw data

input.c

@@ -33,8 +33,9 @@ typedef struct {
 	int i_state;		/* state (read, reread) */
 	int i_char;		/* currently read char */
 	long i_line;		/* line number */
-	char *i_str;		/* current string for input (if not NULL) */
-	char *i_origstr;	/* original string so it can be freed */
+	char *i_cp;		/* pointer to string character to be read */
+	char *i_str;		/* start of string copy to be read, or NULL */
+	long i_num;		/* number of string characters remaining */
 	char *i_ttystr;		/* current character of tty line (or NULL) */
 	FILE *i_fp;		/* current file for input (if not NULL) */
 	char *i_name;		/* file name if known */
@@ -311,7 +312,7 @@ f_open(char *name, char *mode)
 	 */
 	if (!allow_read && !allow_write) {
 		/* no reads and no writes means no opens! */
-		if (start_done) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for read or write disallowed by -m\n");
@@ -319,7 +320,7 @@ f_open(char *name, char *mode)
 		return NULL;
 	} else if (!allow_read && strchr(mode, 'r') != NULL) {
 		/* reading new files disallowed */
-		if (start_done) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for read disallowed by -m\n");
@@ -330,7 +331,7 @@ f_open(char *name, char *mode)
 		    strchr(mode, 'a') != NULL ||
 		    strchr(mode, '+') != NULL)) {
 		/* writing new files disallowed */
-		if (start_done) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for write disallowed by -m\n");
@@ -375,7 +376,6 @@ openfile(char *name)
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
 	cip->i_str = NULL;
-	cip->i_origstr = NULL;
 	cip->i_ttystr = NULL;
 	cip->i_fp = fp;
 	cip->i_line = 1;
@@ -401,7 +401,7 @@ curstream(void)
 
 
 /*
- * Open a string for scanning. String is ended by a null character.
+ * Open a string for scanning, num characters to be read.
  * String is copied into local memory so it can be trashed afterwards.
  * Returns -1 if cannot open string.
  *
@@ -409,21 +409,22 @@ curstream(void)
  *	str		string to be opened
  */
 int
-openstring(char *str)
+openstring(char *str, long num)
 {
 	char *cp;		/* copied string */
 
 	if ((depth >= MAXDEPTH) || (str == NULL))
 		 return -2;
-	cp = (char *)malloc(strlen(str) + 1);
+	cp = (char *) malloc(num + 1);
 	if (cp == NULL)
 		 return -1;
 	strcpy(cp, str);
 	cip = inputs + depth++;
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
+	cip->i_cp = cp;
 	cip->i_str = cp;
-	cip->i_origstr = cp;
+	cip->i_num = num;
 	cip->i_fp = NULL;
 	cip->i_name = NULL;
 	cip->i_ttystr = NULL;
@@ -445,7 +446,6 @@ openterminal(void)
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
 	cip->i_str = NULL;
-	cip->i_origstr = NULL;
 	cip->i_ttystr = NULL;
 	cip->i_fp = NULL;
 	cip->i_name = NULL;
@@ -462,8 +462,8 @@ closeinput(void)
 {
 	if (depth <= 0)
 		return;
-	if (cip->i_origstr)
-		free(cip->i_origstr);
+	if (cip->i_str)
+		free(cip->i_str);
 	if (cip->i_fp)
 		fclose(cip->i_fp);
 	if (cip->i_name)
@@ -515,8 +515,11 @@ nextchar(void)
 		 return ch;
 	}
 	if (cip->i_str) {		/* from string */
-		ch = chartoint(*cip->i_str++);
-		if (ch == '\0')
+		if (cip->i_num) {
+			ch = chartoint(*cip->i_cp++);
+			cip->i_num--;
+		}
+		else
 			ch = EOF;
 	} else if (cip->i_fp) {		/* from file */
 		ch = fgetc(cip->i_fp);
@@ -525,10 +528,6 @@ nextchar(void)
 	} else {			/* from terminal */
 		ch = ttychar();
 	}
-	if (ch == EOF) {		/* fix up end of file */
-		closeinput();
-		ch = EOF;
-	}
 	if (depth > 0)
 		cip->i_char = ch;	/* save for rereads */
 	if (ch == '\n')
@@ -663,6 +662,16 @@ inputisterminal(void)
 }
 
 
+/*
+ * Return depth of current input source
+ */
+int
+inputlevel(void)
+{
+	return depth - 1;
+}
+
+
 /*
  * Return the name of the current input file.
  * Returns NULL for terminal or strings.
@@ -739,6 +748,7 @@ runrcfiles(void)
 		if (i < 0)
 			continue;
 		getcommands(FALSE);
+		closeinput();
 	}
 }
 

lib/Makefile

@@ -44,7 +44,7 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \
 	test2700.cal test3100.cal test3300.cal test3400.cal prompt.cal \
 	test3500.cal seedrandom.cal test4000.cal test4100.cal test4600.cal \
 	beer.cal hello.cal test5100.cal test5200.cal randombitrun.cal \
-	randomrun.cal xx_print.cal natnumset.cal
+	randomrun.cal xx_print.cal natnumset.cal qtime.cal
 
 # These files are found (but not built) in the distribution
 #

lib/README

@@ -1,20 +1,44 @@
-# Copyright (c) 1997 David I. Bell and Landon Curt Noll
-# Permission is granted to use, distribute, or modify this source,
-# provided that this copyright notice remains intact.
+To load a library, try:
 
-The following calc library files are provided because they serve as
-examples of how use the calc language, and/or because the authors thought
-them to be useful!
+    read filename
+
+You to not need to add the .cal extension to the filename.  Calc
+will search along the $CALCPATH (see ``help environment'').
+
+Normally a library will simply define some functions.  By default,
+most libraries will print out a short message when thei are read.
+For example:
+
+    > read lucas
+    lucas(h,n) defined
+    gen_u0(h,n,v1) defined
+    gen_v1(h,n) defined
+    ldebug(funct,str) defined
+
+will cause calc to load and execute the 'lucas.cal' library.
+Executing the library will cause several functions to be defined.
+Executing the lucas function
+
+    > lucas(149,60)
+	    1
+    > lucas(146,61)
+	    0
+
+shows that 149*2^60-1 is prime whereas 146*2^61-1 is not.
+
+=-=
+
+Calc library files are provided because they serve as examples of how use
+the calc language, and/or because the authors thought them to be useful!
 
 If you write something that you think is useful, please send it to:
 
-    dbell@auug.org.au
-    chongo@toad.com                 {uunet,pyramid,sun}!hoptoad!chongo
+    calc-tester@postofc.corp.sgi.com
 
 By convention, a lib file only defines and/or initializes functions,
-objects and variables.  (The regression test is an exception.)  Also by
-convention, the a usage message regarding each important object and
-function is printed at the time of the read.
+objects and variables.  (The regress.cal and testxxx.cal regression test
+suite is an exception.)  Also by convention, an additional usage message
+regarding important object and functions is printed.
 
 If a lib file needs to load another lib file, it should use the -once
 version of read:
@@ -45,18 +69,29 @@ global variable.  By convention, "lib_debug" has the following meanings:
 		    printed at the time of the read in addition
 		    to other debug messages
 
-To conform to the above convention, your lib files should end with
-lines of the form:
+When config("lib_debug") >= 0, function names and their arg are
+printed as they are defined.  Sometimes this printing is not enough
+information.  For example:
+
+	* useful obj definitions
+	* functions with optional args
+	* functions with optional args where the param() interface is used
+
+For these cases we suggest that you place at the bottom of your code
+something like:
 
 	if (config("lib_debug") >= 0) {
 		print "obj xyz defined";
-		print "funcA(side_a, side_b, side_c) defined";
-		print "funcB(size, mass) defined";
+		print "funcA([val1 [, val2]]) defined";
+		print "funcB(size, mass, ...) defined";
 	}
 
-
 =-=
 
+The following is a brief description of some of the calc library files
+that are shipped with calc.  See above for example of how to read in
+and execute these files.
+
 beer.cal
 
     Calc's contribution to the 99 Bottles of Beer web page:
@@ -100,7 +135,7 @@ deg.cal
 
 ellip.cal
 
-    factor(iN, ia, B, force)
+    efactor(iN, ia, B, force)
 
     Attempt to factor using the elliptic functions: y^2 = x^3 + a*x + b.
 
@@ -160,7 +195,7 @@ mfactor.cal
 
 mod.cal
 
-    mod(a)
+    lmod(a)
     mod_print(a)
     mod_one()
     mod_cmp(a, b)
@@ -250,7 +285,7 @@ pix.cal
 
 pollard.cal
 
-    factor(N, N, ai, af)
+    pfactor(N, N, ai, af)
 
     Factor using Pollard's p-1 method.
 
@@ -276,6 +311,13 @@ psqrt.cal
     Calculate square roots modulo a prime
 
 
+qtime.cal
+
+    qtime(utc_hr_offset)
+
+    Print the time as English sentence given the hours offset from UTC.
+
+
 quat.cal
 
     quat(a, b, c, d)
@@ -520,6 +562,20 @@ test3400.cal
     This script is used by regress.cal to test trig functions.
     containing objects.
 
+test3500.cal
+
+    global defaultverbose
+    global err
+    testfrem(x, y, verbose)
+    testgcdrem(x, y, verbose)
+    testf(str, n, verbose)
+    testg(str, n, verbose)
+    testh(str, n, N, verbose)
+    test3500(verbose, n, N)
+
+    This script is used by regress.cal to test the functions frem,
+    fcnt, gcdrem.
+
 test4000.cal
 
     global defaultverbose
@@ -617,7 +673,7 @@ varargs.cal
 
 xx_print.cal
 
-    isoctet(a) defined
+    is_octet(a) defined
     list_print(a) defined
     mat_print (a) defined
     octet_print(a) defined
@@ -628,3 +684,9 @@ xx_print.cal
     error_print(a) defined
 
     Demo for the xx_print object routines.
+
+=-=
+
+# Copyright (c) 1999 David I. Bell and Landon Curt Noll
+# Permission is granted to use, distribute, or modify this source,
+# provided that this copyright notice remains intact.

lib/beer.cal

@@ -20,7 +20,3 @@ for (i=99; i > 0;) {
 	bottles = (i!=1) ? "bottles" : "bottle";
 	print less, bottles, "of beer on the wall!\n";
 }
-
-if (config("lib_debug") >= 0) {
-	/* nothing to do! */
-}

lib/bernoulli.cal

@@ -60,7 +60,3 @@ define B(n)
 	Bnmax = n;
 	return Bn[n];
 }
-
-if (config("lib_debug") >= 0) {
-    print "B(n) defined";
-}

lib/bigprime.cal

@@ -25,7 +25,3 @@ define bigprime(a, m, p)
 		print "	" : n;
 	}
 }
-
-if (config("lib_debug") >= 0) {
-    print "bigprime(a, m, p) defined";
-}

lib/chrem.cal

@@ -86,7 +86,7 @@
  *	i.e., any value that is 301 mod 420.
  *
  * Written by: Ernest W Bowen <ernie@neumann.une.edu.au>
- * Interface by: Landon Curt Noll <chongo@toad.com>
+ * Interface by: Landon Curt Noll http://reality.sgi.com/chongo
  */
 
 static defaultmlist = list(2,3,5,7,11,13,17,19); /* The first eight primes */

lib/deg.cal

@@ -113,11 +113,4 @@ define fixdms(a)
 
 if (config("lib_debug") >= 0) {
     print "obj dms {deg, min, sec} defined";
-    print "dms(deg, min, sec) defined";
-    print "dms_add(a, b) defined";
-    print "dms_neg(a) defined";
-    print "dms_sub(a, b) defined";
-    print "dms_mul(a, b) defined";
-    print "dms_print(a) defined";
-    print "dms_abs(a) defined";
 }

lib/ellip.cal

@@ -24,7 +24,7 @@
  * only an approximation, read "A Course in Number Theory and Cryptography"
  * by Neal Koblitz for a good explanation.
  *
- * factor(iN, ia, B, force)
+ * efactor(iN, ia, B, force)
  *	iN is the number to be factored.
  *	ia is the initial value of a in the equation, and each successive
  *	value of a is an independent attempt at factoring (default 1).
@@ -66,7 +66,7 @@ global	b;		/* second coefficient */
 global	f;		/* found factor */
 
 
-define factor(iN, ia, B, force)
+define efactor(iN, ia, B, force)
 {
 	local	C, x, p;
 
@@ -165,7 +165,3 @@ define point_pow(p, pow)
 	}
 	return r;
 }
-
-if (config("lib_debug") >= 0) {
-    print "factor(N, I, B, force) defined";
-}

lib/hello.cal

@@ -6,7 +6,3 @@
  */
 
 while(1) print "Hello World!";
-
-if (config("lib_debug") >= 0) {
-    /* nothing to do */
-}

lib/lucas.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * lucas - perform a Lucas primality test on h*2^n-1
@@ -1029,7 +1032,3 @@ ldebug(funct, str)
 	}
 	return;
 }
-
-if (config("lib_debug") >= 0) {
-    print "lucas(h, n) defined";
-}

lib/lucas_chk.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * primes of the form h*2^n-1 for 1<=h<200 and 1<=n<1000
@@ -374,7 +377,3 @@ lucas_chk(high_n, quiet)
 		return 0;
 	}
 }
-
-if (config("lib_debug") >= 0) {
-    print "lucas_chk(high_n) defined";
-}

lib/lucas_tbl.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * Lucasian criteria for primality

lib/mersenne.cal

@@ -31,7 +31,3 @@ define mersenne(p)
 	/* 2^p-1 is prime iff u(p) = 0 mod 2^p-1 */
 	return (u == 0);
 }
-
-if (config("lib_debug") >= 0) {
-    print "mersenne(p) defined";
-}

lib/mfactor.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 

lib/mod.cal

@@ -12,12 +12,12 @@ obj mod {a};			/* definition of the object */
 global mod_value = 100;		/* modulus value (value of N) */
 
 
-define mod(a)
+define lmod(a)
 {
 	local obj mod	x;
 
 	if (!isreal(a) || !isint(a))
-		quit "Bad argument for mod function";
+		quit "Bad argument for lmod function";
 	x.a = a % mod_value;
 	return x;
 }
@@ -34,7 +34,7 @@ define mod_print(a)
 
 define mod_one()
 {
-	return mod(1);
+	return lmod(1);
 }
 
 
@@ -51,9 +51,9 @@ define mod_cmp(a, b)
 define mod_rel(a, b)
 {
 	if (isnum(a))
-		a = mod(a);
+		a = lmod(a);
 	if (isnum(b))
-		b = mod(b);
+		b = lmod(b);
 	if (a.a < b.a)
 		return -1;
 	return a.a != b.a;
@@ -163,9 +163,9 @@ define mod_div(a, b)
 
 	obj mod x, y;
 	if (isnum(a))
-		a = mod(a);
+		a = lmod(a);
 	if (isnum(b))
-		b = mod(b);
+		b = lmod(b);
 	c = gcd(a.a, b.a);
 	x.a = a.a / c;
 	y.a = b.a / c;
@@ -191,20 +191,6 @@ define mod_pow(a, b)
 
 if (config("lib_debug") >= 0) {
     print "obj mod {a} defined";
-    print "mod(a) defined";
-    print "mod_print(a) defined";
-    print "mod_one(a) defined";
-    print "mod_cmp(a, b) defined";
-    print "mod_rel(a, b) defined";
-    print "mod_add(a, b) defined";
-    print "mod_sub(a, b) defined";
-    print "mod_mod(a, b) defined";
-    print "mod_square(a) defined";
-    print "mod_inc(a) defined";
-    print "mod_dec(a) defined";
-    print "mod_inv(a) defined";
-    print "mod_div(a, b) defined";
-    print "mod_pow(a, b) defined";
     print "mod_value defined";
     print "set mod_value as needed";
 }

lib/natnumset.cal

@@ -592,41 +592,3 @@ define set_print(a)
 }
 
 local N, M;	/* End scope of static variables N, M */
-
-if (config("lib_debug") >= 0) {
-    print "isset(a) defined";
-    print "setbound(n) defined";
-    print "empty() defined";
-    print "full() defined";
-    print "isin(a, b) defined";
-    print "addmember(a, n) defined";
-    print "rmmember(a, n) defined";
-    print "set() defined";
-    print "mkset(s) defined";
-    print "primes(a, b) defined";
-    print "set_max(a) defined";
-    print "set_min(a) defined";
-    print "set_not(a) defined";
-    print "set_cmp(a, b) defined";
-    print "set_rel(a, b) defined";
-    print "set_or(a, b) defined";
-    print "set_and(a, b) defined";
-    print "set_comp(a) defined";
-    print "set_setminus(a, b) defined";
-    print "set_xor(a,b) defined";
-    print "set_content(a) defined";
-    print "set_add(a, b) defined";
-    print "set_sub(a, b) defined";
-    print "set_mul(a, b) defined";
-    print "set_square(a) defined";
-    print "set_pow(a, n) defined";
-    print "set_sum(a) defined";
-    print "set_plus(a) defined";
-    print "interval(a, b) defined";
-    print "isinterval(a) defined";
-    print "set_mod(a, b) defined";
-    print "randset(n, a, b) defined";
-    print "polyvals(L, A) defined";
-    print "polyvals2(L, A, B) defined";
-    print "set_print(a) defined";
-}

lib/pell.cal

@@ -66,8 +66,3 @@ define pellx(D)
 	}
 	return Q1;
 }
-
-if (config("lib_debug") >= 0) {
-    print "pell(D) defined";
-    print "pellx(D) defined";
-}

lib/pi.cal

@@ -47,7 +47,3 @@ define qpi(epsilon)
 	}
 	return (bround(1/an, bits));
 }
-
-if (config("lib_debug") >= 0) {
-    print "qpi(epsilon) defined";
-}

lib/pix.cal

@@ -38,7 +38,3 @@ define pi_of_x(x)
 	}
 	return primes;
 }
-
-if (config("lib_debug") >= 0) {
-	print "pi_of_x(x) defined";
-}

lib/pollard.cal

@@ -6,7 +6,7 @@
  * Factor using Pollard's p-1 method.
  */
 
-define factor(N, B, ai, af)
+define pfactor(N, B, ai, af)
 {
 	local	a, k, i, d;
 
@@ -28,7 +28,3 @@ define factor(N, B, ai, af)
 	}
 	return 1;
 }
-
-if (config("lib_debug") >= 0) {
-    print "factor(N, B, ai, af) defined";
-}

lib/poly.cal

@@ -689,39 +689,4 @@ c=pol(1+2i,3+4i,5+6i);
 
 if (config("lib_debug") >= 0) {
 	print "obj poly {p} defined";
-	print "pol() defined";
-	print "poly_print(a) defined";
-	print "poly_add(a, b) defined";
-	print "poly_sub(a, b) defined";
-	print "poly_mul(a, b) defined";
-	print "poly_div(a, b) defined";
-	print "poly_quo(a,b) defined";
-	print "poly_mod(a,b) defined";
-	print "poly_neg(a) defined";
-	print "poly_conj(a) defined";
-	print "poly_cmp(a,b) defined";
-	print "iszero(a) defined";
-	print "plist(a) defined";
-	print "listmul(a,b) defined";
-	print "ev(a,t) defined";
-	print "evp(s,t) defined";
-	print "ispoly(a) defined";
-	print "isstring(a) defined";
-	print "var(name) defined";
-	print "pcoeff(a) defined";
-	print "pterm(a,n) defined";
-	print "deg(a) defined";
-	print "polydiv(a,b) defined";
-	print "D(a,n) defined";
-	print "Dp(a,n) defined";
-	print "pgcd(a,b) defined";
-	print "plcm(a,b) defined";
-	print "monic(a) defined";
-	print "pfgcd(a,b) defined";
-	print "interp(X,Y,x) defined";
-	print "makediffs(X,Y) defined";
-	print "evalfd(T,x) defined";
-	print "mdet(A) defined";
-	print "M(A,n,I,J) defined";
-	print "mprint(A) defined";
 }

lib/prompt.cal

@@ -94,8 +94,3 @@ define showvalues(str) {
 		print "\t":eval(str);
 	}
 }
-
-if (config("lib_debug") >= 0) {
-	print "adder() defined";
-	print "showvalues(str) defined";
-}

lib/psqrt.cal

@@ -48,8 +48,3 @@ define psqrt(u, p)
 	}
 	return min(v, p - v);
 }
-
-
-if (config("lib_debug") >= 0) {
-    print "psqrt(u, p) defined";
-}

lib/qtime.cal

@@ -0,0 +1,60 @@
+/*
+ * qtime - Display time as English sentence
+ *
+ * usage:
+ *	qtime(utc_hr_offset)
+ *
+ *	utc_hr_offset	Offset from UTC in hours.
+ *
+ * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
+ * With minor mods by: Landon Curt Noll <http://reality.sgi.com/chongo>
+ *
+ * See:
+ *	http://www.magnetic-ink.dk/download/qtime.html
+ *
+ * for examples of qtime() written on other languages.
+ */
+
+/*
+ * qtime - Display time as English sentence
+ */
+define qtime(utc_hr_offset)
+{
+    static mat hr[12] = {
+      "twelve", "one", "two", "three", "four", "five",
+      "six", "seven", "eight", "nine", "ten", "eleven"
+    };
+    static mat mn[7] = {
+      "", "five ", "ten ", "a quarter ", "twenty ", "twenty-five ", "half "
+    };
+    static mat ny[5] = {
+      "nearly ", "almost ", "", "just after ", "after "
+    };
+    static mat up[3] = {
+      "to ", "", "past "
+    };
+    local adj_mins = (((time() + utc_hr_offset*3600) % 86400) + 30) // 60 + 27;
+    local hours	= (adj_mins // 60) % 12;
+    local minutes = adj_mins % 60;
+    local almost =  minutes % 5;
+    local divisions = (minutes // 5) - 5;
+    local to_past_idx =  divisions > 0 ? 1 : 0;
+
+    if (divisions < 0) {
+	divisions = -divisions;
+	to_past_idx = -1;
+    }
+    ++to_past_idx;
+
+    /*
+     * Print the English sentence
+     *
+     * We avoid forward and back quotes just to show that the char()
+     * builtin function can be used in conjunction with a printf.
+     */
+    printf("It%cs %s%s%s%s",
+	    char(0x27), ny[almost], mn[divisions], up[to_past_idx], hr[hours]);
+    if (divisions == 0)
+	printf(" o%cclock", char(0x27));
+    printf (".\n");
+}

lib/quat.cal

@@ -197,19 +197,4 @@ define quat_shift(a, b)
 
 if (config("lib_debug") >= 0) {
     print "obj quat {s, v} defined";
-    print "quat(a, b, c, d) defined";
-    print "quat_print(a) defined";
-    print "quat_norm(a) defined";
-    print "quat_abs(a, e) defined";
-    print "quat_conj(a) defined";
-    print "quat_add(a, e) defined";
-    print "quat_sub(a, e) defined";
-    print "quat_inc(a) defined";
-    print "quat_dec(a) defined";
-    print "quat_neg(a) defined";
-    print "quat_mul(a, b) defined";
-    print "quat_div(a, b) defined";
-    print "quat_inv(a) defined";
-    print "quat_scale(a, b) defined";
-    print "quat_shift(a, b) defined";
 }

lib/randbitrun.cal

@@ -112,7 +112,3 @@ define randbitrun(run_cnt)
     printf("length>%d\t\t\t\t\tcount=%d\n", MAX_RUN, long_run_cnt);
     printf("max length=%d\n", max_run);
 }
-
-if (config("lib_debug") >= 0) {
-    print "randbitrun([run_length]) defined";
-}

lib/randmprime.cal

@@ -21,7 +21,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 /* obtain our required libs */
@@ -129,7 +132,3 @@ randmprime(bits, seed, dbg)
     }
     return ret;
 }
-
-if (config("lib_debug") >= 0) {
-    print "randmprime(bits, seed [,dbg]) defined";
-}

lib/randombitrun.cal

@@ -112,7 +112,3 @@ define randombitrun(run_cnt)
     printf("length>%d\t\t\t\t\tcount=%d\n", MAX_RUN, long_run_cnt);
     printf("max length=%d\n", max_run);
 }
-
-if (config("lib_debug") >= 0) {
-    print "randombitrun([run_length]) defined";
-}

lib/randomrun.cal

@@ -121,7 +121,3 @@ define randomrun(run_cnt)
     printf("length>%d\t\t\t\t\tcount=%d\n", MAX_RUN, long_run_cnt);
     printf("max length=%d\n", max_run);
 }
-
-if (config("lib_debug") >= 0) {
-    print "randomrun([run_length]) defined";
-}

lib/regress.cal

@@ -22,13 +22,13 @@ prob = 0;				/* clear problem counter */
 
 global junk;				/* throw away value */
 junk = errcount(0);			/* clear error count */
-junk = errmax(0x7fffffff);		/* set maximum error very high */
+junk = errmax(-1);			/* prevent errcount from abouting */
 
 global ecnt;				/* expected value of errcount() */
 ecnt = 0;				/* clear expected errcount() value */
 
 initcfg = config("all", "oldstd");	/* set config to startup default */
-initcfg = config("lib_debug", -1);	/* disable lib startup messages */
+initcfg = config("lib_debug", -4);	/* disable lib startup messages */
 initcfg = config("calc_debug", 1);	/* enable more internal debugging */
 initcfg = config("all");		/* save state for later use */
 
@@ -1555,7 +1555,12 @@ define test_rand()
 	vrfy(randbit() == 1,		  '1567: randbit() == 1');
 	vrfy(randbit() == 0,		  '1568: randbit() == 0');
 
-	print '1569: Ending rand test';
+	/* test seed() as best as we can */
+	vrfy(seed() >= 0,		  '1569: seed() >= 0');
+	vrfy(seed() < 2^64,		  '1570: seed() < 2^64');
+	vrfy(isrand(srand(seed())),	  '1571: isrand(srand(seed()))');
+
+	print '1572: Ending rand test';
 }
 print '025: parsed test_rand()';
 
@@ -4218,7 +4223,7 @@ define test_random()
 
 	/* test range interface some more */
 	tmp = srandom(state1);
-	print				  '5369: tmp = srandom(0)';
+	print				  '5369: tmp = srandom(state1)';
 	vrfy(random(-46,46) == -0x7,	  '5370: random(-46,46) == -0x7');
 	vrfy(random(21701,23209) == 23061,
 		'5371: random(21701,23209) == 23061');
@@ -4410,7 +4415,12 @@ define test_random()
 	vrfy(randombit(123) == 0x2058f802dd42b3aee4e734eacc13057, \
 		  '5463: randombit(123) == 0x2058f802dd42b3aee4e734eacc13057');
 
-	print '5464: Ending test_random';
+	/* test seed() as best as we can */
+	vrfy(seed() >= 0,		  '5464: seed() >= 0');
+	vrfy(seed() < 2^64,		  '5465: seed() < 2^64');
+	vrfy(israndom(srandom(seed())),	  '5466: israndom(srandom(seed()))');
+
+	print '5467: Ending test_random';
 }
 print '137: parsed test_random()';
 
@@ -5907,8 +5917,10 @@ define test_is()
 	 */
 	blkfree("blk5900");
 	print				  '6663: blkfree("blk5900")';
+	fclose(ofd);
+	print				  '6664: fclose(ofd)';
 
-	print '6664: Ending test_is';
+	print '6665: Ending test_is';
 }
 print '168: test_is()';
 
@@ -6998,7 +7010,7 @@ define test_bigcomb()
 {
 	local a, b, n, i, v1, v2;
 
-	print '7900: Starting test_bigcomb()';
+	print '7900: Starting test_bigcomb';
 	a = 1234/4321;
 	print				'7901: a = 1234/4321';
 	b = 3456/6543;
@@ -7021,7 +7033,7 @@ define test_bigcomb()
 	vrfy(f7900(-7/4,33/4,-2) == g7900(-7/4,33/4,-2),
 			'7913: f7900(-7/4,33/4,-2) == g7900(-7/4,33/4,-2)');
 
-	print '7914: Ending test_bigcomb()';
+	print '7914: Ending test_bigcomb';
 }
 print '186: parsed test_bigcomb()';
 
@@ -7036,7 +7048,7 @@ define test_natnumset()
 {
 	local A, B, C, D, P, P1, L1, L2;
 
-	print '8000: Starting test_natnumset()';
+	print '8000: Starting test_natnumset';
 
 	A = set(17, 2, 0, 24, 2);
 	print				'8101: A = set(17, 2, 0, 24, 2);';
@@ -7093,7 +7105,7 @@ define test_natnumset()
 	vrfy(polyvals2(L2,C,D) == set(12,16,21,27,45,55,77,91),
 		'8135: polyvals(L2,C,D) == set(12,16,21,27,45,55,77,91)');
 
-	print '8136: Ending test_natnumset()';
+	print '8136: Ending test_natnumset';
 }
 print '188: parsed test_natnumset()';
 
@@ -7103,7 +7115,7 @@ print '188: parsed test_natnumset()';
  */
 define test_somenew()
 {
-	print	'8200: Starting test_somenew()';
+	print	'8200: Starting test_somenew';
 
 	vrfy(char(-1) == char(255),	'8201: char(-1) == char(255)');
 	vrfy(char(258) == char(2),	'8202: char(258) == char(2)');
@@ -7127,7 +7139,7 @@ define test_somenew()
 	vrfy(1/(1/0) == 0,		'8215: 1/(1/0) == 0');
 	vrfy(inverse(1/0) == 0,		'8216: inverse(1/0) == 0');
 
-	print '8217: Ending test_somenew()';
+	print '8217: Ending test_somenew';
 }
 print '189: parsed test_somenew()';
 
@@ -7144,7 +7156,7 @@ print '200: Reserved for top level test use';
 define count_errors()
 {
 	if (prob  ==  0) {
-		print "9998: passed all tests  /\\../\\";
+		print "9997: passed all tests  /\\../\\";
 	} else {
 		print "****", prob, "error(s) found  \\/++\\/";
 	}
@@ -7380,6 +7392,113 @@ return test_natnumset();
 print;
 return test_somenew();
 
+
+/*
+ * misc define tests
+ */
 print;
+print	'8300: Starting define tests';
+define f8300(x) = x^2; define g8300(x) = 1 - x;
+print	'8301: define f8300(x) = x^2; define g8300(x) = 1 - x;';
+vrfy(f8300(10) == 100,		'8302: f8300(10) == 100');
+vrfy(g8300(10) == -9,		'8303: g8300(10) == -9');
+define h8300(x)=x^3;define i8300(x)=x-1;define j8300(x)=x+1;
+print	'8304: define h8300(x)=x^3;define i8300(x)=x-1;define j8300(x)=x+1;';
+vrfy(h8300(10) == 1000,		'8305: h8300(10) == 1000');
+vrfy(i8300(10) == 9,		'8306: i8300(10) == 9');
+vrfy(j8300(10) == 11,		'8307: j8300(10) == 11');
+print	'8308: Ending define tests';
+
+
+/*
+ * read various calc libs
+ *
+ * We read most of the calc libs shipped with the distribution.
+ * There are a few lib files that are not read:
+ *
+ *	beer.cal	- prints a bunch of things when loaded
+ *	hello.cal	- designed to go into an infinite loop
+ *	lucal.cal	- already read by this file
+ *	lucas_chk.cal	- already read by this file
+ *	lucas_tbl.cal	- duplicatres code already read by another file
+ *	regress.cal	- this file
+ *	surd.cal	- already read by this file
+ *	testXXXX.cal	- already read by this file
+ *	xx_print.cal	- prints a bunch of things when loaded
+ *
+ * We want to do this 2nd to last; ahead of any final cleanup and behind
+ * all of real actions of regress.cal.
+ */
+print;
+print	'9800: Starting read of selected calc libs';
+read -once bernoulli;
+print	'9801: read -once bernoulli';
+read -once bigprime;
+print	'9802: read -once bigprime';
+read -once chrem;
+print	'9803: read -once chrem';
+read -once deg;
+print	'9804: read -once deg';
+read -once ellip;
+print	'9805: read -once ellip';
+read -once mersenne;
+print	'9806: read -once mersenne';
+read -once mfactor;
+print	'9807: read -once mfactor';
+read -once mod;
+print	'9808: read -once mod';
+read -once natnumset;
+print	'9809: read -once natnumset';
+read -once pell;
+print	'9810: read -once pell';
+read -once pi;
+print	'9811: read -once pi';
+read -once pix;
+print	'9812: read -once pix';
+read -once pollard;
+print	'9813: read -once pollard';
+read -once poly;
+print	'9814: read -once poly';
+read -once prompt;
+print	'9815: read -once prompt';
+read -once psqrt;
+print	'9816: read -once psqrt';
+read -once quat;
+print	'9817: read -once quat';
+read -once randbitrun;
+print	'9818: read -once randbitrun';
+read -once randmprime;
+print	'9819: read -once randmprime';
+read -once randombitrun;
+print	'9820: read -once randombitrun';
+read -once randomrun;
+print	'9821: read -once randomrun';
+read -once randrun;
+print	'9822: read -once randrun';
+read -once seedrandom;
+print	'9823: read -once seedrandom';
+read -once solve;
+print	'9824: read -once solve';
+read -once sumsq;
+print	'9825: read -once sumsq';
+read -once unitfrac;
+print	'9826: read -once unitfrac';
+read -once varargs;
+print	'9827: read -once varargs';
+read -once qtime;
+print	'9828: read -once qtime';
+print	'9829: Ending read of selected calc libs';
+
+
+/*
+ * cleanup and report the results
+ */
+print;
+freeredc();
+print '9995: freeredc()';
+freestatics();
+print '9996: freestatics()';
 return count_errors();
+freeglobals();
+print '9998: freeglobals()';
 print '9999: Ending regression tests';

lib/seedrandom.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 /*

lib/solve.cal

@@ -41,7 +41,3 @@ define solve(low, high, epsilon)
 		}
 	}
 }
-
-if (config("lib_debug") >= 0) {
-    print "solve(low, high, epsilon) defined";
-}

lib/sumsq.cal

@@ -37,7 +37,3 @@ define ss(p)
 	}
 	print a : "^2 +" , b : "^2 =" , a^2 + b^2;
 }
-
-if (config("lib_debug") >= 0) {
-    print "ss(p) defined";
-}

lib/surd.cal

@@ -263,25 +263,6 @@ define surd_rel(a, b)
 
 if (config("lib_debug") >= 0) {
     print "obj surd {a, b} defined";
-    print "surd(a, b) defined";
-    print "surd_print(a) defined";
-    print "surd_conj(a) defined";
-    print "surd_norm(a) defined";
-    print "surd_value(a, xepsilon) defined";
-    print "surd_add(a, b) defined";
-    print "surd_sub(a, b) defined";
-    print "surd_inc(a) defined";
-    print "surd_dec(a) defined";
-    print "surd_neg(a) defined";
-    print "surd_mul(a, b) defined";
-    print "surd_square(a) defined";
-    print "surd_scale(a, b) defined";
-    print "surd_shift(a, b) defined";
-    print "surd_div(a, b) defined";
-    print "surd_inv(a) defined";
-    print "surd_sgn(a) defined";
-    print "surd_cmp(a, b) defined";
-    print "surd_rel(a, b) defined";
     print "surd_type defined";
     print "set surd_type as needed";
 }

lib/test1700.cal

@@ -3,14 +3,12 @@
  * Permission is granted to use, distribute, or modify this source,
  * provided that this copyright notice remains intact.
  *
- * By: Landon Curt Noll
- *     chongo@toad.com  -or-  ...!{pyramid,sun,uunet}!hoptoad!chongo
+ * By:  Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This library is used by the 1700 series of the regress.cal test suite.
  */
 
 ++value;
-
-if (config("lib_debug") >= 0) {
-    /* nothing to do */
-}

lib/test2300.cal

@@ -3,8 +3,10 @@
  * Permission is granted to use, distribute, or modify this source,
  * provided that this copyright notice remains intact.
  *
- * By: Landon Curt Noll
- *     chongo@toad.com  -or-  ...!{pyramid,sun,uunet}!hoptoad!chongo
+ * By:  Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This library is used by the 2300 series of the regress.cal test suite.
  */
@@ -95,7 +97,3 @@ define ckmat()
 	/* args match the matrix in the object */
 	return 1;
 }
-
-if (config("lib_debug") >= 0) {
-    /* nothing to do */
-}

lib/test2600.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 2600 series of the regress.cal test suite.
  */
@@ -491,25 +491,3 @@ define test2600(verbose, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose defined";
-	print "global err defined";
-	print "testismult(str,n,verbose) defined";
-	print "testsqrt(str,n,eps,verbose) defined";
-	print "testexp(str,n,eps,verbose) defined";
-	print "testln(str,n,eps,verbose) defined";
-	print "testpower(str,n,b,eps,verbose) defined";
-	print "testgcd(str,n,verbose) defined";
-	print "cpow(x,n,eps) defined";
-	print "cexp(x,eps) defined";
-	print "cln(x,eps) defined";
-	print "mkreal() defined";
-	print "mkcomplex() defined";
-	print "mkbigreal() defined";
-	print "mksmallreal() defined";
-	print "testappr(str,n,verbose) defined";
-	print "checkappr(x,y,z,verbose) defined";
-	print "checkresult(x,y,z,a) defined";
-	print "test2600(verbose,tnum) defined";
-}

lib/test2700.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 2700 series of the regress.cal test suite.
  */
@@ -308,23 +308,3 @@ define test2700(verbose, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose defined";
-	print "global err defined";
-	print "mknonnegreal() defined";
-	print "mkposreal() defined";
-	print "mkreal_2700() defined";
-	print "mknonzeroreal() defined";
-	print "mkposfrac() defined";
-	print "mkfrac() defined";
-	print "mksquarereal() defined";
-	print "mknonsquarereal() defined";
-	print "mkcomplex_2700() defined";
-	print "testcsqrt(str,n,verbose) defined";
-	print "checksqrt(x,y,z,v) defined";
-	print "checkavrem(A,B,X,eps) defined";
-	print "checkrounding(s,n,t,u,z) defined";
-	print "iscomsq(x) defined";
-	print "test2700(verbose,tnum) defined";
-}

lib/test3100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3100 series of the regress.cal test suite.
  */
@@ -17,14 +17,3 @@ define res_mul(a,b) {local obj res v = {(a.r * b.r) % md}; return v;};
 define res_neg(a) {local obj res v = {(-a.r) % md}; return v;};
 define res_inv(a) {local obj res v = {minv(a.r, md)}; return v;};
 define res(x) {local obj res v = {x % md}; return v;};
-
-if (config("lib_debug") >= 0) {
-	print "obj res defined";
-	print "global md defined";
-	print "res_test(a) defined";
-	print "res_sub(a, b) defined";
-	print "res_mul(a, b) defined";
-	print "res_neg(a) defined";
-	print "res_inv(a) defined";
-	print "res(x) defined";
-}

lib/test3300.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3300 series of the regress.cal test suite.
  */
@@ -122,11 +122,3 @@ define test3300(verbose, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose defined";
-	print "global err defined";
-	print "testi(str, n, N, verbose) defined";
-	print "testr(str, n, N, verbose) defined";
-	print "test3300(verbose, tnum) defined";
-}

lib/test3400.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3400 series of the regress.cal test suite.
  */
@@ -299,15 +299,3 @@ define test3400(verbose, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose defined";
-	print "global err defined";
-	print "test3401(str, n, eps, verbose) defined";
-	print "test3402(str, n, eps, verbose) defined";
-	print "test3403(str, n, eps, verbose) defined";
-	print "test3404(str, n, eps, verbose) defined";
-	print "test3405(str, n, eps, verbose) defined";
-	print "test3406(str, n, eps, verbose) defined";
-	print "test3400(verbose, tnum) defined";
-}

lib/test3500.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3500 series of the regress.cal test suite.
  */
@@ -272,14 +272,3 @@ define test3500(verbose, tnum, n, N)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose defined";
-	print "global err defined";
-	print "testfrem(x, y, verbose) defined";
-	print "testgcdrem(x, y, verbose) defined";
-	print "testf(str, n, verbose) defined";
-	print "testg(str, n, verbose) defined";
-	print "testh(str, n, N, verbose) defined";
-	print "test3500(verbose, n, N) defined";
-}

lib/test4000.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4000 series of the regress.cal test suite.
  */
@@ -452,32 +452,3 @@ define test4000(v, tnum)
 	}
 	return tnum;
 }
-
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose";
-	print "global err";
-	print "global BASEB";
-	print "global BASE";
-	print "global COUNT";
-	print "global SKIP";
-	print "global RESIDUE";
-	print "global MODULUS";
-	print "global K1";
-	print "global H1";
-	print "global K2";
-	print "global H2";
-	print "global K3";
-	print "global H3";
-	print "plen(N) defined";
-	print "clen(N) defined";
-	print "ptimes(str, N, n, count, skip, verbose) defined";
-	print "ctimes(str, N, n, count, skip, verbose) defined";
-	print "crtimes(str, a, b, n, count, skip, verbose) defined";
-	print "ntimes(str, N, n, count, skip, residue, mod, verbose) defined";
-	print "testnextcand(str, N, n, cnt, skip, res, mod, verbose) defined";
-	print "testnext1(x, y, count, skip, residue, modulus) defined";;
-	print "testprevcand(str, N, n, cnt, skip, res, mod, verbose) defined";
-	print "testprev1(x, y, count, skip, residue, modulus) defined";
-	print "test4000(verbose, tnum) defined";
-}

lib/test4100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4100 series of the regress.cal test suite.
  */
@@ -472,20 +472,3 @@ define test4100(v, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global defaultverbose";
-	print "global err";
-	print "global K1";
-	print "global K2";
-	print "global BASEB";
-	print "global BASE";
-	print "rlen_4100(N) defined";
-	print "olen(N) defined";
-	print "test4101(x, y, m, k, z1, z2) defined";
-	print "testall(str, n, N, M, verbose) defined";
-	print "times(str, N, n, verbose) defined";
-	print "powtimes(str, N1, N2, n, verbose) defined";
-	print "inittimes(str, N, n, verbose) defined";
-	print "test4100(verbose, tnum) defined";
-}

lib/test4600.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4600 series of the regress.cal test suite.
  */
@@ -223,6 +223,11 @@ define ttest(str, m, n, verbose)
 			return 1;
 		}
 	}
+	if (iserror(fclose(f))) {
+		print 'failed';
+		printf("**** Failure 6 for i = %d\n", i);
+		return 1;
+	}
 	i = rm("junk4600");
 	if (verbose > 0) {
 		printf("passed\n");
@@ -299,12 +304,3 @@ define test4600(v, tnum)
 	}
 	return tnum;
 }
-
-if (config("lib_debug") >= 0) {
-	print "stest(str [, verbose]) defined";
-	print "ttest([m, [n [,verbose]]]) defined";
-	print "sprint(x) defined";
-	print "findline(f,s) defined";
-	print "findlineold(f,s) defined";
-	print "test4600(verbose, tnum) defined";
-}

lib/test5100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 5100 series of the regress.cal test suite.
  */
@@ -48,9 +48,3 @@ define test5100(x)
 	}
 	global a5100 = a5100, b5100 = b5100;
 }
-
-if (config("lib_debug") >= 0) {
-	print "global a5100";
-	print "global b5100";
-	print "test5100(x) defined";
-}