Release calc version 2.11.0t10.5.1

BUGS

@@ -24,30 +24,26 @@ To be sure that your version of calc is up to date, check out:
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/tech/comp/calc
+	http://reality.sgi.com/chongo/tech/comp/calc/index.html
 
 =-=
 
 If you have tried all of the above and things still are not right,
 then it may be time to send in a bug report.  You can send bug reports to:
 
-    calc-tester@postofc.corp.sgi.com
+    calc-bugs at postofc dot corp dot sgi dot com
+
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
 
 When you send your report, please include the following information:
 
     * a description of the problem
-
     * the version of calc you are using (if you cannot get calc
       it to run, then send us the 4 #define lines from version.c)
-
     * if you modified calc from an official patch, send me the mods you made
-
     * the type of system you were using
-
     * the type of compiler you were using
-
     * any compiler warnings or errors that you saw
-
     * cd to the calc source directory, and type:
 
 	make debug > debug.out 2>&1		(sh, ksh, bash users)
@@ -62,185 +58,18 @@ Stack traces from core dumps are useful to send as well.
 Send any comments, compiler warning messages, suggestions and most
 importantly, fixes (in the form of a context diff patch) to:
 
-    calc-tester@postofc.corp.sgi.com
+    calc-tester at postofc dot corp dot sgi dot com
+
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+
+You should use the above calc-bugs address for bug reports, if you are
+not currently a member of the calc-tester mailing list.
 
 =-=
 
 Known bugs:
 
-    * When compiled on some Big Endian machines with BASEB forced to
+    * Calc does not support the #! exec method.	 For example of the
-      be 16 (by setting LONGLONG_BITS= 0 in the Makefile), calc fails
-      a number of regression tests:
-
-	4230: n = ftell(f)
-	4231: isnull(fputs(f,L,"\n",C,"\n",N,"\n"))
-	4232: fseek(f, n)
-	**** Non-true result (0): 4233: fgetstr(f) == LCN
-	4234: isnull(fclose(f))
-	4235: a = exp(27, 1e-1000)
-	4236: b = sqrt(7 + 5i, 1e-2000)
-	4252: fscanf(f, "%*[^|]%*c%n%*[^[]%*c%n", m, n) == 2
-	4253: fseek(f, m)
-	4254: fscanf(f, "%3c", x) == 1
-	**** Non-true result (0): 4255: x == "  Cu"
-	4256: fseek(f, n)
-	4257: fscanf(f, "%s", y) == 1
-	**** Non-true result (0): 4258: y == "Noll"
-	4259: isnull(fclose(f))
-	4260: x = rm("junk4200")
-	4261: Ending test_fileops
-	4600: Beginning test_fileop
-	4601: ttest(0,0): passed
-	4602: stest(): failed
-	**** search(f, "and") != 10 failed
-	4603: ttest(1,1): failed
-	**** Failure 2 for i = 0
-	4604: stest(): failed
-	**** search(f, "and") != 10 failed
-	4605: ttest(2,2): failed
-	**** Failure 2 for i = 0
-	4606: stest(): failed
-	**** search(f, "and") != 10 failed
-	4607: ttest(3,3): failed
-	**** Failure 2 for i = 0
-	4608: stest(): failed
-	**** search(f, "and") != 10 failed
-	4609: ttest(4,4): failed
-	**** Failure 2 for i = 0
-	4610: stest(): failed
-	**** search(f, "and") != 10 failed
-	4611: ttest(5,5): failed
-	**** Failure 2 for i = 0
-	4612: stest(): failed
-	**** search(f, "and") != 10 failed
-	4613: ttest(6,6): failed
-	**** Failure 2 for i = 0
-	4614: stest(): failed
-	**** search(f, "and") != 10 failed
-	4615: ttest(7,7): failed
-	**** Failure 2 for i = 0
-	4616: stest(): failed
-	**** search(f, "and") != 10 failed
-	4617: ttest(8,8): failed
-	**** Failure 2 for i = 0
-	4618: stest(): failed
-	**** search(f, "and") != 10 failed
-	4619: ttest(9,9): failed
-	**** Failure 1 for file size
-	4620: stest(): failed
-	**** fopen("junk4600", "w") failed
-	4621: Ending test_fileop
-
-	4700: Beginning test_charset
-	**** errcount:172  > ecnt:150
-	4701: "\a" == char(7)
-	4702: "\v" == char(11)
-	4703: "\e" == char(27)
-	5000: Beginning test_filesearch
-	5001: x = rm("-f", "junk5000")
-	5002: f = fopen("junk5000", "w")
-	**** Unable to open "junk5000" for writing
-
-	5100: Beginning test_newdecl
-	5101: test5100(1)
-	**** errcount:173  > ecnt:172
-	5102: a5100 == 0
-	5103: b5100 == 2
-	5104: test5100(1)
-	5927: test unused
-	5928: test unused
-	5929: test unused
-	**** errcount:180  > ecnt:177
-	5930: isassoc(loc) == 0
-	5931: isassoc(a) == 1
-	5932: isassoc(ofd) == 0
-	6079: test unused
-	6080: iserror(loc) == 0
-	6081: iserror(a) == 0
-	**** Non-true result (0): 6082: iserror(ofd) == 0
-	**** Non-true result (0): 6083: iserror(cfd) == 0
-	6084: iserror(blk) == 0
-	6085: iserror(nblk) == 0
-	6086: iserror(cfg) == 0
-	6139: test unused
-	6140: isfile(loc) == 0
-	6141: isfile(a) == 0
-	**** Non-true result (0): 6142: isfile(ofd) == 1
-	**** Non-true result (0): 6143: isfile(cfd) == 1
-	6144: isfile(blk) == 0
-	6145: isfile(nblk) == 0
-	6146: isfile(cfg) == 0
-
-	6700: Beginning test_blk
-	6701: A = blk(20);
-	**** errcount:181  > ecnt:180
-	6702: size(A) == 20
-	6703: sizeof(A) == 256
-	6704: B = A;
-	6822: C == A
-	6823: fs = fopen("junk6800", "w+");
-	6824: blkcpy(fs, A);
-	**** errcount:183  > ecnt:181
-	**** Non-true result (0): 6825: size(f) == 5
-	6826: blkcpy(B = blk(), fs);
-	**** errcount:184  > ecnt:183
-	**** Non-true result (0): 6827: B == A
-	6828: blkcpy(fs, A, ,100);
-	**** errcount:185  > ecnt:184
-	**** Non-true result (0): 6829: size(f) == 105
-	6830: blkcpy(C = blk(), fs, 2, ,100)
-	**** errcount:186  > ecnt:185
-	**** Non-true result (0): 6831: C == (blk() = {1,2}
-	6832: A = blk();
-	6833: blkcpy(A, "blk6800");
-	6834: size(A) == 9
-	6900: Beginning test_name
-	6901: x = rm("-f", "junk6900")
-	6902: f = fopen("junk6900", "w")
-	**** errcount:189  > ecnt:186
-	**** Non-true result (0): 6903: name(f) == "junk6900"
-	6904: fclose(f)
-	**** errcount:190  > ecnt:189
-	6905: name(f) == null()
-	6906: A = blk("blk6900")
-	6907: name(A) == "blk6900"
-	7002: B = blk();
-	7003: copy("abc yz", A);
-	7004: copy("defg", B);
-	**** errcount:191  > ecnt:190
-	7005: strprintf("%s", A) == "abc yz"
-	7006: strprintf("%s", A[2]) == "c yz"
-	7007: strprintf("%s", A[7]) == ""
-
-	9995: freeredc()
-	9996: freestatics()
-	**** 24 error(s) found  \/++\/
-
-    We are sure some more 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.
-
-=-=
-
-Calc Mis-features:
-
-    * The following shell command (written in sh,ksh,bash-like form) works:
-
-	    calc '/*
-		   * comment
-		   */
-		  print 2+3;'
-
-      However this (also written in sh,ksh,bash-like form) does not work:
-
-	    echo '/*
-		   * comment
-		   */
-		  print 2+3;' | calc
-
-      The 2nd example will result in an 'Unterminated comment' error.
-
-    * 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:
 
@@ -253,3 +82,106 @@ Calc Mis-features:
       Will result in '"tmp" is undefined' and '"xyzzy" is undefined'
       error messages because calc considers $0 as an expression to
       evaluate.
+
+    * The following file:
+
+	    /* this is bugdemo.cal */
+	    x = eval(prompt(">>> "));
+	    print x;
+
+      when executed as:
+
+	    calc read bugdemo.cal
+
+      will obtain a prompt from the terminal, print the value but leave
+      the terminal in a 'bad' state, as if stty -icanon -echo -echoe
+      had been executed.
+
+    * Use of 'fmt' in the 2nd arg of printf() calls in c_sysinfo.c
+      cause some compilers to issue warnings.
+
+    * The builtin function exp(x) will return 0 when x is a large value
+      in certain cases such as exp(2^32).
+
+    * The builtin function power(x,y) will return 0 in certain cases
+      such as power(pi(),2^32).
+
+    We are sure some more 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.
+
+=-=
+
+Problems with known work-a-rounds:
+
+    * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
+      to fail the regression test.  The work-a-round is to compile with -O
+      or to use gcc-2.96 or later.
+
+    * Solaris cc somtimes barfs while compiling zrand.c.  In particular, calc
+      barfs on on the SVAL macro.  The work-a-round is to use the Solaric cc
+      Makefile set sets -DFORCE_STDC.  I.e,:
+
+	    CCWARN=
+	    CCOPT= ${DEBUG} ${NO_SHARED}
+	    CCMISC= -DFORCE_STDC
+	    #
+	    CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
+	    ICFLAGS= ${CCWARN} ${CCMISC}
+	    #
+	    LCFLAGS=
+	    LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
+	    ILDFLAGS=
+	    #
+	    LCC= cc
+	    CC= ${PURIFY} ${LCC}
+
+    * There is a bug in some versions of the Dec/Compaq cc for the Alpha
+      where the following:
+
+	    #include <stdio.h>
+	    #define SVAL(a,b) (unsigned long)(0x ## a ## b ## ULL)
+	    main(){SVAL(b8a8aeb0,8168eadc);}
+
+      fails because it puts a space inside the concatenated hex.  Calc
+      has code that is affected by this bug.  This bug has been reported
+      to Compaq and may be fixed in the future.	 A work-a-round is to
+      compile with cc -std0 or to use a later version of their compiler.
+
+    * On a Digital UNIX V4.0F (Rev. 1229) on a 500 Mhz 21264, make check
+      dies a horrible death starting in test 600 and 622 gives 100s of
+      messages for calc version 2.11.0t9.4 using the Dec's cc with -O2:
+
+	600: Beginning test_bignums
+	601: muldivcheck 1
+	**** abc != acb: 602: muldivcheck 2
+	**** acb != bac: 602: muldivcheck 2
+	...
+	**** t4 != a4: 622: algcheck 1
+	**** t5 != a5: 622: algcheck 1
+	**** t6 != a6: 622: algcheck 1
+	**** t4 != a4: 622: algcheck 1
+	...
+
+	it finally hangs at test 2000.
+
+      The work-a-round is to compile calc without the optimizer.  If this
+      happens to you, try compiling without -O and without -O2.	 I.e., in
+      the Makefile, set:
+
+	DEBUG= -g
+
+    * There are problems compiling calc on the sparcv9 under 64 bit
+      Solaris.  On that platform, gcc-2.96 is able to compile calc, but
+      calc dumps core very early on in startup.  It is said that sparcv9
+      support in gcc-2.96 is very unofficial and thus there is no
+      work-a-round for gcc-2-96.
+
+      There is a work-a-round for this architecture us one is using the
+      Solaris CC on the sparcv9.  It has been reported that setting the
+      following Makefile variables will produce a working version of
+      calc on the sparcv9 under 64 bit Solaris:
+
+	    LCC="cc -xarch=v9"
+	    CCWARN="-DFORCE_STDC -w"
+	    DEBUG="-fast -xarch=v9"

HOWTO.INSTALL

@@ -19,11 +19,6 @@ Installing calc in 4 easy steps:
 	   As shipped the Makefile assumes 'more'.  On your system
 	   you may find 'less' to be a better pager.
 
-	   The CALCBINDINGS is matter of personal taste.  As shipped
-	   the Makefile assumes a default quasi-emacs-like command
-	   line editor.  Changing CALCBINDINGS= altbind will cause ^D
-	   to end calc in a fashion similar to that of the bc(1) command.
-
 	   Set TOPDIR to be the place under which help files, calc,
 	   include files and calc libs are to be installed.  As shipped
 	   the Makefile assumes a TOPDIR of /usr/local/lib.

LIBRARY

@@ -43,7 +43,7 @@ to use more than one type of arithmetic, since qmath.h automatically includes
 zmath.h, and cmath.h automatically includes qmath.h.
 
 The prototypes for the available routines are listed in the above include
-files.  Some of these routines are meant for internal use, and so aren't
+files.	Some of these routines are meant for internal use, and so aren't
 convenient for outside use.  So you should read the source for a routine
 to see if it really does what you think it does.  I won't guarantee that
 obscure internal routines won't change or disappear in future releases!
@@ -60,7 +60,7 @@ External programs may want to compile with:
 ERROR HANDLING
 --------------
 
-Your program MUST provide a function called math_error.  This is called by
+Your program MUST provide a function called math_error.	 This is called by
 the math routines on an error condition, such as malloc failures or a
 division by zero.  The routine is called in the manner of printf, with a
 format string and optional arguments.  (However, none of the low level math
@@ -142,7 +142,7 @@ output strings with space filling, output formatted strings like printf, and
 flush the output.  Output from these routines is diverted as described above.
 
 You can change the default output mode by calling math_setmode, and you can
-change the default number of digits printed by calling math_setdigits.  These
+change the default number of digits printed by calling math_setdigits.	These
 routines return the previous values.  The possible modes are described in
 zmath.h.
 
@@ -154,7 +154,7 @@ The arbitrary precision integer routines define a structure called a ZVALUE.
 This is defined in zmath.h.  A ZVALUE contains a pointer to an array of
 integers, the length of the array, and a sign flag.  The array is allocated
 using malloc, so you need to free this array when you are done with a
-ZVALUE.  To do this, you should call zfree with the ZVALUE as an argument
+ZVALUE.	 To do this, you should call zfree with the ZVALUE as an argument
 (or call freeh with the pointer as an argument) and never try to free the
 array yourself using free.  The reason for this is that sometimes the pointer
 points to one of two statically allocated arrays which should NOT be freed.
@@ -248,7 +248,7 @@ If the value is too large for ztofull(), ztoulong() or ztolong(), only
 the low order bits converted.
 
 There are two types of comparisons you can make on ZVALUEs.  This is whether
-or not they are equal, or the ordering on size of the numbers.  The zcmp
+or not they are equal, or the ordering on size of the numbers.	The zcmp
 function tests whether two ZVALUEs are equal, returning TRUE if they differ.
 The zrel function tests the relative sizes of two ZVALUEs, returning -1 if
 the first one is smaller, 0 if they are the same, and 1 if the first one
@@ -267,7 +267,7 @@ is always positive.  If the NUMBER is an integer, the denominator has the
 value 1.
 
 Unlike ZVALUEs, NUMBERs are passed using pointers, and pointers to them are
-returned by functions.  So the basic type for using fractions is not really
+returned by functions.	So the basic type for using fractions is not really
 (NUMBER), but is (NUMBER *).  NUMBERs are allocated using the qalloc routine.
 This returns a pointer to a number which has the value 1.  Because of the
 special property of a ZVALUE of 1, the numerator and denominator of this
@@ -283,7 +283,7 @@ A better way to create NUMBERs with particular values is to use the itoq,
 iitoq, or atoq functions.  Using itoq makes a long value into a NUMBER,
 using iitoq makes a pair of longs into the numerator and denominator of a
 NUMBER (reducing them first if needed), and atoq converts a string representing
-a number into the corresponding NUMBER.  The atoq function accepts input in
+a number into the corresponding NUMBER.	 The atoq function accepts input in
 integral, fractional, real, or exponential formats.  Examples of allocating
 numbers are:
 
@@ -294,7 +294,7 @@ numbers are:
 	q3 = atoq("456.78");
 
 Also unlike ZVALUEs, NUMBERs are quickly copied.  This is because they contain
-a link count, which is the number of pointers there are to the NUMBER.  The
+a link count, which is the number of pointers there are to the NUMBER.	The
 qlink macro is used to copy a pointer to a NUMBER, and simply increments
 the link count and returns the same pointer.  Since it is a macro, the
 argument should not be a function call, but a real pointer variable.  The
@@ -329,11 +329,11 @@ denominator, qint to return the integer part of, qfrac to return the
 fractional part of, and qinv to invert a fraction.
 
 There are some transcendental functions in the library, such as sin and cos.
-These cannot be evaluated exactly as fractions.  Therefore, they accept
+These cannot be evaluated exactly as fractions.	 Therefore, they accept
-another argument which tells how accurate you want the result.  This is an
+another argument which tells how accurate you want the result.	This is an
 "epsilon" value, and the returned value will be within that quantity of
 the correct value.  This is usually an absolute difference, but for some
-functions (such as exp), this is a relative difference.  For example, to
+functions (such as exp), this is a relative difference.	 For example, to
 calculate sin(0.5) to 100 decimal places, you could do:
 
 	NUMBER *q, *ans, *epsilon;
@@ -363,7 +363,7 @@ macros are:
 The comparisons for NUMBERs are similar to the ones for ZVALUEs.  You use the
 qcmp and qrel functions.
 
-There are four predefined values for fractions.  You should qlink them when
+There are four predefined values for fractions.	 You should qlink them when
 you want to use them.  These are _qzero_, _qone_, _qnegone_, and _qonehalf_.
 These have the values 0, 1, -1, and 1/2.  An example of using them is:
 
@@ -377,7 +377,7 @@ USING COMPLEX NUMBERS
 ---------------------
 
 The arbitrary precision complex arithmetic routines define a structure
-called COMPLEX.  This is defined in cmath.h.  This contains two NUMBERs
+called COMPLEX.	 This is defined in cmath.h.  This contains two NUMBERs
 for the real and imaginary parts of a complex number, and a count of the
 number of links there are to this COMPLEX number.
 
@@ -410,7 +410,7 @@ There is no direct routine to convert a string value into a COMPLEX value.
 But you can do this yourself by converting two strings into two NUMBERS,
 and then using the qqtoc routine.
 
-COMPLEX values are always returned from these routines.  To split out the
+COMPLEX values are always returned from these routines.	 To split out the
 real and imaginary parts into normal NUMBERs, you can simply qlink the
 two components, as shown in the following example:
 
@@ -423,7 +423,7 @@ two components, as shown in the following example:
 
 There are many macros for checking quick things about complex numbers,
 similar to the ZVALUE and NUMBER macros.  In addition, there are some
-only used for complex numbers.  Examples of macros are:
+only used for complex numbers.	Examples of macros are:
 
 	cisreal(c)	(number is real)
 	cisimag(c)	(number is pure imaginary)
@@ -441,8 +441,8 @@ only used for complex numbers.  Examples of macros are:
 There is only one comparison you can make for COMPLEX values, and that is
 for equality.  The ccmp function returns TRUE if two complex numbers differ.
 
-There are three predefined values for complex numbers.  You should clink
+There are three predefined values for complex numbers.	You should clink
-them when you want to use them.  They are _czero_, _cone_, and _conei_.
+them when you want to use them.	 They are _czero_, _cone_, and _conei_.
 These have the values 0, 1, and i.
 
 ----------------

README

@@ -27,7 +27,7 @@ If you run into problems, see the BUGS file.
 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
+installed calc.	 In these examples, the ">" is the calc prompt, not
 something that you type in.
 
 For list of help topics:
@@ -42,6 +42,7 @@ For overview of calc overview:
     > help define
     > help statement
     > help variable
+    > help usage
 
 For list of builtin functions:
 
@@ -51,7 +52,7 @@ 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:
+Calc is shipped with a library of calc scripts.	 For a list see:
 
     > help stdlib
 
@@ -73,7 +74,9 @@ 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
+    calc-tester-request at postofc dot corp dot sgi dot com
+
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
 
 Your message body (not the subject) should consist of:
 
@@ -84,6 +87,14 @@ Your message body (not the subject) should consist of:
 where ``address'' is your EMail address and ``your_full_name'' is
 your full name.
 
+Calc bug reports, however should be sent to:
+
+    calc-bugs at postofc dot corp dot sgi dot com
+
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+
+but see the BUGS file first.
+
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/tech/comp/calc
+	http://reality.sgi.com/chongo/tech/comp/calc/

addop.c

@@ -16,12 +16,13 @@
 #include "symbol.h"
 
 
-#define	FUNCALLOCSIZE	20	/* reallocate size for functions */
+#define FUNCALLOCSIZE	20	/* reallocate size for functions */
-#define	OPCODEALLOCSIZE	100	/* reallocate size for opcodes in functions */
+#define OPCODEALLOCSIZE 100	/* reallocate size for opcodes in functions */
 
 
 static long maxopcodes;		/* number of opcodes available */
 static long newindex;		/* index of new function */
+static char *newname;		/* name of new function */
 static long oldop;		/* previous opcode */
 static long oldoldop;		/* opcode before previous opcode */
 static long debugline;		/* line number of latest debug opcode */
@@ -61,26 +62,49 @@ initfunctions(void)
 void
 showfunctions(void)
 {
-	FUNC **fpp;		/* pointer into function table */
 	FUNC *fp;		/* current function */
 	long count;
+	long index;
 
 	count = 0;
 	if (funccount > 0) {
-		for (fpp = &functions[funccount - 1]; fpp >= functions; fpp--) {
+		if (conf->lib_debug & LIBDBG_FUNC_INFO)
-			fp = *fpp;
+			math_str("Index\tName        \tArgs\tOpcodes\n"
-			if (fp == NULL)
+				 "-----\t------     \t---- \t------\n");
-				continue;
+		else
-			if (count++ == 0) {
+			math_str("Name\tArguments\n"
-				printf("Name Arguments\n---- ---------\n");
+				 "----\t---------\n");
+		for (index = 0; index < funccount; index++) {
+			fp = functions[index];
+			if (conf->lib_debug & LIBDBG_FUNC_INFO) {
+
+				math_fmt("%5ld\t%-12s\t", index,
+					namestr(&funcnames,index));
+				if (fp) {
+					count++;
+					math_fmt("%-5d\t%-5ld\n",
+					 fp->f_paramcount, fp->f_opcodecount);
+				} else {
+					math_str("null\t0\n");
+				}
+			} else {
+				if (fp == NULL)
+					continue;
+				count++;
+				math_fmt("%-12s\t%-2d\n", namestr(&funcnames,
+					index), fp->f_paramcount);
 			}
-			printf("%-12s %-2d\n", fp->f_name, fp->f_paramcount);
 		}
 	}
-	if (count > 0) {
+	if (conf->lib_debug & LIBDBG_FUNC_INFO) {
-		printf("\nNumber: %ld\n", count);
+		math_fmt("\nNumber non-null: %ld\n", count);
+		math_fmt("Number null: %ld\n", funccount - count);
+		math_fmt("Total number: %ld\n", funccount);
 	} else {
-		printf("No user functions defined\n");
+		if (count > 0)
+			math_fmt("\nNumber: %ld\n", count);
+		else
+			math_str("No user functions defined\n");
 	}
 }
 
@@ -114,7 +138,9 @@ beginfunc(char *name, BOOL newflag)
 	fp->f_localcount = 0;
 	fp->f_opcodecount = 0;
 	fp->f_savedvalue.v_type = V_NULL;
-	fp->f_name = namestr(&funcnames, newindex);
+	fp->f_savedvalue.v_subtype = V_NOSUBTYPE;
+	newname = namestr(&funcnames, newindex);
+	fp->f_name = newname;
 	curfunc = fp;
 	initlocals();
 	initlabels();
@@ -141,10 +167,11 @@ endfunc(void)
 		addop(OP_UNDEF);
 		addop(OP_RETURN);
 	}
+
 	checklabels();
+
 	if (errorcount) {
-		freefunc(curfunc);
+		printf("\"%s\": %ld error%s\n", newname, errorcount,
-		printf("\"%s\": %ld error%s\n", curfunc->f_name, errorcount,
 			((errorcount == 1) ? "" : "s"));
 		return;
 	}
@@ -166,8 +193,8 @@ endfunc(void)
 	}
 	if ((inputisterminal() && conf->lib_debug & LIBDBG_STDIN_FUNC) ||
 		(!inputisterminal() && conf->lib_debug & LIBDBG_FILE_FUNC)) {
-		printf("%s(", fp->f_name);
+		printf("%s(", newname);
-		for (index = 0; index <  fp->f_paramcount; index++) {
+		for (index = 0; index <	 fp->f_paramcount; index++) {
 			if (index)
 				putchar(',');
 			printf("%s", paramname(index));
@@ -182,7 +209,6 @@ endfunc(void)
 		free(functions[newindex]);
 	}
 	functions[newindex] = fp;
-	objuncache();
 }
 
 
@@ -230,7 +256,7 @@ rmuserfunc(char *name)
 
 	index = findstr(&funcnames, name);
 	if (index < 0) {
-		printf("%s() has never been defined\n",
+		fprintf(stderr, "%s() has never been defined\n",
 			name);
 		return;
 	}
@@ -251,12 +277,25 @@ rmuserfunc(char *name)
 void
 freefunc(FUNC *fp)
 {
+	long index;
 	long i;
 
 	if (fp == NULL)
 		return;
+	if (fp == curfunc) {
+		index = newindex;
+	} else {
+		for (index = 0; index < funccount; index++) {
+			if (functions[index] == fp)
+				break;
+		}
+		if (index == funccount) {
+			math_error("Bad call to freefunc!!!");
+			/*NOTREACHED*/
+		}
+	}
 	if (conf->traceflags & TRACE_FNCODES) {
-		printf("Freeing function \"%s\"\n", fp->f_name);
+		printf("Freeing function \"%s\"\n",namestr(&funcnames,index));
 		dumpnames = FALSE;
 		for (i = 0; i < fp->f_opcodecount; ) {
 			printf("%ld: ", i);
@@ -272,12 +311,14 @@ freefunc(FUNC *fp)
 void
 rmalluserfunc(void)
 {
-	FUNC **fpp;
+	FUNC *fp;
+	long index;
 
-	for (fpp = functions; fpp < &functions[funccount]; fpp++) {
+	for (index = 0; index < funccount; index++) {
-		if (*fpp) {
+		fp = functions[index];
-			freefunc(*fpp);
+		if (fp) {
-			*fpp = NULL;
+			freefunc(fp);
+			functions[index] = NULL;
 		}
 	}
 }
@@ -290,12 +331,12 @@ rmalluserfunc(void)
 long
 getuserfunc(char *name)
 {
- 	long index;
+	long index;
 
- 	index = findstr(&funcnames, name);
+	index = findstr(&funcnames, name);
- 	if (index >= 0 && functions[index] != NULL)
+	if (index >= 0 && functions[index] != NULL)
- 		return index;
+		return index;
- 	return -1L;
+	return -1L;
 }
 
 
@@ -461,7 +502,8 @@ addop(long op)
 				fp->f_opcodecount -= diff;
 				oldop = OP_NOP;
 				oldoldop = OP_NOP;
-				fprintf(stderr, "%ld: unused value ignored\n",
+				fprintf(stderr,
+					"Line %ld: unused value ignored\n",
 					linenumber());
 				return;
 			}
@@ -534,8 +576,7 @@ addop(long op)
 				qfree(q);
 				fp->f_opcodes[count - 2] = OP_ZERO;
 				fp->f_opcodecount--;
-			}
+			} else if (qisone(q)) {
-			else if (qisone(q)) {
 				qfree(q);
 				fp->f_opcodes[count - 2] = OP_ONE;
 				fp->f_opcodecount--;
@@ -638,5 +679,3 @@ addoplabel(long op, LABEL *label)
 	addop(op);
 	uselabel(label);
 }
-
-/* END CODE */

align32.c

@@ -4,7 +4,7 @@
  * This file was written by:
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  *	chongo <was here> /\../\
  *
@@ -12,11 +12,11 @@
  * copyright this code.
  *
  * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
- * THIS  SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
+ * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL  LANDON  CURT
+ * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL	 LANDON	 CURT
- * NOLL  BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ * NOLL	 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM  LOSS  OF
- * USE,  DATA  OR  PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * USE,	 DATA  OR  PROFITS, WHETHER IN AN ACTION OF CONTRACT,
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
@@ -70,7 +70,7 @@ main(void)
  * buserr - catch an alignment error
  *
  * given:
- *      arg             to keep ANSI C happy
+ *	arg		to keep ANSI C happy
  */
 /*ARGSUSED*/
 static void

assocfunc.c

@@ -14,10 +14,10 @@
 #include "value.h"
 
 
-#define	MINHASHSIZE	31	/* minimum size of hash tables */
+#define MINHASHSIZE	31	/* minimum size of hash tables */
-#define	GROWHASHSIZE	50	/* approximate growth for hash tables */
+#define GROWHASHSIZE	50	/* approximate growth for hash tables */
-#define	CHAINLENGTH	10	/* desired number of elements on a hash chain */
+#define CHAINLENGTH	10	/* desired number of elements on a hash chain */
-#define	ELEMSIZE(n)	(sizeof(ASSOCELEM) + (sizeof(VALUE) * ((n) - 1)))
+#define ELEMSIZE(n)	(sizeof(ASSOCELEM) + (sizeof(VALUE) * ((n) - 1)))
 
 
 static ASSOCELEM *elemindex(ASSOC *ap, long index);
@@ -47,8 +47,8 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 	QCKHASH hash;
 	int i;
 
-	if (dim <= 0) {
+	if (dim < 0) {
-		math_error("No dimensions for indexing association");
+		math_error("Negative dimension for indexing association");
 		/*NOTREACHED*/
 	}
 
@@ -80,6 +80,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 	 */
 	if (!create) {
 		val.v_type = V_NULL;
+		val.v_subtype = V_NOSUBTYPE;
 		return &val;
 	}
 
@@ -216,6 +217,27 @@ assocfindex(ASSOC *ap, long index)
 }
 
 
+/*
+ * Returns the list of indices for an association element with specified
+ * double-bracket index.
+ */
+LIST *
+associndices(ASSOC *ap, long index)
+{
+	ASSOCELEM *ep;
+	LIST *lp;
+	int i;
+
+	ep = elemindex(ap, index);
+	if (ep == NULL)
+		return NULL;
+	lp = listalloc();
+	for (i = 0; i < ep->e_dim; i++)
+		insertlistlast(lp, &ep->e_indices[i]);
+	return lp;
+}
+
+
 /*
  * Compare two associations to see if they are identical.
  * Returns TRUE if they are different.
@@ -244,8 +266,7 @@ assoccmp(ASSOC *ap1, ASSOC *ap2)
 			hash = ep1->e_hash;
 			dim = ep1->e_dim;
 			for (ep2 = ap2->a_table[hash % size2]; ;
-				ep2 = ep2->e_next)
+				ep2 = ep2->e_next) {
-			{
 				if (ep2 == NULL)
 					return TRUE;
 				if (ep2->e_hash != hash)
@@ -282,8 +303,7 @@ assoccopy(ASSOC *oldap)
 
 	for (oldhi = 0; oldhi < oldap->a_size; oldhi++) {
 		for (oldep = oldap->a_table[oldhi]; oldep;
-			oldep = oldep->e_next)
+			oldep = oldep->e_next) {
-		{
 			ep = (ASSOCELEM *) malloc(ELEMSIZE(oldep->e_dim));
 			if (ep == NULL) {
 				math_error("Cannot allocate association element");
@@ -292,6 +312,7 @@ assoccopy(ASSOC *oldap)
 			ep->e_dim = oldep->e_dim;
 			ep->e_hash = oldep->e_hash;
 			ep->e_value.v_type = V_NULL;
+			ep->e_value.v_subtype = V_NOSUBTYPE;
 			for (i = 0; i < ep->e_dim; i++)
 				copyvalue(&oldep->e_indices[i], &ep->e_indices[i]);
 			copyvalue(&oldep->e_value, &ep->e_value);
@@ -447,8 +468,7 @@ assocprint(ASSOC *ap, long max_print)
 		((ap->a_count == 1) ? "" : "s"));
 
 	for (index = 0; ((index < max_print) && (index < ap->a_count));
-		index++)
+		index++) {
-	{
 		ep = elemindex(ap, index);
 		if (ep == NULL)
 			continue;
@@ -489,5 +509,3 @@ compareindices(VALUE *v1, VALUE *v2, long dim)
 
 	return TRUE;
 }
-
-/* END 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 http://reality.sgi.com/chongo
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo/
  */
 
 #include <stdio.h>
@@ -330,6 +330,7 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 	i = num;
 	while (i-- > 0) {
 		vp->v_type = V_NUM;
+		vp->v_subtype = V_NOSUBTYPE;
 		vp->v_num = itoq((long) *op++);
 		vp++;
 	}
@@ -546,7 +547,7 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 int
 copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 {
-	FILEIO 	*fiop;
+	FILEIO	*fiop;
 	FILE	*fp;
 	unsigned int	numw;
 
@@ -562,7 +563,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 		return E_COPYF1;
 	fp = fiop->fp;
 	if (id == 1 || id == 2) {
-		numw = idfputstr(id, (char *)sblk->data + ssi);  /* XXX */
+		numw = idfputstr(id, (char *)sblk->data + ssi);	 /* XXX */
 		return 0;
 	}
 	if (dsi >= 0) {
@@ -583,7 +584,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 int
 copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 {
-	FILEIO 	*fiop;
+	FILEIO	*fiop;
 	FILE	*fp;
 	unsigned int	numw;
 	ZVALUE	fsize;
@@ -671,7 +672,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 		return E_COPYF1;
 	fp = fiop->fp;
 	if (id == 1 || id == 2) {
-		numw = idfputstr(id, str->s_str + ssi);  /* XXX */
+		numw = idfputstr(id, str->s_str + ssi);	 /* XXX */
 		return 0;
 	}
 	if (dsi >= 0) {
@@ -829,7 +830,7 @@ int
 copyostr2str(char *sstr, long ssi, long num, STRING *dstr, long dsi)
 {
 	long len;
-	char 	*c, *c1;
+	char	*c, *c1;
 
 	len = (long)strlen(sstr);
 
@@ -897,8 +898,8 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
  * Copying between objects that overlap will take place correctly.
  *
  * given:
- *	s1 	destination
+ *	s1	destination
- *	s2 	source
+ *	s2	source
  *	n	octet count
  *
  * returns:
@@ -958,7 +959,7 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 	long	newsize;
 	USB8	*newdata;
 #if CALC_BYTE_ORDER == BIG_ENDIAN
-	ZVALUE	*swnum;	/* byte swapped numerator */
+	ZVALUE	*swnum; /* byte swapped numerator */
 #endif
 
 	if (ssi > snum->num.len)

blkcpy.h

@@ -8,7 +8,7 @@
 
 
 #if !defined(__BLKCPY_H__)
-#define	__BLKCPY_H__
+#define __BLKCPY_H__
 
 /*
  * the main copy gateway function

block.c

@@ -23,12 +23,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -141,7 +141,7 @@ blk_free(BLOCK *blk)
 /*
  * blkchk - check the sanity of a block
  *
- * These checks should never fail if calc is working correctly.  During
+ * These checks should never fail if calc is working correctly.	 During
  * debug time, we plan to call this function often.  Once we are satisfied,
  * we will normally call this code only in a few places.
  *
@@ -205,13 +205,13 @@ blkchk(BLOCK *blk)
  *
  * Reallocation of a block can change several aspects of a block.
  *
- * 	It can change the much data it holds or can hold.
+ *	It can change the much data it holds or can hold.
  *
- * 	It can change the memory footprint (in terms of
+ *	It can change the memory footprint (in terms of
- * 	how much storage is malloced for current or future use).
+ *	how much storage is malloced for current or future use).
  *
  *	It can change the chunk size used to grow malloced size
- * 	as the data size grows.
+ *	as the data size grows.
  *
  * Each of the len and chunksize may be kept the same.
  *
@@ -329,7 +329,7 @@ blkrealloc(BLOCK *blk, int newlen, int newchunk)
 /*
  * blktrunc - truncate a BLOCK down to a minimal fixed block
  *
- * NOTE: THIS IS NOT THE INTERNAL CALC FREE FUNCTION!!  This
+ * NOTE: THIS IS NOT THE INTERNAL CALC FREE FUNCTION!!	This
  * is what blktrunc() builtin calls to reduce storage of a block
  * down to an absolute minimum.
  *
@@ -479,7 +479,7 @@ blk_print(BLOCK *blk)
 	BOOL havetail;
 	USB8 *ptr;
 
-	/* XXX - use the config parameters for better print control */
+	/* XXX - should use the config parameters for better print control */
 
 	printf("chunksize = %d, maxsize = %d, datalen = %d\n\t",
 		(int)blk->blkchunk, (int)blk->maxsize, (int)blk->datalen);
@@ -512,9 +512,9 @@ nblock_print(NBLOCK *nblk)
 		printf("chunksize = %d, maxsize = %d, datalen = %d\n\t",
 		(int)blk->blkchunk, (int)blk->maxsize, (int)blk->datalen);
 		printf("NULL");
-	}
+	} else {
-	else
 		blk_print(blk);
+	}
 }
 
 
@@ -556,8 +556,7 @@ reallocnblock(int id, int len, int chunk)
 			math_error("Allocation failed");
 			/*NOTREACHED*/
 		}
-	}
+	} else if (newsize != oldsize) {
-	else if (newsize != oldsize) {
 		newdata = realloc(blk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Reallocation failed");
@@ -719,7 +718,7 @@ findnblock(int id)
 
 /*
  * Create a new block with specified newlen and new chunksize and copy
- * min(newlen, oldlen) octets to the new block.  The old block is
+ * min(newlen, oldlen) octets to the new block.	 The old block is
  * not changed.
  */
 BLOCK *
@@ -730,7 +729,7 @@ copyrealloc(BLOCK *blk, int newlen, int newchunk)
 
 	oldlen = blk->datalen;
 
-	if (newlen < 0) 		/* retain length */
+	if (newlen < 0)			/* retain length */
 		newlen = oldlen;
 
 	if (newchunk < 0)		/* retain chunksize */

block.h

@@ -23,19 +23,19 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
 
 
 #if !defined(__BLOCK_H__)
-#define	__BLOCK_H__
+#define __BLOCK_H__
 
 
 /*
@@ -139,8 +139,8 @@
  *		style of output = {
  *		    "line",	lines in blkbase with no spaces between octets
  *		    "string",	as one long line with no spaces between octets
- *		    "od_style",	position, spaces between octets
+ *		    "od_style", position, spaces between octets
- *		    "hd_style"}	position, spaces between octets, chars on end
+ *		    "hd_style"} position, spaces between octets, chars on end
  */
 struct block {
 	LEN blkchunk;	/* allocation chunk size */

byteswap.c

@@ -28,9 +28,9 @@
  * swap_b8_in_HALFs - swap 8 and if needed, 16 bits in an array of HALFs
  *
  * given:
- *      dest    - pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src wil be put or
  *		  NULL to allocate the storage
- *	src     - pointer to a HALF array to swap
+ *	src	- pointer to a HALF array to swap
  *	len	- length of the src HALF array
  *
  * returns:
@@ -263,9 +263,9 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
  * swap_b16_in_HALFs - swap 16 bits in an array of HALFs
  *
  * given:
- *      dest    - pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src wil be put or
  *		  NULL to allocate the storage
- *	src     - pointer to a HALF array to swap
+ *	src	- pointer to a HALF array to swap
  *	len	- length of the src HALF array
  *
  * returns:

calc.c

@@ -36,12 +36,17 @@
 #include <stdlib.h>
 #endif
 
+#include "have_strdup.h"
+#if !defined(HAVE_STRDUP)
+# define strdup(x) calc_strdup((CONST char *)(x))
+#endif /* HAVE_STRDUP */
+
+
 /*
  * 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 */
+static void script_args(int *argc, char ***argv, char **shellfile);
 
 
 /*
@@ -52,16 +57,24 @@ main(int argc, char **argv)
 {
 	int want_defhelp = 0;	/* 1=> we only want the default help */
 	int cmdlen;		/* length of the command string */
+	char *shellfile = NULL;	/* =!NULL ==> name of calc shell script */
 	extern char *optarg;	/* option argument */
 	extern int optind;	/* option index */
 	int c;			/* option */
+	char *p;
 	long i;
 
 	/*
 	 * parse args
 	 */
 	program = argv[0];
-	while ((c = getopt(argc, argv, "Cehim:npquvcd")) != -1) {
+	/* catch the case of a leading -s option */
+	if (argc > 2 && strncmp(argv[1], "-s", 2) == 0) {
+		/* convert the calc shell options into command line options */
+		script_args(&argc, &argv, &shellfile);
+	}
+	/* process command line options */
+	while ((c = getopt(argc, argv, "Cehim:npquvcdD:s")) != -1) {
 		switch (c) {
 		case 'C':
 #if defined(CUSTOM)
@@ -87,7 +100,7 @@ main(int argc, char **argv)
 			i_flag = TRUE;
 			break;
 		case 'm':
-			if (optarg[1] == '\0' || *optarg<'0' || *optarg>'7') {
+			if (optarg[1] != '\0' || *optarg<'0' || *optarg>'7') {
 				/*
 				 * we are too early in processing to
 				 * call libcalc_call_me_last()
@@ -126,12 +139,45 @@ main(int argc, char **argv)
 			 */
 			printf("%s (version %s)\n", CALC_TITLE, version());
 			exit(0);
+		case 'D':
+			/*
+			 * parse the -D optarg
+			 *
+			 * Could be calc_debug
+			 *	 or calc_debug:lib_debug
+			 *	 or calc_debug:lib_debug:user_debug
+			 */
+			calc_debug = optarg;
+			p = strchr(optarg, ':');
+			if (p != NULL) {
+				*p = '\0';
+				lib_debug = p+1;
+				p = strchr(lib_debug, ':');
+				if (p != NULL) {
+					*p = '\0';
+					user_debug = p+1;
+				}
+			}
+			break;
+		case 's':
+			/*
+			 * we are too early in processing to call
+			 * libcalc_call_me_last() - nothing to cleanup
+			 */
+			fprintf(stderr,
+			  "%s: -s may only be used in a calc shell script\n",
+			  program);
+			exit(1);
 		default:
 			/*
 			 * we are too early in processing to call
 			 * libcalc_call_me_last() - nothing to cleanup
 			 */
-			fprintf(stderr, usage, program);
+			fprintf(stderr,
+			  "usage: %s [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
+			  "\t[-D calc_debug[:lib_debug:[user_debug]]]\n"
+			  "\t[-n] [-p] [-q] [-u] [-v] [[--] calc_cmd ...]\n",
+			  program);
 			exit(1);
 		}
 	}
@@ -185,6 +231,8 @@ main(int argc, char **argv)
 	 */
 	libcalc_call_me_first();
 	stdin_tty = isatty(0);		/* assume stdin is on fd 0 */
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: stdin_tty is %d\n", stdin_tty);
 	if (want_defhelp) {
 		givehelp(DEFAULTCALCHELP);
 		libcalc_call_me_last();
@@ -239,9 +287,17 @@ main(int argc, char **argv)
 	 */
 	if (run_state == RUN_BEGIN) {
 		if (!q_flag && allow_read) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_RCFILES));
 			run_state = RUN_RCFILES;
 			runrcfiles();
 		}
+		if (conf->calc_debug & CALCDBG_RUNSTATE)
+			printf("DEBUG: run_state from %s to %s\n",
+			    run_state_name(run_state),
+			    run_state_name(RUN_PRE_CMD_ARGS));
 		run_state = RUN_PRE_CMD_ARGS;
 	}
 
@@ -252,25 +308,48 @@ main(int argc, char **argv)
 			if (inputlevel() == 0) {
 				closeinput();
 				runrcfiles();
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_CMD_ARGS));
 				run_state = RUN_PRE_CMD_ARGS;
 			} else {
 				closeinput();
 			}
 		} else {
-			if ((havecommands && !i_flag) || !stdin_tty)
+			if ((havecommands && !i_flag) || !stdin_tty) {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
 				run_state = RUN_EXIT_WITH_ERROR;
-			else
+			} else {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_CMD_ARGS));
 				run_state = RUN_PRE_CMD_ARGS;
+			}
 		}
 	}
 
+	/* XXX - if shellfile != NULL process shellfile here */
+
 	if (run_state == RUN_PRE_CMD_ARGS) {
 		if (havecommands) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_CMD_ARGS));
 			run_state = RUN_CMD_ARGS;
 			(void) openstring(cmdbuf, (long) strlen(cmdbuf));
 			getcommands(FALSE);
 			closeinput();
 		}
+		if (conf->calc_debug & CALCDBG_RUNSTATE)
+			printf("DEBUG: run_state from %s to %s\n",
+			    run_state_name(run_state),
+			    run_state_name(RUN_PRE_TOP_LEVEL));
 		run_state = RUN_PRE_TOP_LEVEL;
 	}
 
@@ -279,19 +358,36 @@ main(int argc, char **argv)
 		if ((c_flag && !stoponerror) || stoponerror < 0) {
 			getcommands(FALSE);
 			if (inputlevel() == 0)
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_TOP_LEVEL));
 				run_state = RUN_PRE_TOP_LEVEL;
 			closeinput();
 		} else {
 			closeinput();
-			if (!stdin_tty || !i_flag || p_flag)
+			if (!stdin_tty || !i_flag || p_flag) {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
 				run_state = RUN_EXIT_WITH_ERROR;
-			else
+			} else {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_TOP_LEVEL));
 				run_state = RUN_PRE_TOP_LEVEL;
+			}
 		}
 	}
 
 	if (run_state == RUN_PRE_TOP_LEVEL) {
 		if (stdin_tty && ((havecommands && !i_flag) || p_flag)) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_EXIT));
 			run_state = RUN_EXIT;
 		} else {
 			if (stdin_tty) {
@@ -300,6 +396,10 @@ main(int argc, char **argv)
 				resetinput();
 				openterminal();
 			}
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_TOP_LEVEL));
 			run_state = RUN_TOP_LEVEL;
 			getcommands(TRUE);
 		}
@@ -315,7 +415,11 @@ main(int argc, char **argv)
 				reinitialize();
 				getcommands(TRUE);
 			} else {
-			 	run_state = RUN_EXIT_WITH_ERROR;
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
+				run_state = RUN_EXIT_WITH_ERROR;
 			}
 		}
 	}
@@ -382,3 +486,184 @@ math_error(char *fmt, ...)
 		exit(3);
 	}
 }
+
+
+/*
+ * script_args - concert shell script options into command line form
+ *
+ * When a calc shell script is executed, the args are presented to calc
+ * in a different form.  Consider the a calc shell script called /tmp/calcit:
+ *
+ *	#!/usr/local/bin/calc -s -q -p
+ *	a=eval(prompt("Enter a: "));
+ *	b=eval(prompt("Enter b: "));
+ *	print a+b;
+ *
+ * When it is executed as:
+ *
+ *	/tmp/calcit -D 31
+ *
+ * then calc will receive the following as args to main():
+ *
+ *	argc:	  5
+ *	argv[0]:  "/usr/local/bin/calc"
+ *	argv[1]:  "-s -q -p -e"
+ *	argv[2]:  "/tmp/calcit"
+ *	argv[3]:  "-D"
+ *	argv[4]:  "31"
+ *	argv[5]:  NULL
+ *
+ * NOTE: The user MUST put -s as the first characters on the calc shell
+ *	 script #! line, right after the calc binary path.
+ *
+ * NOTE: The arg supplied on the #! calc shell script line are returned
+ *	 as a single string.  All tabs are converted into spaces.
+ *
+ * We must remember the calc script filename, break apart the #! args
+ * and remove the -s argument.  In the above case we would return:
+ *
+ *	argc:	  6
+ *	argv[0]:  "/usr/local/bin/calc"
+ *	argv[1]:  "-q"
+ *	argv[2]:  "-p"
+ *	argv[3]:  "-e"
+ *	argv[4]:  "-D"
+ *	argv[5]:  "31"
+ *	argv[6]:  NULL
+ *
+ *	shellfile: "/tmp/calcit"
+ */
+static void
+script_args(int *argc_p, char ***argv_p, char **shellfile_p)
+{
+	int argc;		/* argc to return */
+	char **argv;	/* argv to return */
+	char *shellfile;	/* shell file pathname to return */
+	int delta;		/* the change needed in argc */
+	int i;
+	int j;
+	char *p;
+	char *q;
+
+	/*
+	 * must have at least 3 args and the 2nd must start with -s
+	 */
+	argc = *argc_p;
+	argv = *argv_p;
+	if (argc < 3 || strncmp(argv[1], "-s", 2) != 0) {
+		/*
+		 * we are too early in processing to call
+		 * libcalc_call_me_last() - nothing to cleanup
+		 */
+		fprintf(stderr,
+		    "%s: FATAL: bad args passed to script_args\n", program);
+		exit(1);
+	}
+	shellfile = argv[2];
+
+	/*
+	 * count the additional args beyond the -s
+	 */
+	if (argv[1][2] == ' ') {
+
+		/*
+		 * process args beyond -s on the #!/usr/local/bin line
+		 */
+		p = argv[1]+3 + strspn(argv[1]+3," ");
+		q = p;
+		if (q == '\0') {
+
+			/* only trailing spaces after -s, ignore them */
+			for (i = 3; i <= argc; ++i) {
+				argv[i-2] = argv[i];
+			}
+			argc -= 2;
+
+		} else {
+
+			/* count the space separated strings that follow -s */
+			for (delta = -1; p != NULL && *p;
+			     p = strchr(p+1,' '), ++delta) {
+				/* skip multiple spaces in a row */
+				p += strspn(p, " ");
+			}
+
+			/* allocate the new set of argv pointers */
+			argv = (char **)malloc(sizeof(char *) * argc+delta);
+			if (argv == NULL) {
+				/*
+				 * we are too early in processing to call
+				 * libcalc_call_me_last() - nothing to cleanup
+				 */
+				fprintf(stderr,
+				    "%s: failed to malloc %d pointers\n",
+				    program, argc+delta);
+				exit(1);
+			}
+
+			/* we have the same 0th arg */
+			argv[0] = (*argv_p)[0];
+
+			/* args may be read-only, so duplicate 1st arg */
+			p = strdup(q);
+			if (p == NULL) {
+				/*
+				 * we are too early in processing to call
+				 * libcalc_call_me_last() - nothing to cleanup
+				 */
+				fprintf(stderr,
+				    "%s: failed to duplicate 1st arg\n",
+				    program);
+				exit(1);
+			}
+
+			/* tokenize the 1st arg */
+			for (p=strtok(q," "), i=1; p != NULL;
+			     p=strtok(NULL," "), ++i) {
+				argv[i] = p;
+			}
+
+			/* save the 3rd and later args */
+			for (j=3; (*argv_p)[j] != NULL; ++j, ++i) {
+				argv[i] = (*argv_p)[j];
+			}
+			argv[i] = NULL;
+
+			/* set argc */
+			argc = i;
+		}
+
+	/*
+	 * catch the case of #!/usr/local/bin -stuff_not_extra_args
+	 */
+	} else if (argv[1][2] != '\0') {
+
+		/*
+		 * we are too early in processing to call
+		 * libcalc_call_me_last() - nothing to cleanup
+		 */
+		fprintf(stderr,
+		    "%s: malformed #! line, -s must be "
+		    "followed by space or newline\n",
+		    program);
+		exit(1);
+
+	/*
+	 * Only -s was given in the #!/usr/local/bin line, so we just
+	 * toss the 2nd and 3rd args
+	 */
+	} else {
+		for (i = 3; i <= argc; ++i) {
+			argv[i-2] = argv[i];
+		}
+		argc -= 2;
+	}
+
+	/*
+	 * return and set the argc, argv, shellfile_p values
+	 */
+	*argc_p = argc;
+	*argv_p = argv;
+	*shellfile_p = shellfile;
+	return;
+}

calc.h

@@ -8,53 +8,55 @@
 
 
 #if !defined(__CALC_H__)
-#define	__CALC_H__
+#define __CALC_H__
 
 #include <setjmp.h>
 
 #include "value.h"
 
+#include "have_const.h"
+
 
 /*
  * Configuration definitions
  */
-#define	CALCPATH	"CALCPATH"	/* environment variable for files */
+#define CALCPATH	"CALCPATH"	/* environment variable for files */
-#define	CALCRC		"CALCRC"	/* environment variable for startup */
+#define CALCRC		"CALCRC"	/* environment variable for startup */
-#define	CALCBINDINGS	"CALCBINDINGS"	/* environment variable for hist bindings */
+#define CALCBINDINGS	"CALCBINDINGS"	/* env variable for hist bindings */
-#define	HOME		"HOME"		/* environment variable for home dir */
+#define HOME		"HOME"		/* environment variable for home dir */
-#define	PAGER		"PAGER"		/* environment variable for help */
+#define PAGER		"PAGER"		/* environment variable for help */
-#define	SHELL		"SHELL"		/* environment variable for shell */
+#define SHELL		"SHELL"		/* environment variable for shell */
-#define DEFAULTCALCHELP	"help"		/* help file that -h prints */
+#define DEFAULTCALCBINDINGS "bindings"	/* default calc bindings file */
+#define DEFAULTCALCHELP "help"		/* help file that -h prints */
 #define DEFAULTSHELL	"sh"		/* default shell to use */
-#define	CALCEXT		".cal"	/* extension for files read in */
+#define CALCEXT		".cal"	/* extension for files read in */
-#define	MAX_CALCRC	1024	/* maximum length of $CALCRC */
+#define MAX_CALCRC	1024	/* maximum length of $CALCRC */
-#define	HOMECHAR	'~'	/* char which indicates home directory */
+#define HOMECHAR	'~'	/* char which indicates home directory */
 #define DOTCHAR		'.'	/* char which indicates current directory */
-#define	PATHCHAR	'/'	/* char which separates path components */
+#define PATHCHAR	'/'	/* char which separates path components */
-#define	LISTCHAR	':'	/* char which separates paths in a list */
+#define LISTCHAR	':'	/* char which separates paths in a list */
-#define	MAXCMD		16384	/* maximum length of command invocation */
+#define MAXCMD		16384	/* maximum length of command invocation */
-#define	MAXERROR	512	/* maximum length of error message string */
+#define MAXERROR	512	/* maximum length of error message string */
 
-#define	SYMBOLSIZE	256	/* maximum symbol name size */
+#define SYMBOLSIZE	256	/* maximum symbol name size */
-#define	MAXINDICES	20	/* maximum number of indices for objects */
+#define MAXINDICES	20	/* maximum number of indices for objects */
-#define	MAXLABELS	100	/* maximum number of user labels in function */
+#define MAXLABELS	100	/* maximum number of user labels in function */
-#define	MAXOBJECTS	128	/* maximum number of object types */
+#define MAXSTRING	1024	/* maximum size of string constant */
-#define	MAXSTRING	1024	/* maximum size of string constant */
+#define MAXSTACK	1000	/* maximum depth of evaluation stack */
-#define	MAXSTACK	1000	/* maximum depth of evaluation stack */
+#define MAXFILES	20	/* maximum number of opened files */
-#define	MAXFILES	20	/* maximum number of opened files */
 #define PROMPT1		"> "	/* default normal prompt*/
 #define PROMPT2		">> "	/* default prompt inside multi-line input */
 
 
-#define	TRACE_NORMAL	0x00	/* normal trace flags */
+#define TRACE_NORMAL	0x00	/* normal trace flags */
-#define	TRACE_OPCODES	0x01	/* trace every opcode */
+#define TRACE_OPCODES	0x01	/* trace every opcode */
-#define	TRACE_NODEBUG	0x02	/* suppress debugging opcodes */
+#define TRACE_NODEBUG	0x02	/* suppress debugging opcodes */
 #define TRACE_LINKS	0x04	/* display links for real and complex numbers */
 #define TRACE_FNCODES	0x08	/* display code for newly defined function */
-#define	TRACE_MAX	0x0f	/* maximum value for trace flag */
+#define TRACE_MAX	0x0f	/* maximum value for trace flag */
 
 #define ABORT_NONE	0	/* abort not needed yet */
-#define ABORT_STATEMENT	1	/* abort on statement boundary */
+#define ABORT_STATEMENT 1	/* abort on statement boundary */
 #define ABORT_OPCODE	2	/* abort on any opcode boundary */
 #define ABORT_MATH	3	/* abort on any math operation */
 #define ABORT_NOW	4	/* abort right away */
@@ -64,10 +66,10 @@
 /*
  * File ids corresponding to standard in, out, error, and when not in use.
  */
-#define	FILEID_STDIN	((FILEID) 0)
+#define FILEID_STDIN	((FILEID) 0)
-#define	FILEID_STDOUT	((FILEID) 1)
+#define FILEID_STDOUT	((FILEID) 1)
-#define	FILEID_STDERR	((FILEID) 2)
+#define FILEID_STDERR	((FILEID) 2)
-#define	FILEID_NONE	((FILEID) -1)
+#define FILEID_NONE	((FILEID) -1)
 
 /*
  * File I/O routines.
@@ -123,6 +125,7 @@ extern void resetinput(void);
 extern void setprompt(char *);
 extern BOOL inputisterminal(void);
 extern int inputlevel(void);
+extern long calclevel(void);
 extern char *inputname(void);
 extern long linenumber(void);
 extern void runrcfiles(void);
@@ -140,6 +143,7 @@ extern void givehelp(char *type);
 extern void libcalc_call_me_first(void);
 extern void libcalc_call_me_last(void);
 extern void showerrors(void);
+extern char *calc_strdup(CONST char *);
 
 /*
  * Initialization
@@ -189,7 +193,7 @@ 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_write; /* FALSE => may not open any files for writing */
 extern int allow_exec;	/* FALSE => may not execute any commands */
 
 /*
@@ -207,6 +211,7 @@ typedef enum {
     RUN_EXIT_WITH_ERROR = 7	/* exit with error */
 } run;
 extern run run_state;
+extern char *run_state_name(run state);
 
 /*
  * calc version information

calc.man

@@ -15,17 +15,19 @@ calc \- arbitrary precision calculator
 .RB [ \-c ]
 .RB [ \-C ]
 .RB [ \-d ]
+.RB [ -D\ \&calc_debug[:lib_debug:[user_debug]] ]
+.br
+.in +5n
 .RB [ \-e ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.br
-.in +5n
 .RB [ \-n ]
 .RB [ \-p ]
 .RB [ \-q ]
 .RB [ \-u ]
 .RB [ \-v ]
+.br
 .RB [ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .SH DESCRIPTION
@@ -62,6 +64,13 @@ cause
 .B calc
 to try to process each line being read
 despite the errors that it encounters.
+.sp 1
+By default, calc startup scripts ($CALCRC) are silently
+ignored if not found.
+This flag will report missing
+startup scripts unless
+.B \-d
+is also given.
 
 .TP
 .B \-C
@@ -112,6 +121,36 @@ It's nearly ten past six.
 .fi
 .in -5n
 .sp 1
+This flag disables the reporting of missing calc
+startup scripts ($CALCRC).
+
+.TP
+.BR -D " calc_debug[:lib_debug:[user_debug]]"
+Force the initial value of config("calc_debug"),
+config("lib_debug") and config("user_debug").
+.sp 1
+The : separated strings are interpreted as signed 32 bit values.
+After an optional leading sign a leading zero indicates octal
+conversion, and a leading ``0x'' or ``0X'' hexadecimal
+conversion.  Otherwise, decimal conversion is assumed.
+.sp 1
+By default,
+.I calc_debug
+is 0,
+.I lib_debug
+is 3 and
+.I lib_debug
+is 0.
+.sp 1
+For more information use the following
+.B calc
+command:
+.sp 1
+.in +5n
+.nf
+help config
+.fi
+.in -5n
 
 .TP
 .B \-e
@@ -173,7 +212,8 @@ This flag sets the permission mode of
 It controls the ability for
 .B calc
 to open files and execute programs.
-Mode may be a number from 0 to 7.
+.I Mode
+may be a number from 0 to 7.
 .sp 1
 The mode value is interpreted in a way similar to that
 of the
@@ -196,8 +236,8 @@ octal mode:
 If one wished to run
 .B calc
 from a privileged user, one might want to use
-.B \-m
+.BR \-m " 0"
-0 in an effort to make
+in an effort to make
 .B calc
 somewhat more secure.
 .sp 1
@@ -205,8 +245,8 @@ Mode bits for reading and writing apply only on an
 open.
 Files already open are not effected.
 Thus if one wanted to use the
-.B \-m
+.BR \-m " 0"
-0 in an effort to make
+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
@@ -300,7 +340,7 @@ Normally on startup,
 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
+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.
@@ -515,9 +555,13 @@ line, or \fI\-m\fP disallows opening files for reading),
 reads
 key bindings from the filename specified
 by this environment variable.
-.br
+The key binding file is searched for along the $CALCPATH list
+of directories.
 .sp
-Default value: ${CALCBINDINGS}
+Default value: binding
+.sp
+This variable is not used if calc was compiled with GNU-readline support.
+In that case, the standard readline mechanisms (see readline(3)) are used.
 .sp
 .SH CREDIT
 \&
@@ -527,7 +571,11 @@ The majority of
 was written by David I. Bell.
 .sp
 .B Calc
-archives and calc-tester mailing list maintained by Landon Curt Noll.
+The Calc primary mirror, calc mailing list and calc bug report
+processing is performed by Landon Curt Noll.
+.sp
+Landon Curt Noll maintains the master reference source, performs
+release control functions as well as other calc maintenance functions.
 .sp
 Thanks for suggestions and encouragement from Peter Miller,
 Neil Justusson, and Landon Noll.
@@ -542,7 +590,7 @@ Ernest also supplied the original text for many of the help files.
 .sp
 Portions of this program are derived from an earlier set of
 public domain arbitrarily precision routines which was posted
-to the net around 1984.  By now, there is almost no recognizable
+to the net around 1984.	 By now, there is almost no recognizable
 code left from that original source.
 .sp
 Most of this source and binary has one of the following copyrights:
@@ -567,15 +615,42 @@ scripts that you would like you see included
 in future distributions to:
 .sp
 .in +0.5i
-calc-tester@postofc.corp.sgi.com
+.nf
+calc-tester at postofc dot corp dot sgi dot com
+
+[[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+.fi
 .in -0.5i
 .sp
+Bug reports are sent to:
+.in +0.5i
+.nf
+calc-bugs at postofc dot corp dot sgi dot com
+
+[[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+.fi
+.in -0.5i
+.sp
+See the
+.I BUGS
+source file or use the
+.I calc
+command:
+.sp
+.in +0.5i
+.nf
+help bugs
+.fi
+.in -0.5i
+.sp
+for more information about bug reporting.
+.sp
 Landon Noll maintains the the
 .B calc
 web site is located at:
 .sp
 .in +0.5i
-http://reality.sgi.com/chongo/tech/comp/calc
+http://reality.sgi.com/chongo/tech/comp/calc/
 .in -0.5i
 .sp
 One may join the
@@ -583,7 +658,11 @@ One may join the
 testing group by sending a request to:
 .sp
 .in +0.5i
-calc-tester-request@postofc.corp.sgi.com
+.nf
+calc-tester-request at postofc dot corp dot sgi dot com
+
+[[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+.fi
 .in -0.5i
 .sp
 Your message body (not the subject) should consist of:

calc_errno.c

@@ -1,123 +0,0 @@
-/*
- * errno - Determine how to declare errno, sys_errlist and sys_nerr
- *
- * On most machines: errno sys_errlist and sys_nerr are declared
- * by either <stdio.h> and/or <errno.h>.  But some systems declare
- * them somewhere else or do not declare them at all!
- *
- * If the system were doing a proper job in headers, this should declare them:
- *
- *	#include <stdio.h>
- *	#include <errno.h>
- *
- * But one some systems one must explicitly declare them as:
- *
- *	extern int errno;
- *	extern const char *const sys_errlist[];
- *	extern int sys_nerr;
- *
- * and on some old systems they must be explicitly and incorrectly declared as:
- *
- *	extern int errno;
- *	extern char *sys_errlist[];
- *	extern int sys_nerr;
- *
- * The purpose of this utility is try and find the right way to declare
- * them and to output the middle of a header file called calc_errno.h.
- */
-
-/*
- * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright, this permission notice and text
- * this comment, and the disclaimer below appear in all of the following:
- *
- *	supporting documentation
- *	source copies
- *	source works derived from this source
- *	binaries derived from this source or from derived source
- *
- * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * chongo was here	/\../\
- */
-
-#include <stdio.h>
-#if defined(TRY_ERRNO_NO_DECL)
-#  include <errno.h>
-#endif /* TRY_ERRNO_NO_DECL */
-
-int
-main(void)
-{
-
-#if defined(TRY_ERRNO_NO_DECL)
-	printf("/*\n");
-	printf(" * The following comments were produced by calc_errno\n");
-	printf(" * in an effort to see if these values were correctly\n");
-	printf(" * declared when calc_errno.c was compiled.\n");
-	printf(" */\n\n");
-	printf("/* Initially errno is %d */\n", errno);
-	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
-	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
-	printf("/*\n");
-	printf(" * Based on the above, calc_errno now knows\n");
-	printf(" * how to declare errno and friends.\n");
-	printf(" */\n\n");
-	printf("#include <stdio.h>\n");
-	printf("#include <errno.h>\n");
-#elif defined(TRY_ERRNO_OLD_DECL)
-	extern int errno;		/* last system error */
-	extern char *sys_errlist[];	/* system error messages */
-	extern int sys_nerr;		/* number of system errors*/
-
-	printf("/*\n");
-	printf(" * The following comments were produced by calc_errno\n");
-	printf(" * in an effort to see if these values were correctly\n");
-	printf(" * declared when calc_errno.c was compiled.\n");
-	printf(" */\n\n");
-	printf("/* Initially errno is %d */\n", errno);
-	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
-	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
-	printf("/*\n");
-	printf(" * Based on the above, calc_errno now knows\n");
-	printf(" * how to declare errno and friends.\n");
-	printf(" */\n\n");
-	printf("extern int errno;\t\t/* last system error */\n");
-	printf("extern char *sys_errlist[];\t"
-	       "/* system error messages */\n");
-	printf("extern int sys_nerr;\t\t/* number of system errors*/\n");
-#else	/* assume defined(TRY_ERRNO_STD_DECL) */
-	extern int errno;			/* last system error */
-	extern const char *const sys_errlist[];	/* system error messages */
-	extern int sys_nerr;			/* number of system errors*/
-
-	printf("/*\n");
-	printf(" * The following comments were produced by calc_errno\n");
-	printf(" * in an effort to see if these values were correctly\n");
-	printf(" * declared when calc_errno.c was compiled.\n");
-	printf(" */\n\n");
-	printf("/* Initially errno is %d */\n", errno);
-	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
-	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
-	printf("/*\n");
-	printf(" * Based on the above, calc_errno now knows\n");
-	printf(" * how to declare errno and friends.\n");
-	printf(" */\n\n");
-	printf("extern int errno;\t\t\t/* last system error */\n");
-	printf("extern const char *const sys_errlist[];\t"
-	       "/* system error messages */\n");
-	printf("extern int sys_nerr;\t\t\t/* number of system errors*/\n");
-#endif
-
-	/* exit(0); */
-	return 0;
-}

calcerr.tbl

@@ -336,3 +336,5 @@ E_STRCPY	Bad argument type for strcpy
 E_STRNCPY	Bad argument type for strncpy
 E_BACKSLASH	Bad argument type for unary backslash
 E_SETMINUS	Bad argument type for setminus
+E_INDICES1	Bad first argument type for indices
+E_INDICES2	Bad second argument for indices

calcerr_c.awk

@@ -6,12 +6,12 @@ BEGIN {
     printf(" * names of calc error values\n");
     printf(" */\n");
     printf("CONST char *error_table[E__COUNT+2] = {\n");
-    printf("    \"No error\",\n");
+    printf("	\"No error\",\n");
 }
 {
     print $0;
 }
 END {
-    printf("    NULL\n");
+    printf("	NULL\n");
     printf("};\n");
 }

check.awk

@@ -1,5 +1,5 @@
 # This awk script will print 3 lines before and after any non-blank line that
-# does not begin with a number.  This allows the 'make debug' rule to remove
+# does not begin with a number.	 This allows the 'make debug' rule to remove
 # all non-interest lines the the 'make check' regression output while providing
 # 3 lines of context around unexpected output.
 #
@@ -11,6 +11,7 @@ BEGIN {
     havebuf2=0;
     buf2=0;
     error = 0;
+    end_seen = 0;
 }
 
 NF == 0 {
@@ -29,6 +30,10 @@ NF == 0 {
     next;
 }
 
+/: Ending regression tests$/ {
+    end_seen = 1;
+}
+
 $1 ~ /^[0-9]+:/ {
     if (error > 0) {
 	if (havebuf2) {
@@ -71,7 +76,7 @@ END {
     if (error > 0 && havebuf0) {
 	print buf0;
     }
-    if (error > 0) {
+    if (error > 0 || !end_seen) {
 	exit(1);
     } else {
 	exit(0);

cmath.h

@@ -8,7 +8,7 @@
 
 
 #if !defined(__CMATH_H__)
-#define	__CMATH_H__
+#define __CMATH_H__
 
 
 #include "qmath.h"
@@ -114,7 +114,7 @@ extern COMPLEX *swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
 #define cisnegone(c)	(cisreal(c) && qisnegone((c)->real))
 #define cisrunit(c)	(cisreal(c) && qisunit((c)->real))
 #define cisiunit(c)	(qiszero((c)->real) && qisunit((c)->imag))
-#define	cisunit(c)	(cisrunit(c) || cisiunit(c))
+#define cisunit(c)	(cisrunit(c) || cisiunit(c))
 #define cistwo(c)	(cisreal(c) && qistwo((c)->real))
 #define cisint(c)	(qisint((c)->real) && qisint((c)->imag))
 #define ciseven(c)	(qiseven((c)->real) && qiseven((c)->imag))

codegen.c

@@ -32,8 +32,8 @@ static void getfunction(void);
 static void ungetfunction(void);
 static void getbody(LABEL *contlabel, LABEL *breaklabel,
 		    LABEL *nextcaselabel, LABEL *defaultlabel);
-static void getdeclarations(int symtype);
+static int getdeclarations(int symtype);
-static void getsimpledeclaration (int symtype);
+static int getsimpledeclaration (int symtype);
 static int getonevariable (int symtype);
 static void getstatement(LABEL *contlabel, LABEL *breaklabel,
 			 LABEL *nextcaselabel, LABEL *defaultlabel);
@@ -180,8 +180,8 @@ getcommands(BOOL toplevel)
 /*
  * Evaluate a line of statements.
  * This is done by treating the current line as a function body,
- * compiling it, and then executing it.  Returns TRUE if the line
+ * compiling it, and then executing it.	 Returns TRUE if the line
- * successfully compiled and executed.  The last expression result
+ * successfully compiled and executed.	The last expression result
  * is saved in the f_savedvalue element of the current function.
  * The nestflag variable should be FALSE for the outermost evaluation
  * level, and TRUE for all other calls (such as the 'eval' function).
@@ -256,9 +256,15 @@ ungetfunction(void)
 			case T_MULT:
 				rmalluserfunc();
 				continue;
-			default:
+			case T_NEWLINE:
+			case T_SEMICOLON:
+			case T_EOF:
 				rescantoken();
 				return;
+			default:
+				scanerror(T_SEMICOLON,
+					 "Non-name arg for undefine");
+				return;
 		}
 	}
 }
@@ -382,7 +388,7 @@ getbody(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *defaul
 			return;
 
 		case T_EOF:
-			scanerror(T_SEMICOLON, "End-of-file in function body");
+			scanerror(T_NULL, "End-of-file in function body");
 			return;
 
 		default:
@@ -398,9 +404,11 @@ getbody(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *defaul
  * declarations = { LOCAL | GLOBAL | STATIC } onedeclaration
  *	[ ',' onedeclaration ] ... ';'.
  */
-static void
+static int
 getdeclarations(int symtype)
 {
+	int res = 0;
+
 	while (TRUE) {
 		switch (gettoken()) {
 			case T_COMMA:
@@ -409,29 +417,33 @@ getdeclarations(int symtype)
 			case T_NEWLINE:
 			case T_SEMICOLON:
 			case T_RIGHTBRACE:
+			case T_EOF:
 				rescantoken();
-				return;
+				return res;
 
 			case T_SYMBOL:
 				addopone(OP_DEBUG, linenumber());
 				rescantoken();
-				getsimpledeclaration(symtype);
+				if (getsimpledeclaration(symtype))
+					res = 1;
 				break;
 
 			case T_MAT:
 				addopone(OP_DEBUG, linenumber());
 				getmatdeclaration(symtype);
+				res = 1;
 				break;
 
 			case T_OBJ:
 				addopone(OP_DEBUG, linenumber());
 				getobjdeclaration(symtype);
 				addop(OP_POP);
+				res = 1;
 				break;
 
 			default:
 				scanerror(T_SEMICOLON, "Bad syntax in declaration statement");
-				return;
+				return res;
 		}
 	}
 }
@@ -443,22 +455,24 @@ getdeclarations(int symtype)
  * Subsequences end with "," or at end of line; spaces indicate
  * repeated assignment, e.g. "c d = 2" has the effect of "c = 2, d = 2".
  */
-static void
+static int
 getsimpledeclaration(int symtype)
 {
+	int res = 0;
 
 	for (;;) {
 		switch (gettoken()) {
 			case T_SYMBOL:
 				rescantoken();
-				if (getonevariable(symtype))
+				res = getonevariable(symtype);
+				if (res)
 					addop(OP_POP);
 				continue;
 			case T_COMMA:
 				continue;
 			default:
 				rescantoken();
-				return;
+				return res;
 		}
 	}
 }
@@ -507,11 +521,9 @@ getonevariable(int symtype)
  *	| BREAK ';'
  *	| RETURN assignment ';'
  *	| GOTO label ';'
- *	| MAT name '[' value [ ':' value ] [',' value [ ':' value ] ] ']' ';'
- *	| OBJ type '{' arg [ ',' arg ] ... '}' ] ';'
- *	| OBJ type name [ ',' name ] ';'
  *	| PRINT assignment [, assignment ] ... ';'
  *	| QUIT [ string ] ';'
+ *	| ABORT [ string ] ';'
  *	| SHOW item ';'
  *	| body
  *	| assignment ';'
@@ -540,18 +552,20 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		return;
 
 	case T_GLOBAL:
-		getdeclarations(SYM_GLOBAL);
+		(void) getdeclarations(SYM_GLOBAL);
 		break;
 
 	case T_STATIC:
 		clearlabel(&label);
 		addoplabel(OP_INITSTATIC, &label);
-		getdeclarations(SYM_STATIC);
+		if (getdeclarations(SYM_STATIC))
-		setlabel(&label);
+			setlabel(&label);
+		else
+			curfunc->f_opcodecount -= 2;
 		break;
 
 	case T_LOCAL:
-		getdeclarations(SYM_LOCAL);
+		(void) getdeclarations(SYM_LOCAL);
 		break;
 
 	case T_RIGHTBRACE:
@@ -691,14 +705,14 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 			}
 		}
 		if (gettoken() != T_RIGHTPAREN) {	/* have 'c' part */
-			if (label1.l_offset <= 0)
+			if (label1.l_offset < 0)
 				addoplabel(OP_JUMP, &label3);
 			setlabel(&label2);
 			contlabel = &label2;
 			rescantoken();
 			(void) getexprlist();
 			addop(OP_POP);
-			if (label1.l_offset > 0)
+			if (label1.l_offset >= 0)
 				addoplabel(OP_JUMP, &label1);
 			if (gettoken() != T_RIGHTPAREN) {
 				(void) tokenmode(oldmode);
@@ -718,15 +732,21 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 	case T_WHILE:
 		oldmode = tokenmode(TM_DEFAULT);
 		contlabel = &label1;
-		breaklabel = &label2;
 		clearlabel(contlabel);
-		clearlabel(breaklabel);
 		setlabel(contlabel);
 		getcondition();
-		addoplabel(OP_JUMPZ, breaklabel);
+		if (gettoken() != T_SEMICOLON) {
-		getstatement(contlabel, breaklabel, NULL_LABEL, NULL_LABEL);
+			breaklabel = &label2;
-		addoplabel(OP_JUMP, contlabel);
+			clearlabel(breaklabel);
-		setlabel(breaklabel);
+			addoplabel(OP_JUMPZ, breaklabel);
+			rescantoken();
+			getstatement(contlabel, breaklabel,
+				NULL_LABEL, NULL_LABEL);
+			addoplabel(OP_JUMP, contlabel);
+			setlabel(breaklabel);
+		} else {
+			addoplabel(OP_JUMPNZ, contlabel);
+		}
 		(void) tokenmode(oldmode);
 		return;
 
@@ -936,7 +956,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 /*
  * Read in an object declaration.
  * This is of the following form:
- *	OBJ type [ '{' id [ ',' id ] ... '}' ]  [ objlist ].
+ *	OBJ type [ '{' id [ ',' id ] ... '}' ]	[ objlist ].
  * The OBJ keyword has already been read.  Symtype is SYM_UNDEFINED if this
  * is an OBJ statement, otherwise this is part of a declaration which will
  * define new symbols with the specified type.
@@ -994,7 +1014,11 @@ getobjdeclaration(int symtype)
 				/*FALLTHRU*/
 			case T_RIGHTBRACE:
 				(void) tokenmode(oldmode);
-				(void) defineobject(name, indices, count);
+				if (defineobject(name, indices, count)) {
+					scanerror(T_NULL,
+				"Object type \"%s\" is already defined", name);
+					return;
+				}
 				getobjvars(name, symtype);
 				return;
 			case T_NEWLINE:
@@ -1033,18 +1057,14 @@ getoneobj(long index, int symtype)
 }
 
 /*
- * Routine to collect a set of variables for the specified object type
+ * Routine to assign a specified object-type value to each of a set of
- * and initialize them as being that type of object.
+ * variables in a "global", "local" or "static" declaration, or, if
- * Here
+ * symtype is SYM_UNDEFINED, to create one object value of the specified
- *	objlist = name initlist [ ',' name initlist ] ... ';'.
+ * type.
- * If symtype is SYM_UNDEFINED, then this is an OBJ statement where the
- * values can be any variable expression, and no symbols are to be defined.
- * Otherwise this is part of a declaration, and the variables must be raw
- * symbol names which are defined with the specified symbol type.
  *
  * given:
  *	name		object name
- *	symtype		type of symbol to collect for
+ *	symtype		declaration type
  */
 static void
 getobjvars(char *name, int symtype)
@@ -1058,6 +1078,8 @@ getobjvars(char *name, int symtype)
 	}
 	for (;;) {
 		getoneobj(index, symtype);
+		if (symtype == SYM_UNDEFINED)
+			return;
 		if (gettoken() != T_COMMA) {
 			rescantoken();
 			return;
@@ -1113,6 +1135,21 @@ getonematrix(int symtype)
 	}
 	rescantoken();
 
+	if (gettoken() == T_LEFTPAREN) {
+		if (isrvalue(getexprlist())) {
+			scanerror(T_SEMICOLON, "Lvalue expected");
+			return;
+		}
+		if (gettoken() != T_RIGHTPAREN) {
+			scanerror(T_SEMICOLON, "Missing right parenthesis");
+			return;
+		}
+		getonematrix(symtype);
+		addop(OP_ASSIGN);
+		return;
+	}
+	rescantoken();
+
 	if (gettoken() != T_LEFTBRACKET) {
 		rescantoken();
 		scanerror(T_SEMICOLON, "Left-bracket expected");
@@ -1128,23 +1165,32 @@ getonematrix(int symtype)
 	 * will patch the correct value back into the opcode.
 	 */
 	if (gettoken() == T_RIGHTBRACKET) {
-		clearopt();
+		if (gettoken() == T_ASSIGN) {
-		patchpc = curfunc->f_opcodecount + 1;
+			clearopt();
-		addopone(OP_NUMBER, (long) -1);
+			patchpc = curfunc->f_opcodecount + 1;
-		clearopt();
+			addopone(OP_NUMBER, (long) -1);
-		addop(OP_ZERO);
+			clearopt();
-		addopone(OP_MATCREATE, dim);
+			addop(OP_ZERO);
-		addop(OP_ZERO);
+			addopone(OP_MATCREATE, dim);
-		addop(OP_INITFILL);
+			addop(OP_ZERO);
-		count = 0;
+			addop(OP_INITFILL);
-		if (gettoken() == T_ASSIGN)
+			count = 0;
 			count = getinitlist();
-		else
+			index = addqconstant(itoq(count));
+			if (index < 0)
+				math_error("Cannot allocate constant");
+			curfunc->f_opcodes[patchpc] = index;
+			return;
+		}
+		rescantoken();
+		addopone(OP_MATCREATE, 0);
+		if (gettoken() == T_LEFTBRACKET) {
+			creatematrix();
+		} else {
 			rescantoken();
-		index = addqconstant(itoq(count));
+			addop(OP_ZERO);
-		if (index < 0)
+		}
-			math_error("Cannot allocate constant");
+		addop(OP_INITFILL);
-		curfunc->f_opcodes[patchpc] = index;
 		return;
 	}
 
@@ -1164,41 +1210,45 @@ creatematrix(void)
 {
 	long dim;
 
-	dim = 1;
+	dim = 0;
 
-	while (TRUE) {
+	for (;;) {
+		if (gettoken() == T_RIGHTBRACKET) {
+			addopone(OP_MATCREATE, dim);
+			if (gettoken() == T_LEFTBRACKET) {
+				creatematrix();
+			} else {
+				rescantoken();
+				addop(OP_ZERO);
+			}
+			addop(OP_INITFILL);
+			return;
+		}
+		rescantoken();
+		if (++dim > MAXDIM) {
+			scanerror(T_SEMICOLON, "Only %ld dimensions allowed", MAXDIM);
+			return;
+		}
 		(void) getopassignment();
 		switch (gettoken()) {
 			case T_RIGHTBRACKET:
-			case T_COMMA:
 				rescantoken();
+			case T_COMMA:
 				addop(OP_ONE);
 				addop(OP_SUB);
 				addop(OP_ZERO);
 				break;
 			case T_COLON:
 				(void) getopassignment();
-				break;
+				switch(gettoken()) {
+					case T_RIGHTBRACKET:
+						rescantoken();
+					case T_COMMA:
+						continue;
+				}
+				/*FALLTHRU*/
 			default:
 				rescantoken();
-		}
-		switch (gettoken()) {
-			case T_RIGHTBRACKET:
-				addopone(OP_MATCREATE, dim);
-				if (gettoken() == T_LEFTBRACKET) {
-					creatematrix();
-				} else {
-					rescantoken();
-					addop(OP_ZERO);
-				}
-				addop(OP_INITFILL);
-				return;
-			case T_COMMA:
-				if (++dim <= MAXDIM)
-					break;
-				scanerror(T_SEMICOLON, "Only %ld dimensions allowed", MAXDIM);
-				return;
-			default:
 				scanerror(T_SEMICOLON, "Illegal matrix definition");
 				return;
 		}
@@ -1283,7 +1333,7 @@ getcondition(void)
 
 /*
  * Get an expression list consisting of one or more expressions,
- * separated by commas.  The value of the list is that of the final expression.
+ * separated by commas.	 The value of the list is that of the final expression.
  * This is the top level routine for parsing expressions.
  * Returns flags describing the type of the last assignment or expression found.
  * exprlist = assignment [ ',' assignment ] ...
@@ -1337,8 +1387,8 @@ getopassignment(void)
 		case T_MODEQUALS:	op = OP_MOD; break;
 		case T_ANDEQUALS:	op = OP_AND; break;
 		case T_OREQUALS:	op = OP_OR; break;
-		case T_LSHIFTEQUALS: 	op = OP_LEFTSHIFT; break;
+		case T_LSHIFTEQUALS:	op = OP_LEFTSHIFT; break;
-		case T_RSHIFTEQUALS: 	op = OP_RIGHTSHIFT; break;
+		case T_RSHIFTEQUALS:	op = OP_RIGHTSHIFT; break;
 		case T_POWEREQUALS:	op = OP_POWER; break;
 		case T_HASHEQUALS:	op = OP_HASHOP; break;
 		case T_TILDEEQUALS:	op = OP_XOR; break;
@@ -1349,7 +1399,7 @@ getopassignment(void)
 			return type;
 	}
 	if (isrvalue(type)) {
-		scanerror(T_NULL, "Illegal assignment in getopassignment");
+		scanerror(T_NULL, "Illegal assignment");
 		(void) getopassignment();
 		return (EXPR_RVALUE | EXPR_ASSIGN);
 	}
@@ -1378,8 +1428,8 @@ getopassignment(void)
 			case T_MODEQUALS:	op = OP_MOD; break;
 			case T_ANDEQUALS:	op = OP_AND; break;
 			case T_OREQUALS:	op = OP_OR; break;
-			case T_LSHIFTEQUALS: 	op = OP_LEFTSHIFT; break;
+			case T_LSHIFTEQUALS:	op = OP_LEFTSHIFT; break;
-			case T_RSHIFTEQUALS: 	op = OP_RIGHTSHIFT; break;
+			case T_RSHIFTEQUALS:	op = OP_RIGHTSHIFT; break;
 			case T_POWEREQUALS:	op = OP_POWER; break;
 			case T_HASHEQUALS:	op = OP_HASHOP; break;
 			case T_TILDEEQUALS:	op = OP_XOR; break;
@@ -1442,7 +1492,7 @@ getassignment (void)
 			return type;
 	}
 	if (isrvalue(type)) {
-		scanerror(T_SEMICOLON, "Illegal assignment in getassignment");
+		scanerror(T_SEMICOLON, "Illegal assignment");
 		(void) getassignment();
 		return (EXPR_RVALUE | EXPR_ASSIGN);
 	}
@@ -1724,7 +1774,7 @@ getshiftexpr(void)
 		case T_NOT:		op = OP_NOT; break;
 		case T_DIV:		op = OP_INVERT; break;
 		case T_BACKSLASH:	op = OP_BACKSLASH; break;
-		case T_TILDE: 		op = OP_COMP; break;
+		case T_TILDE:		op = OP_COMP; break;
 		case T_HASH:		op = OP_CONTENT; break;
 	}
 	if (op) {
@@ -1737,7 +1787,7 @@ getshiftexpr(void)
 	switch (gettoken()) {
 		case T_POWER:		op = OP_POWER; break;
 		case T_LEFTSHIFT:	op = OP_LEFTSHIFT; break;
-		case T_RIGHTSHIFT: 	op = OP_RIGHTSHIFT; break;
+		case T_RIGHTSHIFT:	op = OP_RIGHTSHIFT; break;
 		default:
 			rescantoken();
 			return type;
@@ -1901,11 +1951,6 @@ getterm(void)
 
 		case T_MAT:
 			getonematrix(SYM_UNDEFINED);
-			while (gettoken() == T_COMMA) {
-				addop(OP_POP);
-				getonematrix(SYM_UNDEFINED);
-			}
-			rescantoken();
 			type = EXPR_ASSIGN;
 			break;
 
@@ -2170,12 +2215,18 @@ getmatargs(void)
 	/*
 	 * Normal indexing with the indexes separated by commas.
 	 * Initialize the flag in the opcode to assume that the array
-	 * element will only be referenced for reading.  If the parser
+	 * element will only be referenced for reading.	 If the parser
 	 * finds that the element will be referenced for writing, then
 	 * it will call writeindexop to change the flag in the opcode.
 	 */
-	dim = 1;
+	dim = 0;
+	if (gettoken() == T_RIGHTBRACKET) {
+		addoptwo(OP_INDEXADDR, (long) dim, (long) FALSE);
+		return;
+	}
+	rescantoken();
 	for (;;) {
+		++dim;
 		(void) getopassignment();
 		switch (gettoken()) {
 			case T_RIGHTBRACKET:
@@ -2183,7 +2234,6 @@ getmatargs(void)
 						(long) FALSE);
 				return;
 			case T_COMMA:
-				dim++;
 				break;
 			default:
 				rescantoken();

comfunc.c

@@ -138,38 +138,6 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 
 	up1 = up2 = 0;
 	sign = (R & 64) != 0;
-#if 0
-	if (qiszero(epsilon)) {
-		aes = qsquare(c->real);
-		bes = qsquare(c->imag);
-		v = qqadd(aes, bes);
-		qfree(aes);
-		qfree(bes);
-		u = qsqrt(v, epsilon, 0);
-		qfree(v);
-		if (qiszero(u)) {
-			qfree(u);
-			return clink(&_czero_);
-		}
-		aes = qqadd(u, c->real);
-		qfree(u);
-		bes = qscale(aes, -1);
-		qfree(aes);
-		u = qsqrt(bes, epsilon, R);
-		qfree(bes);
-		if (qiszero(u)) {
-			qfree(u);
-			return clink(&_czero_);
-		}
-		aes = qscale(c->imag, -1);
-		v = qqdiv(aes, u);
-		qfree(aes);
-		r = comalloc();
-		r->real = u;
-		r->imag = v;
-		return r;
-	}
-#endif
 	imsign = c->imag->num.sign;
 	es = qsquare(epsilon);
 	aes = qqdiv(c->real, es);
@@ -255,8 +223,7 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 			up2 = -1;
 		zfree(tmp1);
 		zfree(aa);
-	}
+	} else {
-	else {
 		s1 = zsqrt(tmp3, &cc, 0);
 		zfree(tmp3);
 		zadd(cc, a, &tmp1);
@@ -333,9 +300,9 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 		zfree(mul2);
 		mul2 = tmp2;
 	}
-	if (ziszero(mul1))
+	if (ziszero(mul1)) {
 		u = qlink(&_qzero_);
-	else {
+	} else {
 		mul1.sign = sign ^ epsilon->num.sign;
 		u = qalloc();
 		zreduce(mul1, epsilon->den, &tmp2, &u->den);
@@ -343,9 +310,9 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 		zfree(tmp2);
 	}
 	zfree(mul1);
-	if (ziszero(mul2))
+	if (ziszero(mul2)) {
 		v = qlink(&_qzero_);
-	else {
+	} else {
 		mul2.sign = imsign ^ sign ^ epsilon->num.sign;
 		v = qalloc();
 		zreduce(mul2, epsilon->den, &tmp2, &v->den);
@@ -1147,5 +1114,3 @@ cprintfr(COMPLEX *c)
 		zprintval(i->den, 0L, 0L);
 	}
 }
-
-/* END CODE */

commath.c

@@ -69,7 +69,7 @@ csub(COMPLEX *c1, COMPLEX *c2)
 /*
  * Multiply two complex numbers.
  * This saves one multiplication over the obvious algorithm by
- * trading it for several extra additions, as follows.  Let
+ * trading it for several extra additions, as follows.	Let
  *	q1 = (a + b) * (c + d)
  *	q2 = a * c
  *	q3 = b * d

config.c

@@ -48,13 +48,16 @@ NAMETYPE configs[] = {
 	    {"maxerr",	CONFIG_MAXSCAN},	/* old name for maxscan */
 	{"prompt",	CONFIG_PROMPT},
 	{"more",	CONFIG_MORE},
-	{"blkmaxprint",	CONFIG_BLKMAXPRINT},
+	{"blkmaxprint", CONFIG_BLKMAXPRINT},
 	{"blkverbose",	CONFIG_BLKVERBOSE},
 	{"blkbase",	CONFIG_BLKBASE},
 	{"blkfmt",	CONFIG_BLKFMT},
 	{"lib_debug",	CONFIG_LIB_DEBUG},
 	{"calc_debug",	CONFIG_CALC_DEBUG},
 	{"user_debug",	CONFIG_USER_DEBUG},
+	{"verbose_quit",CONFIG_VERBOSE_QUIT},
+	{"ctrl_d",	CONFIG_CTRL_D},
+	    {"ctrl-d",	CONFIG_CTRL_D},		/* alias for ctrl_d */
 	{NULL,		0}
 };
 
@@ -93,9 +96,11 @@ 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 */
-	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
-	0 			/* user defined debug level */
+	3,			/* calc library debug level */
+	0,			/* user defined debug level */
+	TRUE,			/* print Quit or abort executed messages */
+	CTRL_D_VIRGIN_EOF		/* ^D only exits on virgin lines */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
@@ -128,9 +133,11 @@ 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 */
-	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
-	0 			/* user defined debug level */
+	3,			/* calc library debug level */
+	0,			/* user defined debug level */
+	TRUE,			/* print Quit or abort executed messages */
+	CTRL_D_VIRGIN_EOF		/* ^D only exits on virgin lines */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
 
@@ -139,13 +146,17 @@ CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
  * Possible output modes.
  */
 static NAMETYPE modes[] = {
+	{"fraction",	MODE_FRAC},
 	{"frac",	MODE_FRAC},
-	{"decimal",	MODE_FRAC},
+	{"integer",	MODE_INT},
-	{"dec",		MODE_FRAC},
 	{"int",		MODE_INT},
 	{"real",	MODE_REAL},
+	{"float",	MODE_REAL},
+	{"default",	MODE_INITIAL},	/* MODE_REAL */
+	{"scientific",	MODE_EXP},
+	{"sci",		MODE_EXP},
 	{"exp",		MODE_EXP},
-	{"hexadecimal",	MODE_HEX},
+	{"hexadecimal", MODE_HEX},
 	{"hex",		MODE_HEX},
 	{"octal",	MODE_OCTAL},
 	{"oct",		MODE_OCTAL},
@@ -155,34 +166,13 @@ static NAMETYPE modes[] = {
 };
 
 
-/*
- * Possible binary config state values
- */
-static NAMETYPE truth[] = {
-	{"y",		TRUE},
-	{"n",		FALSE},
-	{"yes",		TRUE},
-	{"no",		FALSE},
-	{"set",		TRUE},
-	{"unset",	FALSE},
-	{"on",		TRUE},
-	{"off",		FALSE},
-	{"true",	TRUE},
-	{"false",	FALSE},
-	{"t",		TRUE},
-	{"f",		FALSE},
-	{"1",		TRUE},
-	{"0",		FALSE},
-	{NULL,		0}
-};
-
-
 /*
  * Possible block base output modes
  */
 static NAMETYPE blk_base[] = {
-	{"hexadecimal",	BLK_BASE_HEX},
+	{"hexadecimal", BLK_BASE_HEX},
 	{"hex",		BLK_BASE_HEX},
+	{"default",	BLK_BASE_HEX},
 	{"octal",	BLK_BASE_OCT},
 	{"oct",		BLK_BASE_OCT},
 	{"character",	BLK_BASE_CHAR},
@@ -199,17 +189,60 @@ static NAMETYPE blk_base[] = {
  * Possible block output formats
  */
 static NAMETYPE blk_fmt[] = {
-	{"line",	BLK_FMT_LINE},
 	{"lines",	BLK_FMT_LINE},
-	{"str",		BLK_FMT_STRING},
+	{"line",	BLK_FMT_LINE},
-	{"string",	BLK_FMT_STRING},
 	{"strings",	BLK_FMT_STRING},
-	{"od",		BLK_FMT_OD_STYLE},
+	{"string",	BLK_FMT_STRING},
-	{"odstyle",	BLK_FMT_OD_STYLE},
+	{"str",		BLK_FMT_STRING},
 	{"od_style",	BLK_FMT_OD_STYLE},
-	{"hd",		BLK_FMT_HD_STYLE},
+	{"odstyle",	BLK_FMT_OD_STYLE},
-	{"hdstyle",	BLK_FMT_HD_STYLE},
+	{"od",		BLK_FMT_OD_STYLE},
 	{"hd_style",	BLK_FMT_HD_STYLE},
+	{"hdstyle",	BLK_FMT_HD_STYLE},
+	{"hd",		BLK_FMT_HD_STYLE},
+	{"default",	BLK_FMT_HD_STYLE},
+	{NULL,		0}
+};
+
+
+/*
+ * Possible ctrl_d styles
+ */
+static NAMETYPE ctrl_d[] = {
+	{"virgin_eof",	CTRL_D_VIRGIN_EOF},
+	{"virgineof",	CTRL_D_VIRGIN_EOF},
+	{"virgin",	CTRL_D_VIRGIN_EOF},
+	{"default",	CTRL_D_VIRGIN_EOF},
+	{"never_eof",	CTRL_D_NEVER_EOF},
+	{"nevereof",	CTRL_D_NEVER_EOF},
+	{"never",	CTRL_D_NEVER_EOF},
+	{"empty_eof",	CTRL_D_EMPTY_EOF},
+	{"emptyeof",	CTRL_D_EMPTY_EOF},
+	{"empty",	CTRL_D_EMPTY_EOF},
+	{NULL,		0}
+};
+
+
+/*
+ * Possible binary config state values
+ */
+#define TRUE_STRING	"on"
+#define FALSE_STRING	"off"
+static NAMETYPE truth[] = {
+	{TRUE_STRING,	TRUE},
+	{"true",	TRUE},
+	{"t",		TRUE},
+	{"yes",		TRUE},
+	{"y",		TRUE},
+	{"set",		TRUE},
+	{"1",		TRUE},
+	{FALSE_STRING,	FALSE},
+	{"false",	FALSE},
+	{"f",		FALSE},
+	{"no",		FALSE},
+	{"n",		FALSE},
+	{"unset",	FALSE},
+	{"0",		FALSE},
 	{NULL,		0}
 };
 
@@ -217,11 +250,8 @@ static NAMETYPE blk_fmt[] = {
 /*
  * declate static functions
  */
-static int modetype(char *name);
+static long lookup_long(NAMETYPE *set, char *name);
-static int blkbase(char *name);
+static char *lookup_name(NAMETYPE *set, long val);
-static int blkfmt(char *name);
-static int truthtype(char *name);
-static char *modename(int type);
 
 
 /*
@@ -246,18 +276,21 @@ configtype(char *name)
 
 
 /*
- * Given the name of a mode, convert it to the internal format.
+ * lookup_long - given a name and a NAMETYPE, return the int
- * Returns -1 if the string is unknown.
  *
  * given:
- *	name			mode name
+ *	set		the NAMESET array of name/int pairs
+ *	name		mode name
+ *
+ * returns:
+ *	numeric value of the name or -1 if not found
  */
-static int
+static long
-modetype(char *name)
+lookup_long(NAMETYPE *set, char *name)
 {
 	NAMETYPE *cp;		/* current config pointer */
 
-	for (cp = modes; cp->name; cp++) {
+	for (cp = set; cp->name; cp++) {
 		if (strcmp(cp->name, name) == 0)
 			return cp->type;
 	}
@@ -266,78 +299,22 @@ modetype(char *name)
 
 
 /*
- * Given the name of a block output base, convert it to the internal format.
+ * lookup_name - given numeric value and a NAMETYPE, return the name
- * Returns -1 if the string is unknown.
  *
  * given:
- *	name			mode name
+ *	set		the NAMESET array of name/int pairs
- */
+ *	val		numeric value to lookup
-static int
-blkbase(char *name)
-{
-	NAMETYPE *cp;		/* current config pointer */
-
-	for (cp = blk_base; cp->name; cp++) {
-		if (strcmp(cp->name, name) == 0)
-			return cp->type;
-	}
-	return -1;
-}
-
-
-/*
- * Given the name of a block output format, convert it to the internal format.
- * Returns -1 if the string is unknown.
  *
- * given:
+ * returns:
- *	name			mode name
+ *	name of the value found of NULL
- */
-static int
-blkfmt(char *name)
-{
-	NAMETYPE *cp;		/* current config pointer */
-
-	for (cp = blk_fmt; cp->name; cp++) {
-		if (strcmp(cp->name, name) == 0)
-			return cp->type;
-	}
-	return -1;
-}
-
-
-/*
- * Given the name of a truth value, convert it to a BOOL or -1.
- * Returns -1 if the string is unknown.
- *
- * given:
- *	name			mode name
- */
-static int
-truthtype(char *name)
-{
-	NAMETYPE *cp;		/* current config pointer */
-
-	for (cp = truth; cp->name; cp++) {
-		if (strcmp(cp->name, name) == 0)
-			return cp->type;
-	}
-	return -1;
-}
-
-
-/*
- * Given the mode type, convert it to a string representing that mode.
- * Where there are multiple strings representing the same mode, the first
- * one in the table is used.  Returns NULL if the node type is unknown.
- * The returned string cannot be modified.
  */
 static char *
-modename(int type)
+lookup_name(NAMETYPE *set, long val)
 {
 	NAMETYPE *cp;		/* current config pointer */
 
-	for (cp = modes; cp->name; cp++) {
+	for (cp = set; cp->name; cp++) {
-		if (type == cp->type)
+		if (val == cp->type)
 			return cp->name;
 	}
 	return NULL;
@@ -358,7 +335,7 @@ setconfig(int type, VALUE *vp)
 
 	switch (type) {
 	case CONFIG_ALL:
-		newconf = NULL;	/* firewall */
+		newconf = NULL; /* firewall */
 		if (vp->v_type == V_STR) {
 			if (strcmp(vp->v_str->s_str, "oldstd") == 0) {
 				newconf = &oldstd;
@@ -414,7 +391,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Non-string for mode");
 			/*NOTREACHED*/
 		}
-		temp = modetype(vp->v_str->s_str);
+		temp = lookup_long(modes, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\"", vp->v_str);
 			/*NOTREACHED*/
@@ -523,7 +500,7 @@ setconfig(int type, VALUE *vp)
 			q = vp->v_num;
 			conf->tilde_ok = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
-			temp = truthtype(vp->v_str->s_str);
+			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 				math_error("Illegal truth value for tilde");
 				/*NOTREACHED*/
@@ -537,7 +514,7 @@ setconfig(int type, VALUE *vp)
 			q = vp->v_num;
 			conf->tab_ok = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
-			temp = truthtype(vp->v_str->s_str);
+			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 				math_error("Illegal truth value for tab");
 				/*NOTREACHED*/
@@ -677,7 +654,7 @@ setconfig(int type, VALUE *vp)
 			q = vp->v_num;
 			conf->leadzero = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
-			temp = truthtype(vp->v_str->s_str);
+			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) { {
 				math_error("Illegal truth value for leadzero");
 				/*NOTREACHED*/
@@ -692,7 +669,7 @@ setconfig(int type, VALUE *vp)
 			q = vp->v_num;
 			conf->fullzero = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
-			temp = truthtype(vp->v_str->s_str);
+			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) { {
 				math_error("Illegal truth value for fullzero");
 				/*NOTREACHED*/
@@ -769,7 +746,7 @@ setconfig(int type, VALUE *vp)
 			q = vp->v_num;
 			conf->blkverbose = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
-			temp = truthtype(vp->v_str->s_str);
+			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 			    math_error("Illegal truth value for blkverbose");
 			    /*NOTREACHED*/
@@ -783,7 +760,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Non-string for blkbase");
 			/*NOTREACHED*/
 		}
-		temp = blkbase(vp->v_str->s_str);
+		temp = lookup_long(blk_base, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\" for blkbase",
 			    vp->v_str->s_str);
@@ -797,7 +774,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Non-string for blkfmt");
 			/*NOTREACHED*/
 		}
-		temp = blkfmt(vp->v_str->s_str);
+		temp = lookup_long(blk_fmt, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\" for blkfmt",
 			    vp->v_str->s_str);
@@ -806,20 +783,6 @@ setconfig(int type, VALUE *vp)
 		conf->blkfmt = temp;
 		break;
 
-	case CONFIG_LIB_DEBUG:
-		if (vp->v_type != V_NUM) {
-			math_error("Non numeric for lib_debug");
-			/*NOTREACHED*/
-		}
-		q = vp->v_num;
-		temp = qtoi(q);
-		if (qisfrac(q) || !zistiny(q->num)) {
-			math_error("Illegal lib_debug parameter value");
-			/*NOTREACHED*/
-		}
-		conf->lib_debug = temp;
-		break;
-
 	case CONFIG_CALC_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for calc_debug");
@@ -834,6 +797,20 @@ setconfig(int type, VALUE *vp)
 		conf->calc_debug = temp;
 		break;
 
+	case CONFIG_LIB_DEBUG:
+		if (vp->v_type != V_NUM) {
+			math_error("Non numeric for lib_debug");
+			/*NOTREACHED*/
+		}
+		q = vp->v_num;
+		temp = qtoi(q);
+		if (qisfrac(q) || !zistiny(q->num)) {
+			math_error("Illegal lib_debug parameter value");
+			/*NOTREACHED*/
+		}
+		conf->lib_debug = temp;
+		break;
+
 	case CONFIG_USER_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for user_debug");
@@ -848,6 +825,35 @@ setconfig(int type, VALUE *vp)
 		conf->user_debug = temp;
 		break;
 
+	case CONFIG_VERBOSE_QUIT:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->verbose_quit = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value "
+					   "for verbose_quit");
+				/*NOTREACHED*/
+			}
+			conf->verbose_quit = (int)temp;
+		}
+		break;
+
+	case CONFIG_CTRL_D:
+		if (vp->v_type != V_STR) {
+			math_error("Non-string for ctrl_d");
+			/*NOTREACHED*/
+		}
+		temp = lookup_long(ctrl_d, vp->v_str->s_str);
+		if (temp < 0) {
+			math_error("Unknown mode \"%s\" for ctrl_d",
+			    vp->v_str->s_str);
+			/*NOTREACHED*/
+		}
+		conf->ctrl_d = temp;
+		break;
+
 	default:
 		math_error("Setting illegal config parameter");
 		/*NOTREACHED*/
@@ -968,6 +974,7 @@ void
 config_value(CONFIG *cfg, int type, VALUE *vp)
 {
 	long i=0;
+	char *p;
 
 	/*
 	 * firewall
@@ -982,6 +989,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 	 * convert element to value
 	 */
 	vp->v_type = V_NUM;
+	vp->v_subtype = V_NOSUBTYPE;
 	switch (type) {
 	case CONFIG_ALL:
 		vp->v_type = V_CONFIG;
@@ -998,7 +1006,12 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 
 	case CONFIG_MODE:
 		vp->v_type = V_STR;
-		vp->v_str = makenewstring(modename(cfg->outmode));
+		p = lookup_name(modes, cfg->outmode);
+		if (p == NULL) {
+			math_error("invalid output mode: %d", cfg->outmode);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
 		return;
 
 	case CONFIG_EPSILON:
@@ -1026,12 +1039,22 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_TILDE:
-		i = cfg->tilde_ok;
+		vp->v_type = V_STR;
-		break;
+		if (cfg->tilde_ok) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
 
 	case CONFIG_TAB:
-		i = cfg->tab_ok;
+		vp->v_type = V_STR;
-		break;
+		if (cfg->tab_ok) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
 
 	case CONFIG_QUOMOD:
 		i = cfg->quomod;
@@ -1070,12 +1093,22 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_LEADZERO:
-		i = cfg->leadzero;
+		vp->v_type = V_STR;
-		break;
+		if (cfg->leadzero) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
 
 	case CONFIG_FULLZERO:
-		i = cfg->fullzero;
+		vp->v_type = V_STR;
-		break;
+		if (cfg->fullzero) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
 
 	case CONFIG_MAXSCAN:
 		i = cfg->maxscancount;
@@ -1096,29 +1129,65 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_BLKVERBOSE:
-		i = cfg->blkverbose;
+		vp->v_type = V_STR;
-		break;
+		if (cfg->blkverbose) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
 
 	case CONFIG_BLKBASE:
-		i = cfg->blkbase;
+		vp->v_type = V_STR;
-		break;
+		p = lookup_name(blk_base, cfg->blkbase);
+		if (p == NULL) {
+			math_error("invalid block base: %d", cfg->blkbase);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
+		return;
 
 	case CONFIG_BLKFMT:
-		i = cfg->blkfmt;
+		vp->v_type = V_STR;
+		p = lookup_name(blk_fmt, cfg->blkfmt);
+		if (p == NULL) {
+			math_error("invalid block format: %d", cfg->blkfmt);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
+		return;
+
+	case CONFIG_CALC_DEBUG:
+		i = cfg->calc_debug;
 		break;
 
 	case CONFIG_LIB_DEBUG:
 		i = cfg->lib_debug;
 		break;
 
-	case CONFIG_CALC_DEBUG:
-		i = cfg->calc_debug;
-		break;
-
 	case CONFIG_USER_DEBUG:
 		i = cfg->user_debug;
 		break;
 
+	case CONFIG_VERBOSE_QUIT:
+		vp->v_type = V_STR;
+		if (cfg->verbose_quit) {
+			vp->v_str = makenewstring(TRUE_STRING);
+		} else {
+			vp->v_str = makenewstring(FALSE_STRING);
+		}
+		return;
+
+	case CONFIG_CTRL_D:
+		vp->v_type = V_STR;
+		p = lookup_name(ctrl_d, cfg->ctrl_d);
+		if (p == NULL) {
+			math_error("invalid Control-D: %d", cfg->ctrl_d);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
+		return;
+
 	default:
 		math_error("Getting illegal CONFIG element");
 		/*NOTREACHED*/
@@ -1192,7 +1261,9 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	       cfg1->blkverbose != cfg2->blkverbose ||
 	       cfg1->blkbase != cfg2->blkbase ||
 	       cfg1->blkfmt != cfg2->blkfmt ||
-	       cfg1->lib_debug != cfg2->lib_debug ||
 	       cfg1->calc_debug != cfg2->calc_debug ||
-	       cfg1->user_debug != cfg2->user_debug;
+	       cfg1->lib_debug != cfg2->lib_debug ||
+	       cfg1->user_debug != cfg2->user_debug ||
+	       cfg1->verbose_quit != cfg2->verbose_quit ||
+	       cfg1->ctrl_d != cfg2->ctrl_d;
 }

config.h

@@ -20,16 +20,16 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Prior to calc 2.9.3t9, these routines existed as a calc library called
- * cryrand.cal.  They have been rewritten in C for performance as well
+ * cryrand.cal.	 They have been rewritten in C for performance as well
  * as to make them available directly from libcalc.a.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -52,11 +52,11 @@
 #define CONFIG_EPSILON	3
 #define CONFIG_EPSILONPREC 3	/* not a real type -- tied to CONFIG_EPSILON */
 #define CONFIG_TRACE	4
-#define CONFIG_MAXPRINT	5
+#define CONFIG_MAXPRINT 5
-#define	CONFIG_MUL2	6
+#define CONFIG_MUL2	6
-#define	CONFIG_SQ2	7
+#define CONFIG_SQ2	7
-#define	CONFIG_POW2	8
+#define CONFIG_POW2	8
-#define	CONFIG_REDC2	9
+#define CONFIG_REDC2	9
 #define CONFIG_TILDE	10
 #define CONFIG_TAB	11
 #define CONFIG_QUOMOD	12
@@ -66,10 +66,10 @@
 #define CONFIG_APPR	16
 #define CONFIG_CFAPPR	17
 #define CONFIG_CFSIM	18
-#define CONFIG_OUTROUND	19
+#define CONFIG_OUTROUND 19
 #define CONFIG_ROUND	20
-#define CONFIG_LEADZERO	21
+#define CONFIG_LEADZERO 21
-#define CONFIG_FULLZERO	22
+#define CONFIG_FULLZERO 22
 #define CONFIG_MAXSCAN	23
 #define CONFIG_PROMPT	24
 #define CONFIG_MORE	25
@@ -80,13 +80,15 @@
 #define CONFIG_LIB_DEBUG 30
 #define CONFIG_CALC_DEBUG 31
 #define CONFIG_USER_DEBUG 32
+#define CONFIG_VERBOSE_QUIT 33
+#define CONFIG_CTRL_D 34
 
 
 /*
  * config default symbols
  */
 #define DISPLAY_DEFAULT 20	/* default digits for float display */
-#define EPSILON_DEFAULT "1e-20"	/* allowed error for float calculations */
+#define EPSILON_DEFAULT "1e-20" /* allowed error for float calculations */
 #define EPSILONPREC_DEFAULT 67	/* 67 ==> 2^-67 <= EPSILON_DEFAULT < 2^-66 */
 #define NEW_EPSILON_DEFAULT "1e-10"	/* newstd EPSILON_DEFAULT */
 #define NEW_EPSILONPREC_DEFAULT 34	/* 34 ==> 2^-34 <= 1e-10 < 2^-33 */
@@ -101,7 +103,9 @@
  *
  *	quickhash.c	- config_hash()
  *	hash.c		- hash_value()
- *	config.c	- setconfig(), config_value(), config_cmp()
+ *	config.c	- configs[], oldstd, newstd, setconfig(),
+ *			  config_value(), config_cmp()
+ *	config.h	- CONFIG_XYZ_SYMBOL (see above)
  */
 struct config {
 	int outmode;		/* current output mode */
@@ -114,8 +118,8 @@ struct config {
 	LEN sq2;		/* size of number to use square algorithm 2 */
 	LEN pow2;		/* size of modulus to use REDC for powers */
 	LEN redc2;		/* size of modulus to use REDC algorithm 2 */
-	int tilde_ok;		/* ok to print a tilde on aproximations */
+	BOOL tilde_ok;		/* ok to print a tilde on aproximations */
-	int tab_ok;		/* ok to print tab before numeric values */
+	BOOL tab_ok;		/* ok to print tab before numeric values */
 	long quomod;		/* quomod() default rounding mode */
 	long quo;		/* quotent // default rounding mode */
 	long mod;		/* mod % default rounding mode */
@@ -125,20 +129,22 @@ struct config {
 	long cfsim;		/* cfsim() default rounding mode */
 	long outround;		/* output default rounding mode */
 	long round;		/* round()/bround() default rounding mode */
-	int leadzero;		/* ok to print leading 0 before decimal pt */
+	BOOL leadzero;		/* ok to print leading 0 before decimal pt */
-	int fullzero;		/* ok to print trailing 0's */
+	BOOL fullzero;		/* ok to print trailing 0's */
 	long maxscancount;	/* max scan errors before abort */
 	char *prompt1;		/* normal prompt */
 	char *prompt2;		/* prompt when inside multi-line input */
 	int blkmaxprint;	/* octets of a block to print, 0 => all */
-	int blkverbose;		/* TRUE => print all lines if a block */
+	BOOL blkverbose;	/* TRUE => print all lines if a block */
 	int blkbase;		/* block output base */
 	int blkfmt;		/* block output style */
-	int lib_debug;		/* library debug, see LIB_DEBUG_XXX below */
+	long calc_debug;	/* internal debug, see CALC_DEBUG_XXX below */
-	int calc_debug;		/* internal debug, see CALC_DEBUG_XXX below */
+	long lib_debug;		/* library debug, see LIB_DEBUG_XXX below */
-	int user_debug;		/* user defined debug value: 0 default */
+	long user_debug;	/* user defined debug value: 0 default */
+	BOOL verbose_quit;	/* TRUE => print Quit or abort executed msg */
+	int ctrl_d;		/* see CTRL_D_xyz below */
 };
-typedef	struct config CONFIG;
+typedef struct config CONFIG;
 
 
 /*
@@ -146,7 +152,8 @@ typedef	struct config CONFIG;
  */
 #define LIBDBG_STDIN_FUNC   (0x00000001)    /* interactive func define debug */
 #define LIBDBG_FILE_FUNC    (0x00000002)    /* file read func define debug */
-#define LIBDBG_MASK	    (0x00000003)
+#define LIBDBG_FUNC_INFO    (0x00000004)    /* print extra info for show func */
+#define LIBDBG_MASK	    (0x00000007)
 
 
 /*
@@ -156,7 +163,16 @@ typedef	struct config CONFIG;
 #define CALCDBG_FUNC_QUIT   (0x00000002)    /* active functions when quit */
 #define CALCDBG_HASH_STATE  (0x00000004)    /* hash state details */
 #define CALCDBG_BLOCK	    (0x00000008)    /* block debug */
-#define CALCDBG_MASK	    (0x0000000f)
+#define CALCDBG_TTY	    (0x00000010)    /* report TTY state changes */
+#define CALCDBG_RUNSTATE    (0x00000020)    /* report run_state changes */
+#define CALCDBG_MASK	    (0x0000003f)
+
+/*
+ * ctrl-d meanings
+ */
+#define CTRL_D_VIRGIN_EOF  (0)	/* ^D only exits on virgin command lines */
+#define CTRL_D_NEVER_EOF   (1)	/* ^D never exits, emacs binding meaning only */
+#define CTRL_D_EMPTY_EOF   (2)	/* ^D always exits at start of line */
 
 
 /*
@@ -165,6 +181,9 @@ typedef	struct config CONFIG;
 extern CONFIG *conf;		/* current configuration */
 extern CONFIG oldstd;		/* backward compatible standard configuration */
 extern CONFIG newstd;		/* new non-backward compatible configuration */
+extern char *calc_debug;	/* !=NULL => value of config("calc_debug") */
+extern char *lib_debug;		/* !=NULL => value of config("lib_debug") */
+extern char *user_debug;	/* !=NULL => value of config("user_debug") */
 
 
 /*

custom.c

@@ -20,12 +20,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -117,7 +117,7 @@ showcustom(void)
 {
 #if defined(CUSTOM)
 
-	CONST struct custom *p;	/* current function */
+	CONST struct custom *p; /* current function */
 
 	/*
 	 * disable custom functions unless -C was given

custom.h

@@ -20,16 +20,16 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Prior to calc 2.9.3t9, these routines existed as a calc library called
- * cryrand.cal.  They have been rewritten in C for performance as well
+ * cryrand.cal.	 They have been rewritten in C for performance as well
  * as to make them available directly from libcalc.a.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/CUSTOM_CAL

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997 Landon Curt Noll
+# Copyright (c) 1999 Landon Curt Noll
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby granted,
@@ -19,7 +19,7 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# chongo was here	/\../\		http://reality.sgi.com/chongo
+# 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
@@ -44,8 +44,19 @@ calc library standards and guidelines.
 
 =-=
 
+argv.cal
+
+    argv(var, ...)
+
+    print information about various args
+
 halflen.cal
 
     halflen(num)
 
     Calculate the length of a numeric value in HALF's.
+
+pzasusb8.cal
+
+    Run custom("pzasusb8") on a standard set of data, print Endian
+    related information and print value size information.

custom/HOW_TO_ADD

@@ -6,7 +6,7 @@ Step 0: Determine if is should it be done?
     multi-precision calculations in a C-like environment.  You should
     consider implementing algorithms in the calc language as a first
     choice.  Sometimes an algorithm requires use of special hardware, a
-    non-portable OS or pre-compiled C library.  In these cases a custom
+    non-portable OS or pre-compiled C library.	In these cases a custom
     interface may be needed.
 
     The custom function interface is intended to make is easy for
@@ -38,17 +38,17 @@ Step 1: Do some background work
     you look at some examples of custom functions.  Check out
     the following source files:
 
-	../custom.c
+	custom.c
-	custom.h
+	custom/custom.h
-	custtbl.c
+	custom/custtbl.c
-	c_*.[ch]
+	custom/c_*.[ch]
-	../help/custom
+	help/custom		(or run:  calc help custom)
 
     You would be well advised to look at a more recent calc source
-    such as one available in from the calc alpha test archive.
+    such as one available in from the calc version archive.
     See the following for more details:
 
-	../help/archive
+	help/archive		(or run:  calc help archive)
 
 
 Step 2: Name your custom function
@@ -184,7 +184,7 @@ Step 5: Write your custom function
 	   The 3 args are passed in by the custom interface
 	   and have the following meaning:
 
-		name    The name of the custom function that
+		name	The name of the custom function that
 			was called.  In particular, this is the first
 			string arg that was given to the custom()
 			builtin.  This is the equivalent of argv[0] for
@@ -215,11 +215,11 @@ Step 5: Write your custom function
 
 			    custom("curds", a, b, c)
 
-		        would cause vals to point to the following array:
+			would cause vals to point to the following array:
 
-			    vals[0]  points to  a
+			    vals[0]  points to	a
-			    vals[1]  points to  b
+			    vals[1]  points to	b
-			    vals[2]  points to  c
+			    vals[2]  points to	c
 
 	c) The return value is the function must be a VALUE.
 
@@ -247,7 +247,7 @@ Step 5: Write your custom function
 
     The VALUE is a union of major value types found inside calc.
     The v_type VALUE element determines which union element is
-    being used.   Assume that we have:
+    being used.	  Assume that we have:
 
 	VALUE *vp;
 
@@ -427,12 +427,12 @@ Step 6: Register the function in the custom interface table
     level Makefile, one does not have unsatisfied symbols.
 
     The brief description should be brief so that 'show custom' looks well
-    formatted.  If the brief description cannot fit on the same line as
+    formatted.	If the brief description cannot fit on the same line as
     the name without wrapping on a 80 col window, the description is
     probably too long and will not look nice in the show custom output.
 
     The minargs places a lower bound on the number of args that
-    must be supplied to the interface.  This does NOT count
+    must be supplied to the interface.	This does NOT count
     the name argument given to custom().  So if minargs is 2:
 
 	custom("curds")		/* call blocked at high level interface */
@@ -604,3 +604,16 @@ Step 11: Install
 
     Although calc does not run setuid, you may need to be root to install
     the directories into which calc installs may be write protected.
+
+
+Step 12: Contribute
+
+    Your custom function may be of interest to some people and/or
+    serve as an example of what one can do with custom functions.
+
+    Read the file:
+
+	help/contrib		(or run:  calc help contrib)
+
+    and consider submitting your custom function for possible
+    inclusion in later versions of calc.

custom/Makefile

@@ -22,12 +22,12 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 # Comments, suggestions, bug fixes and questions about these routines
-# are welcome.  Send EMail to the address given below.
+# are welcome.	Send EMail to the address given below.
 #
 # Happy bit twiddling,
 #
 #      Landon Curt Noll
-#      http://reality.sgi.com/chongo
+#      http://reality.sgi.com/chongo/
 #
 # chongo <was here> /\../\
 
@@ -146,7 +146,7 @@ DEBUG= -O
 #	BSD	    NO_SHARED=
 #	SYSV	    NO_SHARED= -dn
 #	IRIX	    NO_SHARED= -non_shared
-#	disable     NO_SHARED=
+#	disable	    NO_SHARED=
 #
 # If in doubt, use NO_SHARED=
 #
@@ -168,7 +168,7 @@ RANLIB=:
 # a default here just in case you want to build from this directory.
 #
 # Normally certain files depend on the Makefile.  If the Makefile is
-# changed, then certain steps should be redone.  If MAKE_FILE is
+# changed, then certain steps should be redone.	 If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
 # MAKE_FILE is empty, they they wont.
 #
@@ -192,7 +192,7 @@ MAKE_FILE= Makefile
 #
 # By default, custom builtin functions may only be executed if calc
 # is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.  One may completely
+# may invoke non-standard or non-portable code.	 One may completely
 # disable custom builtin functions by not compiling any of code
 #
 # ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
@@ -285,6 +285,10 @@ H_SRC= ${CUSTOM_H_SRC}
 DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
 	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE}
 
+# These files are used to make (but not built) a calc .a library
+#
+CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
+
 # complete list of targets
 #
 TARGETS= libcustcalc.a ${CUSTCALC_OBJ}
@@ -310,6 +314,15 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
 	ar qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
 
+##
+#
+# Special .o files
+#
+##
+
+c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+	${CC} ${CFLAGS} c_sysinfo.c -c
+
 ##
 #
 # used by the upper level Makefile
@@ -324,27 +337,30 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
 
 ##
 #
-# File list generation.  You can ignore this section.
+# File list generation.	 You can ignore this section.
 #
 #
 # We will form the names of source files as if they were in a
 # sub-directory called calc/lib.
 #
 # NOTE: Due to bogus shells found on one common system we must have
-#       an non-emoty else clause for every if condition.  *sigh*
+#	an non-emoty else clause for every if condition.  *sigh*
 #
 ##
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/custom/$$i; \
+		echo custom/$$i; \
 	done
 
-# The bsdi distribution has generated files as well as distributed files.
+distdir:
-#
+	${Q}echo custom
-bsdilist: ${DISTLIST}
+
-	${Q}for i in ${DISTLIST}; do \
+calcliblist: ${CALCLIBLIST}
-		echo calc/custom/$$i; \
+	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo custom/$$i; \
+	    fi; \
 	done
 
 ##
@@ -371,7 +387,7 @@ depend:
 	${Q}mkdir skel
 	${Q}mkdir skel/custom
 	-${Q}for i in ${C_SRC}; do \
-		${SED} -n '/^#[	 ]*include[ 	]*"/p' \
+		${SED} -n '/^#[	 ]*include[	 ]*"/p' \
 		    "$$i" > "skel/custom/$$i"; \
 	done
 	-${Q}for i in /dev/null ${H_SRC}; do \
@@ -379,7 +395,7 @@ depend:
 		    continue; \
 		fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#ifndef $$tag" > "skel/custom/$$i"; \
+		echo "#if !defined($$tag)" > "skel/custom/$$i"; \
 		echo "#define $$tag" >> "skel/custom/$$i"; \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
 		    >> "skel/custom/$$i"; \
@@ -388,7 +404,7 @@ depend:
 	${Q}(cd ..; ${MAKE} hsrc)
 	${Q}for i in `cd ..; ${MAKE} h_list`; do \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#ifndef $$tag" > "skel/$$i"; \
+		echo "#if !defined($$tag)" > "skel/$$i"; \
 		echo "#define $$tag" >> "skel/$$i"; \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
 		    >> "skel/$$i"; \
@@ -401,10 +417,8 @@ depend:
 	    skel/custom/makedep.out
 	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -m -f makedep.out ${C_SRC}
 	-${Q}for i in ${C_SRC}; do \
-		echo "$$i" | \
+		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
-		    ${SED} 's/^\(.*\)\.c/\1.o: \1.c/' \
+	done >> skel/custom/makedep.out
-		    >> skel/custom/makedep.out; \
-	done
 	${Q}echo custom dependency list formed
 	${Q}echo forming new custom/Makefile
 	-${Q}rm -f Makefile.bak
@@ -419,12 +433,12 @@ depend:
 	else \
 		rm -f Makefile.tmp; \
 		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then; \
+		if [ -d RCS ]; then \
 		    co -l Makefile; \
 		fi ;\
 		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then; \
+		if [ -d RCS ]; then \
-		echo new custom Makefile formed '--' you need to check it in'; \
+		echo 'new custom Makefile formed -- you need to check it in'; \
 		fi; \
 	fi
 

custom/argv

@@ -23,11 +23,11 @@ DESCRIPTION
 EXAMPLE
     > foo=5^713; bar=17; baz=list(2,3,4);
     > custom("argv", foo, bar, baz, 3+4.5i, pi())
-	    arg[0]  rational_value          size=1  sizeof=272
+	    arg[0]  rational_value	    size=1  sizeof=272
-	    arg[1]  rational_value          size=1  sizeof=68
+	    arg[1]  rational_value	    size=1  sizeof=68
-	    arg[2]  list                    size=3  sizeof=256
+	    arg[2]  list		    size=3  sizeof=256
-	    arg[3]  complex_value           size=1  sizeof=140
+	    arg[3]  complex_value	    size=1  sizeof=140
-	    arg[4]  rational_value          size=1  sizeof=84
+	    arg[4]  rational_value	    size=1  sizeof=84
 	    5
 
 LIMITS

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	/\../\		http://reality.sgi.com/chongo
+ * chongo was here	/\../\		http://reality.sgi.com/chongo/
  */
 /*
  * argv - print information about various args

custom/c_argv.c

@@ -11,12 +11,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -98,13 +98,13 @@ c_argv(char *name, int count, VALUE **vals)
 		case V_FILE:	/* opened file id */
 			type = "file";
 			break;
-		case V_RAND:    /* address of additive 55 random state */
+		case V_RAND:	/* address of additive 55 random state */
 			type = "rand_state";
 			break;
-		case V_RANDOM:  /* address of Blum random state */
+		case V_RANDOM:	/* address of Blum random state */
 			type = "random_state";
 			break;
-		case V_CONFIG:  /* configuration state */
+		case V_CONFIG:	/* configuration state */
 			type = "config_state";
 			break;
 		case V_HASH:	/* hash state */
@@ -115,7 +115,7 @@ c_argv(char *name, int count, VALUE **vals)
 			break;
 #if 0
 		/* XXX - V_OCTET is subject to change */
-		case V_OCTET: 	/* octet (unsigned char) */
+		case V_OCTET:	/* octet (unsigned char) */
 			type = "octet";
 			break;
 #endif

custom/c_devnull.c

@@ -11,12 +11,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/c_help.c

@@ -11,12 +11,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/c_pzasusb8.c

@@ -2,7 +2,7 @@
  * 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
+ *	      Ernest Bowen, following Landon Curt Noll
  */
 
 #if defined(CUSTOM)
@@ -20,7 +20,7 @@
  *
  * given:
  *    count = 1;
- *    vals[0]   real number;
+ *    vals[0]	real number;
  *
  * returns:
  *    null
@@ -29,7 +29,7 @@
 VALUE
 c_pzasusb8(char *name, int count, VALUE **vals)
 {
-	VALUE result;           /* what we will return */
+	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 */

custom/c_sysinfo.c

@@ -11,12 +11,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -33,6 +33,7 @@
 #include "../config.h"
 #include "../calc.h"
 #include "../longbits.h"
+#define CHECK_L_FORMAT
 #include "../longlong.h"
 #include "../block.h"
 #include "../calcerr.h"
@@ -108,7 +109,6 @@ static struct infoname sys_info[] = {
     {"MAXLABELS", "max number of user labels in function", NULL, (FULL)MAXLABELS},
     {"MAXLEN", "longest storage size allowed", NULL, (FULL)MAXLEN},
     {"MAXLONG", "largest long val", NULL, (FULL)MAXLONG},
-    {"MAXOBJECTS", "max number of object types", NULL, (FULL)MAXOBJECTS},
     {"MAXPRINT_DEFAULT", "default number of elements printed", NULL, (FULL)MAXPRINT_DEFAULT},
     {"MAXREDC", "number of entries in REDC cache", NULL, (FULL)MAXREDC},
     {"MAXSCANCOUNT", "default max scan errors before an abort", NULL, (FULL)MAXSCANCOUNT},
@@ -307,17 +307,33 @@ static void
 dump_name_value(void)
 {
 	struct infoname *p;	/* current infoname */
+	char *fmt;		/* printf value format */
 
 	/* dump the entire table */
 	for (p = sys_info; p->name != NULL; ++p) {
 		if (p->str == NULL) {
 #if LONG_BITS == FULL_BITS || FULL_BITS == 32 || !defined(HAVE_LONGLONG)
-			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
+			fmt = "%s%-23s\t%-8lu\t(0x%lx)\n";
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-			printf("%s%-23s\t%-8llu\t(0x%llx)\n",
+			/*
+			 * Determine of %ld can print a 64 bit long long.
+			 *
+			 * Some systems that can make use of %ld to print a
+			 * a 64 bit value do not support the %lld type.
+			 * So we will only try %lld if %ld does not work.
+			 */
+			if (l_format < 0) {
+				/* %ld prints lower 32 bits only, use %lld */
+				fmt = "%s%-23s\t%-8llu\t(0x%llx)\n";
+			} else {
+				/* %ld prints all 64 bits, use %ld */
+				fmt = "%s%-23s\t%-8lu\t(0x%lx)\n";
+			}
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);
@@ -338,17 +354,33 @@ static void
 dump_mening_value(void)
 {
 	struct infoname *p;	/* current infoname */
+	char *fmt;		/* printf value format */
 
 	/* dump the entire table */
 	for (p = sys_info; p->name != NULL; ++p) {
 		if (p->str == NULL) {
 #if LONG_BITS == FULL_BITS || FULL_BITS == 32 || !defined(HAVE_LONGLONG)
-			printf("%s%-36.36s\t%-8lu\t(0x%lx)\n",
+			fmt = "%s%-36.36s\t%-8lu\t(0x%lx)\n";
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-			printf("%s%-36.36s\t%-8llu\t(0x%llx)\n",
+			/*
+			 * Determine of %ld can print a 64 bit long long.
+			 *
+			 * Some systems that can make use of %ld to print a
+			 * a 64 bit value do not support the %lld type.
+			 * So we will only try %lld if %ld does not work.
+			 */
+			if (l_format < 0) {
+				/* %ld prints lower 32 bits only, use %lld */
+				fmt = "%s%-36.36s\t%-8llu\t(0x%llx)\n";
+			} else {
+				/* %ld prints all 64 bits, use %ld */
+				fmt = "%s%-36.36s\t%-8lu\t(0x%lx)\n";
+			}
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);

custom/custtbl.c

@@ -20,12 +20,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  * Comments, suggestions, bug fixes and questions about these routines
- * are welcome.  Send EMail to the address given below.
+ * are welcome.	 Send EMail to the address given below.
  *
  * Happy bit twiddling,
  *
- *      Landon Curt Noll
+ *	Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -37,7 +37,7 @@
 
 /*
  * NOTE: See the file CUSTOM for instructions on how to add
- * 	 custom functions.
+ *	 custom functions.
  */
 
 

custom/devnull

@@ -10,7 +10,7 @@ TYPES
     return	null
 
 DESCRIPTION
-    This custom function does nothing.  It is intented for testing
+    This custom function does nothing.	It is intented for testing
     of the general custom interface.
 
 EXAMPLE

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	/\../\		http://reality.sgi.com/chongo
+ * chongo was here	/\../\		http://reality.sgi.com/chongo/
  */
 /*
  * halflen - determine the length of numeric value in HALFs

custom/pzasusb8

@@ -11,7 +11,7 @@ TYPES
 
 DESCRIPTION
     This custom function prints out the numerator of a real value
-    in octets.  Each HALF value is printed in a separate line.
+    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:
@@ -26,15 +26,15 @@ DESCRIPTION
 
 EXAMPLE
     > custom("pzasusb8", 0x01020304050607080910111213141516);
-    0:      13141516
+    0:	    13141516
-    1:      09101112
+    1:	    09101112
-    2:      05060708
+    2:	    05060708
-    3:      01020304
+    3:	    01020304
 
     > custom("pzasusb8", 10^25)
-    0:      4a000000
+    0:	    4a000000
-    1:      16140148
+    1:	    16140148
-    2:      00084595
+    2:	    00084595
 
     > printf("%x\n", 10^25);
     0x84595161401484a000000

custom/pzasusb8.cal

@@ -27,3 +27,5 @@ 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");
+print "Calc sizes:";
+show sizes;

file.c

@@ -19,7 +19,7 @@
 #include "file.h"
 #include "calcerr.h"
 
-#define	READSIZE	1024	/* buffer size for reading */
+#define READSIZE	1024	/* buffer size for reading */
 
 /*
  * external STDIO functions
@@ -34,7 +34,7 @@ extern FILE *f_open(char *name, char *mode);
  * and cannot be closed.  Their file ids are always 0, 1, and 2.
  */
 static FILEIO files[MAXFILES] = {
-	{FILEID_STDIN,  NULL,  (dev_t)0, (ino_t)0,
+	{FILEID_STDIN,	NULL,  (dev_t)0, (ino_t)0,
 	 "(stdin)",  TRUE, FALSE, 'r', "r"},
 	{FILEID_STDOUT, NULL, (dev_t)0, (ino_t)0,
 	 "(stdout)", FALSE,  TRUE, 'w', "w"},
@@ -43,7 +43,7 @@ static FILEIO files[MAXFILES] = {
 };
 
 
-static int ioindex[MAXFILES] = {0,1,2};	/* Indices for FILEIO table */
+static int ioindex[MAXFILES] = {0,1,2}; /* Indices for FILEIO table */
 static FILEID lastid = FILEID_STDERR;	/* Last allocated file id */
 static int idnum = 3;			/* Number of allocated file ids */
 
@@ -398,7 +398,7 @@ indexid(long index)
 
 
 /*
- * Close the specified file id.  Returns TRUE if there was an error.
+ * Close the specified file id.	 Returns TRUE if there was an error.
  * Closing of stdin, stdout, or stderr is illegal, but closing of already
  * closed files is allowed.
  */
@@ -536,7 +536,7 @@ flushall(void)
  *
  *	bit 0:	at newline
  *	bit 1:	at null character
- *	bit 2:  at white space (also skips leading white space)
+ *	bit 2:	at white space (also skips leading white space)
  *
  * If neither '\n' nor '\0' is encountered reading continues until EOF.
  * If bit 3 is set the stop character is removed.
@@ -725,7 +725,7 @@ printid(FILEID id, int flags)
 
 
 /*
- * Print a formatted string similar to printf.  Various formats of output
+ * Print a formatted string similar to printf.	Various formats of output
  * are possible, depending on the format string AND the actual types of the
  * values.  Mismatches do not cause errors, instead something reasonable is
  * printed instead.  The output goes to the file with the specified id.
@@ -1294,7 +1294,7 @@ getloc(FILEID id, ZVALUE *res)
 	 */
 	fiop = findid(id, 0);
 	if (fiop == NULL) {
-	  	/* file not open */
+		/* file not open */
 		return -1;
 	}
 	fp = fiop->fp;
@@ -1467,7 +1467,7 @@ setloc(FILEID id, ZVALUE zpos)
 	 */
 	fiop = findid(id, 0);
 	if (fiop == NULL) {
-	  	/* file not open */
+		/* file not open */
 		return -1;
 	}
 	fp = fiop->fp;
@@ -1635,7 +1635,7 @@ getsize(FILEID id, ZVALUE *res)
 	 */
 	fiop = findid(id, 0);
 	if (fiop == NULL) {
-	  	/* file not open */
+		/* file not open */
 		return 1;
 	}
 	fp = fiop->fp;
@@ -1671,7 +1671,7 @@ get_device(FILEID id, ZVALUE *dev)
 	 */
 	fiop = findid(id, 0);
 	if (fiop == NULL) {
-	  	/* file not open */
+		/* file not open */
 		return -1;
 	}
 
@@ -1704,7 +1704,7 @@ get_inode(FILEID id, ZVALUE *inode)
 	 */
 	fiop = findid(id, 0);
 	if (fiop == NULL) {
-	  	/* file not open */
+		/* file not open */
 		return -1;
 	}
 
@@ -2144,7 +2144,7 @@ scanfstr(char *str, char *fmt, int count, VALUE **vals)
 
 
 /*
- * Read a number in floating-point format from a file.  The first dot,
+ * Read a number in floating-point format from a file.	The first dot,
  * if any, is considered as the decimal point; later dots are ignored.
  * For example, -23.45..67. is interpreted as -23.4567
  * An optional 'e' or 'E' indicates multiplication by a power or 10,
@@ -2228,15 +2228,16 @@ freadnum(FILE *fp, VALUE *valptr)
 			ch = fgetc(fp);
 		}
 	}
-	if (ch == 'i' || ch == 'I')
+	if (ch == 'i' || ch == 'I') {
 		imag = TRUE;
-	else {
+	} else {
 		ungetc(ch, fp);
 	}
 
 	if (ziszero(num)) {
 		zfree(num);
 		val.v_type = V_NUM;
+		val.v_subtype = V_NOSUBTYPE;
 		val.v_num = qlink(&_qzero_);
 		*valptr = val;
 		return;
@@ -2281,11 +2282,11 @@ freadnum(FILE *fp, VALUE *valptr)
 		c->imag = q;
 		val.v_type = V_COM;
 		val.v_com = c;
-	}
+	} else {
-	else {
 		val.v_type = V_NUM;
 		val.v_num = q;
 	}
+	val.v_subtype = V_NOSUBTYPE;
 	*valptr = val;
 }
 
@@ -2393,7 +2394,7 @@ isattyid(FILEID id)
  *	zero if string found, position stored at res
  *
  * XXX - This search is a translation of the original search that did not
- *	 work with large files.  The search algorithm used is slow and
+ *	 work with large files.	 The search algorithm used is slow and
  *	 should be spead up much more.
  */
 int
@@ -2512,7 +2513,7 @@ fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res)
  *	zero if string found, position stored at res
  *
  * XXX - This search is a translation of the original search that did not
- *	 work with large files.  The search algorithm used is so slow
+ *	 work with large files.	 The search algorithm used is so slow
  *	 as to be painful to the user and needs to be sped up much more.
  */
 int

file.h

@@ -42,7 +42,7 @@ typedef struct {
  * We assume that if your system does not have fgetpos/fsetpos,
  * then it will have a FILEPOS that is a scalar type (e.g., long).
  * Some obscure systems without fgetpos/fsetpos may not have a simple
- * scalar type.  In these cases the f_tell macro below will fail.
+ * scalar type.	 In these cases the f_tell macro below will fail.
  */
 #if defined(HAVE_FPOS)
 
@@ -51,7 +51,7 @@ typedef struct {
 
 #else
 
-#define f_seek_set(stream, loc)  \
+#define f_seek_set(stream, loc)	 \
 	fseek((FILE*)(stream), *(FILEPOS*)(loc), SEEK_SET)
 #define f_tell(stream, loc) (*((FILEPOS*)(loc)) = ftell((FILE*)(stream)))
 

fposval.c

@@ -12,7 +12,7 @@
  *
  * We will #define of 8 symbols:
  *
- *	FILEPOS_BITS 		length in bits of the type FILEPOS
+ *	FILEPOS_BITS		length in bits of the type FILEPOS
  *	SWAP_HALF_IN_FILEPOS	will copy/swap FILEPOS into an HALF array
  *	OFF_T_BITS		length in bits of the st_size stat element
  *	SWAP_HALF_IN_OFF_T	will copy/swap st_size into an HALF array

func.h

@@ -6,7 +6,7 @@
 
 
 #if !defined(__FUNC_H__)
-#define	__FUNC_H__
+#define __FUNC_H__
 
 
 #include "calc.h"

hash.c

@@ -39,6 +39,15 @@ extern void shs1_init_state(HASH*);
 extern void MD5_init_state(HASH*);
 
 
+/*
+ * hash_long can deal with BOOL's, int's, FLAGS's and LEN's
+ */
+#define hash_bool(type, val, state) (hash_long((type), (long)(val), (state)))
+#define hash_int(type, val, state) (hash_long((type), (long)(val), (state)))
+#define hash_flag(type, val, state) (hash_long((type), (long)(val), (state)))
+#define hash_len(type, val, state) (hash_long((type), (long)(val), (state)))
+
+
 /*
  * hash_setup - setup the hash state for a given hash
  */
@@ -248,15 +257,18 @@ hash_final(HASH *state)
  *
  * given:
  *	type	- hash type (see hash.h)
- *	longval	- a long value
+ *	longval - a long value
  *	state	- the state to hash
  *
  * returns:
- *      the new state
+ *	the new state
  *
  * This function will hash a long value as if it were a 64 bit value.
- * The input is a long.  If a long is smaller than 64 bits, we will
+ * The input is a long.	 If a long is smaller than 64 bits, we will
  * hash a final 32 bits of zeros.
+ *
+ * This function is OK to hash BOOL's, unslogned long's, unsigned int's
+ * signed int's as well as FLAG's and LEN's.
  */
 HASH *
 hash_long(int type, long longval, HASH *state)
@@ -734,11 +746,10 @@ hash_value(int type, void *v, HASH *state)
 		(state->type)(value->v_type, state);
 
 		/* hash as if we have a 64 bit value */
-		state = hash_long(type, (long)value->v_int, state);
+		state = hash_int(type, value->v_int, state);
 		break;
 
 	case V_NUM:
-
 		/* hash this type */
 		state = hash_number(type, value->v_num, state);
 		break;
@@ -826,10 +837,11 @@ hash_value(int type, void *v, HASH *state)
 
 		/* hash the object name and then the element values */
 
-		state = hash_str(type, value->v_obj->o_actions->name, state);
+		state = hash_str(type, objtypename(
+			value->v_obj->o_actions->oa_index), state);
 		(state->chkpt)(state);
 
-		for (i=value->v_obj->o_actions->count, vp=value->v_obj->o_table;
+		for (i=value->v_obj->o_actions->oa_count, vp=value->v_obj->o_table;
 		     i-- > 0;
 		     vp++) {
 
@@ -884,12 +896,12 @@ hash_value(int type, void *v, HASH *state)
 		(state->type)(value->v_type, state);
 
 		/* hash the RAND state */
-		state = hash_long(type, (long)value->v_rand->seeded, state);
+		state = hash_int(type, value->v_rand->seeded, state);
-		state = hash_long(type, (long)value->v_rand->bits, state);
+		state = hash_int(type, value->v_rand->bits, state);
 		(state->update)(state,
 			(USB8 *)value->v_rand->buffer, SLEN*FULL_BITS/8);
-		state = hash_long(type, (long)value->v_rand->j, state);
+		state = hash_int(type, value->v_rand->j, state);
-		state = hash_long(type, (long)value->v_rand->k, state);
+		state = hash_int(type, value->v_rand->k, state);
 		(state->update)(state,
 			(USB8 *)value->v_rand->slot, SCNT*FULL_BITS/8);
 		(state->update)(state,
@@ -903,8 +915,8 @@ hash_value(int type, void *v, HASH *state)
 		(state->type)(value->v_type, state);
 
 		/* hash the RANDOM state */
-		state = hash_long(type, (long)value->v_random->seeded, state);
+		state = hash_int(type, value->v_random->seeded, state);
-		state = hash_long(type, (long)value->v_random->bits, state);
+		state = hash_int(type, value->v_random->bits, state);
 		(state->update)(state,
 			(USB8 *)&(value->v_random->buffer), BASEB/8);
 		state = hash_zvalue(type, value->v_random->r, state);
@@ -918,20 +930,19 @@ hash_value(int type, void *v, HASH *state)
 		(state->type)(value->v_type, state);
 
 		/* hash the CONFIG state */
-		state = hash_long(type, (long)value->v_config->outmode, state);
+		state = hash_int(type, value->v_config->outmode, state);
 		state = hash_long(type,(long)value->v_config->outdigits, state);
 		state = hash_number(type, value->v_config->epsilon, state);
 		state = hash_long(type,
 			(long)value->v_config->epsilonprec, state);
-		state = hash_long(type,
+		state = hash_flag(type, value->v_config->traceflags, state);
-			(long)value->v_config->traceflags, state);
 		state = hash_long(type, (long)value->v_config->maxprint, state);
-		state = hash_long(type, (long)value->v_config->mul2, state);
+		state = hash_len(type, value->v_config->mul2, state);
-		state = hash_long(type, (long)value->v_config->sq2, state);
+		state = hash_len(type, value->v_config->sq2, state);
-		state = hash_long(type, (long)value->v_config->pow2, state);
+		state = hash_len(type, value->v_config->pow2, state);
-		state = hash_long(type, (long)value->v_config->redc2, state);
+		state = hash_len(type, value->v_config->redc2, state);
-		state = hash_long(type, (long)value->v_config->tilde_ok, state);
+		state = hash_bool(type, value->v_config->tilde_ok, state);
-		state = hash_long(type, (long)value->v_config->tab_ok, state);
+		state = hash_bool(type, value->v_config->tab_ok, state);
 		state = hash_long(type, (long)value->v_config->quomod, state);
 		state = hash_long(type, (long)value->v_config->quo, state);
 		state = hash_long(type, (long)value->v_config->mod, state);
@@ -941,28 +952,26 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_long(type, (long)value->v_config->cfsim, state);
 		state = hash_long(type, (long)value->v_config->outround, state);
 		state = hash_long(type, (long)value->v_config->round, state);
-		state = hash_long(type, (long)value->v_config->leadzero, state);
+		state = hash_bool(type, value->v_config->leadzero, state);
-		state = hash_long(type, (long)value->v_config->fullzero, state);
+		state = hash_bool(type, value->v_config->fullzero, state);
 		state = hash_long(type,
 			(long)value->v_config->maxscancount, state);
 		state = hash_str(type, value->v_config->prompt1, state);
 		state->bytes = FALSE;	/* as if just read words */
 		state = hash_str(type, value->v_config->prompt2, state);
 		state->bytes = FALSE;	/* as if just read words */
-		state = hash_long(type,
+		state = hash_int(type, value->v_config->blkmaxprint, state);
-			(long)value->v_config->blkmaxprint, state);
+		state = hash_bool(type, value->v_config->blkverbose, state);
-		state = hash_long(type,
+		state = hash_int(type, value->v_config->blkbase, state);
-			(long)value->v_config->blkverbose, state);
+		state = hash_int(type, value->v_config->blkfmt, state);
-		state = hash_long(type,
-			(long)value->v_config->blkbase, state);
-		state = hash_long(type,
-			(long)value->v_config->blkfmt, state);
 		state = hash_long(type,
 			(long)value->v_config->lib_debug, state);
 		state = hash_long(type,
 			(long)value->v_config->calc_debug, state);
 		state = hash_long(type,
 			(long)value->v_config->user_debug, state);
+		state = hash_bool(type, value->v_config->verbose_quit, state);
+		state = hash_int(type, value->v_config->ctrl_d, state);
 		break;
 
 	case V_HASH:
@@ -971,11 +980,11 @@ hash_value(int type, void *v, HASH *state)
 		(state->type)(value->v_type, state);
 
 		/* hash the HASH state */
-		state = hash_long(type, (long)value->v_hash->type, state);
+		state = hash_int(type, value->v_hash->type, state);
-		state = hash_long(type, (long)value->v_hash->bytes,state);
+		state = hash_bool(type, value->v_hash->bytes,state);
-		state = hash_long(type, (long)value->v_hash->base, state);
+		state = hash_int(type, value->v_hash->base, state);
-		state = hash_long(type, (long)value->v_hash->chunksize, state);
+		state = hash_int(type, value->v_hash->chunksize, state);
-		state = hash_long(type, (long)value->v_hash->unionsize, state);
+		state = hash_int(type, value->v_hash->unionsize, state);
 		(state->update)(state,
 		    value->v_hash->h_union.data, state->unionsize);
 		state->bytes = FALSE;	/* as if reading words */

hash.h

@@ -52,8 +52,8 @@
  */
 typedef struct hashstate HASH;
 struct hashstate {
-        int hashtype;		/* XYZ_HASH_TYPE debug value */
+	int hashtype;		/* XYZ_HASH_TYPE debug value */
-        BOOL bytes;		/* TRUE => reading bytes rather than words */
+	BOOL bytes;		/* TRUE => reading bytes rather than words */
 	void (*update)(HASH*, USB8*, USB32);	/* update arbitrary length */
 	void (*chkpt)(HASH*);			/* checkpoint a state */
 	void (*note)(int, HASH*);		/* note a special value */

have_offscl.c

@@ -5,7 +5,7 @@
  *	have_offscl
  *
  * On some systems, off_t is a scalar value on which one can perform
- * arithmetic operations, assignments and comparisons.  On some systems
+ * arithmetic operations, assignments and comparisons.	On some systems
  * off_t is some sort of union or struct which must be converted into
  * a ZVALUE in order to perform arithmetic operations, assignments and
  * comparisons.

have_posscl.c

@@ -5,7 +5,7 @@
  *	have_posscl
  *
  * On some systems, FILEPOS is a scalar value on which one can perform
- * arithmetic operations, assignments and comparisons.  On some systems
+ * arithmetic operations, assignments and comparisons.	On some systems
  * FILEPOS is some sort of union or struct which must be converted into
  * a ZVALUE in order to perform arithmetic operations, assignments and
  * comparisons.
@@ -51,7 +51,7 @@ main(void)
 {
 #if !defined(FILEPOS_NON_SCALAR)
 	FILEPOS value;	/* an FILEPOS to perform arithmatic on */
-	FILEPOS value2;	/* an FILEPOS to perform arithmatic on */
+	FILEPOS value2; /* an FILEPOS to perform arithmatic on */
 
 	/*
 	 * do some math opts on an FILEPOS

have_rusage.c

@@ -0,0 +1,62 @@
+/*
+ * have_rusage - Determine if we getrusage()
+ *
+ * usage:
+ *	have_rusage
+ *
+ * Not all systems have the getrusage() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETRUSAGE
+ *		defined ==> use getrusage()
+ *		undefined ==> do not call or cannot call getrusage()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETRUSAGE)
+
+	printf("#undef HAVE_GETRUSAGE /* no */\n");
+
+#else /* HAVE_NO_GETRUSAGE */
+
+	struct rusage rusage;		/* resource utilization */
+
+	(void) getrusage(RUSAGE_SELF, &rusage);
+
+	printf("#define HAVE_GETRUSAGE /* yes */\n");
+
+#endif /* HAVE_NO_GETRUSAGE */
+
+	/* exit(0); */
+	return 0;
+}

have_stdvs.c

@@ -9,7 +9,7 @@
  * as if it were vsprintf() and hope for the best.
  *
  * This program will output #defines and exits 0 if vsprintf() (or sprintf())
- * produces the results that we expect.  This program exits 1 if vsprintf()
+ * produces the results that we expect.	 This program exits 1 if vsprintf()
  * (or sprintf()) produces unexpected results while using the <stdarg.h>
  * include file.
  */
@@ -109,14 +109,14 @@ main(void)
 	puts(" * SIMULATE_STDARG");
 	puts(" *");
 	puts(" * WARNING: This type of stdarg makes assumptions about the stack");
-	puts(" * 	    that may not be true on your system.  You may want to");
+	puts(" *	    that may not be true on your system.  You may want to");
 	puts(" *	    define STDARG (if using ANSI C) or VARARGS.");
 	puts(" */");
 	puts("typedef char *va_list;");
 	puts("#define va_start(ap,parmn) (void)((ap) = (char*)(&(parmn) + 1))");
 	puts("#define va_end(ap) (void)((ap) = 0)");
 	puts("#define va_arg(ap, type) \\");
-	puts("        (((type*)((ap) = ((ap) + sizeof(type))))[-1])");
+	puts("	      (((type*)((ap) = ((ap) + sizeof(type))))[-1])");
 	puts("#define SIMULATE_STDARG /* use std_arg.h to simulate <stdarg.h> */");
 #else
 	puts("#define STDARG /* use <stdarg.h> */");

have_strdup.c

@@ -0,0 +1,62 @@
+/*
+ * have_strdup - Determine if we strdup()
+ *
+ * usage:
+ *	have_strdup
+ *
+ * Not all systems have the strdup() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_STRDUP
+ *		defined ==> use strdup()
+ *		undefined ==> do not call or cannot call strdup()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <string.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_STRDUP)
+
+	printf("#undef HAVE_STRDUP /* no */\n");
+
+#else /* HAVE_NO_STRDUP */
+
+	char *p;
+
+	p = strdup("#define HAVE_STRDUP /* yes */");
+	if (p != NULL) {
+		printf("%s\n", p);
+	}
+
+#endif /* HAVE_NO_STRDUP */
+
+	/* exit(0); */
+	return 0;
+}

have_ustat.c

@@ -50,8 +50,8 @@ main(void)
 
 #else /* HAVE_NO_USTAT */
 
-	struct stat stat_dot;           /* stat of "." */
+	struct stat stat_dot;		/* stat of "." */
-	struct ustat ustat_dot;         /* usage stat of "." */
+	struct ustat ustat_dot;		/* usage stat of "." */
 
 	(void) stat(".", &stat_dot);
 	(void) ustat(stat_dot.st_dev, &ustat_dot);

have_varvs.c

@@ -6,7 +6,7 @@
  * and hope for the best.
  *
  * This program will output #defines and exits 0 if vsprintf() (or sprintf())
- * produces the results that we expect.  This program exits 1 if vsprintf()
+ * produces the results that we expect.	 This program exits 1 if vsprintf()
  * (or sprintf()) produces unexpected results while using the <stdarg.h>
  * include file.
  */

help/Makefile

@@ -35,13 +35,12 @@ Q=@
 
 # standard tools
 #
-NATIVE_CC= cc
+LCC= cc
-NATIVE_CFLAGS=
+ICFLAGS=
+ILDFLAGS=
 SED= sed
 SORT= sort
 FMT= fmt
-CMP= cmp
-CAT= cat
 
 # Standard and Builtin help files
 #
@@ -68,7 +67,7 @@ BLT_HELP_FILES_9= stdlib
 
 STD_HELP_FILES_10= types usage unexpected variable
 
-BLT_HELP_FILES_11= altbind bindings custom_cal libcalc new_custom stdlib
+BLT_HELP_FILES_11= bindings custom_cal libcalc new_custom stdlib
 
 STD_HELP_FILES_12= archive
 
@@ -106,28 +105,29 @@ BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \
 #
 DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	appr arg arrow asec asech asin asinh assign atan atan2 atanh avg base \
-	bit blk blkcpy blkfree blocks bround btrunc ceil cfappr cfsim char \
+	bit blk blkcpy blkfree blocks bround btrunc calclevel ceil cfappr \
-	cmdbuf cmp comb conj cos cosh cot coth count cp csc csch ctime delete \
+	cfsim char cmdbuf cmp comb conj cos cosh cot coth count cp csc csch \
-	den dereference det digit digits dp epsilon errcount errmax errno \
+	ctime delete den dereference det digit digits dp epsilon errcount \
-	error eval exp fact factor fclose fcnt feof ferror fflush fgetc \
+	errmax errno error eval exp fact factor fclose fcnt feof ferror \
-	fgetfield fgetline fgets fgetstr fib files floor fopen forall fprintf \
+	fflush fgetc fgetfield fgetline fgets fgetstr fib files floor fopen \
-	fputc fputs fputstr frac free freeglobals freeredc freestatics frem \
+	forall fprintf fputc fputs fputstr frac free freeglobals freeredc \
-	freopen fscan fscanf fseek fsize ftell gcd gcdrem gd getenv hash head \
+	freestatics frem freopen fscan fscanf fseek fsize ftell gcd gcdrem \
-	highbit hmean hnrmod hypot ilog ilog10 ilog2 im insert int inverse \
+	gd getenv hash head highbit hmean hnrmod hypot ilog ilog10 ilog2 \
-	iroot isassoc isatty isblk isconfig isdefined iserror iseven isfile \
+	im indices inputlevel insert int inverse iroot isassoc isatty isblk \
-	ishash isident isint islist ismat ismult isnull isnum isobj isobjtype \
+	isconfig isdefined iserror iseven isfile ishash isident isint islist \
-	isodd isprime isptr isqrt isrand israndom isreal isrel issimple issq \
+	ismat ismult isnull isnum isobj isobjtype isodd isprime isptr isqrt \
-	isstr istype jacobi join lcm lcmfact lfactor ln lowbit ltol makelist \
+	isrand israndom isreal isrel issimple issq isstr istype jacobi join \
-	matdim matfill matmax matmin matsum mattrace mattrans max md5 memsize \
+	lcm lcmfact lfactor ln lowbit ltol makelist matdim matfill matmax \
-	meq min minv mmin mne mod modify name near newerror nextcand \
+	matmin matsum mattrace mattrans max md5 memsize meq min minv mmin \
-	nextprime norm null num oldvalue ord param perm pfact pi pix places \
+	mne mod modify name near newerror nextcand nextprime norm null \
-	pmod polar poly pop popcnt power prevcand prevprime printf prompt \
+	num oldvalue ord param perm pfact pi pix places pmod polar poly \
-	protect ptest push putenv quo quomod rand randbit random randombit \
+	pop popcnt power prevcand prevprime printf prompt protect ptest \
-	randperm rcin rcmul rcout rcpow rcsq re remove reverse rewind rm root \
+	push putenv quo quomod rand randbit random randombit randperm rcin \
-	round rsearch runtime saveval scale scan scanf search sec sech seed \
+	rcmul rcout rcpow rcsq re remove reverse rewind rm root round rsearch \
-	segment select sgn sha sha1 sin sinh size sizeof sort sqrt srand \
+	runtime saveval scale scan scanf search sec sech seed segment select \
-	srandom ssq str strcat strerror strlen strpos strprintf strscan \
+	sgn sha sha1 sin sinh size sizeof sort sqrt srand srandom ssq str \
-	strscanf substr sum swap system tail tan tanh test time trunc xor
+	strcat strerror strlen strpos strprintf strscan strscanf substr \
+	sum swap system tail tan tanh test time trunc xor
 
 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
@@ -147,13 +147,17 @@ DISTLIST= ${STD_HELP_FILES} ${DETAIL_HELP} ${MAKE_FILE} \
 	obj.file builtin.top builtin.end funclist.sed \
 	errorcodes.hdr errorcodes.sed
 
+# These files are used to make (but not built) a calc .a library
+#
+CALCLIBLIST=
+
 all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
      ${SINGULAR_FILES} calc .all
 
 # used by the upper level Makefile to determine of we have done all
 #
 # NOTE: Due to bogus shells found on one common system we must have
-#       an non-emoty else clause for every if condition.  *sigh*
+#	an non-emoty else clause for every if condition.  *sigh*
 #
 .all:
 	rm -f .all
@@ -171,18 +175,6 @@ bindings: ../lib/bindings
 	    true; \
 	fi
 
-altbind: ../lib/altbind
-	rm -f $@
-	cp ../lib/altbind $@
-	chmod 0444 $@
-	-@if [ -z "${Q}" ]; then \
-	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
-	    echo ''; \
-	else \
-	    true; \
-	fi
-
 stdlib: ../lib/README
 	rm -f $@
 	cp ../lib/README $@
@@ -233,7 +225,7 @@ bugs: ../BUGS
 
 errorcodes: ../calcerr.h errorcodes.hdr errorcodes.sed
 	rm -f $@
-	${CAT} errorcodes.hdr > $@
+	cat errorcodes.hdr > $@
 	${SED} -n -f errorcodes.sed < ../calcerr.h >> $@
 	chmod 0444 $@
 	-@if [ -z "${Q}" ]; then \
@@ -341,7 +333,7 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 # Form the builtin file
 #
 # We ave a "chicken-and-egg" problem.  We want the builtn help file to
-# accurately reflect the function list.  It would be nice if we could
+# accurately reflect the function list.	 It would be nice if we could
 # just execute calc show builtin, but calc may not have been built or
 # buildable at this point.  The hack-a-round used is to convert ../func.c
 # into a standalone program that generates a suitable function list
@@ -358,17 +350,13 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 #
 builtin: builtin.top builtin.end ../func.c funclist.sed
 	${Q}echo "forming builtin help file"
-	-${Q}rm -f builtin
-	${Q}cat builtin.top > builtin
 	-${Q}rm -f funclist.c
 	${Q}${SED} -n -f funclist.sed ../func.c > funclist.c
-
+	-${Q}rm -f funclist.o funclist
-	-${Q}rm -f ../funclist.c ../funclist.o ../funclist funclist
+	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include -I.. funclist.c -c
-	${Q}cp funclist.c ..
+	${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist
-	-${Q}(cd ..; \
+	-${Q}rm -f builtin
-	 ${NATIVE_CC} ${NATIVE_CFLAGS} -DFUNCLIST funclist.c -o funclist; \
+	${Q}cat builtin.top > builtin
-	 mv funclist help; \
-	 rm -f funclist.c funclist.o funclist)
 	${Q}./funclist | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
 	${Q}cat builtin.end >> builtin
@@ -383,7 +371,7 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 
 ##
 #
-# File list generation.  You can ignore this section.
+# File list generation.	 You can ignore this section.
 #
 #
 # We will form the names of source files as if they were in a
@@ -393,15 +381,18 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/help/$$i; \
+		echo help/$$i; \
 	done | ${SORT}
 
-# The bsdi distribution has generated files as well as distributed files.
+distdir:
-#
+	${Q}echo help
-bsdilist: ${DISTLIST} ${BLT_HELP_FILES}
+
-	${Q}for i in ${DISTLIST} ${BLT_HELP_FILES}; do \
+calcliblist:
-		echo calc/help/$$i; \
+	${Q}for i in ${CALCLIBLIST} /dev/null; do \
-	done | ${SORT}
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo help/$$i; \
+	    fi; \
+	done
 
 # The BSDI cdrom makefile expects all help files to be pre-built.  This rule
 # creats these fils so that the release can be shipped off to BSDI.  You can
@@ -416,8 +407,8 @@ bsdi: all
 detaillist:
 	${Q}-(echo "xxxxx"; \
 	   for i in ${DETAIL_HELP}; do \
-		if [ ! -f SCCS/s.$$i ]; then \
+		if [ ! -f RCS/$$i,v ]; then \
-		    echo "WARNING: $$i not under SCCS control" 1>&2; \
+		    echo "WARNING: $$i not under RCS control" 1>&2; \
 		else \
 		    echo $$i; \
 		fi; \

help/acosh

@@ -17,7 +17,7 @@ DESCRIPTION
     acosh(x) is the nonnegative real number v for which cosh(v) = x.
     It is given by
 
-   		 acosh(x) = ln(x + sqrt(x^2 - 1))
+		 acosh(x) = ln(x + sqrt(x^2 - 1))
 
 EXAMPLE
     > print acosh(2, 1e-5), acosh(2, 1e-10), acosh(2, 1e-15), acosh(2, 1e-20)

help/acoth

@@ -16,7 +16,7 @@ DESCRIPTION
 
     acoth(x) is the real number v for which coth(v) = x.
     It is given by
-    		acoth(x) = ln((x + 1)/(x - 1))/2
+		acoth(x) = ln((x + 1)/(x - 1))/2
 
 EXAMPLE
     > print acoth(2, 1e-5), acoth(2, 1e-10), acoth(2, 1e-15), acoth(2, 1e-20)

help/acsch

@@ -16,7 +16,7 @@ DESCRIPTION
 
     acsch(x) is the real number v for which csch(v) = x.  It is given by
 
-    		acsch(x) = ln((1 + sqrt(1 + x^2))/x)
+		acsch(x) = ln((1 + sqrt(1 + x^2))/x)
 
 
 EXAMPLE

help/address

@@ -20,7 +20,7 @@ DESCRIPTION
     otherwise accessing, such a vacated address may be catastrophic.
 
     An octet is normally expressed by B[i] where B is a block and
-    0 <= i < sizeof(B).  &B[i] then returns the address at which this
+    0 <= i < sizeof(B).	 &B[i] then returns the address at which this
     octet is located until the block is freed or relocated.  Freeing
     of an unnamed block B occurs when a new value is assigned to B or
     when B ceases to exist; a named block B is freed by blkfree(B().
@@ -96,7 +96,7 @@ DESCRIPTION
 			> define f(a) = 27 + a;
 
     the three occurrences of 27 have the same address which may be displayed
-    by any of &27, &*x, &*y and &f(0).  If x and y are assigned
+    by any of &27, &*x, &*y and &f(0).	If x and y are assigned
     other values and f is redefined or undefined and the 27 has not been
     stored elsewhere (e.g. as the "old value" or in another function
     definition or as an element in an association), the address assigned at
@@ -105,7 +105,7 @@ DESCRIPTION
 
     When a function returns a number value, that number value is usually
     placed at a newly allocated address, even if an equal number is stored
-    elsewhere.  For example calls to f(a), as defined above, with the same
+    elsewhere.	For example calls to f(a), as defined above, with the same
     non-zero value for a will be assigned to different addresses as can be
     seen from printing &*A, &*B, &*C after
 

help/appr

@@ -84,7 +84,7 @@ DESCRIPTION
 
     Complex x:
 
-	Returns  appr(re(x), y, z) + appr(im(x), y, z) * 1i
+	Returns	 appr(re(x), y, z) + appr(im(x), y, z) * 1i
 
 PROPERTIES
 	If appr(x,y,z) != x, then abs(x - appr(x,y,z)) < abs(y).

help/archive

@@ -1,28 +1,16 @@
 Where to get the the latest versions of calc
 
-    Landon Noll maintains the official calc ftp archive at:
+    Landon Noll maintains the official calc home page at:
 
-	ftp://ftp.uu.net/pub/calc
+	    http://reality.sgi.com/chongo/tech/comp/calc/
 
-    Alpha test versions, complete with bugs, untested code and
+    See:
-    experimental features may be fetched (if you are brave) under:
 
-	http://reality.sgi.com/chongo/tech/comp/calc/
+	    http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
-    One may join the calc testing group by sending a request to:
+    for information on how to obtain up a recent version of calc.
-
-	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.
 
 Landon Curt Noll
-http://reality.sgi.com/chongo
+http://reality.sgi.com/chongo/
 
 chongo <was here> /\../\

help/asech

@@ -16,7 +16,7 @@ DESCRIPTION
 
     asech(x) is the real number v for which sech(v) = x.  It is given by
 
-    		asech(x) = ln((1 + sqrt(1 - x^2))/x)
+		asech(x) = ln((1 + sqrt(1 - x^2))/x)
 
 EXAMPLE
     > print asech(.5,1e-5), asech(.5,1e-10), asech(.5,1e-15), asech(.5,1e-20)

help/asinh

@@ -16,7 +16,7 @@ DESCRIPTION
 
     asinh(x) is the real number v for which sinh(v) = x.  It is given by
 
-    		asinh(x) = ln(x + sqrt(1 + x^2))
+		asinh(x) = ln(x + sqrt(1 + x^2))
 
 EXAMPLE
     > print asinh(2, 1e-5), asinh(2, 1e-10), asinh(2, 1e-15), asinh(2, 1e-20)

help/assign

@@ -44,7 +44,7 @@ DESCRIPTION
     In simple assignments, = associates from right to left so that, for
     example,
 
-    		a = b = c
+		a = b = c
 
     has the effect of a = (b = c) and results in assigning the value of c
     to both a and b.  The expression (a = b) = c is acceptable, but has the
@@ -66,7 +66,7 @@ DESCRIPTION
     that of A[0] = A[1].
 
     If, in execution of a = b, a is changed by the evaluation of b, the
-    value of b may be stored in an unintended or inaccessible location.  For
+    value of b may be stored in an unintended or inaccessible location.	 For
     example,
 		mat A[2]= {1,2};
 		A[0] = (A = 3);

help/assoc

@@ -14,7 +14,7 @@ DESCRIPTION
     assignments of the forms
 
 	A[a_1] = v_1
-        A[a_1, a_2] = v_2
+	A[a_1, a_2] = v_2
 	A[a_1, a_2, a_3] = v_3
 	A[a_1, a_2, a_3, a_4] = v_4
 
@@ -53,7 +53,7 @@ DESCRIPTION
     a sequential scan through the elements difficult.
 
     The search and rsearch functions can search for an element in an
-    association which has the specified value.  They return the index
+    association which has the specified value.	They return the index
     of the found element, or a NULL value if the value was not found.
 
     Associations can be copied by an assignment, and can be compared

help/base

@@ -18,19 +18,46 @@ DESCRIPTION
 
     The following convention is used to declare modes:
 
-	     base        config
+	     base	equivalent
-	    value        string
+		      config("mode")'s
 
-	       2	"binary"	binary fractions
+	       2	"binary"	base 2 fractions
-	       8	"octal"		octal fractions
+			"bin"
-	      10	"real"		decimal floating point
-	      16	"hex"		hexadecimal fractions
-	     -10	"int"		decimal integer
-	     1/3	"frac"		decimal fractions
-	    1e20	"exp"		decimal exponential
 
-    For convenience, any non-integer value is assumed to mean "frac",
+	       8	"octal"		base 8 fractions
-    and any integer >= 2^64 is assumed to mean "exp".
+			"oct"
+
+	      10	"real"		base 10 floating point
+			"float"
+			"default"
+
+	     -10	"integer"	base 10 integers
+			"int"
+
+	      16	"hexadecimal"	base 16 fractions
+			"hex"
+
+	     1/3	"fraction"	base 10 fractions
+			"frac"
+
+	    1e20	"scientific"	base 10 scientific notation
+			"sci"
+			"exp"
+
+    For convenience, any non-integer value is assumed to mean base 10
+    fractions and any integer >= 2^64 is assumed to mean base 10
+    scientific notation.
+
+    These base() calls have the same meaning as config("mode", "fraction"):
+
+	base(1/3)	base(0.1415)	base(16/37)
+
+    These base() calls have the same meaning as config("mode", "scientific"):
+
+	base(1e20)	base(2^64)	base(2^8191-1)
+
+    However the base() function will only return one of the base values
+    lised in the table above.
 
 EXAMPLE
     > base()

help/bit

@@ -11,7 +11,7 @@ TYPES
     return	int
 
 DESCRIPTION
-    Determine if the binary bit y is set in x.  If:
+    Determine if the binary bit y is set in x.	If:
 
 	     x
 	int(---) mod 2 == 1

help/blk

@@ -26,7 +26,7 @@ DESCRIPTION
     ... , B[len-1], these all initially having zero value.
 
     The octets B[i] for i >= len always have zero value.  If B[i] with
-    some i >= len is referenced, len is increased by 1.  For example:
+    some i >= len is referenced, len is increased by 1.	 For example:
 
 			B[i] = x
 
@@ -70,11 +70,11 @@ DESCRIPTION
     If a block value B created by B = blk(len, chunk) is assigned to
     another variable by C = B, a new block of the same structure as B
     is created to become the value of C, and the octets in B are copied
-    to this new block.  A block with possibly different length or
+    to this new block.	A block with possibly different length or
     chunksize is created by C = blk(B, newlen, newchunk), only the first
     min(len, newlen) octets being copied from B; later octets are
     assigned zero value.  If omitted, newlen and newchunk default to
-    the current datalen and chunk-size for B.  The curent datalen,
+    the current datalen and chunk-size for B.  The current datalen,
     chunksize and number of allocated octets for B may be changed by:
 
 			B = blk(B, newlen, newchunk).
@@ -120,14 +120,14 @@ DESCRIPTION
     last two avoid printing of the new value for A.
 
     Named blocks are assigned index numbers 0, 1, 2, ..., in the order
-    of their creation.  The block with index id is returned by blocks(id).
+    of their creation.	The block with index id is returned by blocks(id).
     With no argument, blocks() returns the number of current unfreed
     named blocks.  A named block may be used
 
     The memory allocated to a named block is freed by the blkfree()
     function with argument the named block, its name, or its id number.
     The block remains in existence but with a null data pointer,
-    its length and size being reduced to zero.  A new block of memory
+    its length and size being reduced to zero.	A new block of memory
     may be allocated to it, with possibly new length and chunksize by:
 
 			blk(val [, len, chunk])

help/blkcpy

@@ -90,7 +90,7 @@ DESCRIPTION
     so that num can be at most size(B) - ssi.
 
     For copying to a block B (named or unnamed), reallocation will be
-    required if dsi + num > sizeof(B).  (This will not be permitted if
+    required if dsi + num > sizeof(B).	(This will not be permitted if
     protect(B) has bit 4 set.)
 
     For copying from a file stream fs, num can be at most size(fs) - ssi.

help/blkfree

@@ -12,7 +12,7 @@ TYPES
 DESCRIPTION
     If val is a named block, or the name of a named block, or the
     identifying index for a named block, blkfree(val) frees the
-    memory block allocated to this named block.  The block remains
+    memory block allocated to this named block.	 The block remains
     in existence with the same name, identifying index, and chunksize,
     but its size and maxsize becomes zero and the pointer for the start
     of its data block null.
@@ -26,16 +26,16 @@ EXAMPLE
     > B1 = blk("foo")
     > B2 = blk("Second block")
     show blocks
-     id   name
+     id	  name
     ----  -----
-     0   foo
+     0	 foo
-     1   Second block
+     1	 Second block
 
     > blkfree(B1)
     > show blocks
-     id   name
+     id	  name
     ----  -----
-     1   Second block
+     1	 Second block
 
     > B1
 	block 0: foo

help/bround

@@ -12,7 +12,7 @@ TYPES
     Otherwise, if x is an object of type tt, or if x is not an object or
     number but y is an object of type tt, and the function tt_bround has
     to be defined; the types for x, plcs, rnd, and the returned value,
-    if any, are as required for specified in tt_bround.  For the object
+    if any, are as required for specified in tt_bround.	 For the object
     case, plcs and rnd default to the null value.
 
     For other cases:
@@ -31,7 +31,7 @@ DESCRIPTION
     If the number of binary places is n and eps = 10^-n, the
     result is the same as for appr(x, eps, rnd).  This will be
     exactly x if x is a multiple of eps; otherwise rounding occurs
-    to one of the nearest multiples of eps on either side of x.  Which
+    to one of the nearest multiples of eps on either side of x.	 Which
     of these multiples is returned is determined by z = rnd & 31, i.e.
     the five low order bits of rnd, as follows:
 

help/builtin.end

@@ -4,25 +4,25 @@
 	to be set or read.  If only one argument is given, then the current
 	value of the named parameter is returned.  If two arguments are given,
 	then the named parameter is set to the value of the second argument,
-	and the old value of the parameter is returned.  Therefore you can
+	and the old value of the parameter is returned.	 Therefore you can
 	change a parameter and restore its old value later.  The possible
 	parameters are explained in the next section.
 
 	The scale function multiplies or divides a number by a power of 2.
 	This is used for fractional calculations, unlike the << and >>
-	operators, which are only defined for integers.  For example,
+	operators, which are only defined for integers.	 For example,
 	scale(6, -3) is 3/4.
 
 	The quomod function is used to obtain both the quotient and remainder
-	of a division in one operation.  The first two arguments a and b are
+	of a division in one operation.	 The first two arguments a and b are
 	the numbers to be divided.  The last two arguments c and d are two
 	variables which will be assigned the quotient and remainder.  For
 	nonnegative arguments, the results are equivalent to computing a//b
 	and a%b.  If a is negative and the remainder is nonzero, then the
 	quotient will be one less than a//b.  This makes the following three
-	properties always hold:  The quotient c is always an integer.  The
+	properties always hold:	 The quotient c is always an integer.  The
 	remainder d is always 0 <= d < b.  The equation a = b * c + d always
-	holds.  This function returns 0 if there is no remainder, and 1 if
+	holds.	This function returns 0 if there is no remainder, and 1 if
 	there is a remainder.  For examples, quomod(10, 3, x, y) sets x to 3,
 	y to 1, and returns the value 1, and quomod(-4, 3.14159, x, y) sets x
 	to -2, y to 2.28318, and returns the value 1.
@@ -37,8 +37,8 @@
 
 	The digit and bit functions return individual digits of a number,
 	either in base 10 or in base 2, where the lowest digit of a number
-	is at digit position 0.  For example, digit(5678, 3) is 5, and
+	is at digit position 0.	 For example, digit(5678, 3) is 5, and
-	bit(0b1000100, 2) is 1.  Negative digit positions indicate places
+	bit(0b1000100, 2) is 1.	 Negative digit positions indicate places
 	to the right of the decimal or binary point, so that for example,
 	digit(3.456, -1) is 4.
 
@@ -139,11 +139,11 @@
 
 	The functions rcin, rcmul, rcout, rcpow, and rcsq are used to
 	perform modular arithmetic calculations for large odd numbers
-	faster than the usual methods.  To do this, you first use the
+	faster than the usual methods.	To do this, you first use the
 	rcin function to convert all input values into numbers which are
-	in a format called REDC format.  Then you use rcmul, rcsq, and
+	in a format called REDC format.	 Then you use rcmul, rcsq, and
 	rcpow to multiply such numbers together to produce results also
-	in REDC format.  Finally, you use rcout to convert a number in
+	in REDC format.	 Finally, you use rcout to convert a number in
 	REDC format back to a normal number.  The addition, subtraction,
 	negation, and equality comparison between REDC numbers are done
 	using the normal modular methods.  For example, to calculate the
@@ -185,8 +185,8 @@
 
 	The following convention is used to declare modes:
 
-		 base    config
+		 base	 config
-		value    string
+		value	 string
 
 		   2	"binary"	binary fractions
 		   8	"octal"		octal fractions

help/builtin.top

@@ -1,8 +1,8 @@
 Builtin functions
 
-	There is a large number of built-in functions.  Many of the
+	There is a large number of built-in functions.	Many of the
 	functions work on several types of arguments, whereas some only
-	work for the correct types (e.g., numbers or strings).  In the
+	work for the correct types (e.g., numbers or strings).	In the
 	following description, this is indicated by whether or not the
 	description refers to values or numbers.  This display is generated
 	by the 'show builtin' command.

help/calclevel

@@ -0,0 +1,35 @@
+NAME
+    calclevel - current calculation level
+
+SYNOPSIS
+    calclevel()
+
+TYPES
+    return	nonnegative integer
+
+DESCRIPTION
+    This function returns the calculation level at which it is called.
+    When a command is being read from a terminal or from a file,
+    calc is at calculation level zero.	The level is increased
+    by 1 each time calculation starts of a user-defined function
+    or of eval(S) for some expression S which evaluates to a string.  It
+    decreases to zero if an error occurs or a quit or abort statement
+    is executed.  Otherwise, it decreases by 1 when the calculation
+    is completed.  Except when an error occurs or abort is executed,
+    the input level is not affected by changes in the calculation level.
+
+    Zero calculation level is also called top calculation level; greater
+    values of calclevel() indicate calculation is occurring at greater
+    depths.
+
+EXAMPLE
+    n/a
+
+LIMITS
+    none
+
+LIBRARY
+    none
+
+SEE ALSO
+    eval, read, quit, abort, inputlevel

help/cfappr

@@ -6,7 +6,7 @@ SYNOPSIS
 
 TYPES
     x		real
-    eps 	real with abs(eps) < 1, defaults to epsilon()
+    eps		real with abs(eps) < 1, defaults to epsilon()
     n		real with n >= 1
     rnd		integer, defaults to config("cfappr")
 
@@ -21,7 +21,7 @@ DESCRIPTION
 
     If n >= 1 and den(x) > n, cfappr(x, n) returns the nearest above,
     nearest below, or nearest, approximation to x with denominator less
-    than or equal to n.  If den(x) <= n, cfappr(x,n) returns x.
+    than or equal to n.	 If den(x) <= n, cfappr(x,n) returns x.
 
     In either case when the result v is not x, how v relates to x is
     determined by bits 0, 1, 2 and 4 of the argument rnd in the same way as

help/cfsim

@@ -30,7 +30,7 @@ DESCRIPTION
     This corresponds to the use of rnd for functions like round(x, n, rnd).
 
     If bit 3 or 4 of rnd is set, the lower order bits are ignored; bit 3
-    is ignored if bit 4 is set.  Thusi, for rnd > 3, it sufficient to
+    is ignored if bit 4 is set.	 Thusi, for rnd > 3, it sufficient to
     consider the two cases rnd = 8 and rnd = 16.
 
     If den(x) > 2, cfsim(x, 8) returns the value of the penultimate simple
@@ -55,7 +55,7 @@ DESCRIPTION
 
 	rnd		integer x	half-integer x		den(x) > 2
 
-         8 		0		x - sgn(x)/2		approximant
+	 8		0		x - sgn(x)/2		approximant
 	16		x - sgn(x)	x + sgn(x)/2		nearest
 
      From either cfsim(x, 0) and cfsim(x, 1), the other is easily
@@ -72,7 +72,7 @@ DESCRIPTION
      Iteration of cfsim(x,8) until an integer is obtained gives a sequence of
      "good" approximations to x with decreasing denominators and
      correspondingly decreasing accuracy; each denominator is less than half
-     the preceding denominator.  (Unlike the "forward" sequence of
+     the preceding denominator.	 (Unlike the "forward" sequence of
      continued-fraction approximants these are not necessarily alternately
      greater than and less than x.)
 

help/cmp

@@ -17,7 +17,7 @@ TYPES
 
     return	if x and y are both real: -1, 0, or 1
 		if x and y are both numbers but not both real:
-    			-1, 0, 1, -1+1i, 1i, 1+1i, -1-1i, -1i, or 1-1i
+			-1, 0, 1, -1+1i, 1i, 1+1i, -1-1i, -1i, or 1-1i
 		if x and y are both strings: -1, 0, or 1
 		all other cases: the null value
 
@@ -47,7 +47,7 @@ DESCRIPTION
 		obj point {x,y};
 
 	if points with real components are to be partially ordered by their
-        euclidean distance from the origin, an appropriate point_rel
+	euclidean distance from the origin, an appropriate point_rel
 	function may be that given by
 
 		define point_rel(a,b) = sgn(a.x^2 + a.y^2 - b.x^2 - b.y^2);

help/command

@@ -3,7 +3,7 @@ Command sequence
     This is a sequence of any the following command formats, where
     each command is terminated by a semicolon or newline.  Long command
     lines can be extended by using a back-slash followed by a newline
-    character.  When this is done, the prompt shows a double angle
+    character.	When this is done, the prompt shows a double angle
     bracket to indicate that the line is still in progress.  Certain
     cases will automatically prompt for more input in a similar manner,
     even without the back-slash.  The most common case for this is when
@@ -25,7 +25,7 @@ Command sequence
 	    The second form defines a simple function which calculates
 	    the specified expression value from the specified parameters.
 	    The expression cannot be a statement.  However, the comma
-	    and question mark operators can be useful.  Examples of
+	    and question mark operators can be useful.	Examples of
 	    simple functions are:
 
 		    define sumcubes(a, b) = a^3 + b^3
@@ -45,7 +45,7 @@ Command sequence
     read filename
     read -once filename
 	    This reads definitions from the specified filename.
-	    The name can be quoted if desired.  The calculator
+	    The name can be quoted if desired.	The calculator
 	    uses the CALCPATH environment variable to search
 	    through the specified directories for the filename,
 	    similarly to the use of the PATH environment variable.
@@ -54,7 +54,7 @@ Command sequence
 	    directory followed by a general calc library directory).
 	    The ".cal" extension is defaulted for input files, so
 	    that if "filename" is not found, then "filename.cal" is
-	    then searched for.  The contents of the filename are
+	    then searched for.	The contents of the filename are
 	    command sequences which can consist of expressions to
 	    evaluate or functions to define, just like at the top
 	    level command level.
@@ -82,7 +82,7 @@ Command sequence
 	    later read in order to recreate the variable values.
 	    For speed reasons, values are written as hex fractions.
 	    This command currently only saves simple types, so that
-	    matrices, lists, and objects are not saved.  Function
+	    matrices, lists, and objects are not saved.	 Function
 	    definitions are also not saved.
 
 	    If the -m mode disallows opening of files for writing,
@@ -247,7 +247,7 @@ Command sequence
 	>		<==== calc interactive prompt
 
     because the '-i' calc causes ABORT to drop into an
-    interactive prompt.  However typing a QUIT or ABORT
+    interactive prompt.	 However typing a QUIT or ABORT
     at the interactive prompt level will always calc to exit,
     even when calc is invoked with '-i'.
 
@@ -304,5 +304,5 @@ Command sequence
 
     Also see the help topic:
 
-	    statement       flow control and declaration statements
+	    statement	    flow control and declaration statements
 	    usage	    how to invoke the calc command and calc -options

help/config

@@ -1,10 +1,10 @@
 Configuration parameters
 
     Configuration parameters affect how the calculator performs certain
-    operations.  Among features that are controlled by these parameters
+    operations.	 Among features that are controlled by these parameters
     are the accuracy of some calculations, the displayed format of results,
     the choice from possible alternative algorithms, and whether or not
-    debugging information is displayed.  The parameters are
+    debugging information is displayed.	 The parameters are
     read or set using the "config" built-in function; they remain in effect
     until their values are changed by a config or equivalent instruction.
     The following parameters can be specified:
@@ -40,10 +40,11 @@ Configuration parameters
 	    "blkverbose"	TRUE=>print all lines, FALSE=>skip duplicates
 	    "blkbase"		block output base
 	    "blkfmt"		block output format
-	    "lib_debug"		controls library script debug information
 	    "calc_debug"	controls internal calc debug information
+	    "lib_debug"		controls library script debug information
 	    "user_debug"	for user defined debug information
-
+	    "verbose_quit"	TRUE=>print message on empty quit or abort
+	    "ctrl_d"		The interactive meaning of ^D (Control D)
 
     The "all" config value allows one to save/restore the configuration
     set of values.  The return of:
@@ -64,7 +65,7 @@ Configuration parameters
     It allows functions to control their configuration without impacting
     the calling function.
 
-    There are two configuration state aliases that may be set.  To
+    There are two configuration state aliases that may be set.	To
     set the backward compatible standard configuration:
 
 	    config("all", "oldstd")
@@ -81,6 +82,43 @@ Configuration parameters
     startup files; newstd may also be established by invoking calc
     with the flag -n.
 
+    The following are synonyms for true:
+
+	    "on"
+	    "true"
+	    "t"
+	    "yes"
+	    "y"
+	    "set"
+	    "1"
+	    any non-zero number
+
+    The following are synonyms for false:
+
+	    "off"
+	    "false"
+	    "f"
+	    "no"
+	    "n"
+	    "unset"
+	    "0"
+	    the number zero (0)
+
+    Examples of setting some parameters are:
+
+	    config("mode", "exp");	    exponential output
+	    config("display", 50);	    50 digits of output
+	    epsilon(epsilon() / 8);	    3 bits more accuracy
+	    config("tilde", 0)		    disable roundoff tilde printing
+	    config("tab", "off")	    disable leading tab printing
+
+
+Detailed config descriptions
+
+    =-=
+
+    config("trace", bitflag)
+
     When nonzero, the "trace" parameter activates one or more features
     that may be useful for debugging.  These features correspond to
     powers of 2 which contribute additively to config("trace"):
@@ -100,22 +138,31 @@ Configuration parameters
 
     See also lib_debug, calc_debug and user_debug below for more debug levels.
 
+    =-=
+
+    config("display", int)
+
     The "display" parameter specifies the maximum number of digits after
     the decimal point to be printed in real or exponential mode in
     normal unformatted printing (print, strprint, fprint) or in
     formatted printing (printf, strprintf, fprintf) when precision is not
-    specified.  The initial value for oldstd is 20, for newstd 10.
+    specified.	The initial value for oldstd is 20, for newstd 10.
     The parameter may be changed to the value d by either
     config("display", d) or by display (d).  This parameter does not change
     the stored value of a number.  Where rounding is necessary to
     display up to d decimal places, the type of rounding to be used is
     controlled by config("outround").
 
+    =-=
+
+    config("epsilon", real)
+    epsilon(real)
+
     The "epsilon" parameter specifies the default accuracy for the
     calculation of functions for which exact values are not possible or
     not desired.  For most functions, the
 
-	 	remainder = exact value - calculated value
+		remainder = exact value - calculated value
 
     has absolute value less than epsilon, but, except when the sign of
     the remainder is controlled by an appropriate parameter, the
@@ -129,32 +176,68 @@ Configuration parameters
     For the transcendental functions and the functions sqrt() and
     appr(), the calculated value is always a multiple of epsilon.
 
+    =-=
+
+    config("mode", "mode_string")
+
     The "mode" parameter is a string specifying the mode for printing of
     numbers by the unformatted print functions, and the default
     ("%d" specifier) for formatted print functions.  The initial mode
-    is "real".  The available modes are:
+    is "real".	The available modes are:
 
-	    "frac"		decimal fractions
+	  config("mode")	meaning				equivalent
-	    "int"		decimal integer
+	      string						base() call
-	    "real"		decimal floating point
+
-	    "exp"		decimal exponential
+	    "binary"		base 2 fractions		base(2)
-	    "hex"		hex fractions
+	    "bin"
-	    "oct"		octal fractions
+
-	    "bin"		binary fractions
+	    "octal"		base 8 fractions		base(8)
+	    "oct"
+
+	    "real"		base 10 floating point		base(10)
+	    "float"
+	    "default"
+
+	    "integer"		base 10 integer			base(-10)
+	    "int"
+
+	    "hexadecimal"	base 16 fractions		base(16)
+	    "hex"
+
+	    "fraction"		base 10 fractions		base(1/3)
+	    "frac"
+
+	    "scientific"	base 10 scientific notation	base(1e20)
+	    "sci"
+	    "exp"
+
+    Where multiple strings are given, the first string listed is what
+    config("mode") will return.
+
+    The default "mode" is "real".
+
+    =-=
+
+    config("maxprint", int)
 
     The "maxprint" parameter specifies the maximum number of elements to
     be displayed when a matrix or list is printed.  The initial value is 16.
 
+    =-=
+
+    config("mul2", int)
+    config("sq2", int)
+
     Mul2 and sq2 specify the sizes of numbers at which calc switches
     from its first to its second algorithm for multiplying and squaring.
     The first algorithm is the usual method of cross multiplying, which
     runs in a time of O(N^2).  The second method is a recursive and
     complicated method which runs in a time of O(N^1.585).  The argument
     for these parameters is the number of binary words at which the
-    second algorithm begins to be used.  The minimum value is 2, and
+    second algorithm begins to be used.	 The minimum value is 2, and
     the maximum value is very large.  If 2 is used, then the recursive
     algorithm is used all the way down to single digits, which becomes
-    slow since the recursion overhead is high.  If a number such as
+    slow since the recursion overhead is high.	If a number such as
     1000000 is used, then the recursive algorithm is never used, causing
     calculations for large numbers to slow down.  For a typical example
     on a 386, the two algorithms are about equal in speed for a value
@@ -162,6 +245,10 @@ Configuration parameters
     the parameter back to its default value.  Usually there is no need
     to change these parameters.
 
+    =-=
+
+    config("pow2", int)
+
     Pow2 specifies the sizes of numbers at which calc switches from
     its first to its second algorithm for calculating powers modulo
     another number.  The first algorithm for calculating modular powers
@@ -170,24 +257,48 @@ Configuration parameters
     which avoids divisions.  The argument for pow2 is the size of the
     modulus at which the second algorithm begins to be used.
 
+    =-=
+
+    config("redc2", int)
+
     Redc2 specifies the sizes of numbers at which calc switches from
     its first to its second algorithm when using the REDC algorithm.
     The first algorithm performs a multiply and a modular reduction
-    together in one loop which runs in O(N^2).  The second algorithm
+    together in one loop which runs in O(N^2).	The second algorithm
     does the REDC calculation using three multiplies, and runs in
-    O(N^1.585).  The argument for redc2 is the size of the modulus at
+    O(N^1.585).	 The argument for redc2 is the size of the modulus at
     which the second algorithm begins to be used.
 
+    =-=
+
+    config("tilde", boolean)
+
     Config("tilde") controls whether or not a leading tilde ('~') is
     printed to indicate that a number has not been printed exactly
     because the number of decimal digits required would exceed the
     specified maximum number.  The initial "tilde" value is 1.
 
+    =-=
+
+    config("tab", boolean)
+
     Config ("tab") controls the printing of a tab before results
-    automatically displayed when working interactively.  It does not
+    automatically displayed when working interactively.	 It does not
     affect the printing by the functions print, printf, etc.  The initial
     "tab" value is 1.
 
+    =-=
+
+    config("quomod", bitflag)
+    config("quo", bitflag)
+    config("mod", bitflag)
+    config("sqrt", bitflag)
+    config("appr", bitflag)
+    config("cfappr", bitflag)
+    config("cfsim", bitflag)
+    config("outround", bitflag)
+    config("round", bitflag)
+
     The "quomod", "quo", "mod", "sqrt", "appr", "cfappr", "cfsim", and
     "round" control the way in which any necessary rounding occurs.
     Rounding occurs when for some reason, a calculated or displayed
@@ -233,11 +344,19 @@ Configuration parameters
     by the various kinds of printing to the output: bits 0, 1, 3 and 4
     are used in the same way as for the functions round and bround.
 
+    =-=
+
+    config("leadzero", bool)
+
     The "leadzero" parameter controls whether or not a 0 is printed
     before the decimal point in non-zero fractions with absolute value
     less than 1, e.g. whether 1/2 is printed as 0.5 or .5.   The
     initial value is 0, corresponding to the printing .5.
 
+    =-=
+
+    config("fullzero", bool)
+
     The "fullzero" parameter controls whether or not in decimal floating-
     point printing, the digits are padded with zeros to reach the
     number of digits specified by config("display") or by a precision
@@ -245,10 +364,18 @@ Configuration parameters
     parameter is 0, so that, for example, if config("display") >= 2,
     5/4 will print in "real" mode as 1.25.
 
+    =-=
+
+    config("maxscan", int)
+
     The maxscan value controls how many scan errors are allowed
     before the compiling phase of a computation is aborted.  The initial
     value of "maxscan" is 20.  Setting maxscan to 0 disables this feature.
 
+    =-=
+
+    config("prompt", str)
+
     The default prompt when in interactive mode is "> ".  One may change
     this prompt to a more cut-and-paste friendly prompt by:
 
@@ -258,30 +385,47 @@ Configuration parameters
     cut/copy an input line and paste it directly into input.  The
     leading ';' will be ignored.
 
+    =-=
+
+    config("more", str)
+
     When inside multi-line input, the more prompt is used.  One may
     change it by:
 
 	    config("more", ";; ")
 
+    =-=
+
+    config("blkmaxprint", int)
+
     The "blkmaxprint" config value limits the number of octets to print
     for a block.  A "blkmaxprint" of 0 means to print all octets of a
     block, regardless of size.
 
     The default is to print only the first 256 octets.
 
+    =-=
+
+    config("blkverbose", bool)
+
     The "blkverbose" determines if all lines, including duplicates
-    should be printed.  If TRUE, then all lines are printed.  If false,
+    should be printed.	If TRUE, then all lines are printed.  If false,
     duplicate lines are skipped and only a "*" is printed in a style
     similar to od.  This config value has not meaning if "blkfmt" is "str".
 
     The default value for "blkverbose" is FALSE: duplicate lines are
     not printed.
 
+    =-=
+
+    config("blkbase", "blkbase_string")
+
     The "blkbase" determines the base in which octets of a block
     are printed.  Possible values are:
 
 	"hexadecimal"		Octets printed in 2 digit hex
 	"hex"
+	"default"
 
 	"octal"			Octets printed in 3 digit octal
 	"oct"
@@ -295,53 +439,45 @@ Configuration parameters
 	"raw"			Octets printed as is, i.e. raw binary
 	"none"
 
-    The default "blkbase" is "hex".
+    Where multiple strings are given, the first string listed is what
+    config("blkbase") will return.
+
+    The default "blkbase" is "hexadecimal".
+
+    =-=
+
+    config("blkfmt", "blkfmt_string")
 
     The "blkfmt" determines for format of how block are printed:
 
-	"line"		print in lines of up to 79 chars + newline
+	"lines"		print in lines of up to 79 chars + newline
-	"lines"
+	"line"
 
-	"str"		print as one long string
+	"strings"	print as one long string
 	"string"
-	"strings"
+	"str"
 
-	"od"		print in od-like format, with leading offset,
+	"od_style"	print in od-like format, with leading offset,
 	"odstyle"	   followed by octets in the given base
-	"od_style"
+	"od"
 
-	"hd"		print in hex dump format, with leading offset,
+	"hd_style"	print in hex dump format, with leading offset,
 	"hdstyle"	   followed by octets in the given base, followed
-	"hd_style"	   by chars or '.' if no-printable or blank
+	"hd"		   by chars or '.' if no-printable or blank
+	"default"
 
-    The default "blkfmt" is "hd".
+    Where multiple strings are given, the first string listed is what
+    config("blkfmt") will return.
 
-    The "lib_debug" parameter is intended for controlling the possible
+    The default "blkfmt" is "hd_style".
-    display of special information relating to functions, objects, and
-    other structures created by instructions in calc scripts.
-    Zero value of config("lib_debug") means that no such information
-    is displayed.  For other values, the non-zero bits which currently
-    have meanings are as follows:
 
-	n		Meaning of bit n of config("lib_debug")
+    =-=
 
-	0	When a function is defined, redefined or undefined at
+    config("calc_debug", bitflag)
-		interactive level, a message saying what has been done
-		is displayed.
-
-	1	When a function is defined, redefined or undefined during
-		the reading of a file, a message saying what has been done
-		is displayed.
-
-    The value for config("lib_debug") in both oldstd and newstd is 3,
-    but if calc is invoked with the -d flag, its initial value is zero.
-    Thus, if calc is started without the -d flag, until config("lib_debug")
-    is changed, a message will be output when a function is defined
-    either interactively or during the reading of a file.
 
     The "calc_debug" is intended for controlling internal calc routines
     that test its operation, or collect or display information that
-    might be useful for debug purposes.  Much of the output from these
+    might be useful for debug purposes.	 Much of the output from these
     will make sense only to calc wizards.   Zero value (the default for
     both oldstd and newstd) of config("lib_calc") corresponds to switching
     off all these routines.  For nonzero value, particular bits
@@ -363,7 +499,53 @@ Configuration parameters
 		block is not NULL, and that its "length" is not negative.
 		A failure will result in a runtime error.
 
-    Bits >= 4 are reserved for future use and should not be used at this time.
+	4	Report on changes to the state of stdin as well as changes
+		to internal variables that control the setting and restoring
+		of stdin.
+
+	5	Report on changes to the run state of calc.
+
+    Bits >= 6 are reserved for future use and should not be used at this time.
+
+    By default, "calc_debug" is 0.  The initial value may be overridden
+    by the -D command line option.
+
+    =-=
+
+    config("lib_debug", bitflag)
+
+    The "lib_debug" parameter is intended for controlling the possible
+    display of special information relating to functions, objects, and
+    other structures created by instructions in calc scripts.
+    Zero value of config("lib_debug") means that no such information
+    is displayed.  For other values, the non-zero bits which currently
+    have meanings are as follows:
+
+	n		Meaning of bit n of config("lib_debug")
+
+	0	When a function is defined, redefined or undefined at
+		interactive level, a message saying what has been done
+		is displayed.
+
+	1	When a function is defined, redefined or undefined during
+		the reading of a file, a message saying what has been done
+		is displayed.
+
+	2	Show func will display more information about a functions
+		arguments as well as more argument sdummary information.
+
+    The value for config("lib_debug") in both oldstd and newstd is 3,
+    but if calc is invoked with the -d flag, its initial value is zero.
+    Thus, if calc is started without the -d flag, until config("lib_debug")
+    is changed, a message will be output when a function is defined
+    either interactively or during the reading of a file.
+
+    By default, "lib_debug" is 3.  The -d flag changes this default to 0.
+    The initial value may be overridden by the -D command line option.
+
+    =-=
+
+    config("user_debug", int)
 
     The "user_debug" is provided for use by users.  Calc ignores this value
     other than to set it to 0 by default (for both "oldstd" and "newstd").
@@ -375,18 +557,83 @@ Configuration parameters
     slower operation or more memory usage, and a particular value (like
     -1 or 0) corresponding to "no tests".
 
-    The following are synonyms for true:
+    By default, "user_debug" is 0.  The initial value may be overridden
+    by the -D command line option.
 
-	"on"   "yes"   "y"   "true"   "t"   "1"   any non-zero number
+    =-=
 
-    The following are synonyms for false:
+    config("verbose_quit", bool)
 
-	"off"  "no"    "n"   "false"  "f"   "0"   the number zero (0)
+    The "verbose_quit" controls the print of the message:
 
-    Examples of setting some parameters are:
+	Quit or abort executed
 
-	    config("mode", "exp");	    exponential output
+    when a non-interactive quit or abort without an argument is encountered.
-	    config("display", 50);	    50 digits of output
+    A quit of abort without an argument does not display a message when
-	    epsilon(epsilon() / 8);	    3 bits more accuracy
+    invoked at the interactive level.
-	    config("tilde", 0)	    	    disable roundoff tilde printing
+
-	    config("tab", "off")	    disable leading tab printing
+    =-=
+
+    config("ctrl_d", "ctrl_d_string")
+
+    For calc that is using the calc binding (not GNU-readline) facility:
+
+	The "ctrl_d" controls the interactive meaning of ^D (Control D):
+
+	    "virgin_eof"  If ^D is the only character that has been typed
+	    "virgineof"	  on a line, then calc will exit.  Otherwise ^D
+	    "virgin"	  will act according to the calc binding, which
+	    "default"	  by default is a Emacs-style delete-char.
+
+	    "never_eof"	  The ^D never exits calc and only acts according
+	    "nevereof"	  calc binding, which by default is a Emacs-style
+	    "never"	  delete-char.
+
+	    "empty_eof"	  The ^D always exits calc if typed on an empty line.
+	    "emptyeof"	  This condition occurs when ^D either the first
+	    "empty"	  character typed, or when all other characters on
+			  the line have been removed (say by deleting them).
+
+	Where multiple strings are given, the first string listed is what
+	config("ctrl_d") will return.
+
+	Note that config("ctrl_d") actually controls each and every character
+	that is bound to ``delete_char''.  By default, ``delete_char'' is
+	Control D.  Any character(s) bound to ``delete_char'' will cause calc
+	to exit (or not exit) as directed by config("ctrl_d").
+
+	See the ``binding'' help for information on the default calc bindings.
+
+	The default "ctrl_d", without GNU-readline is "virgin_eof".
+
+    For calc that was compiled with the GNU-readline facility:
+
+	The "ctrl_d" controls the interactive meaning of ^D (Control D):
+
+	    "virgin_eof"  Same as "empty_eof"
+	    "virgineof"
+	    "virgin"
+	    "default"
+
+	    "never_eof"	  The ^D never exits calc and only acts according
+	    "nevereof"	  calc binding, which by default is a Emacs-style
+	    "never"	  delete-char.
+
+	    "empty_eof"	  The ^D always exits calc if typed on an empty line.
+	    "emptyeof"	  This condition occurs when ^D either the first
+	    "empty"	  character typed, or when all other characters on
+
+	Where multiple strings are given, the first string listed is what
+	config("ctrl_d") will return.
+
+	The default "ctrl_d", with GNU-readline is effectively "empty_eof".
+
+	Literally it is "virgin_eof", but since "virgin_eof" is the
+	same as "empty_eof", the default is effectively "empty_eof".
+
+    Emacs users may find the default behavior objectionable, particularly
+    when using the GNU-readline facility.  Such users may want to add the line:
+
+	config("ctrl_d", "never_eof"),;
+
+    to their ~/.calcrc startup file to prevent ^D from causing calc to exit.

help/contrib

@@ -5,30 +5,27 @@ We welcome and encourage you to send us:
     * custom functions that you have modified or written
     * any other source code modifications
 
-Prior to doing so, you should consider trying your changes on the most
+Prior to doing so, you should consider applying your changes to the most
-recent alpha test code.  To obtain the most recent code, look under
+recent version of calc.
+
+Landon Noll maintains the official calc home page at:
 
 	http://reality.sgi.com/chongo/tech/comp/calc/
 
-You should also consider joining the calc testing group by sending a
+See:
-request to:
 
-	calc-tester-request@postofc.corp.sgi.com
+	http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
-    Your message body (not the subject) should consist of:
+for information on how to obtain up a recent version of calc.
 
-	subscribe calc-tester address
+=-=
-	end
-	name your_full_name
-
-    where "address" is your EMail address and "your_full_name"
-    is your full name.
 
 In order to consider integrating your code, we need:
 
-    * help files (documentation)
+    * the calc version you are working with (use the latest calc, see above)
-    * CHANGES text (brief description of what it does)
+    * new help files or help file patches, if applicable (documentation)
-    * regress.cal test (to test non-custom code)
+    * proposed text for the CHANGES file (brief description of what it does)
+    * regress.cal test patch, if applicable
     * your source code and/or source code changes (:-))
 
 The best way to send us new code, if your changes are small, is
@@ -39,13 +36,44 @@ gziped (or compressed) tar file).
 
 You should send submissions to:
 
-	calc-tester@postofc.corp.sgi.com
+    calc-tester at postofc dot corp dot sgi dot com
 
-Thanks for considering submitting code to calc.  Calc is a collective
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+
+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!
 
+Calc bug reports, however, should be sent to:
+
+    calc-bugs at postofc dot corp dot sgi dot com
+
+    [[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+
+See the BUGS file or try the help command:
+
+    help bugs
+
+for details on bug reporting.
+
+=-=
+
+One may join the calc testing group by sending a request to:
+
+	calc-tester-request at postofc dot corp dot sgi dot com
+
+	[[ Replace 'at' with @, 'dot' is with . and remove the spaces ]]
+
+    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.
+
 Landon Curt Noll
-http://reality.sgi.com/chongo
+http://reality.sgi.com/chongo/
 
 chongo <was here> /\../\

help/credit

@@ -2,7 +2,11 @@ Credits
 
     The majority of calc was written by David I. Bell.
 
-    Calc archives and calc-tester mailing list maintained by Landon Curt Noll.
+    The Calc primary mirror, calc mailing list and calc bug report
+    processing is performed by Landon Curt Noll.
+
+    Landon Curt Noll maintains the master reference source, performs
+    release control functions as well as other calc maintenance functions.
 
     Thanks for suggestions and encouragement from Peter Miller,
     Neil Justusson, and Landon Noll.
@@ -11,7 +15,7 @@ Credits
     hist.c which is used to do the command line editing.
 
     Thanks to Ernest W. Bowen for supplying many improvements in
-    accuracy and generality for some numeric functions.  Much of
+    accuracy and generality for some numeric functions.	 Much of
     this was in terms of actual code which I gratefully accepted.
     Ernest also supplied the original text for many of the help files.
 
@@ -22,41 +26,10 @@ Credits
 
     Most of this source and binary has one of the following copyrights:
 
-	    Copyright (c) 19xx David I. Bell
+	    Copyright (c) year David I. Bell
-	    Copyright (c) 19xx David I. Bell and Landon Curt Noll
+	    Copyright (c) year David I. Bell and Landon Curt Noll
-	    Copyright (c) 19xx Landon Curt Noll
+	    Copyright (c) year Landon Curt Noll
-	    Copyright (c) 19xx Ernest Bowen and Landon Curt Noll
+	    Copyright (c) year Ernest Bowen and Landon Curt Noll
 
     Permission is granted to use, distribute, or modify this source,
     provided that this copyright notice remains intact.
-
-    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
-
-    Landon Noll maintains the official calc http/ftp archive at:
-
-	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/tech/comp/calc/
-
-    One may join the calc testing group by sending 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.
-
-    Enjoy!

help/custom

@@ -28,7 +28,7 @@ DESCRIPTION
 		calc -C
 
     In other words, explicit action must be taken in order to
-    enable the use of custom functions.  By default (no -C arg)
+    enable the use of custom functions.	 By default (no -C arg)
     custom functions are compiled in but disabled so that only
     portable calc scripts may be used.
 
@@ -36,7 +36,7 @@ DESCRIPTION
     multi-precision calculations in a C-like environment.  You should
     consider implementing algorithms in the calc language as a first
     choice.  Sometimes an algorithm requires use of special hardware, a
-    non-portable OS or pre-compiled C library.  In these cases a custom
+    non-portable OS or pre-compiled C library.	In these cases a custom
     interface may be needed.
 
     The custom function interface is intended to make is easy for

help/define

@@ -9,7 +9,7 @@ Function definitions
     by a return statement, and the function definition is ended with a
     right brace.
 
-    There are some subtle differences, however.  The types of parameters
+    There are some subtle differences, however.	 The types of parameters
     and variables are not defined at compile time, and may vary during
     execution and be different in different calls to the function.  For
     example, a two-argument function add may be defined by

help/den

@@ -11,7 +11,7 @@ TYPES
 
 DESCRIPTION
     For real x, den(x) returns the denominator of x when x is expressed
-    in lowest terms with positive denominator.  In calc,
+    in lowest terms with positive denominator.	In calc,
     real values are actually rational values.  Each calc real
     value can be uniquely expressed as:
 

help/environment

@@ -14,7 +14,7 @@ Environment variables
 
 		    /usr/local/lib/calc
 
-	This value is used by the READ command.  It is an error
+	This value is used by the READ command.	 It is an error
 	if no such readable file is found.
 
 	The CALCBINDINGS file searches the CALCPATH as well.
@@ -48,8 +48,6 @@ Environment variables
 	Typically compiled in value is:
 
 		    bindings
-	or:
-		    altbind		(bindings where ^D means exit)
 
 	The bindings file is searched along the CALCPATH.  Unlike
 	the READ command, a .cal extension is not added.
@@ -58,6 +56,10 @@ Environment variables
 	a terminal, then calc will still run, but fancy command line
 	editing is disabled.
 
+	NOTE: If calc was compiled with GNU-readline support, the
+	      CALCBINDINGS facility is ignored and the standard
+	      readline mechanisms (see readline(3)) are used.
+
     HOME
 
 	This value is taken to be the home directory of the

help/errorcodes.sed

@@ -1 +1 @@
-/^#define E_[^_].*[	 ][1-9][0-9]*[	 ]\/\* .* \*\//s/#define E_.*[ 	]\([1-9][0-9]*\)[	 ]*\/\* \(.*\)[	 ][	 ]*\*\//    \1	\2/p
+/^#define E_[^_].*[	 ][1-9][0-9]*[	 ]\/\* .* \*\//s/#define E_.*[	]\([1-9][0-9]*\)[	 ]*\/\* \(.*\)[	 ][	 ]*\*\//    \1	\2/p

help/eval

@@ -11,7 +11,7 @@ TYPES
 
 DESCRIPTION
    For eval(str), the value of str is to be a string that could be the body
-   of the definition of a function f().  This string may declare local
+   of the definition of a function f().	 This string may declare local
    variables and include keywords (while, for, ...) other than the
    reserved keywords (define, show, help, read, write, show, cd) intended
    for interactive use or for reading from a file.

help/exp

@@ -1,5 +1,5 @@
 NAME
-    exp	- exponential function
+    exp - exponential function
 
 SYNOPSIS
     exp(x [,eps])
@@ -31,7 +31,7 @@ EXAMPLE
     -1.1312+2.47173i -1.1312043838+2.471726672i
 
 LIMITS
-    x < 100000
+    x < 693093
 
 LIBRARY
     NUMBER *qexp(NUMBER *x, NUMBER *eps)

help/factor

@@ -14,7 +14,7 @@ TYPES
 DESCRIPTION
 
     If n >= 0 and n has a prime factor less than or equal to limit,
-    factor(n, limit) returns the smallest such factor.  If n >= 0
+    factor(n, limit) returns the smallest such factor.	If n >= 0
     and the smallest prime factor of n exceeds limit, 1 is returned.
     In particular, if n >= 0 and limit <= 1, factor(n, limit)
     always returns 1; factor(n,2) returns 2 if and only if n is even.

help/fclose

@@ -13,20 +13,20 @@ DESCRIPTION
     This function closes the open file associated with the descriptor fd.
     When this is done, the file value associated with the file remains
     a file value, but appears 'closed', and cannot be used in further
-    file-related calls (except fclose) without causing errors.  This same
+    file-related calls (except fclose) without causing errors.	This same
     action occurs to all copies of the file value.  You do not need to
     explicitly close all the copies of a file value.
 
     Standard input, standard output and standard error are always opened
     and cannot be closed.
 
-    The truth value of an closed file is FALSE.
+    The truth value of a closed file is FALSE.
 
     The fclose function returns the numeric value of errno if
     there had been an error using the file, or the null value if
     there was no error.
 
-    Closing a closed file is permitted.  Fclose returns null in
+    Closing a closed file is permitted.	 Fclose returns null in
     this case.
 
 EXAMPLE

help/feof

@@ -14,7 +14,7 @@ DESCRIPTION
     is set or clear.
 
     The end-of-file flag for the stream fd is set if reading at the
-    end-of-file position is attempted.  The flag is cleared by
+    end-of-file position is attempted.	The flag is cleared by
     positioning operations (fseek, rewind, fsetpos) and by freopen.
 
 EXAMPLE
@@ -23,14 +23,14 @@ EXAMPLE
     > fflush(fd1)
     > fd2 = fopen("/tmp/newfile", "r")
     > feof(fd2)
-            0
+	    0
     > fgetline(fd2)
 	    "Chongo was here"
     > feof(fd2)
-            0
+	    0
     > fgetline(fd2)
     > feof(fd2)
-            1
+	    1
 
 LIMITS
     none

help/ferror

@@ -20,10 +20,10 @@ DESCRIPTION
 EXAMPLE
     > fd = fopen("/etc/motd", "r")
     > ferror(fd)
-            0
+	    0
 
 LIMITS
-    fd must be associaed with an open file
+    fd must be associated with an open file
 
 LIBRARY
     none

help/fflush

@@ -10,7 +10,7 @@ TYPES
     return	nil
 
 DESCRIPTION
-    This function forces and buffered output to the file associated with fd.
+    This function forces a buffered output to the file associated with fd.
 
 EXAMPLE
     > fd = fopen("/tmp/file", "w")
@@ -18,7 +18,7 @@ EXAMPLE
     > fflush(fd)
 
 LIMITS
-    fd must be associaed with an open file
+    fd must be associated with an open file
 
 LIBRARY
     none

help/fgetc

@@ -14,7 +14,7 @@ DESCRIPTION
     associated with fd.
 
     If there is a next character, this function returns a 1
-    character string containing that character.  In the case
+    character string containing that character.	 In the case
     of EOF or error, nil is returned.
 
 EXAMPLE
@@ -25,7 +25,7 @@ EXAMPLE
 	    "c"
 
 LIMITS
-    fd must be associaed with an open file
+    fd must be associated with an open file
 
 LIBRARY
     none

help/fgetfield

@@ -16,7 +16,7 @@ DESCRIPTION
     characters are skipped.  If the reading reaches end-of-file, the
     null value is returned.  If non-whitespace is encountered, formation
     of a string begins, continuing until whitespace of '\0' or end-of-file
-    is reached.  The returned value is this string (terminated as usual
+    is reached.	 The returned value is this string (terminated as usual
     by a null character).  After the operation, the file position will
     be immediately after the first whitespace character of '\0' or at
     end-of-file.

help/fgetline

@@ -14,7 +14,7 @@ DESCRIPTION
     the open file associated with fd.  Unlike fgets, the trailing
     newline is removed from the return string.
 
-    Empty lines return the null string.  When the end of file is reached,
+    Empty lines return the null string.	 When the end of file is reached,
     fgetline returns the null value.  (Note the distinction between a null
     string and a null value.)
 
@@ -41,7 +41,7 @@ EXAMPLE
 	    123
 
 LIMITS
-    fd must be associaed with an open file
+    fd must be associated with an open file
 
 LIBRARY
     none