Release calc version 2.12.1.12

BUGS

@@ -47,7 +47,7 @@ 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)
+      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
@@ -72,183 +72,32 @@ Known bugs:
     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:
+=-=
 
-    * The gcc as shipped with Redhat 7 perhaps other Linux distributions
-      has a bug causes calc to dump core on startup when calc is:
+mis-features in calc:
 
-	  compiled optimized (-O, -O1, -O2 or -O3)
+    Some problems are not bugs but rarther mis-features / things that could
+    work better.  The following is a list of mis-features that should be
+    addressed and improved someday.
 
-	  	AND
+    * When statement is of the form { ... }, the leading { MUST BE ON
+      THE SAME LINE as the if, for, while or do keyword.
 
-      	  compiled with debugging (-g or -g3)
+      This works as expected:
 
-	  	AND
+	if (expr) {
+	    ...
+	}
 
-	  when calc is compiled with readline (see USE_READLINE,
-	    READLINE_LIB and READLINE_INCLUDE in the Makefile)
+      However this WILL NOT WORK AS EXPECTED:
 
-      On Redhat, the gcc -v which has this problem is:
+	if (expr)
+	{
+	    ...
+	}
 
-	gcc version 2.96 20000731 (Red Hat Linux 7.1 2.96-85)
-
-      there may be other gcc versions that also suffer this fate.
-
-      The readlines associated with problem are:
-
-	readline-4.1-5
-	readline2.2.1-2.2.1-2
-	readline-devel-4.1-5
-
-      One work-a-round is to compile calc WITHOUT readline.  In the
-      Makefile be sure that:
-
-	USE_READLINE=
-	READLINE_LIB=
-	READLINE_INCLUDE=
-
-      i.e., these Makefile vars are empty.
-
-      If you must use readline, then an alternate work-a-round is to
-      change the DEBUG Makefile variable to either:
-
-	compile for speed:  -O3		(or -O2 if you do not have -O3)
-	compile to debug:   -g3		(or -g if you do not have -g3)
-
-      but not both.
-
-      See RH bug #57889 for details:
-
-	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57889
-
-    * 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.
-
-      This bug has been observed on the Sparc and the PowerPC machine.
-
-      On the PowerPC with gcc-2.95 when compiled with -O2, the following
-      patch seems to help:
-
-*** zfunc.c.orig        Fri Feb 23 18:18:39 2001
---- zfunc.c     Fri Feb 23 18:39:33 2001
-***************
-*** 1481,1487 ****
-  {
-        HALF *a, *A, *b, *a0, u;
-        int i, j, j1, j2, k, k1, m, m0, m1, n, n0, o;
-!       FULL d, e, f, g, h, s, t, x, topbit;
-        int remsign;
-        BOOL up, onebit;
-        ZVALUE sqrt;
---- 1481,1488 ----
-  {
-        HALF *a, *A, *b, *a0, u;
-        int i, j, j1, j2, k, k1, m, m0, m1, n, n0, o;
-!       volatile FULL d;
-!       FULL e, f, g, h, s, t, x, topbit;
-        int remsign;
-        BOOL up, onebit;
-        ZVALUE sqrt;
-*** zmath.c	2000/06/07 14:02:13	29.2
---- zmath.c	2001/03/13 19:47:03
-***************
-*** 1608,1614 ****
-  void
-  zbitvalue(long n, ZVALUE *res)
-  {
-! 	ZVALUE z;
-
-  	if (n < 0) n = 0;
-  	z.sign = 0;
---- 1608,1614 ----
-  void
-  zbitvalue(long n, ZVALUE *res)
-  {
-! 	volatile ZVALUE z;
-
-  	if (n < 0) n = 0;
-  	z.sign = 0;
-
-    * 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"
-
-    * Under BSDI v4, the warnings of the form:
-
-	/usr/include/ctype.h:147: warning: `__runetype' defined but not used
-	/usr/include/ctype.h:161: warning: `__isctype' defined but not used
-	/usr/include/ctype.h:170: warning: `toupper' defined but not used
-	/usr/include/ctype.h:177: warning: `tolower' defined but not used
-
-      are seen.	 These warnings are the result of mis-features in BSDI
-      include files.  They do not have an impact on the operation
-      or performance.  The work-a-round is to ignore these warnings
-      under BSDI.
+      This needs to be changed.  See also "help statement", "help unexpected",
+      and "help todo".
 
     * The chi.cal resource file does not work well with odd degrees
       of freedom.  Can someone improve this algorithm?
@@ -272,7 +121,30 @@ Problems with known work-a-rounds:
 
       will not.
 
-## Copyright (C) 1999  Landon Curt Noll
+=-=
+
+Problems with old systems that have 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.
+
+    * 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"
+
+## Copyright (C) 1999-2006  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -288,8 +160,8 @@ Problems with known work-a-rounds:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.17 $
-## @(#) $Id: BUGS,v 29.17 2001/12/31 22:12:35 chongo Exp $
+## @(#) $Revision: 29.26 $
+## @(#) $Id: BUGS,v 29.26 2007/01/03 21:26:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13

COPYING

@@ -12,8 +12,8 @@ This file is Copyrighted
 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.
 
-    # @(#) $Revision: 29.6 $
-    # @(#) $Id: COPYING,v 29.6 2001/06/01 11:26:53 chongo Exp $
+    # @(#) $Revision: 29.9 $
+    # @(#) $Id: COPYING,v 29.9 2007/02/11 10:16:31 chongo Exp $
     # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $
 
 =-=
@@ -164,12 +164,13 @@ Calc copyrights and exception files
 	Copyright (C) year  Landon Curt Noll
 	Copyright (C) year  Ernest Bowen and Landon Curt Noll
 	Copyright (C) year  Ernest Bowen
+	Copyright (C) year  Petteri Kettunen and Landon Curt Noll
 
     These files are not covered under one of the Copyrights listed above:
 
 	    shs1.c	    shs1.h	 shs.c		shs.h
 	    md5.c	    md5.h	 COPYING	COPYING-LGPL
-	    cal/qtime.cal
+	    cal/qtime.cal   cal/screen.cal
 
     The file COPYING-LGPL, which contains a copy of the version 2.1
     GNU Lesser General Public License, is itself Copyrighted by the
@@ -181,9 +182,11 @@ Calc copyrights and exception files
     top of this file.  It is important to note that you may distribute
     verbatim copies of this file but you may not modify this file.
 
-    Some of these exception files are in the public domain.  Other
-    exception files have non-LGPL Copyrights.  Other files are under a
-    LGPL Copyright but have different authors.
+    Some of these exception files are in the public domain.  The md5.c
+    and md5.h files were "derived from the RSA Data Security, Inc. MD5
+    Message-Digest Algorithm" and are under a copyright that allows these
+    two files to be freely used and distributed.  Other files are under
+    the LGPL but have different authors that those listed above.
 
     In all cases one may use and distribute these exception files freely.
     And because one may freely distribute the LGPL covered files, the

HOWTO.INSTALL

@@ -1,4 +1,29 @@
-Installing calc in 4 easy steps:
+Installing calc from the gziped tarball in 4 easy steps:
+
+    0)  If your platform supports i686 RPMs, you may want to go to:
+
+	    http://www.isthe.com/chongo/src/calc/
+
+	and use these RPMs:
+
+	    * calc*.i686.rpm
+		- all that is needed if you just want to use calc
+
+	    * calc-devel-*.i686.rpm
+	        - calc *.h header and *.a lib files for use in other programs
+
+	    * calc.*.src.rpm
+	        - calc source in RPM package form
+
+	The following 4 steps apply to calc source tree that comes from either:
+
+		gunzip -c calc-*.tar.gz | tar -xvf -
+
+	or from:
+
+		rpm -ivh calc-*.src.rpm
+		cd /var/tmp
+		gunzip -c /usr/src/redhat/SOURCES/calc-*.tar.gz | tar -xvf -
 
     1)	Look at the makefile, and adjust it to suit your needs.
 
@@ -27,14 +52,14 @@ Installing calc in 4 easy steps:
 	    CALC_INCDIR        where the calc include files are installed
 	    CUSTOMCALDIR       where custom *.cal files are installed
 	    CUSTOMHELPDIR      where custom help files are installed
-	    CUSTOMINCPDIR      where custom .h files are installed
+	    CUSTOMINCDIR       where custom .h files are installed
 	    SCRIPTDIR          where calc shell scripts are installed
 
 	If you want to install calc files under a top level directory,
 	then set the T value:
 
-	    The calc install is performed under $T, the calc build is
-	    performed under /.	The purpose for $T is to allow someone
+	    The calc install is performed under ${T}, the calc build is
+	    performed under /.	The purpose for ${T} is to allow someone
 	    to install calc somewhere other than into the system area.
 
 	    For example, if:
@@ -54,10 +79,10 @@ Installing calc in 4 easy steps:
 		calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 		... etc ...		/var/tmp/testing/...
 
-	    If $T is empty, calc is installed under /, which is the same
-	    top of tree for which it was built.  If $T is non-empty, then
-	    calc is installed under $T, as if one had to chroot under
-	    $T for calc to operate.
+	    If ${T} is empty, calc is installed under /, which is the same
+	    top of tree for which it was built.  If ${T} is non-empty, then
+	    calc is installed under ${T}, as if one had to chroot under
+	    ${T} for calc to operate.
 
 	Look for the section that starts:
 
@@ -137,8 +162,8 @@ the calc help subsystem.  See the README file for details.
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.6 $
-## @(#) $Id: HOWTO.INSTALL,v 29.6 2002/03/14 00:28:28 chongo Exp $
+## @(#) $Revision: 29.9 $
+## @(#) $Id: HOWTO.INSTALL,v 29.9 2006/09/18 13:11:57 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

README.WINDOWS

@@ -27,7 +27,6 @@ recommends the following settings:
 	TERMCONTROL= -DUSE_TERMIOS
 	BYTE_ORDER= -DLITTLE_ENDIAN
 	LONG_BITS= 32
-	LONGLONG_BITS= 64
 	HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS
 	FPOS_BITS= 32
 	OFF_T_BITS= 32
@@ -57,7 +56,7 @@ recommends the following settings:
 	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 	CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
 	CALCPAGER= less.exe -ci
-	DEBUG= -O2 -gstabs+
+	DEBUG= -O2 -gstabs+ -DWINDOZ
 
 The 'Linux set' or 'gcc set' (see the Select your compiler type section)
 should work for DJGPP systems if you set the above Makefile variables.
@@ -93,53 +92,28 @@ The major porting work was performed by Thomas Jones-Low
     tools. The make file provided with Calc is not compatible with
     NMAKE, so I used the Visual Studio tools to generate another one
     (not included). Calc is built in two parts, calc.dll, which is the
-    library, and calcexe.exe which is the command line interface.
+    library, and calc.exe which is the command line interface.
 
-He recommends that you generate by hand all of the header files generated
-by the make file:
+He recommended that you generate by hand all of the header files that
+by the Makefile.  This has been done for you via the makefile rule:
 
-    align32.h args.h calcerr.h conf.h endian_calc.h
-    fposval.h have_const.h have_fpos.h have_fpos_pos.h have_malloc.h
-    have_memmv.h have_newstr.h have_offscl.h have_posscl.h
-    have_stdlib.h have_string.h have_times.h have_uid_t.h
-    have_unistd.h longbits.h longlong.h terminal.h
-    have_ustat.h have_getsid.h have_getpgid.h
-    have_gettime.h have_getprid.h have_urandom.h have_rusage.h
-    have_strdup.h
+	make win32_hsrc
+
+which uses the Makefile variables in win32.mkdef to form these header
+files under win32 directory.
 
 You will find generated versions of these files located in the win32
 sub-directory.  These files may be appropriate for your Cygwin building
-needs.  Just copy the win32/*.[ch] files up into the top level calc
-source directory, edited (if needed) and build using the Cygwin GCC
-compiler.
+needs.
 
-People who maintain calc need to keep in mind the following:
+In particular:
 
-The following was added to opcodes.h, config.h, zmath.h and value.h:
-
-	#if defined(_WIN32)
-	#ifdef _EXPORTING
-	  #define DLL	__declspec(dllexport)
-	#else
-	  #define DLL	__declspec(dllimport)
-	#endif
-
-	#else /* Windoz free systems */
-
-	  #define DLL
-
-	#endif /* Windoz free systems */
-
-Then DLL was added in front of all the exported functions.  For example:
-
-    extern int configtype(char*);
-
-was changed to:
-
-    DLL extern int configtype(char*);
+	Just copy the win32/*.[ch] files up into the top level calc
+	source directory, edit them (if needed) and build using the
+	Cygwin GCC compiler and Cygwin build environment.
 
 
-## Copyright (C) 2002  Landon Curt Noll and Thomas Jones-Low
+## Copyright (C) 2002-2007  Landon Curt Noll and Thomas Jones-Low
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -155,8 +129,8 @@ was changed to:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.8 $
-## @(#) $Id: README.WINDOWS,v 29.8 2002/03/14 00:28:28 chongo Exp $
+## @(#) $Revision: 29.13 $
+## @(#) $Id: README.WINDOWS,v 29.13 2007/02/11 10:23:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
 ##
 ## Under source code control:	2001/02/25 14:00:05

addop.c

@@ -1,7 +1,7 @@
 /*
  * addop - add opcodes to a function being compiled
  *
- * Copyright (C) 1999  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: addop.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.14 $
+ * @(#) $Id: addop.c,v 29.14 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -44,17 +44,17 @@
 #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 */
-static long funccount;		/* number of functions */
-static long funcavail;		/* available number of functions */
-static FUNC *functemplate;	/* function definition template */
-static FUNC **functions;	/* table of functions */
-static STRINGHEAD funcnames;	/* function names */
+STATIC unsigned 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 */
+STATIC long funccount;		/* number of functions */
+STATIC long funcavail;		/* available number of functions */
+STATIC FUNC *functemplate;	/* function definition template */
+STATIC FUNC **functions;	/* table of functions */
+STATIC STRINGHEAD funcnames;	/* function names */
 
 
 /*
@@ -184,8 +184,8 @@ void
 endfunc(void)
 {
 	register FUNC *fp;		/* function just finished */
-	unsigned long size;		/* size of just created function */
-	long index;
+	size_t size;			/* size of just created function */
+	unsigned long index;
 
 	if (oldop != OP_RETURN) {
 		addop(OP_UNDEF);
@@ -195,8 +195,8 @@ endfunc(void)
 	checklabels();
 
 	if (errorcount) {
-		printf("\"%s\": %ld error%s\n", newname, errorcount,
-			((errorcount == 1) ? "" : "s"));
+		scanerror(T_NULL,"Compilation of \"%s\" failed: %ld error(s)",
+			 newname, errorcount);
 		return;
 	}
 	size = funcsize(curfunc->f_opcodecount);
@@ -211,7 +211,7 @@ endfunc(void)
 	if (newname[0] != '*' && (conf->traceflags & TRACE_FNCODES)) {
 		dumpnames = TRUE;
 		for (size = 0; size < fp->f_opcodecount; ) {
-			printf("%ld: ", (long)size);
+			printf("%ld: ", (unsigned long)size);
 			size += dumpop(&fp->f_opcodes[size]);
 		}
 	}
@@ -280,12 +280,13 @@ rmuserfunc(char *name)
 
 	index = findstr(&funcnames, name);
 	if (index < 0) {
-		fprintf(stderr, "%s() has never been defined\n",
-			name);
+		warning("No function named \"%s\" to be undefined", name);
 		return;
 	}
-	if (functions[index] == NULL)
+	if (functions[index] == NULL) {
+		warning("No defined function \"%s\" to be undefined", name);
 		return;
+	}
 	freenumbers(functions[index]);
 	free(functions[index]);
 	if ((inputisterminal() && conf->resource_debug & RSCDBG_STDIN_FUNC) ||
@@ -302,7 +303,7 @@ void
 freefunc(FUNC *fp)
 {
 	long index;
-	long i;
+	unsigned long i;
 
 	if (fp == NULL)
 		return;
@@ -383,7 +384,7 @@ clearopt(void)
 FUNC *
 findfunc(long index)
 {
-	if ((unsigned long) index >= funccount) {
+	if (index >= funccount) {
 		math_error("Undefined function");
 		/*NOTREACHED*/
 	}
@@ -451,124 +452,122 @@ addop(long op)
 	 * slightly optimize the code depending on the various combinations.
 	 */
 	switch (op) {
-		case OP_GETVALUE:
-			switch (oldop) {
-				case OP_NUMBER:
-				case OP_ZERO:
-				case OP_ONE:
-				case OP_IMAGINARY:
-				case OP_GETEPSILON:
-				case OP_SETEPSILON:
-				case OP_STRING:
-				case OP_UNDEF:
-				case OP_GETCONFIG:
-				case OP_SETCONFIG:
-					return;
-				case OP_DUPLICATE:
-					diff = 1;
-					oldop = OP_DUPVALUE;
-					break;
-				case OP_FIADDR:
-					diff = 1;
-					oldop = OP_FIVALUE;
-					break;
-				case OP_GLOBALADDR:
-					diff = 1 + PTR_SIZE;
-					oldop = OP_GLOBALVALUE;
-					break;
-				case OP_LOCALADDR:
-					oldop = OP_LOCALVALUE;
-					break;
-				case OP_PARAMADDR:
-					oldop = OP_PARAMVALUE;
-					break;
-				case OP_ELEMADDR:
-					oldop = OP_ELEMVALUE;
-					break;
-				default:
-					cut = FALSE;
+	case OP_GETVALUE:
+		switch (oldop) {
+		case OP_NUMBER:
+		case OP_ZERO:
+		case OP_ONE:
+		case OP_IMAGINARY:
+		case OP_GETEPSILON:
+		case OP_SETEPSILON:
+		case OP_STRING:
+		case OP_UNDEF:
+		case OP_GETCONFIG:
+		case OP_SETCONFIG:
+			return;
+		case OP_DUPLICATE:
+			diff = 1;
+			oldop = OP_DUPVALUE;
+			break;
+		case OP_FIADDR:
+			diff = 1;
+			oldop = OP_FIVALUE;
+			break;
+		case OP_GLOBALADDR:
+			diff = 1 + PTR_SIZE;
+			oldop = OP_GLOBALVALUE;
+			break;
+		case OP_LOCALADDR:
+			oldop = OP_LOCALVALUE;
+			break;
+		case OP_PARAMADDR:
+			oldop = OP_PARAMVALUE;
+			break;
+		case OP_ELEMADDR:
+			oldop = OP_ELEMVALUE;
+			break;
+		default:
+			cut = FALSE;
 
-			}
-			if (cut) {
-				fp->f_opcodes[count - diff] = oldop;
-				return;
-			}
+		}
+		if (cut) {
+			fp->f_opcodes[count - diff] = oldop;
+			return;
+		}
+		break;
+	case OP_POP:
+		switch (oldop) {
+		case OP_ASSIGN:
+			fp->f_opcodes[count-1] = OP_ASSIGNPOP;
+			oldop = OP_ASSIGNPOP;
+			return;
+		case OP_NUMBER:
+		case OP_IMAGINARY:
+			q = constvalue(fp->f_opcodes[count-1]);
+			qfree(q);
 			break;
-		case OP_POP:
-			switch (oldop) {
-			case OP_ASSIGN:
-				fp->f_opcodes[count-1] = OP_ASSIGNPOP;
-				oldop = OP_ASSIGNPOP;
-				return;
-			case OP_NUMBER:
-			case OP_IMAGINARY:
-				q = constvalue(fp->f_opcodes[count-1]);
-				qfree(q);
-				break;
-			case OP_STRING:
-				sfree(findstring((long)fp->f_opcodes[count-1]));
-				break;
-			case OP_LOCALADDR:
-			case OP_PARAMADDR:
-				break;
-			case OP_GLOBALADDR:
-				diff = 1 + PTR_SIZE;
-				break;
-			case OP_UNDEF:
-				fp->f_opcodecount -= 1;
-				oldop = OP_NOP;
-				oldoldop = OP_NOP;
-				return;
-			default:
-				cut = FALSE;
-			}
-			if (cut) {
-				fp->f_opcodecount -= diff;
-				oldop = OP_NOP;
-				oldoldop = OP_NOP;
-				fprintf(stderr,
-					"Line %ld: unused value ignored\n",
-					linenumber());
-				return;
-			}
+		case OP_STRING:
+			sfree(findstring((long)fp->f_opcodes[count-1]));
 			break;
-		case OP_NEGATE:
-			if (oldop == OP_NUMBER) {
-				q = constvalue(fp->f_opcodes[count-1]);
-				fp->f_opcodes[count-1] = addqconstant(qneg(q));
-				qfree(q);
-				return;
-			}
+		case OP_LOCALADDR:
+		case OP_PARAMADDR:
+			break;
+		case OP_GLOBALADDR:
+			diff = 1 + PTR_SIZE;
+			break;
+		case OP_UNDEF:
+			fp->f_opcodecount -= 1;
+			oldop = OP_NOP;
+			oldoldop = OP_NOP;
+			return;
+		default:
+			cut = FALSE;
+		}
+		if (cut) {
+			fp->f_opcodecount -= diff;
+			oldop = OP_NOP;
+			oldoldop = OP_NOP;
+			warning("Constant before comma operator");
+			return;
+		}
+		break;
+	case OP_NEGATE:
+		if (oldop == OP_NUMBER) {
+			q = constvalue(fp->f_opcodes[count-1]);
+			fp->f_opcodes[count-1] = addqconstant(qneg(q));
+			qfree(q);
+			return;
+		}
 	}
 	if (oldop == OP_NUMBER) {
 		if (oldoldop == OP_NUMBER) {
 			q1 = constvalue(fp->f_opcodes[count - 3]);
 			q2 = constvalue(fp->f_opcodes[count - 1]);
 			switch (op) {
-				case OP_DIV:
-					if (qiszero(q2)) {
-						cut = FALSE;
-						break;
-					}
-					q = qqdiv(q1,q2);
-					break;
-				case OP_MUL:
-					q = qmul(q1,q2);
-					break;
-				case OP_ADD:
-					q = qqadd(q1,q2);
-					break;
-				case OP_SUB:
-					q = qsub(q1,q2);
-					break;
-				case OP_POWER:
-					if (qisfrac(q2) || qisneg(q2))
-						cut = FALSE;
-					else
-						q = qpowi(q1,q2);
-					break;
-				default:
+			case OP_DIV:
+				if (qiszero(q2)) {
 					cut = FALSE;
+					break;
+				}
+				q = qqdiv(q1,q2);
+				break;
+			case OP_MUL:
+				q = qmul(q1,q2);
+				break;
+			case OP_ADD:
+				q = qqadd(q1,q2);
+				break;
+			case OP_SUB:
+				q = qsub(q1,q2);
+				break;
+			case OP_POWER:
+				if (qisfrac(q2) || qisneg(q2))
+					cut = FALSE;
+				else
+					q = qpowi(q1,q2);
+				break;
+			default:
+				cut = FALSE;
 			}
 			if (cut) {
 				qfree(q1);

alloc.h

@@ -1,7 +1,7 @@
 /*
  * alloc - storage allocation and storage debug macros
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: alloc.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: alloc.h,v 29.7 2007/02/12 03:57:00 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:29
@@ -33,54 +33,38 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "have_malloc.h"
 # include "have_newstr.h"
 # include "have_string.h"
 # include "have_memmv.h"
 #else
-# include <calc/have_malloc.h>
 # include <calc/have_newstr.h>
 # include <calc/have_string.h>
 # include <calc/have_memmv.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#else
-#if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
-   extern void *malloc();
-   extern void *realloc();
-   extern void free();
-# else
-   extern char *malloc();
-   extern char *realloc();
-   extern void free();
-# endif
-#endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 
 #else
 
 # if defined(HAVE_NEWSTR)
-extern void *memcpy();
-extern void *memset();
+E_FUNC void *memcpy();
+E_FUNC void *memset();
 #if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
-extern size_t strlen();
+E_FUNC size_t strlen();
 #  else
-extern long strlen();
+E_FUNC long strlen();
 #  endif
 # else /* HAVE_NEWSTR */
-extern void bcopy();
-extern void bfill();
-extern char *index();
+E_FUNC void bcopy();
+E_FUNC void bfill();
+E_FUNC char *index();
 # endif /* HAVE_NEWSTR */
-extern char *strchr();
-extern char *strcpy();
-extern char *strncpy();
-extern char *strcat();
-extern int strcmp();
+E_FUNC char *strchr();
+E_FUNC char *strcpy();
+E_FUNC char *strncpy();
+E_FUNC char *strcat();
+E_FUNC int strcmp();
 
 #endif
 
@@ -94,13 +78,13 @@ extern int strcmp();
 #endif /* HAVE_NEWSTR */
 
 #if !defined(HAVE_MEMMOVE)
-# undef CALC_SIZE_T
+# undef MEMMOVE_SIZE_T
 #if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
-#  define CALC_SIZE_T size_t
+#  define MEMMOVE_SIZE_T size_t
 # else
-#  define CALC_SIZE_T long
+#  define MEMMOVE_SIZE_T long
 # endif
-extern void *memmove(void *s1, const void *s2, CALC_SIZE_T n);
+E_FUNC void *memmove(void *s1, CONST void *s2, MEMMOVE_SIZE_T n);
 #endif
 
 #endif /* !__ALLOC_H__ */

assocfunc.c

@@ -1,7 +1,7 @@
 /*
  * assocfunc - association table routines
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: assocfunc.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: assocfunc.c,v 29.3 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/assocfunc.c,v $
  *
  * Under source code control:	1993/07/20 23:04:27
@@ -46,10 +46,10 @@
 #define ELEMSIZE(n)	(sizeof(ASSOCELEM) + (sizeof(VALUE) * ((n) - 1)))
 
 
-static ASSOCELEM *elemindex(ASSOC *ap, long index);
-static BOOL compareindices(VALUE *v1, VALUE *v2, long dim);
-static void resize(ASSOC *ap, long newsize);
-static void assoc_elemfree(ASSOCELEM *ep);
+S_FUNC ASSOCELEM *elemindex(ASSOC *ap, long index);
+S_FUNC BOOL compareindices(VALUE *v1, VALUE *v2, long dim);
+S_FUNC void resize(ASSOC *ap, long newsize);
+S_FUNC void assoc_elemfree(ASSOCELEM *ep);
 
 
 /*
@@ -69,7 +69,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 {
 	ASSOCELEM **listhead;
 	ASSOCELEM *ep;
-	static VALUE val;
+	STATIC VALUE val;
 	QCKHASH hash;
 	int i;
 
@@ -200,7 +200,7 @@ assocrsearch(ASSOC *ap, VALUE *vp, long i, long j, ZVALUE *index)
  *	ap		association to index into
  *	index		index of desired element
  */
-static ASSOCELEM *
+S_FUNC ASSOCELEM *
 elemindex(ASSOC *ap, long index)
 {
 	ASSOCELEM *ep;
@@ -356,7 +356,7 @@ assoccopy(ASSOC *oldap)
  * This is only actually done if the growth from the previous size is
  * enough to make this worthwhile.
  */
-static void
+S_FUNC void
 resize(ASSOC *ap, long newsize)
 {
 	ASSOCELEM **oldtable;
@@ -400,7 +400,7 @@ resize(ASSOC *ap, long newsize)
 /*
  * Free an association element, along with any contained values.
  */
-static void
+S_FUNC void
 assoc_elemfree(ASSOCELEM *ep)
 {
 	int i;
@@ -520,7 +520,7 @@ assocprint(ASSOC *ap, long max_print)
  * Compare two lists of index values to see if they are identical.
  * Returns TRUE if they are the same.
  */
-static BOOL
+S_FUNC BOOL
 compareindices(VALUE *v1, VALUE *v2, long dim)
 {
 	int i;

blkcpy.c

@@ -1,7 +1,7 @@
 /*
  * blkcpy - general values and related routines used by the calculator
  *
- * Copyright (C) 1999  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: blkcpy.c,v 29.3 2001/04/10 22:06:46 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: blkcpy.c,v 29.11 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
  *
  * Under source code control:	1997/04/18 20:41:26
@@ -73,51 +73,51 @@ copystod(VALUE *svp, long ssi, long num, VALUE *dvp, long dsi)
 	 * determine/check source type
 	 */
 	switch(svp->v_type) {
-		case V_NBLOCK:
-			if (svp->v_nblock->subtype & V_NOCOPYFROM)
-				return E_COPY15;
-			sblk = svp->v_nblock->blk;
-			if (sblk->data == NULL)
-				return E_COPY8;
-			break;
-		case V_BLOCK:
-			sblk = svp->v_block;
-			break;
-		case V_STR:
-		case V_OCTET:
-		case V_NUM:
-		case V_FILE:
-		case V_MAT:
-		case V_LIST:
-			break;
-		default:
-			return E_COPY9;
+	case V_NBLOCK:
+		if (svp->v_nblock->subtype & V_NOCOPYFROM)
+			return E_COPY15;
+		sblk = svp->v_nblock->blk;
+		if (sblk->data == NULL)
+			return E_COPY8;
+		break;
+	case V_BLOCK:
+		sblk = svp->v_block;
+		break;
+	case V_STR:
+	case V_OCTET:
+	case V_NUM:
+	case V_FILE:
+	case V_MAT:
+	case V_LIST:
+		break;
+	default:
+		return E_COPY9;
 	}
 
 	/*
 	 * determine/check destination type
 	 */
 	switch(dvp->v_type) {
-		case V_NBLOCK:
-			if (dvp->v_nblock->subtype & V_NOCOPYTO)
-				return E_COPY16;
-			noreloc |=((dvp->v_nblock->subtype & V_NOREALLOC) != 0);
-			dblk = dvp->v_nblock->blk;
-			if (dblk->data == NULL)
-				return E_COPY10;
-			break;
-		case V_BLOCK:
-			noreloc = ((dvp->v_subtype & V_NOREALLOC) != 0);
-			dblk = dvp->v_block;
-			break;
-		case V_STR:
-		case V_NUM:
-		case V_FILE:
-		case V_MAT:
-		case V_LIST:
-			break;
-		default:
-			return E_COPY11;
+	case V_NBLOCK:
+		if (dvp->v_nblock->subtype & V_NOCOPYTO)
+			return E_COPY16;
+		noreloc |=((dvp->v_nblock->subtype & V_NOREALLOC) != 0);
+		dblk = dvp->v_nblock->blk;
+		if (dblk->data == NULL)
+			return E_COPY10;
+		break;
+	case V_BLOCK:
+		noreloc = ((dvp->v_subtype & V_NOREALLOC) != 0);
+		dblk = dvp->v_block;
+		break;
+	case V_STR:
+	case V_NUM:
+	case V_FILE:
+	case V_MAT:
+	case V_LIST:
+		break;
+	default:
+		return E_COPY11;
 	}
 
 	/*
@@ -280,20 +280,20 @@ copymat2mat(MATRIX *smat, long ssi, long num, MATRIX *dmat, long dsi)
 	VALUE *vp;
 	VALUE *vq;
 	VALUE *vtemp;
-	short subtype;
+	unsigned short subtype;
 
 	if (ssi > smat->m_size)
 		return E_COPY2;
 
 	if (num < 0)
 		num = smat->m_size - ssi;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (num == 0)
 		return 0;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -311,7 +311,7 @@ copymat2mat(MATRIX *smat, long ssi, long num, MATRIX *dmat, long dsi)
 		subtype = vq->v_subtype;
 		freevalue(vq);
 		*vq = *vp;
-		vq->v_subtype = subtype;
+		vq->v_subtype |= subtype;
 	}
 	free(vtemp);
 	return 0;
@@ -329,19 +329,19 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 	VALUE *vq;
 	VALUE *vtemp;
 	long i;
-	short subtype;
+	unsigned short subtype;
 
 	if (ssi > blk->datalen)
 		return E_COPY2;
 	if (num < 0)
 		num = blk->datalen - ssi;
-	if ((USB32) ssi + num > blk->datalen)
+	if (ssi + num > blk->datalen)
 		return E_COPY5;
 	if (num == 0)
 		return 0;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	op = blk->data + ssi;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
@@ -363,7 +363,7 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 		subtype = vq->v_subtype;
 		freevalue(vq);
 		*vq = *vp;
-		vq->v_subtype = subtype;
+		vq->v_subtype |= subtype;
 	}
 	free(vtemp);
 	return 0;
@@ -389,7 +389,7 @@ copymat2blk(MATRIX *smat, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 		num = smat->m_size - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
@@ -429,6 +429,7 @@ copymat2list(MATRIX *smat, long ssi, long num, LIST *lp, long dsi)
 	LISTELEM *ep;
 	VALUE *vtemp;
 	long i;
+	unsigned short subtype;
 
 	if (ssi > smat->m_size)
 		return E_COPY2;
@@ -436,11 +437,11 @@ copymat2list(MATRIX *smat, long ssi, long num, LIST *lp, long dsi)
 		num = smat->m_size - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > lp->l_count)
+	if (dsi + num > lp->l_count)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -456,8 +457,10 @@ copymat2list(MATRIX *smat, long ssi, long num, LIST *lp, long dsi)
 	ep = listelement(lp, (long) dsi);
 	i = num;
 	while (i-- > 0) {
+		subtype = ep->e_value.v_subtype;
 		freevalue(&ep->e_value);
 		ep->e_value = *vq++;
+		ep->e_value.v_subtype |= subtype;
 		ep = ep->e_next;
 	}
 	free(vtemp);
@@ -476,7 +479,7 @@ copylist2mat(LIST *lp, long ssi, long num, MATRIX *dmat, long dsi)
 	LISTELEM *ep;
 	VALUE *vtemp;
 	long i;
-	short subtype;
+	unsigned short subtype;
 
 	if (ssi > lp->l_count)
 		return E_COPY2;
@@ -484,11 +487,11 @@ copylist2mat(LIST *lp, long ssi, long num, MATRIX *dmat, long dsi)
 		num = lp->l_count - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > lp->l_count)
+	if (ssi + num > lp->l_count)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -508,7 +511,7 @@ copylist2mat(LIST *lp, long ssi, long num, MATRIX *dmat, long dsi)
 		subtype = vq->v_subtype;
 		freevalue(vq);
 		*vq = *vp;
-		vq->v_subtype = subtype;
+		vq->v_subtype |= subtype;
 	}
 	free(vtemp);
 	return 0;
@@ -526,6 +529,7 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 	LISTELEM *dep;
 	VALUE *vtemp;
 	VALUE *vp;
+	unsigned short subtype;
 
 	if (ssi > slp->l_count)
 		return E_COPY2;
@@ -533,11 +537,11 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 		num = slp->l_count - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > slp->l_count)
+	if (ssi + num > slp->l_count)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dlp->l_count)
+	if (dsi + num > dlp->l_count)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -555,8 +559,10 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 	vp = vtemp;
 	i = num;
 	while (i-- > 0) {
+		subtype = dep->e_value.v_subtype;
 		freevalue(&dep->e_value);
 		dep->e_value = *vp++;
+		dep->e_value.v_subtype |= subtype;
 		dep = dep->e_next;
 	}
 	free(vtemp);
@@ -572,7 +578,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 {
 	FILEIO	*fiop;
 	FILE	*fp;
-	unsigned int	numw;
+	long	numw;
 
 	if (ssi > sblk->datalen)
 		return E_COPY2;
@@ -609,7 +615,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 {
 	FILEIO	*fiop;
 	FILE	*fp;
-	unsigned int	numw;
+	long	numw;
 	ZVALUE	fsize;
 	long	filelen;
 	long	newlen;
@@ -639,7 +645,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 		num = filelen - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > filelen)
+	if (ssi + num > filelen)
 		return E_COPY5;
 	if (fseek(fp, ssi, 0))		/* using system fseek  XXX */
 		return E_COPYF2;
@@ -677,7 +683,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 {
 	long len;
 	FILEIO *fiop;
-	unsigned int numw;
+	long numw;
 	FILE *fp;
 
 	len = str->s_len;
@@ -688,7 +694,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
-	if ((USB32) ssi + num > len)
+	if (ssi + num > len)
 		return E_COPY5;		/* Insufficient memory in str */
 	fiop = findid(id, TRUE);
 	if (fiop == NULL)
@@ -726,7 +732,7 @@ copyblk2blk(BLOCK *sblk, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc
 		num = sblk->datalen - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned int) ssi + num > sblk->datalen)
+	if (ssi + num > sblk->datalen)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
@@ -806,13 +812,13 @@ copystr2str(STRING *sstr, long ssi, long num, STRING *dstr, long dsi)
 {
 	char *c, *c1;
 
-	if (num < 0 || ssi + num > sstr->s_len)
+	if (num < 0 || (size_t)(ssi + num) > sstr->s_len)
 		num = sstr->s_len - ssi;
 	if (num <= 0)
 		return 0;		/* Nothing to be copied */
 	if (dsi < 0)			/* default destination index */
 		dsi = 0;
-	if (dsi + num > dstr->s_len)
+	if ((size_t)(dsi + num) > dstr->s_len)
 		num = dstr->s_len - dsi;
 	c1 = sstr->s_str + ssi;
 	c = dstr->s_str + dsi;
@@ -838,7 +844,7 @@ copyblk2str(BLOCK *sblk, long ssi, long num, STRING *dstr, long dsi)
 		return 0;		/* Nothing to be copied */
 	if (dsi < 0)			/* default destination index */
 		dsi = 0;
-	if (dsi + num > dstr->s_len)
+	if ((size_t)(dsi + num) > dstr->s_len)
 		num = dstr->s_len - dsi;
 	c1 = sblk->data + ssi;
 	c = (USB8 *)dstr->s_str + dsi;
@@ -852,18 +858,18 @@ copyblk2str(BLOCK *sblk, long ssi, long num, STRING *dstr, long dsi)
 int
 copyostr2str(char *sstr, long ssi, long num, STRING *dstr, long dsi)
 {
-	long len;
+	size_t len;
 	char	*c, *c1;
 
-	len = (long)strlen(sstr);
+	len = strlen(sstr);
 
-	if (num < 0 || ssi + num > len)
+	if (num < 0 || (size_t)(ssi + num) > len)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
 	if (dsi < 0)
 		dsi = 0;		/* Default destination index */
-	if (dsi + num > dstr->s_len)
+	if ((size_t)(dsi + num) > dstr->s_len)
 		num = dstr->s_len - dsi;
 	c1 = sstr + ssi;
 	c = dstr->s_str + dsi;
@@ -879,16 +885,16 @@ copyostr2str(char *sstr, long ssi, long num, STRING *dstr, long dsi)
 int
 copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 {
-	int	len;
-	int	newlen;
-	int	newsize;
+	size_t	len;
+	size_t	newlen;
+	size_t	newsize;
 	USB8	*newdata;
 
 	len = strlen(str) + 1;
 
-	if (ssi > len)
+	if (ssi > 0 && (size_t)ssi > len)
 		return E_COPY2;
-	if (num < 0 || (unsigned long) ssi + num > len)
+	if (num < 0 || (size_t)(ssi + num) > len)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
@@ -897,7 +903,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 	newlen = dsi + num;
 	if (newlen <= 0)
 		return E_COPY7;
-	if (newlen >= dblk->maxsize) {
+	if (newlen >= (size_t)dblk->maxsize) {
 		if (noreloc)
 			return E_COPY17;
 		newsize = (1 + newlen/dblk->blkchunk) * dblk->blkchunk;
@@ -910,7 +916,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 		dblk->maxsize = newsize;
 	}
 	memmove(dblk->data + dsi, str + ssi, num);
-	if (newlen > dblk->datalen)
+	if (newlen > (size_t)dblk->datalen)
 		dblk->datalen = newlen;
 	return 0;
 }
@@ -929,7 +935,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
  *	s1
  */
 void *
-memmove(void *s1, const void *s2, CALC_SIZE_T n)
+memmove(void *s1, CONST void *s2, MEMMOVE_SIZE_T n)
 {
 	/*
 	 * firewall
@@ -978,8 +984,8 @@ memmove(void *s1, const void *s2, CALC_SIZE_T n)
 int
 copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 {
-	long	newlen;
-	long	newsize;
+	size_t	newlen;
+	size_t	newsize;
 	USB8	*newdata;
 #if CALC_BYTE_ORDER == BIG_ENDIAN
 	ZVALUE	*swnum; /* byte swapped numerator */
@@ -991,14 +997,14 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 		num = snum->num.len - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned long) ssi + num > snum->num.len)
+	if (ssi + num > snum->num.len)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
-	newlen = dsi + (long)(num*sizeof(HALF));
+	newlen = dsi + (num*sizeof(HALF));
 	if (newlen <= 0)
 		return E_COPY7;
-	if (newlen >= dblk->maxsize) {
+	if (newlen >= (size_t)dblk->maxsize) {
 		if (noreloc)
 			return E_COPY17;
 		newsize = (1 + newlen/dblk->blkchunk) * dblk->blkchunk;
@@ -1017,7 +1023,7 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 	memmove(dblk->data+dsi, (char *)(swnum->v+ssi), num*sizeof(HALF));
 	zfree(*swnum);
 #endif
-	if (newlen > dblk->datalen)
+	if (newlen > (size_t)dblk->datalen)
 		dblk->datalen = newlen;
 	return 0;
 }
@@ -1029,7 +1035,7 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 int
 copyblk2num(BLOCK *sblk, long ssi, long num, NUMBER *dnum, long dsi, NUMBER **res)
 {
-	long	newlen;
+	size_t	newlen;
 	NUMBER *ret;		/* cloned and modified numerator */
 #if CALC_BYTE_ORDER == BIG_ENDIAN
 	HALF *swapped;		/* byte swapped input data */
@@ -1044,11 +1050,11 @@ copyblk2num(BLOCK *sblk, long ssi, long num, NUMBER *dnum, long dsi, NUMBER **re
 		num = sblk->datalen - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned long) ssi + num > sblk->datalen)
+	if (ssi + num > sblk->datalen)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dnum->num.len;
-	newlen = dsi + (long)((num+sizeof(HALF)-1)/sizeof(HALF));
+	newlen = dsi + ((num+sizeof(HALF)-1)/sizeof(HALF));
 	if (newlen <= 0)
 		return E_COPY7;
 

blkcpy.h

@@ -1,7 +1,7 @@
 /*
  * blkcpy - general values and related routines used by the calculator
  *
- * Copyright (C) 1999  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: blkcpy.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: blkcpy.h,v 29.3 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.h,v $
  *
  * Under source code control:	1997/04/18 20:41:25
@@ -36,27 +36,27 @@
 /*
  * the main copy gateway function
  */
-extern int copystod(VALUE *, long, long, VALUE *, long);
+E_FUNC int copystod(VALUE *, long, long, VALUE *, long);
 
 /*
  * specific copy functions
  */
-extern int copyblk2blk(BLOCK *, long, long, BLOCK *, long, BOOL);
-extern int copyblk2file(BLOCK *, long, long, FILEID, long);
-extern int copyblk2mat(BLOCK *, long, long, MATRIX *, long);
-extern int copyblk2num(BLOCK *, long, long, NUMBER *, long, NUMBER **);
-extern int copyblk2str(BLOCK *, long, long, STRING *, long);
-extern int copyfile2blk(FILEID, long, long, BLOCK *, long, BOOL);
-extern int copylist2list(LIST *, long, long, LIST *, long);
-extern int copylist2mat(LIST *, long, long, MATRIX *, long);
-extern int copymat2blk(MATRIX *, long, long, BLOCK *, long, BOOL);
-extern int copymat2list(MATRIX *, long, long, LIST *, long);
-extern int copymat2mat(MATRIX *, long, long, MATRIX *, long);
-extern int copynum2blk(NUMBER *, long, long, BLOCK *, long, BOOL);
-extern int copyostr2blk(char *, long, long, BLOCK *, long, BOOL);
-extern int copyostr2str(char *, long, long, STRING *, long);
-extern int copystr2blk(STRING *, long, long, BLOCK *, long, BOOL);
-extern int copystr2file(STRING *, long, long, FILEID, long);
-extern int copystr2str(STRING *, long, long, STRING *, long);
+E_FUNC int copyblk2blk(BLOCK *, long, long, BLOCK *, long, BOOL);
+E_FUNC int copyblk2file(BLOCK *, long, long, FILEID, long);
+E_FUNC int copyblk2mat(BLOCK *, long, long, MATRIX *, long);
+E_FUNC int copyblk2num(BLOCK *, long, long, NUMBER *, long, NUMBER **);
+E_FUNC int copyblk2str(BLOCK *, long, long, STRING *, long);
+E_FUNC int copyfile2blk(FILEID, long, long, BLOCK *, long, BOOL);
+E_FUNC int copylist2list(LIST *, long, long, LIST *, long);
+E_FUNC int copylist2mat(LIST *, long, long, MATRIX *, long);
+E_FUNC int copymat2blk(MATRIX *, long, long, BLOCK *, long, BOOL);
+E_FUNC int copymat2list(MATRIX *, long, long, LIST *, long);
+E_FUNC int copymat2mat(MATRIX *, long, long, MATRIX *, long);
+E_FUNC int copynum2blk(NUMBER *, long, long, BLOCK *, long, BOOL);
+E_FUNC int copyostr2blk(char *, long, long, BLOCK *, long, BOOL);
+E_FUNC int copyostr2str(char *, long, long, STRING *, long);
+E_FUNC int copystr2blk(STRING *, long, long, BLOCK *, long, BOOL);
+E_FUNC int copystr2file(STRING *, long, long, FILEID, long);
+E_FUNC int copystr2str(STRING *, long, long, STRING *, long);
 
 #endif /* !__BLKCPY_H__ */

block.c

@@ -1,7 +1,7 @@
 /*
  * block - fixed, dynamic, fifo and circular memory blocks
  *
- * Copyright (C) 1999  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: block.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: block.c,v 29.4 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.c,v $
  *
  * Under source code control:	1997/02/27 00:29:40
@@ -42,14 +42,14 @@
 
 #define NBLOCKCHUNK 16
 
-static long nblockcount = 0;
-static long maxnblockcount = 0;
-static STRINGHEAD nblocknames;
-static NBLOCK **nblocks;
+STATIC long nblockcount = 0;
+STATIC long maxnblockcount = 0;
+STATIC STRINGHEAD nblocknames;
+STATIC NBLOCK **nblocks;
 
 
 /* forward declarations */
-static void blkchk(BLOCK*);
+S_FUNC void blkchk(BLOCK*);
 
 
 /*
@@ -57,7 +57,7 @@ static void blkchk(BLOCK*);
  *
  * given:
  *	len	- initial memory length of the block
- *	type	- BLK_TYPE_XXX
+ *	type	- BLK_TYPE_XYZ
  *	chunk	- allocation chunk size
  *
  * returns:
@@ -154,7 +154,7 @@ blk_free(BLOCK *blk)
  *	if all is ok, otherwise math_error() is called and this
  *	function does not return
  */
-static void
+S_FUNC void
 blkchk(BLOCK *blk)
 {
 

block.h

@@ -1,7 +1,7 @@
 /*
  * block - fixed, dynamic, fifo and circular memory blocks
  *
- * Copyright (C) 1999  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: block.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: block.h,v 29.3 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.h,v $
  *
  * Under source code control:	1997/02/21 05:03:39
@@ -160,7 +160,7 @@ typedef struct nblock NBLOCK;
 /*
  * block debug
  */
-extern int blk_debug;	/* 0 => debug off */
+EXTERN int blk_debug;	/* 0 => debug off */
 
 
 /*
@@ -204,22 +204,22 @@ typedef USB8 OCTET;
 /*
  * external functions
  */
-extern BLOCK *blkalloc(int, int);
-extern void blk_free(BLOCK*);
-extern BLOCK *blkrealloc(BLOCK*, int, int);
-extern void blktrunc(BLOCK*);
-extern BLOCK *blk_copy(BLOCK*);
-extern int blk_cmp(BLOCK*, BLOCK*);
-extern void blk_print(BLOCK*);
-extern void nblock_print(NBLOCK *);
-extern NBLOCK *createnblock(char *, int, int);
-extern NBLOCK *reallocnblock(int, int, int);
-extern int removenblock(int);
-extern int findnblockid(char *);
-extern NBLOCK *findnblock(int);
-extern BLOCK *copyrealloc(BLOCK*, int, int);
-extern int countnblocks(void);
-extern void shownblocks(void);
+E_FUNC BLOCK *blkalloc(int, int);
+E_FUNC void blk_free(BLOCK*);
+E_FUNC BLOCK *blkrealloc(BLOCK*, int, int);
+E_FUNC void blktrunc(BLOCK*);
+E_FUNC BLOCK *blk_copy(BLOCK*);
+E_FUNC int blk_cmp(BLOCK*, BLOCK*);
+E_FUNC void blk_print(BLOCK*);
+E_FUNC void nblock_print(NBLOCK *);
+E_FUNC NBLOCK *createnblock(char *, int, int);
+E_FUNC NBLOCK *reallocnblock(int, int, int);
+E_FUNC int removenblock(int);
+E_FUNC int findnblockid(char *);
+E_FUNC NBLOCK *findnblock(int);
+E_FUNC BLOCK *copyrealloc(BLOCK*, int, int);
+E_FUNC int countnblocks(void);
+E_FUNC void shownblocks(void);
 
 
 #endif /* !__BLOCK_H__ */

cal/Makefile

@@ -2,7 +2,7 @@
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.15 $
-# @(#) $Id: Makefile,v 29.15 2003/01/05 08:10:56 chongo Exp $
+# @(#) $Revision: 29.24 $
+# @(#) $Id: Makefile,v 29.24 2006/09/18 13:13:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -33,8 +33,8 @@
 
 # required vars
 #
-SHELL = /bin/sh
-MAKE_FILE = Makefile
+SHELL= /bin/sh
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -96,12 +96,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -163,6 +163,14 @@ Q=@
 #
 CHMOD= chmod
 CMP= cmp
+RM= rm
+MKDIR= mkdir
+RMDIR= rmdir
+CP= cp
+MV= mv
+CO= co
+TRUE= true
+TOUCH= touch
 
 # The calc files to install
 #
@@ -170,13 +178,14 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \
 	lucas_tbl.cal mersenne.cal mod.cal pell.cal pi.cal pix.cal \
 	pollard.cal poly.cal psqrt.cal quat.cal regress.cal solve.cal \
 	sumsq.cal surd.cal unitfrac.cal varargs.cal chrem.cal mfactor.cal \
-	bindings randmprime.cal test1700.cal randrun.cal \
+	bindings randmprime.cal test1700.cal randrun.cal linear.cal \
 	randbitrun.cal bernoulli.cal test2300.cal test2600.cal \
 	test2700.cal test3100.cal test3300.cal test3400.cal prompt.cal \
 	test3500.cal seedrandom.cal test4000.cal test4100.cal test4600.cal \
 	beer.cal hello.cal test5100.cal test5200.cal randombitrun.cal \
 	randomrun.cal repeat.cal xx_print.cal natnumset.cal qtime.cal \
-	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal
+	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal screen.cal \
+	dotest.cal set8700.cal set8700.line alg_config.cal sumtimes.cal
 
 # These files are found (but not built) in the distribution
 #
@@ -191,8 +200,8 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 # used by the upper level Makefile to determine of we have done all
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -208,17 +217,17 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
 	    fi; \
 	done
 
 distdir:
-	${Q}echo cal
+	${Q} echo cal
 
 calcliblist:
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
 	    fi; \
@@ -231,7 +240,7 @@ calcliblist:
 ##
 
 echo_inst_files:
-	${Q}for i in ${CALC_FILES} /dev/null; do \
+	${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CALC_SHAREDIR}/$$i; \
 	    fi; \
@@ -246,32 +255,61 @@ echo_inst_files:
 clean:
 
 clobber:
-	rm -f .all
+	${RM} -f .all
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}for i in ${CALC_FILES} /dev/null; do \
+	${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CALC_SHAREDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CALC_SHAREDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CALC_SHAREDIR}/$$i.new; \
-		cp -f $$i $T${CALC_SHAREDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CALC_SHAREDIR}/$$i.new; \
-		mv -f $T${CALC_SHAREDIR}/$$i.new $T${CALC_SHAREDIR}/$$i; \
-		echo "installed $T${CALC_SHAREDIR}/$$i"; \
+		${RM} -f ${T}${CALC_SHAREDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CALC_SHAREDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CALC_SHAREDIR}/$$i.new; \
+		${MV} -f ${T}${CALC_SHAREDIR}/$$i.new ${T}${CALC_SHAREDIR}/$$i; \
+		echo "installed ${T}${CALC_SHAREDIR}/$$i"; \
+	    fi; \
+	done
+
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q} for i in ${CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${CALC_SHAREDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CALC_SHAREDIR}/$$i"; \
+		if [ -f "${T}${CALC_SHAREDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CALC_SHAREDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${CALC_SHAREDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${CALC_SHAREDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done

cal/README

@@ -12,7 +12,7 @@ Normally a resource file will simply define some functions.  By default,
 most resource files will print out a short message when they are read.
 For example:
 
-    > read lucas
+    ; read lucas
     lucas(h,n) defined
     gen_u0(h,n,v1) defined
     gen_v1(h,n) defined
@@ -22,9 +22,9 @@ will cause calc to load and execute the 'lucas.cal' resource file.
 Executing the resource file will cause several functions to be defined.
 Executing the lucas function:
 
-    > lucas(149,60)
+    ; lucas(149,60)
 	    1
-    > lucas(146,61)
+    ; lucas(146,61)
 	    0
 
 shows that 149*2^60-1 is prime whereas 146*2^61-1 is not.
@@ -75,7 +75,7 @@ have meanings are as follows:
 	is displayed.
 
     2	Show func will display more information about a functions
-	arguments as well as more argument sdummary information.
+	arguments as well as more argument summary information.
 
     3	During execution, allow calc standard resource files
 	to output additional debugging information.
@@ -103,7 +103,7 @@ either of the bottom 2 bits set:
 		print "funcB(size, mass, ...) defined";
 	}
 
-If your the resource file needs to output special debugging informatin,
+If your the resource file needs to output special debugging information,
 we recommend that you check for bit 3 of the config("resource_debug")
 before printing the debug statement:
 
@@ -117,12 +117,68 @@ The following is a brief description of some of the calc resource files
 that are shipped with calc.  See above for example of how to read in
 and execute these files.
 
+alg_config.cal
+
+    global test_time
+    mul_loop(repeat,x) defined
+    mul_ratio(len) defined
+    best_mul2() defined
+    sq_loop(repeat,x) defined
+    sq_ratio(len) defined
+    best_sq2() defined
+    pow_loop(repeat,x,ex) defined
+    pow_ratio(len) defined
+    best_pow2() defined
+
+    These functions search for an optimal value of config("mul2"),
+    config("sq2"), and config("pow2").  The calc default values of these
+    configuration values were set by running this resource file on a
+    1.8GHz AMD 32-bit CPU of ~3406 BogoMIPS.
+
+    The best_mul2() function returns the optimal value of config("mul2").
+    The best_sq2() function returns the optimal value of config("sq2").
+    The best_pow2() function returns the optimal value of config("pow2").
+    The other functions are just support functions.
+
+    By design, best_mul2(), best_sq2(), and best_pow2() take a few
+    minutes to run.  These functions increase the number of times a
+    given computational loop is executed until a minimum amount of CPU
+    time is consumed.  To watch these functions progress, one can set
+    the config("user_debug") value.
+
+    Here is a suggested way to use this resource file:
+
+	; read alg_config
+	; config("user_debug",2),;
+	; best_mul2(); best_sq2(); best_pow2();
+	; best_mul2(); best_sq2(); best_pow2();
+	; best_mul2(); best_sq2(); best_pow2();
+
+    NOTE: It is perfectly normal for the optimal value returned to differ
+    slightly from run to run.  Slight variations due to inaccuracy in
+    CPU timings will cause the best value returned to differ slightly
+    from run to run.
+
+    One can use a calc startup file to change the initial values of
+    config("mul2"), config("sq2"), and config("pow2").  For example one
+    can place into ~/.calcrc these lines:
+
+	config("mul2", 1780),;
+	config("sq2", 3388),;
+	config("pow2", 176),;
+
+    to automatically and silently change these config values.
+    See help/config and CALCRC in help/environment for more information.
+
+
 beer.cal
 
     Calc's contribution to the 99 Bottles of Beer web page:
 
 	http://www.ionet.net/~timtroyr/funhouse/beer.html#calc
 
+     NOTE: This resource produces a lot of output.  :-)
+
 
 bernoulli.cal
 
@@ -132,7 +188,7 @@ bernoulli.cal
 
     NOTE: There is now a bernoulli() builtin function.  This file is
     	  left here for backward compatibility and now simply returns
-	  the buildin function.
+	  the builtin function.
 
 
 bigprime.cal
@@ -153,9 +209,9 @@ chi.cal
 
     The chi_prob() function does not work well with odd degrees of freedom.
     It is reasonable with even degrees of freedom, although one must give
-    a sifficently small error term as the degress gets large (>100).
+    a sufficiently small error term as the degrees gets large (>100).
 
-    The Z(x) and P(x) are internal statistical funcions.
+    The Z(x) and P(x) are internal statistical functions.
 
     eps is an optional epsilon() like error term.
 
@@ -180,6 +236,38 @@ deg.cal
     Calculate in degrees, minutes, and seconds.
 
 
+dotest.cal
+
+    dotest(dotest_file [,dotest_code [,dotest_maxcond]])
+
+    dotest_file
+
+	Search along CALCPATH for dotest_file, which contains lines that
+	should evaluate to 1.  Comment lines and empty lines are ignored.
+	Comment lines should use ## instead of the multi like /* ... */
+	because lines are evaluated one line at a time.
+
+    dotest_code
+
+	Assign the code number that is to be printed at the start of
+	each non-error line and after **** in each error line.
+	The default code number is 999.
+
+    dotest_maxcond
+
+	The maximum number of error conditions that may be detected.
+	An error condition is not a sign of a problem, in some cases
+	a line deliberately forces an error condition.	A value of -1,
+	the default, implies a maximum of 2147483647.
+
+    Global variables and functions must be declared ahead of time because
+    the dotest scope of evaluation is a line at a time.  For example:
+
+	read dotest.cal
+	read set8700.cal
+	dotest("set8700.line");
+
+
 ellip.cal
 
     efactor(iN, ia, B, force)
@@ -194,6 +282,8 @@ hello.cal
 	http://www.latech.edu/~acm/HelloWorld.shtml
 	http://www.latech.edu/~acm/helloworld/calc.html
 
+     NOTE: This resource produces a lot of output.  :-)
+
 
 intfile.cal
 
@@ -222,6 +312,14 @@ intfile.cal
 	of the integer become the last octets of the file.
 
 
+linear.cal
+
+    linear(x0, y0, x1, y1, x)
+
+    Returns the value y such that (x,y) in on the line (x0,y0), (x1,y1).
+    Requires x0 != y0.
+
+
 lucas.cal
 
     lucas(h, n)
@@ -497,6 +595,58 @@ regress.cal
     Errors are reported with '****' messages, or worse. :-)
 
 
+screen.cal
+
+    up
+    CUU	/* same as up */
+    down = CUD
+    CUD	/* same as down */
+    forward
+    CUF	/* same as forward */
+    back = CUB
+    CUB	/* same as back */
+    save
+    SCP	/* same as save */
+    restore
+    RCP	/* same as restore */
+    cls
+    home
+    eraseline
+    off
+    bold
+    faint
+    italic
+    blink
+    rapidblink
+    reverse
+    concealed
+    /* Lowercase indicates foreground, uppercase background */
+    black
+    red
+    green
+    yellow
+    blue
+    magenta
+    cyan
+    white
+    Black
+    Red
+    Green
+    Yellow
+    Blue
+    Magenta
+    Cyan
+    White
+
+    Define ANSI control sequences providing (i.e., cursor movement, changing
+    foreground or background color, etc.) for VT100 terminals and terminal
+    window emulators (i.e., xterm, Apple OS/X Terminal, etc.) that support them.
+
+    For example:
+
+	read screen
+	print green:"This is green. ":red:"This is red.":black
+
 seedrandom.cal
 
     seedrandom(seed1, seed2, bitsize [,trials])
@@ -515,6 +665,24 @@ seedrandom.cal
     Blum primes for the modulus.
 
 
+set8700.cal
+
+    set8700_getA1() defined
+    set8700_getA2() defined
+    set8700_getvar() defined
+    set8700_f(set8700_x) defined
+    set8700_g(set8700_x) defined
+
+    Declare globals and define functions needed by dotest() (see
+    dotest.cal) to evaluate set8700.line a line at a time.
+
+
+set8700.line
+
+    A line-by-line evaluation file for dotest() (see dotest.cal).
+    The set8700.cal file (and dotest.cal) should be read first.
+
+
 solve.cal
 
     solve(low, high, epsilon)
@@ -533,6 +701,27 @@ sumsq.cal
     4N+1, and always impossible for primes of the form 4N-1.
 
 
+sumtimes.cal
+
+    timematsum(N)
+    timelistsum(N)
+    timematsort(N)
+    timelistsort(N)
+    timematreverse(N)
+    timelistreverse(N)
+    timematssq(N)
+    timelistssq(N)
+    timehmean(N,M)
+    doalltimes(N)
+
+    Give the user CPU time for various ways of evaluating sums, sums of
+    squares, etc, for large lists and matrices.  N is the size of
+    the list or matrix to use.  The doalltimes() function will run
+    all fo the sumtimes tests.  For example:
+
+    	doalltimes(1e6);
+
+
 surd.cal
 
     surd(a, b)
@@ -825,8 +1014,8 @@ xx_print.cal
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.9 $
-## @(#) $Id: README,v 29.9 2003/01/05 08:10:56 chongo Exp $
+## @(#) $Revision: 29.16 $
+## @(#) $Id: README,v 29.16 2006/12/16 11:18:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32

cal/deg.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: deg.cal,v 29.3 2003/01/21 11:12:37 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: deg.cal,v 29.4 2003/01/26 19:32:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/deg.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:33
@@ -75,9 +75,9 @@ define dms_neg(a)
 {
 	local obj dms	ans;
 
-	ans.deg = -ans.deg;
-	ans.min = -ans.min;
-	ans.sec = -ans.sec;
+	ans.deg = -a.deg;
+	ans.min = -a.min;
+	ans.sec = -a.sec;
 	return ans;
 }
 

cal/dotest.cal

@@ -0,0 +1,193 @@
+/*
+ * dotest - test truth statements found in line tests of dotest_testline file
+ *
+ * This file was created by Ernest Bowen <ebowen at une dot edu dot au>
+ * and modified by Landon Curt Noll.
+ *
+ * This dotest_code has been placed in the public domain.  Please do not
+ * copyright this dotest_code.
+ *
+ * ERNEST BOWEN AND LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY 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.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: dotest.cal,v 29.2 2006/05/21 00:55:27 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/dotest.cal,v $
+ *
+ * This file is not covered under version 2.1 of the GNU LGPL.
+ *
+ * Under source dotest_code control:	2006/03/08 05:54:09
+ * File existed as early as:	2006
+ */
+
+
+/*
+ * dotest - perform tests from dotest_testline file
+ *
+ * given:
+ *	dotest_file	filename containing single test lines
+ *	dotest_code	regress.cal test number to use (def: 0)
+ *	dotest_maxcond	max error conditions allowed (def: <0 ==> 2^31-1)
+ *
+ * returns:
+ *	number of line test failures
+ *
+ * NOTE: All variables used by the dotest() function start with "dotest_".
+ *	 The dotest_file and dotest_read should not use any variable
+ *	 that starts with "dotest_".
+ */
+define dotest(dotest_file, dotest_code = 0, dotest_maxcond = -1)
+{
+    local dotest_f_file;	/* open file containing test lines */
+    local dotest_testline;	/* test line */
+    local dotest_testeval;	/* eval value from dotest_testline test line */
+    local dotest_tmperrcnt;	/* temp error count after line test */
+    local dotest_errcnt;	/* total number of errors */
+    local dotest_failcnt;	/* number of line tests failed */
+    local dotest_testnum;	/* number of test lines evaluated */
+    local dotest_linenum;	/* test line number */
+    local dotest_old_errmax;	/* value of errmax() prior to calling */
+    local dotest_old_errcount;	/* value of errcount() prior to calling */
+
+    /*
+     * preserve calling stats
+     */
+    dotest_old_errmax = errmax();
+    dotest_old_errcount = errcount(0);
+
+    /*
+     * initialize test accounting
+     */
+    dotest_errcnt = errcount();
+    dotest_failcnt = 0;
+    dotest_testnum = 0;
+    dotest_linenum = 0;
+
+    /*
+     * setup error accounting for dotest
+     */
+    if (dotest_maxcond >= 0 && dotest_maxcond < 2147483647) {
+	    errmax(dotest_maxcond + dotest_old_errcount + 1),;
+    } else {
+	    errmax(2147483647),;
+    }
+
+    /*
+     * open the test line file
+     */
+    printf("%d-: opening line file: %d", dotest_code, dotest_file);
+    dotest_f_file = fpathopen(dotest_file, "r");
+    if (!isfile(dotest_f_file)) {
+	printf("**** Unable to file or open file \"%s\"\n",
+		dotest_file);
+	quit;
+    }
+    printf('%d: testing "%s"\n', dotest_code, dotest_file);
+
+    /*
+     * perform dotest_testline test on each line of the file
+     */
+    for (;;) {
+
+	/* get the next test line */
+	dotest_testline = fgets(dotest_f_file);
+	++dotest_linenum;
+	if (iserror(dotest_testline)) {
+	    quit "**** Error while reading file";
+	} else if (isnull(dotest_testline)) {
+	    /* EOF - end of test file */
+	    break;
+	}
+
+	/* skip empty lines */
+	if (dotest_testline == "\n") {
+	    continue;
+	}
+
+	/* evaluate the test line */
+	dotest_testeval = eval(dotest_testline);
+
+	/* ignore white space or comment lines */
+	if (isnull(dotest_testeval)) {
+	    continue;
+	}
+
+	/* look for test line parse errors */
+	if (iserror(dotest_testeval)) {
+	    printf("**** evaluation error: ");
+	    ++dotest_failcnt;
+
+	/* look for test line dotest_failcnt */
+	} else if (dotest_testeval != 1) {
+	    printf("**** did not return 1: ");
+	    ++dotest_failcnt;
+	}
+
+	/* show the test line we just performed */
+	printf("%d-%d: %s", dotest_code, dotest_linenum, dotest_testline);
+
+	/* error accounting */
+	dotest_tmperrcnt = errcount() - dotest_errcnt;
+	if (dotest_tmperrcnt > 0) {
+
+	    /* report any other errors */
+	    if (dotest_tmperrcnt > 1) {
+		printf("%d-%d: NOTE: %d error conditions(s): %s\n",
+		    dotest_code, dotest_linenum, dotest_tmperrcnt);
+	    }
+
+	    /* report the calc error string */
+	    printf("%d-%d: NOTE: last error string: %s\n",
+	        dotest_code, dotest_linenum, strerror());
+
+	    /* new error count level */
+	    dotest_errcnt = errcount();
+	    if (dotest_maxcond >= 0 &&
+	        dotest_old_errcount-dotest_errcnt > dotest_maxcond) {
+		printf("%d-%d: total error conditions: %d > %d\n",
+		       dotest_code, dotest_linenum,
+		       dotest_maxcond, dotest_old_errcount-dotest_errcnt);
+	    }
+	}
+    }
+
+    /*
+     * test the close of the line file
+     */
+    printf("%d-: detected %d error condition(s), many of which may be OK\n",
+    	   dotest_code, dotest_old_errcount-dotest_errcnt);
+    printf("%d-: closing line file: %d\n", dotest_code, dotest_file);
+    fclose(dotest_f_file);
+
+    /*
+     * test line file accounting
+     */
+    if (dotest_failcnt > 0) {
+	printf("**** %d-: %d test failure(s) in %d line(s)\n",
+	    dotest_code, dotest_failcnt, dotest_linenum);
+    } else {
+	printf("%d-: no failure(s) in %d line(s)\n",
+	    dotest_code, dotest_linenum);
+    }
+
+    /*
+     * preppare to return to the caller environment
+     *
+     * We increase the caller's error count by the number
+     * of line tests that failed, not the number of internal
+     * errors that were noted.
+     */
+    errmax(dotest_old_errmax),;
+    errcount(dotest_old_errcount + dotest_failcnt),;
+
+    /*
+     * All Done!!! -- Jessica Noll, Age 2
+     */
+    return dotest_failcnt;
+}

cal/ellip.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: ellip.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: ellip.cal,v 29.4 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/ellip.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:33
@@ -28,16 +28,17 @@
  */
 
 /*
- * Attempt to factor numbers using elliptic functions.
- *	y^2 = x^3 + a*x + b   (mod N).
+ * Attempt to factor numbers using elliptic functions:
  *
- * Many points (x,y) (mod N) are found that solve the above equation,
+ *	y^2 = x^3 + a*x + b   (mod ellip_N).
+ *
+ * Many points (x,y) (mod ellip_N) are found that solve the above equation,
  * starting from a trivial solution and 'multiplying' that point together
  * to generate high powers of the point, looking for such a point whose
- * order contains a common factor with N.  The order of the group of points
- * varies almost randomly within a certain interval for each choice of a
- * and b, and thus each choice provides an independent opportunity to
- * factor N.  To generate a trivial solution, a is chosen and then b is
+ * order contains a common factor with ellip_N.  The order of the group of
+ * points varies almost randomly within a certain interval for each choice of
+ * a and b, and thus each choice provides an independent opportunity to
+ * factor ellip_N.  To generate a trivial solution, a is chosen and then b is
  * selected so that (1,1) is a solution.  The multiplication is done using
  * the basic fact that the equation is a cubic, and so if a line hits the
  * curve in two rational points, then the third intersection point must
@@ -45,9 +46,9 @@
  * the number of rational solutions can be made very large.  When modular
  * arithmetic is used, solving for the third point requires the taking of a
  * modular inverse (instead of division), and if this fails, then the GCD
- * of the failing value and N provides a factor of N.  This description is
- * only an approximation, read "A Course in Number Theory and Cryptography"
- * by Neal Koblitz for a good explanation.
+ * of the failing value and ellip_N provides a factor of ellip_N.
+ * This description is only an approximation, read "A Course in Number
+ * Theory and Cryptography" by Neal Koblitz for a good explanation.
  *
  * efactor(iN, ia, B, force)
  *	iN is the number to be factored.
@@ -81,15 +82,15 @@
  *
  * If a factor is found, it is returned and is also saved in the global
  * variable f.	The number being factored is also saved in the global
- * variable N.
+ * variable ellip_N.
  */
 
 
 obj point {x, y};
-global	N;		/* number to factor */
-global	a;		/* first coefficient */
-global	b;		/* second coefficient */
-global	f;		/* found factor */
+global	ellip_N;		/* number to factor */
+global	ellip_a;		/* first coefficient */
+global	ellip_b;		/* second coefficient */
+global	ellip_f;		/* found factor */
 
 
 define efactor(iN, ia, B, force)
@@ -103,28 +104,28 @@ define efactor(iN, ia, B, force)
 	if (isnull(ia))
 		ia = 1;
 	obj point x;
-	a = ia;
-	b = -ia;
-	N = iN;
-	C = isqrt(N);
+	ellip_a = ia;
+	ellip_b = -ia;
+	ellip_N = iN;
+	C = isqrt(ellip_N);
 	C = 2 * C + 2 * isqrt(C) + 1;
-	f = 0;
-	while (f == 0) {
-		print "A =", a;
+	ellip_f = 0;
+	while (ellip_f == 0) {
+		print "A =", ellip_a;
 		x.x = 1;
 		x.y = 1;
 		print 2, x;
 		x = x ^ (2 ^ (highbit(C) + 1));
-		for (p = 3; ((p < B) && (f == 0)); p += 2) {
+		for (p = 3; ((p < B) && (ellip_f == 0)); p += 2) {
 			if (!ptest(p, 1))
 				continue;
 			print p, x;
 			x = x ^ (p ^ ((highbit(C) // highbit(p)) + 1));
 		}
-		a++;
-		b--;
+		ellip_a++;
+		ellip_b--;
 	}
-	return f;
+	return ellip_f;
 }
 
 
@@ -141,18 +142,18 @@ define point_mul(p1, p2)
 	if (p2 == 1)
 		return p1;
 	if (p1 == p2)
-		return point_square(&p1);
+		return point_square(`p1);
 	obj point r;
-	m = (minv(p2.x - p1.x, N) * (p2.y - p1.y)) % N;
+	m = (minv(p2.x - p1.x, ellip_N) * (p2.y - p1.y)) % ellip_N;
 	if (m == 0) {
-		if (f == 0)
-			f = gcd(p2.x - p1.x, N);
+		if (ellip_f == 0)
+			ellip_f = gcd(p2.x - p1.x, ellip_N);
 		r.x = 1;
 		r.y = 1;
 		return r;
 	}
-	r.x = (m^2 - p1.x - p2.x) % N;
-	r.y = ((m * (p1.x - r.x)) - p1.y) % N;
+	r.x = (m^2 - p1.x - p2.x) % ellip_N;
+	r.y = ((m * (p1.x - r.x)) - p1.y) % ellip_N;
 	return r;
 }
 
@@ -162,16 +163,16 @@ define point_square(p)
 	local	r, m;
 
 	obj point r;
-	m = ((3 * p.x^2 + a) * minv(p.y << 1, N)) % N;
+	m = ((3 * p.x^2 + ellip_a) * minv(p.y << 1, ellip_N)) % ellip_N;
 	if (m == 0) {
-		if (f == 0)
-			f = gcd(p.y << 1, N);
+		if (ellip_f == 0)
+			ellip_f = gcd(p.y << 1, ellip_N);
 		r.x = 1;
 		r.y = 1;
 		return r;
 	}
-	r.x = (m^2 - p.x - p.x) % N;
-	r.y = ((m * (p.x - r.x)) - p.y) % N;
+	r.x = (m^2 - p.x - p.x) % ellip_N;
+	r.y = ((m * (p.x - r.x)) - p.y) % ellip_N;
 	return r;
 }
 
@@ -184,10 +185,10 @@ define point_pow(p, pow)
 	if (isodd(pow))
 		r = p;
 	t = p;
-	for (bit = 2; ((bit <= pow) && (f == 0)); bit <<= 1) {
-		t = point_square(&t);
+	for (bit = 2; ((bit <= pow) && (ellip_f == 0)); bit <<= 1) {
+		t = point_square(`t);
 		if (bit & pow)
-			r = point_mul(&t, &r);
+			r = point_mul(`t, `r);
 	}
 	return r;
 }

cal/linear.cal

@@ -0,0 +1,26 @@
+/*
+ * linear - perform a simple two point 2D linear interpolation
+ *
+ * given:
+ *	x0, y0		first known point on the line
+ *	x1, y1		second knonw point on the line
+ *	x		a given point to interpolate on
+ *
+ * returns:
+ *	y such that (x,y) is on the line defined by (x0,y0) and (x1,y1)
+ *
+ * NOTE: The line cannot be vertical.  So x0 != y0.
+ */
+define linear(x0, y0, x1, y1, x)
+{
+    /* firewall */
+    if (!isnum(x0) || ! isnum(y0) || !isnum(x1) || ! isnum(y1) || !isnum(x)) {
+	quit "non-numeric argument passed to linear";
+    }
+    if (x0 == x1) {
+	quit "linear given a line with an infinite slope";
+    }
+
+    /* return y = y0 + (delta_Y/delta_X) * (x - x0) */
+    return y0 + (((y1-y0)/(x1-x0)) * (x - x0));
+}

cal/mfactor.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: mfactor.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: mfactor.cal,v 29.3 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mfactor.cal,v $
  *
  * Under source code control:	1996/07/06 06:09:40
@@ -261,7 +261,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 	} else {
 		/* report this loop */
 		printf("at 2*%d*%d+1, cpu: %f\n",
-			(q-1)/(2*n), n, runtime());
+			(q-1)/(2*n), n, usertime());
 		fflush(files(1));
 		loop = 0;
 	}
@@ -274,7 +274,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 		if (rept_loop <= ++loop) {
 			/* report this loop */
 			printf("at 2*%d*%d+1, cpu: %f\n",
-				(q-1)/(2*n), n, runtime());
+				(q-1)/(2*n), n, usertime());
 			fflush(files(1));
 			loop = 0;
 		}

cal/natnumset.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: natnumset.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: natnumset.cal,v 29.3 2006/05/01 19:19:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/natnumset.cal,v $
  *
  * Under source code control:	1997/09/07 23:53:51
@@ -471,7 +471,7 @@ define set_plus(a) = set_sum(a);
 define interval(a, b)
 {
 	local i, j, s;
-	static tail = str("\0\1\3\7\17\37\77\177\377");
+	static tail = "\0\1\3\7\17\37\77\177\377";
 
 	if (!isint(a) || !isint(b))
 		quit "Non-integer argument for interval";

cal/pi.cal

@@ -1,7 +1,7 @@
 /*
  * pi - various routines to calculate pi
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2004  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: pi.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: pi.cal,v 29.5 2004/02/23 14:04:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pi.cal,v $
  *
  * Under source code control:	1991/05/22 21:56:37
@@ -61,7 +61,7 @@ define qpi(epsilon)
 	yn = sqrt2 - 1;
 	an = 6 - 4 * sqrt2;
 	tn = 2;
-	for (count = 0; count < niter; count++) {
+	for (count = 0; count < niter; ++count) {
 		ym = yn;
 		am = an;
 		tn *= 4;
@@ -104,7 +104,7 @@ define piforever()
 		* Next approximation
 		*/
 		p = k * k;
-		q = k + k++;
+		q = k + ++k;
 
 		a2 = a;
 		b2 = b;

cal/prompt.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: prompt.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: prompt.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/prompt.cal,v $
  *
  * Under source code control:	1995/12/18 04:43:25
@@ -101,7 +101,7 @@ define adder() {
 	}
 }
 
-global x;
+global prompt_x;
 
 define showvalues(str) {
 	local s;
@@ -109,8 +109,8 @@ define showvalues(str) {
 		s = prompt("? ");
 		if (s == "end")
 			break;
-		x = eval(s);
-		if (!isnum(x)) {
+		prompt_x = eval(s);
+		if (!isnum(prompt_x)) {
 			print "Please enter a number";
 			continue;
 		}

cal/randmprime.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: randmprime.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: randmprime.cal,v 29.3 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randmprime.cal,v $
  *
  * Under source code control:	1994/03/14 23:11:21
@@ -88,8 +88,8 @@ randmprime(bits, seed, dbg)
      * loop until we find a prime
      */
     if (dbg >= 1) {
-	start = runtime();
-	init = runtime();
+	start = usertime();
+	init = usertime();
 	plush = 0;
 	print "DEBUG1: testing (h+" : plush : ")*2^" : n : "-1";
     }
@@ -97,7 +97,7 @@ randmprime(bits, seed, dbg)
 
 	/* bump h, and n if needed */
 	if (dbg >= 2) {
-	    stop = runtime();
+	    stop = usertime();
 	    print "DEBUG2: last test:", stop-start, "	total time:", stop-init;
 	}
 	if (dbg >= 1) {
@@ -116,7 +116,7 @@ randmprime(bits, seed, dbg)
 
     /* found a prime */
     if (dbg >= 2) {
-	stop = runtime();
+	stop = usertime();
 	print "DEBUG2: last test:", stop-start, "   total time:", stop-init;
 	print "DEBUG3: " : h : "*2^" : n : "-1 is prime";
     }

cal/regress.cal

@@ -1,7 +1,7 @@
 /*
  * regress - calc regression and correctness test suite
  *
- * Copyright (C) 1999-2002  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2006  David I. Bell and Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.14 $
- * @(#) $Id: regress.cal,v 29.14 2002/12/29 09:16:07 chongo Exp $
+ * @(#) $Revision: 29.36 $
+ * @(#) $Id: regress.cal,v 29.36 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:36
@@ -52,7 +52,8 @@ errmax(-1),;				/* prevent errcount from abouting */
 global ecnt;				/* expected value of errcount() */
 ecnt = 0;				/* clear expected errcount() value */
 
-initcfg = config("all", "oldstd");	/* set config to startup default */
+initcfg = config("all", "newstd");	/* set config to startup default */
+defcfg = config("all");			/* capture the default config */
 config("resource_debug", 0),;		/* disable resource startup messages */
 config("calc_debug", 0),;		/* disable internal debugging */
 config("verbose_quit", 0),;		/* disable quit messages */
@@ -200,7 +201,6 @@ define test_variables()
 	local	x1, x2, x3;
 	global	g1, g2;
 	local	t;
-	global	globalvar;
 	local x;
 
 	print '350: Beginning test_variables';
@@ -380,19 +380,19 @@ define test_config()
 	/* check the set and return of all config */
 	callcfg = config("all");
 	print				'501: callcfg = config("all")';
+	vrfy(callcfg == startcfg,	'502: callcfg == startcfg');
+
 	callcfg = config("all", "oldstd");
-	print				'502: callcfg = config("all","oldstd")';
-	oldcfg = config("all", "newstd");
-	print				'503: oldcfg = config("all","newstd")';
+	print				'503: callcfg = config("all","oldstd")';
 	vrfy(callcfg == startcfg,	'504: callcfg == startcfg');
-	newcfg = config("all");
-	print				'505: newcfg = config("all")';
-	vrfy(config("all") == newcfg,	'506: config("all") == newcfg');
-	vrfy(config("all", oldcfg) == newcfg,
-					'507: config("all", oldcfg) == newcfg');
+	oldcfg = config("all");
+	print				'505: oldcfg = config("all");';
+	vrfy(config("all") == oldcfg,	'506: config("all") == oldcfg');
+	vrfy(oldcfg==config("all","newstd"),
+					'507: oldcfg==config("all","newstd")');
+	vrfy(defcfg == config("all"),	'508: defcfg == config("all")');
 
 	/* vrfy the state of the default config */
-	vrfy(config("all") == oldcfg,	'508: config("all") == oldcfg');
 	vrfy(config("mode") == "real",
 					'509: config("mode") == "real"');
 	vrfy(config("display") == 20,
@@ -403,14 +403,14 @@ define test_config()
 					'512: config("trace") == 0');
 	vrfy(config("maxprint") == 16,
 					'513: config("maxprint") == 16');
-	vrfy(config("mul2") == 20,
-					'514: config("mul2") == 20');
-	vrfy(config("sq2") == 20,
-					'515: config("sq2") == 20');
-	vrfy(config("pow2") == 40,
-					'516: config("pow2") == 40');
-	vrfy(config("redc2") == 50,
-					'517: config("redc2") == 50');
+	vrfy(config("mul2") == 1780,
+					'514: config("mul2") == 1780');
+	vrfy(config("sq2") == 3388,
+					'515: config("sq2") == 3388');
+	vrfy(config("pow2") == 176,
+					'516: config("pow2") == 176');
+	vrfy(config("redc2") == 220,
+					'517: config("redc2") == 220');
 	vrfy(config("tilde"),
 					'518: config("tilde")');
 	vrfy(config("tab"),
@@ -429,58 +429,59 @@ define test_config()
 					'525: config("cfappr") == 0');
 	vrfy(config("cfsim") == 8,
 					'526: config("cfsim") == 8');
-	vrfy(config("outround") == 2,
-					'527: config("outround") == 2');
+	vrfy(config("outround") == 24,
+					'527: config("outround") == 24');
 	vrfy(config("round") == 24,
 					'528: config("round") == 24');
-	vrfy(config("leadzero") == 0,
-					'529: config("leadzero") == 0');
+	vrfy(config("leadzero") == 1,
+					'529: config("leadzero") == 1');
 	vrfy(config("fullzero") == 0,
 					'530: config("fullzero") == 0');
 	vrfy(config("maxscan") == 20,
 					'531: config("maxscan") == 20');
-	vrfy(config("prompt") == "> ",
-					'532: config("prompt") == "> "');
-	vrfy(config("more") == ">> ",
-					'533: config("more") == ">> "');
+	vrfy(config("prompt") == "; ",
+					'532: config("prompt") == "; "');
+	vrfy(config("more") == ";; ",
+					'533: config("more") == ";; "');
 
-	/* convert to "newstd" config by individual changes */
-	vrfy(config("display", 10) == 20,
-					'534: config("display") == 20');
-	vrfy(config("epsilon",1e-10)==1e-20,
-					'535: config("epsilon",1e-10)==1e-20');
-	vrfy(config("quo", 0) == 2,	'536: config("quo", 0) == 2');
-	vrfy(config("outround", 24) == 2,
-					'537: config("outround", 24) == 2');
-	vrfy(config("leadzero","y") == 0,
-				'538: config("leadzero","y") == 0');
-	vrfy(config("fullzero", 1) == 0,
-				'539: config("fullzero", 1) == 0');
-	vrfy(config("prompt", "; ") == "> ",
-					'540: config("prompt", "; ") == "> "');
-	vrfy(config("more", ";; ") == ">> ",
-					'541: config("more", ";; ") == ">> "');
-	vrfy(config("all") == newcfg,	'542: config("all") == newcfg');
+	/* convert to "oldstd" config by individual changes */
+	print				'534: test unused';
+	vrfy(config("outround", 2) == 24,
+					'535: config("outround", 2) == 24');
+	vrfy(config("leadzero","n") == 1,
+					'536: config("leadzero","n") == 1');
+	print				'537: test unused';
+	vrfy(config("prompt", "> ") == "; ",
+					'538: config("prompt", "> ") == "; "');
+	vrfy(config("more", ">> ") == ";; ",
+					'539: config("more", ">> ") == ";; "');
+	vrfy(config("all") == oldcfg,	'540: config("all") == oldcfg');
 
-	/* check on the new config("fullzero") effect */
-	vrfy(config("all","oldstd") == newcfg,
-					'543: config("all",callcfg) == newcfg');
+	/* restore the configation at the start of this function */
+	vrfy(config("all",callcfg) == oldcfg,
+					'541: config("all",callcfg) == oldcfg');
+
+	/* display and fullzero tests */
 	vrfy(config("display",2) == 20,
-					'544: config("display",2) == 20');
+					'542: config("display",2) == 20');
+	vrfy(config("leadzero",0) == 1,
+					'543: config("leadzero",0) == 1');
 	vrfy(config("fullzero",1) == 0,
-					'545: config("fullzero",1) == 0');
+					'544: config("fullzero",1) == 0');
 	vrfy(strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00",
-		'546: strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00"');
+		'545: strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00"');
 	vrfy(config("display",20) == 2,
-					'547: config("display",20) == 2');
-	vrfy(config("fullzero",0),
-					'548: config("fullzero",0)');
+					'546: config("display",20) == 2');
+	vrfy(config("leadzero",1) == 0,
+					'547: config("leadzero",1) == 0');
+	vrfy(config("fullzero",0) == 1,
+					'548: config("fullzero",0) == 1');
 	vrfy(strprintf("%d %d %d", 0, 1, 2) == "0 1 2",
 		'549: strprintf("%d %d %d", 0, 1, 2) == "0 1 2"');
 
 	/* restore calling config */
-	vrfy(config("all",callcfg) == oldcfg,
-					'550: config("all",callcfg) == oldcfg');
+	vrfy(config("all",callcfg) == startcfg,
+		'550: config("all",callcfg) == startcfg');
 	vrfy(config("all") == callcfg,	'551: config("all") == callcfg');
 	vrfy(config("all") == startcfg, '552: config("all") == startcfg');
 
@@ -496,7 +497,33 @@ define test_config()
 	vrfy(config("mode2") == "off",
 					'556: config("mode2") == "off"');
 
-	print '557: Ending test_config';
+	/* hz is numeric */
+	vrfy(isint(config("hz")),	'557: isint(config("hz"))');
+
+	/* compile_custom is simple */
+	vrfy(issimple(config("compile_custom")),
+		'558: issimple(config("compile_custom"))');
+
+	/* allow_custom is simple */
+	vrfy(issimple(config("allow_custom")),
+		'559: issimple(config("allow_custom"))');
+
+	/* allow_custom is simple */
+	vrfy(issimple(config("allow_custom")),
+		'559: issimple(config("allow_custom"))');
+
+	/* baseb is numeric */
+	vrfy(isint(config("baseb")),	'560: isint(config("baseb"))');
+
+	/* redecl_warn is simple */
+	vrfy(issimple(config("redecl_warn")),
+		'561: issimple(config("redecl_warn"))');
+
+	/* dupvar_warn is simple */
+	vrfy(issimple(config("dupvar_warn")),
+		'562: issimple(config("rdupvar_warn"))');
+
+	print '563: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -742,6 +769,7 @@ define test_functions()
 	local pi;
 	local h, n, r, m, v;
 	local n2, m2, v2;
+	local t;
 
 	print '700: Beginning test_functions';
 
@@ -759,7 +787,7 @@ define test_functions()
 	vrfy(den(17) == 1,		'712: den(17) == 1');
 	vrfy(den(3/7) == 7,		'713: den(3/7) == 7');
 	vrfy(den(-2/3) == 3,		'714: den(-2/3) == 3');
-	vrfy(digits(0) == 0,		'715: digits(0) == 0');
+	vrfy(digits(0) == 1,		'715: digits(0) == 1');
 	vrfy(digits(9) == 1,		'716: digits(9) == 1');
 	vrfy(digits(10) == 2,		'717: digits(10) == 2');
 	vrfy(digits(-691) == 3,		'718: digits(-691) == 3');
@@ -1000,9 +1028,9 @@ define test_functions()
 	vrfy(strpos(a, "abc") == 1,	'946: strpos(a, "abc") == 1');
 	vrfy(strpos(a, "xyz") == 0,	'947: strpos(a, "xyz") == 0');
 	vrfy(strpos(a, a) == 1,		'948: strpos(a, a) == 1');
-	if (config("windows")) {
-	    print '949: test skipped for windows systems';
-	    print '950: test skipped for windows systems';
+	if (config("windows") || config("cygwin")) {
+	    print '949: test skipped for windows or cygwin systems';
+	    print '950: test skipped for windows or cygwin systems';
 	} else {
 	    vrfy(system("") == 0,		'949: system("") == 0');
 	    vrfy(system("true") == 0,		'950: system("true") == 0');
@@ -1038,8 +1066,8 @@ define test_functions()
 	vrfy(digit(a,-1) == 4,		'974: digit(a,-1) == 4');
 	vrfy(digit(a,-2) == 2,		'975: digit(a,-2) == 2');
 	vrfy(digit(a,-3) == 8,		'976: digit(a,-3) == 8');
-	vrfy(digits(0) == 0,		'977: digits(0) == 0');
-	vrfy(digits(0.0123) == 0,	'978: digits(0.0123) == 0');
+	vrfy(digits(0) == 1,		'977: digits(0) == 1');
+	vrfy(digits(0.0123) == 1,	'978: digits(0.0123) == 1');
 	vrfy(digits(3.7) == 1,		'979: digits(3.7) == 1');
 	vrfy(digits(-27) == 2,		'980: digits(-27) == 2');
 	vrfy(digits(-99.7) == 2,	'981: digits(-99.7) == 2');
@@ -1308,9 +1336,77 @@ define test_functions()
 	 * verify sleep
 	 */
 	vrfy(sleep(1/5) == null(),	'1153: sleep(1/5) == null()');
-	vrfy(sleep(1) == null(),	'1154: sleep(1) == null()');
+	vrfy(sleep(1/100) == null(),	'1154: sleep(1/100) == null()');
 
-	print '1155: Ending test_functions';
+	/*
+	 * verify calcpath
+	 */
+	vrfy(isstr(calcpath()),		'1155: isstr(calcpath())');
+
+	/*
+	 * ssq use of lists
+	 */
+	vrfy(ssq(1,2, list(3,4,list(5,6)), list(), 7, 8) == 204,
+		'1156: ssq(1,2, list(3,4,list(5,6)), list(), 7, 8) == 204');
+
+	/*
+	 * quomod 5th argument rounding tests
+	 */
+	vrfy(quomod(10,-3,a,b,0) == 1,	'1157: vrfy(quomod(10,-3,a,b,0) == 1');
+	vrfy(a == -4,			'1158: a == -4');
+	vrfy(b == -2,			'1159: b == -2');
+	vrfy(quomod(-10,-3,a,b,1) == 1, '1160: vrfy(quomod(-10,-3,a,b,1) == 1');
+	vrfy(a == 4,			'1161: a == 4');
+	vrfy(b == 2,			'1162: b == 2');
+	vrfy(quomod(10,3,a,b,2) == 1,	'1163: vrfy(quomod(10,3,a,b,2) == 1');
+	vrfy(a == 3,			'1164: a == 3');
+	vrfy(b == 1,			'1165: b == 1');
+	vrfy(quomod(-10,3,a,b,3) == 1,	'1166: vrfy(quomod(-10,3,a,b,3) == 1');
+	vrfy(a == -4,			'1167: a == -4');
+	vrfy(b == 2,			'1168: b == 2');
+	vrfy(quomod(10,-3,a,b,4) == 1,	'1169: vrfy(quomod(10,-3,a,b,4) == 1');
+	vrfy(a == -3,			'1170: a == -3');
+	vrfy(b == 1,			'1171: b == 1');
+	vrfy(quomod(-10,-3,a,b,5) == 1, '1172: vrfy(quomod(-10,-3,a,b,5) == 1');
+	vrfy(a == 3,			'1173: a == 3');
+	vrfy(b == -1,			'1174: b == -1');
+	vrfy(quomod(10,3,a,b,6) == 1,	'1175: vrfy(quomod(10,3,a,b,6) == 1');
+	vrfy(a == 3,			'1176: a == 3');
+	vrfy(b == 1,			'1177: b == 1');
+	vrfy(quomod(-10,3,a,b,7) == 1,	'1178: vrfy(quomod(-10,3,a,b,7) == 1');
+	vrfy(a == -4,			'1179: a == -4');
+	vrfy(b == 2,			'1180: b == 2');
+	vrfy(quomod(10,-3,a,b,8) == 1,	'1181: vrfy(quomod(10,-3,a,b,8) == 1');
+	vrfy(a == -4,			'1182: a == -4');
+	vrfy(b == -2,			'1183: b == -2');
+	vrfy(quomod(-10,-3,a,b,9) == 1, '1184: vrfy(quomod(-10,-3,a,b,9) == 1');
+	vrfy(a == 3,			'1185: a == 3');
+	vrfy(b == -1,			'1186: b == -1');
+	vrfy(quomod(10,3,a,b,10) == 1,	'1187: vrfy(quomod(10,3,a,b,10) == 1');
+	vrfy(a == 4,			'1188: a == 4');
+	vrfy(b == -2,			'1189: b == -2');
+	vrfy(quomod(-10,3,a,b,11) == 1, '1190: vrfy(quomod(-10,3,a,b,11) == 1');
+	vrfy(a == -4,			'1191: a == -4');
+	vrfy(b == 2,			'1192: b == 2');
+	vrfy(quomod(10,-3,a,b,12) == 1, '1193: vrfy(quomod(10,-3,a,b,12) == 1');
+	vrfy(a == -3,			'1194: a == -3');
+	vrfy(b == 1,			'1195: b == 1');
+	vrfy(quomod(-10,-3,a,b,13) == 1,'1196: vrfy(quomod(-10,-3,a,b,13) == 1');
+	vrfy(a == 4,			'1197: a == 4');
+	vrfy(b == 2,			'1198: b == 2');
+	vrfy(quomod(10,3,a,b,14) == 1,	'1199: vrfy(quomod(10,3,a,b,14) == 1');
+	vrfy(a == 4,			'1200: a == 4');
+	vrfy(b == -2,			'1201: b == -2');
+	vrfy(quomod(-10,3,a,b,15) == 1, '1202: vrfy(quomod(-10,3,a,b,15) == 1');
+	vrfy(a == -4,			'1203: a == -4');
+	vrfy(b == 2,			'1204: b == 2');
+
+	/* runtime(), systime(), usertime() return numeric values */
+	vrfy(isnum(runtime()),		'1205: isnum(runtime())');
+	vrfy(isnum(systime()),		'1206: isnum(systime())');
+	vrfy(isnum(usertime()),		'1207: isnum(usertime())');
+
+	print '1208: Ending test_functions';
 }
 print '017: parsed test_functions()';
 
@@ -1327,14 +1423,14 @@ define _test_underscore()
 	local _a = 27;
 	local __a = 23209;
 
-	print "1200: Beginning _test_underscore";
+	print "1290: Beginning _test_underscore";
 
-	vrfy(_a == 27,			    '1201: _a == 27');
-	vrfy(_ == 49,			    '1202: _ == 49');
-	vrfy(__ == 63,			    '1203: __ == 63');
-	vrfy(__a == 23209,		    '1204: __a == 23209');
+	vrfy(_a == 27,			    '1291: _a == 27');
+	vrfy(_ == 49,			    '1292: _ == 49');
+	vrfy(__ == 63,			    '1293: __ == 63');
+	vrfy(__a == 23209,		    '1294: __a == 23209');
 
-	print "1205: Ending _test_underscore";
+	print "1295: Ending _test_underscore";
 }
 print '020: parsed _test_underscore';
 
@@ -2208,6 +2304,7 @@ print '033: read -once test2300';
 define test_xx_incdec()
 {
 	local A, B;
+	local n;
 
 	print '2300: Beginning object increment/decrement test';
 
@@ -2240,6 +2337,20 @@ define test_xx_incdec()
 	vrfy(ckmat(B,1,2,3) == 1,
 				'2314: ckmat(B,1,2,3) == 1');
 
+	n = 1;
+	print			'2315: n = 1';
+	vrfy(n + n + n + n++ == 4,
+				'2316: n + n + n + n++ == 4');
+	vrfy(n == 2,		'2317: n == 2');
+	n = 1;
+	print			'2318: n = 1';
+	vrfy(n + n + n++ == 3,	'2319: n + n + n++ == 3');
+	vrfy(n == 2,		'2320: n == 2');
+	n = 1;
+	print			'2321: n = 1';
+	vrfy(n + n++ == 2,	'2322: n + n++ == 3');
+	vrfy(n == 2,		'2323: n == 2');
+
 	print '2315: Ending object increment/decrement test';
 }
 print '034: parsed test_xx_incdec()';
@@ -2554,6 +2665,49 @@ define test_2600()
 	i = config("sqrt", i);
 	print tnum++: ': i = config("sqrt", i)';
 
+	i = epsilon(1e-100),;
+	print tnum++: ': i = epsilon(1e-100),;';
+	vrfy(ln(exp(6)) == 6,
+				strcat(str(tnum++), ': ln(exp(6)) == 6'));
+	vrfy(ln(exp(4)^4) == 16,
+				strcat(str(tnum++), ': ln(exp(4)^4) == 16'));
+	vrfy(ln(exp(6.5)^8) == 52,
+				strcat(str(tnum++), ': ln(exp(6.5)^8) == 52'));
+	vrfy(ln(exp(5)^16) == 80,
+				strcat(str(tnum++), ': ln(exp(5)^16) == 80'));
+	vrfy(ln(exp(4.5)^4) == 18,
+				strcat(str(tnum++), ': ln(exp(4.5)^4) == 18'));
+	vrfy(ln(exp(4)^8) == 32,
+				strcat(str(tnum++), ': ln(exp(4)^8) == 32'));
+	vrfy(ln(exp(60/11)^11) == 60,
+			    strcat(str(tnum++), ': ln(exp(60/11)^11) == 60'));
+	vrfy(ln(exp(6)^15) == 90,
+			    strcat(str(tnum++), ': ln(exp(6)^11) == 90'));
+	vrfy(ln(exp(80/17)^17) == 80,
+			    strcat(str(tnum++), ': ln(exp(80/17)^17) == 80'));
+	vrfy(ln(exp(6)^15) == 90,
+			    strcat(str(tnum++), ': ln(exp(6)^15) == 90'));
+	vrfy(ln(exp(5)^18) == 90,
+			    strcat(str(tnum++), ': ln(exp(5)^18) == 90'));
+	vrfy(log(1e6) == 6,
+			    strcat(str(tnum++), ': log(1e6)) == 6'));
+	vrfy(log(1) == 0,
+			    strcat(str(tnum++), ': log(1)) == 0'));
+	vrfy(log(100) == 2,
+			    strcat(str(tnum++), ': log(100)) == 2'));
+	vrfy(log(1e66) == 66,
+			    strcat(str(tnum++), ': log(1e66)) == 66'));
+	vrfy(log(1e127) == 127,
+			    strcat(str(tnum++), ': log(1e127)) == 127'));
+	vrfy(round(log(17^47),10) == 57.8310993048,
+			    strcat(str(tnum++),
+			    	   ': round(log(17^47),10) == 57.8310993048'));
+	vrfy(round(log(127),10) == 2.103803721,
+			    strcat(str(tnum++),
+			    	   ': round(log(127),10) == 2.103803721'));
+        epsilon(i),;
+	print tnum++: ': epsilon(i),;';
+
 	print tnum: ': Ending extensive numeric function test';
 }
 print '037: parsed test_2600()';
@@ -3339,11 +3493,12 @@ print '070: parsed test_redc()';
  */
 define test_fileops()
 {
-	local a, b, c, f, m, n, x, y, z;
+	local a, b, c, f, m, n, p, r, s, x, y, z;
 	local L = "Landon";
 	local C = "Curt";
 	local N = "Noll";
 	local LCN = "Landon\nCurt\nNoll\n";
+	local long = "0123456789abcdef0123456789abcdef";
 
 	print '4200: Beginning test_fileops';
 
@@ -3441,13 +3596,60 @@ define test_fileops()
 	vrfy(y == "Noll",		  '4258: y == "Noll"');
 	vrfy(isnull(fclose(f)),		  '4259: isnull(fclose(f))');
 
+	/*
+	 * fpathopen tests
+	 */
+	vrfy(!iserror(p=fpathopen("junk4200","r",".")),
+			'4260: !iserror(p=fparhopen("junk4200","r","."))');
+	vrfy(!iserror(fclose(p)),	  '4261: !iserror(fclose(p))');
+	vrfy(!iserror(r=fpathopen("regress.cal","r")),
+			'4262: !iserror(r=fparhopen("regress.cal","r","."))');
+	vrfy(!iserror(fclose(r)),	  '4263: !iserror(fclose(r))');
+
+	/*
+	 * verify non-stack overflow on long filenames
+	 */
+	long = long + long + long + long;
+	print		  '4264: long = long + long + long + long;';
+	long = long + long + long + long;
+	print		  '4265: long = long + long + long + long;';
+	vrfy(strlen(long) == 512,	  '4266: strlen(long) == 512');
+	/* bump ecnt up by 1 */
+	++ecnt;
+	print				  '4267: ++ecnt;';
+	vrfy(isfile(p=fopen(long,"r")) == 0,
+			'4268: isfile(p=fopen(long,"r")) == 0');
+
+	/*
+	 * test fgetfile() and fgetline()
+	 */
+	vrfy(!iserror(p=fopen("tmp4200","w")),
+			'4269: !iserror(p=fopen("tmp4200","w"))');
+	vrfy(!iserror(fputs(p,"chongo\n")),
+			'4270: !iserror(fputs(p,"chongo\n"))');
+	vrfy(!iserror(fputs(p,"w\0a\0s\n")),
+			'4271: !iserror(fputs(p,"w\0a\0s\n"))');
+	vrfy(!iserror(fputs(p,"here\n")),
+			'4272: !iserror(fputs(p,"here\n"))');
+	vrfy(!iserror(fclose(p)),	  '4273: !iserror(fclose(p))');
+	vrfy(!iserror(p=fopen("tmp4200","r")),
+			'4274: !iserror(p=fopen("tmp4200","r"))');
+	vrfy(!iserror(s=fgetline(p)),	  '4275: !iserror(s=fgetline(p))');
+	vrfy(strcmp(s,"chongo") == 0, 	  '4276: strcmp(s,"chongo") == 0');
+	vrfy(!iserror(s=fgetfile(p)),	  '4277: !iserror(s=fgetfile(p))');
+	vrfy(strcmp(s,"w\0a\0s\nhere\n") == 0,
+			'4278: strcmp(s,"w\0a\0s\nhere\n") == 0');
+	vrfy(!iserror(fclose(p)),	  '4279: !iserror(fclose(p))');
+
 	/*
 	 * cleanup
 	 */
 	x = rm("junk4200");
-	print				  '4260: x = rm("junk4200")';
+	print				  '4280: x = rm("junk4200")';
+	x = rm("tmp4200");
+	print				  '4281: x = rm("tmp4200")';
 
-	print '4261: Ending test_fileops';
+	print '4282: Ending test_fileops';
 }
 print '071: parsed test_fileops()';
 
@@ -3882,7 +4084,7 @@ print '088: parsed test_fileop()';
 /*
  * global and static assignment tests
  */
-global a = 10, b, c d = 20, e, f;
+global a = 10, b, c d = 20, e;
 print			'089: global a = 10, b, c d = 20, e, f';
 vrfy(a == 10,		'090: a == 10');
 vrfy(b == 0,		'091: b == 0');
@@ -4582,13 +4784,11 @@ print '137: parsed test_random()';
 /*
  * test_newsyn - test new command completion syntax and scope rules
  */
-for (s5500 = 0, i = 0; i < 5; i++)
-	s5500 += i;
+for (s5500 = 0, i = 0; i < 5; i++) s5500 += i;
 print "138: for (s5500 = 0, i = 0; i < 5; i++) s5500 += i;";
 vrfy(s5500 == 10,		'139: s5500 == 10');
 vrfy(i == 5,		'140: i == 5');
-for (s5500 = 0, i = 0; i < 9; i++)
-{
+for (s5500 = 0, i = 0; i < 9; i++) {
 	s5500 += i;
 }
 print "141: for (s5500 = 0, i = 0; i < 9; i++) { s5500 += i; }";
@@ -4636,7 +4836,6 @@ define test_newsyn()
 	vrfy(i == 3,			  '5509: i == 3');
 	/**/
 	{
-		local i;
 		for (s5500 = 0, i = 0; i < 11; i++)
 			s5500 += i;
 		vrfy(s5500 == 55,		  '5510: s5500 == 45');
@@ -5048,8 +5247,6 @@ print '156: parsed test_size()';
 /*
  * test_assign - test assignment of constants and variables
  */
-global A, B;	/* A, B for "constants" */
-print '157: global A, B';
 global X5800, Y5800;	/* X5800, Y5800 for "variables" */
 print '158: global X5800, Y5800';
 obj xy5800 {x, y};
@@ -5071,7 +5268,7 @@ define test_assign(base, work)
 	Y5800 = base+4;
 	print				  base+4: ': Y5800 = base+4';
 	obj xy5800 A={1,2}, obj xy5800 B={3,4};
-	print base+5: ': obj xy5800 A={1,2}, obj xy5000 B={3,4}';
+	print base+5: ': obj xy5800 A={1,2}, obj xy5800 B={3,4}';
 
 	/*
 	 * test assignment
@@ -5136,6 +5333,11 @@ define test_is()
 	local square;	/* square of an odd prime */
 	local string;	/* string */
 	local com;	/* complex value */
+	local rndint;	/* a random integer */
+	local rndexp;	/* a random exponent */
+	local rndval;	/* rndint ^ rndexp */
+	local i;	/* integer value */
+	local ok;	/* 1 ==> issq() tests were OK, 0 ==> failure */
 
 	print '5900: Beginning test_is';
 
@@ -5194,7 +5396,7 @@ define test_is()
 	prime = 3217;
 	print				  '5922: prime = 3217';
 	square = prime^2;
-	print				  '5923: square = prine^2';
+	print				  '5923: square = prime^2';
 	string = "a string";
 	print				  '5924: string = "a string"';
 	com = 3+4i;
@@ -6073,15 +6275,75 @@ define test_is()
 	vrfy(istype(matrix,odd) == 0,	  '6661: istype(matrix,odd) == 0');
 	vrfy(istype(a,odd) == 0,	  '6662: istype(a,odd) == 0');
 
+	/*
+	 * perform more extensive issq() testing
+	 */
+	ok = 1;
+	for (i=0; i < 256; ++i) {
+		/* rndval will be a square - even powers>0 of x>1 */
+		rndexp = random(1, 16) * 2;
+		rndint = random(2, 4294967296);
+		if (issq(rndint)) {
+			++rndint;
+		}
+		rndval = rndint ^ rndexp;
+		if (issq(rndval) == 0) {
+			prob(strprintf("issq(%d^%d) returned 0",
+					rndint, rndexp));
+			ok = 0;
+		}
+	}
+	if (ok) {
+		print	  '6663: issq() on 256 squares';
+	} else {
+		print	  '****: failure(s): 6663: faiissq() on 256 squares';
+	}
+	for (i=0; i < 256; ++i) {
+		/* rndval will not be a square - 1 + even powers>0 of x>1 */
+		rndexp = random(1, 16) * 2;
+		rndint = random(2, 4294967296);
+		rndval = rndint ^ rndexp;
+		if (issq(rndval+1) != 0) {
+			prob(strprintf("issq(%d^%d)+1 returned non-zero",
+					rndint, rndexp));
+			ok = 0;
+		}
+	}
+	if (ok) {
+		print	  '6664: issq() on 256 squares+1';
+	} else {
+		print	  '****: failure(s): 6664: issq() on 256 squares+1';
+	}
+	print				  '6664: issq() on 256 squares+1';
+	for (i=0; i < 256; ++i) {
+		/* rndval will not be a square - odd powers>0 of x>1 */
+		rndexp = (random(1, 16) * 2) + 1;
+		rndint = random(2, 4294967296);
+		if (issq(rndint)) {
+			++rndint;
+		}
+		rndval = rndint ^ rndexp;
+		if (issq(rndval) != 0) {
+			prob(strprintf("issq(%d^%d) returned non-zero",
+					rndint, rndexp));
+			ok = 0;
+		}
+	}
+	if (ok) {
+		print	  '6665: issq() on 256 non-squares';
+	} else {
+		print	  '****: failure(s): 6665: issq() on 256 non-squares';
+	}
+
 	/*
 	 * cleanup
 	 */
 	blkfree("blk5900");
-	print				  '6663: blkfree("blk5900")';
+	print				  '6666: blkfree("blk5900")';
 	fclose(ofd);
-	print				  '6664: fclose(ofd)';
+	print				  '6667: fclose(ofd)';
 
-	print '6665: Ending test_is';
+	print '6668: Ending test_is';
 }
 print '168: test_is()';
 
@@ -6193,7 +6455,7 @@ define test_blk()
 	/* A second named block */
 
 	B1 = blk("+++6700", 15, 10) = {1,2,3,4,5};
-	print				  '6746: B1 = blk("+++6700", , 10);';
+	print				  '6746: B1 = blk("+++6700", 15 , 10) = {1,2,3,4,5};';
 	vrfy(size(B1) == 15,		  '6747: size(B1) == 15');
 	vrfy(sizeof(B1) == 20,		  '6748: sizeof(B1) == 20');
 	vrfy(test(B1) == 1,		  '6749: test(B1) == 1');
@@ -6588,10 +6850,10 @@ define test_sha()
 	    0x21e42319a26787046c2b28b7ae70f1b54bf0ba2a,
 		'7122: sha(sha("this is", 7^19-8, ..., "hash")) == 0x21e4...');
 
-	z = sha(list(1,2,3), "curds and whey", 2^21701-1, pi());
-	print '7123: z = sha(list(1,2,3), "curds and whey", 2^21701-1, pi());';
-	vrfy(sha(z) == 0x36dcca3e51865c30a2cf738023cda446f1368340,
-		'7124: sha(z) == 0x36dcca3e51865c30a2cf738023cda446f1368340');
+	z = sha(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));
+	print '7123: z = sha(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));';
+	vrfy(sha(z) == 257075527903934749824451356785709876382198951165,
+		'7124: sha(z) == 257075527903934749824451356785709876382198951165');
 
 	y = sha();
 	print '7125: y = sha()';
@@ -6599,8 +6861,8 @@ define test_sha()
 	print '7126: y = sha(y, list(1,2,3), "curds and whey")';
 	y = sha(y, 2^21701-1);
 	print '7127: y = sha(y, 2^21701-1)';
-	y = sha(y, pi());
-	print '7128: y = sha(y, pi())';
+	y = sha(y, pi(1e-100));
+	print '7128: y = sha(y, pi(1e-100))';
 	vrfy(y == z,			'7129: y == z');
 
 	B = blk() = {"a", "b", "c"};
@@ -6659,10 +6921,10 @@ define test_sha1()
 	'7209: sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) == ...');
 
 
-	z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi());
-	print '7210: z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi());';
-	vrfy(sha1(z) == 0xc19e7317675dbf71e293b4c41e117169e9da5b6f,
-		'7211: sha1(z) == 0xc19e7317675dbf71e293b4c41e117169e9da5b6f');
+	z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));
+	print '7210: z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));';
+	vrfy(sha1(z) == 0x158cc87deeb9dd478ca14e3ab359205b0fb15b83,
+		'7211: sha1(z) == 0x158cc87deeb9dd478ca14e3ab359205b0fb15b83');
 
 	y = sha1();
 	print '7212: y = sha1();';
@@ -6670,8 +6932,8 @@ define test_sha1()
 	print '7213: y = sha1(y, list(1,2,3), "curds and whey");';
 	y = sha1(y, 2^21701-1);
 	print '7214: y = sha1(y, 2^21701-1);';
-	y = sha1(y, pi());
-	print '7215: y = sha1(y, pi());';
+	y = sha1(y, pi(1e-100));
+	print '7215: y = sha1(y, pi(1e-100));';
 	vrfy(y == z, '7216: y == z');
 
 	vrfy(sha1(sha1("a"))==0x86f7e437faa5a7fce15d1ddcb9eaeaea377667b8,
@@ -6747,18 +7009,18 @@ define test_md5()
     '7310: md5(md5("this is", 7^19-8, "a composit", 3i+4.5, "hash")) == ...');
 
 
-	z = md5(list(1,2,3), "curds and whey", 2^21701-1, pi());
-	print '7311: z = md5(list(1,2,3), "curds and whey", 2^21701-1, pi());';
-	vrfy(md5(z) == 0x63d2b2fccae2de265227c30b05abb6b5,
-		'7312: md5(z) == 0x63d2b2fccae2de265227c30b05abb6b5');
+	z = md5(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));
+	print '7311: z = md5(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));';
+	vrfy(md5(z) == 0x487462e577eabef0302dd13af6632546,
+		'7312: md5(z) == 0x487462e577eabef0302dd13af6632546');
 	y = md5();
 	print		'7313: y = md5();';
 	y = md5(y, list(1,2,3), "curds and whey");
 	print		'7314: y = md5(y, list(1,2,3), "curds and whey")';
 	y = md5(y, 2^21701-1);
 	print		'7315: y = md5(y, 2^21701-1);';
-	y = md5(y, pi());
-	print		'7316: y = md5(y, pi());';
+	y = md5(y, pi(1e-100));
+	print		'7316: y = md5(y, pi(1e-100));';
 	vrfy(y == z,	'7317: y == z');
 
 	vrfy(md5(md5("a")) == 0x0cc175b9c0f1b6a831c399e269772661,
@@ -7295,7 +7557,7 @@ define test_somenew()
 	vrfy(size(char(0)) == 1,	'8203: size(char(0)) == 1');
 	vrfy(strlen(char(0)) == 0,	'8204: strlen(char(0)) == 0');
 	vrfy(char(0) != "",		'8205: char(0) != ""');
-	vrfy(strcmp(char(0),"") == 0,	'8206: strcmp(char(0),"") == 0');
+	vrfy(str(char(0)) == "",	'8206: str(char(0)) == ""');
 
 	vrfy(str("abc") == "abc",	'8207: str("abc") == "abc"');
 
@@ -7652,18 +7914,54 @@ print	'8406: Ending test_quit';
  * test_divmod - psuedo-random tests on the // and % with various rounding modes
  */
 print;
-print '8500: Starting test_divmod'
+print '8500: Starting test of divmod'
 read -once "test8500";
-/* 85xx: Ending test_divmod is printed by test8500.cal */
+/* 85xx: Ending test of divmod is printed by test8500.cal */
 
 
 /*
  * test_maxargs - test up to 1024 args being passed to a builtin function
  */
 print;
-print '8600: Starting test_1024args'
+print '8600: Starting test of up to 1024 args'
 read -once "test8600";
-/* 86xx: Ending test_1024args is printed by test8600.cal */
+/* 860x: Ending test of up to 1024 args is printed by test8600.cal */
+
+
+/*
+ * dupvar_warn and redecl_warn testing
+ */
+print;
+print '8650: Starting test of dupvar_warn and redecl_warn config parameters';
+vrfy(config("redecl_warn",0),	  '8651: config("redecl_warn",0)');
+vrfy(config("dupvar_warn",0),	  '8652: config("dupvar_warn",0)');
+vrfy(u_glob == 6,		  '8653: u_glob == 6');
+global u_glob = 555;
+print 				  '8654: reclare u_glob';
+vrfy(u_glob == 555,		  '8655: u_glob == 555');
+define func_8650(u_glob) { local u_glob; return u_glob; }
+print				  '8656: u_glob as both local and parameter';
+define func_8650a(u_glob) { static u_glob; return u_glob; }
+print				  '8657: u_glob as both static and parameter';
+vrfy(config("redecl_warn",1)==0,  '8658: config("redecl_warn",1)==0');
+vrfy(config("dupvar_warn",1)==0,  '8659: config("dupvar_warn",1)==0');
+/* 865x: Ending test of up to 1024 args is printed by test8600.cal */
+
+
+/*
+ * dotest scripts
+ *
+ * We use the dotest driver to evaluate test-97xx data files.
+ */
+print;
+print '8700: Starting dotest runs'
+print '8701: read -once "dotest"';
+read -once "dotest";
+print '8702: read -once "set8700"';
+read -once "set8700";
+vrfy(dotest("set8700.line", 8703) == 0,
+     '8703: dotest("set8700.line", 8703) == 0');
+/* 87xx: Ending dotest runs is printed by set8700.test */
 
 
 /*
@@ -7743,7 +8041,28 @@ read -once varargs;
 print	'9827: read -once varargs';
 read -once qtime;
 print	'9828: read -once qtime';
-print	'9829: Ending read of selected calc resource files';
+read -once chi;
+print	'9829: read -once chi';
+read -once intfile;
+print	'9830: read -once intfile';
+read -once lucas;
+print	'9831: read -once lucas';
+read -once lucas_tbl;
+print	'9832: read -once lucas_tbl';
+read -once natnumset;
+print	'9833: read -once natnumset';
+read -once repeat;
+print	'9834: read -once repeat';
+read -once screen;
+print	'9835: read -once screen';
+read -once linear;
+print	'9836: read -once linear';
+print	'9837: skipping read -once beer.cal because it is an infinite loop';
+print	'9838: skipping read -once hello.cal because it is an infinite loop';
+print	'9839: skipping read -once xx_print.cal because it is a printing demo';
+read -once sumtimes;
+print	'9840: read -once sumtimes';
+print	'9841: Ending read of selected calc resource files';
 
 
 /*

cal/repeat.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: repeat.cal,v 29.3 2003/01/14 04:03:20 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: repeat.cal,v 29.4 2003/01/26 19:42:03 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/repeat.cal,v $
  *
  * Under source code control:	2003/01/05 00:00:01
@@ -48,6 +48,6 @@ define repeat(digit_set, repeat_count)
     }
 
     /* return repeated set of digits */
-    digit_count = max(digits(digit_set), 1);
+    digit_count = digits(digit_set);
     return digit_set * (10^(digit_count*repeat_count)-1) / (10^digit_count-1);
 }

cal/screen.cal

@@ -0,0 +1,61 @@
+/*
+ * screen - ANSI control sequences
+ *
+ * This file was created by Ernest Bowen <ebowen at une dot edu dot au>.
+ *
+ * This code has been placed in the public domain.  Please do not
+ * copyright this code.
+ *
+ * ERNEST BOWEN DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
+ * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY 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.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: screen.cal,v 29.2 2006/05/01 19:21:18 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/screen.cal,v $
+ *
+ * This file is not covered under version 2.1 of the GNU LGPL.
+ *
+ * Under source code control:	2006/03/08 05:54:09
+ * File existed as early as:	2006
+ */
+
+up = CUU ="\e[A";
+down = CUD = "\e[B}";
+forward = CUF = "\e[C";
+back = CUB = "\e[D";
+save = SCP = "\e[s";
+restore = RCP = "\e[u";
+cls = "\e[2J";
+home = "\e[F";
+eraseline = "\e[K";
+off = "\e[0m";
+bold = "\e[1m";
+faint = "\e[2m";
+italic = "\e[3m";
+blink = "\e[5m";
+rapidblink = "\e[6m";
+reverse = "\e[7m";
+concealed = "\e[8m";
+/* Lowercase indicates foreground, uppercase background" */
+black = "\e[30m";
+red = "\e[31m";
+green = "\e[32m";
+yellow = "\e[33m";
+blue = "\e[34m";
+magenta = "\e[35m";
+cyan = "\e[36m";
+white = "\e[37m";
+Black = "\e[40m";
+Red = "\e[41m";
+Green = "\e[42m";
+Yellow = "\e[43m";
+Blue = "\e[44m";
+Magenta = "\e[45m";
+Cyan = "\e[46m";
+White = "\e[47m";

cal/set8700.cal

@@ -0,0 +1,77 @@
+/*
+ * set8700 - environment for dotest line tests for the 8700 set of regress.cal
+ *
+ * Copyright (C) 2006  Ernest Bowen and Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: set8700.cal,v 29.2 2006/08/20 16:16:11 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.cal,v $
+ *
+ * Under source code control:	2006/05/20 14:10:11
+ * File existed as early as:	2006
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * setup global variables for dotest() to use with set8700.set
+ */
+
+global set8700_A;
+global set8700_B;
+global set8700_M;
+global set8700_M1;
+global set8700_M2;
+global set8700_L;
+global set8700_L1;
+global set8700_L2;
+global set8700_O;
+global set8700_P;
+global set8700_P1;
+global set8700_P2;
+global set8700_Q;
+global set8700_R;
+global set8700_S;
+global set8700_X;
+global set8700_Y;
+global set8700_x;
+global set8700_y;
+
+define set8700_getA1() = set8700_A;
+
+define set8700_getA2() { return set8700_A; }
+
+define set8700_getvar() {local a = 42; protect(a,256); return a;}
+
+define set8700_f(set8700_x) = set8700_x^2;
+
+define set8700_g(set8700_x)
+{
+    if (isodd(set8700_x)) protect(set8700_x, 256);
+    return set8700_x;
+}
+
+obj set8700_point {
+	set8700_x, set8700_y, set8700_z
+}
+
+global mat set8700_c[] = { 1, 2+3i, -5+4i, 5i+6, -7i };
+
+global mat set8700_e[] = { 0, 1, 0, 0, 2, -3/2, 2, -1/2,
+			   -3, 0.5, -1.0, 0.5, 1.0, 0.0, 0.0, 0.0 };

cal/set8700.line

@@ -0,0 +1,429 @@
+##
+## set8700 - dotest line tests for the 8700 set of regress.cal
+##
+## Copyright (C) 2006  Ernest Bowen and Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+##
+## @(#) $Revision: 29.4 $
+## @(#) $Id: set8700.line,v 29.4 2006/08/20 16:16:11 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.line,v $
+##
+## Under source code control:	2006/05/20 14:10:11
+## File existed as early as:	2006
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+
+
+strcpy("", "") == ""
+strcpy("", "xyz") == ""
+strcpy("a", "xyz") == "x"
+strcpy("ab", "xyz") == "xy"
+strcpy("abc", "xyz") == "xyz"
+strcpy("abcd", "xyz") == "xyz\0"  ## Result will print as "xyz"
+strcpy("abcde", "xyz") == "xyz\0e"
+strcpy("abcdef", "xyz") == "xyz\0ef"
+strcpy("abcdef", "x\0z") == "x\0z\0ef" ## Note z is copied
+strcpy("abc", "") == "\0bc"
+
+strncpy("abcdef", "xyz", 0) == "abcdef" ## No characters copied
+strncpy("abcdef", "xyz", 1) == "xbcdef" ## One character copied, no '\0'
+strncpy("abcdef", "xyz", 2) == "xycdef"
+strncpy("abcdef", "xyz", 3) == "xyzdef"
+strncpy("abcdef", "xyz", 4) == "xyz\0ef"
+strncpy("abcdef", "xyz", 5) == "xyz\0\0f" ## Two nulls as in C
+strncpy("abcdef", "xyz", 6) == "xyz\0\0\0"
+strncpy("abcdef", "xyz", 7) == "xyz\0\0\0" ## Size of first string unchanged
+strncpy("a\0cdef", "\0yz", 4) == "\0yz\0ef"
+strncpy("ab", "xyz", 3) == "xy"
+
+strcmp("", "") == 0
+strcmp("", "a") == -1
+strcmp("\n", "\n") == 0
+strcmp("\0", "") == 1		## '\0' treated like other characters
+strcmp("ab", "") == 1
+strcmp("ab", "a") == 1
+strcmp("ab", "ab") == 0
+strcmp("ab", "abc") == -1
+strcmp("abc", "abb") == 1
+strcmp("abc", "abc") == 0
+strcmp("abc", "abd") == -1
+strcmp("abc\0", "abc") == 1
+
+strncmp("abc", "xyz", 0) == 0
+strncmp("abc", "xyz", 1) == -1
+strncmp("abc", "", 1) == 1
+strncmp("abc", "a", 1) == 0
+strncmp("", "", 2) == 0
+strncmp("a", "a", 2) == 0
+strncmp("a", "b", 2) == -1
+strncmp("ab", "ab", 2) == 0
+strncmp("ab", "ac", 2) == -1
+strncmp("\0ac", "\0b", 2) == -1
+strncmp("ab", "abc", 2) == 0
+strncmp("abc", "abd", 2) == 0
+strncmp("a", "a\0", 2) == -1
+strncmp("a", "a", 3) == 0
+strncmp("abc", "abd", 3) == -1
+strncmp("\0\0\n", "\0\0\t", 3) == 1
+
+str("abc") == "abc"
+str("ab\0") == "ab"
+str("a\0c") == "a"
+str("\0bc") == ""
+
+size("") == 0
+size("a") == 1
+size("\0") == 1
+size("a\0") == 2
+size("a\0b") == 3
+
+strlen("\0") == 0
+strlen("a\0") == 1
+strlen("a\0b") == 1
+
+0 * "abc" == ""
+1 * "abc" == "abc"
+2 * "abc" == "abcabc"
+3 * "abc" == "abcabcabc"
+1 * "" == ""
+-1 * "abc" == "cba"
+-2 * "abc" == "cbacba"
+"abc" + "xyz" == "abcxyz"
+"abc" - "xyz" == "abczyx"
+
+
+substr("abcd",0,0) == ""
+substr("abcd",0,1) == "a"
+substr("abcd",0,2) == "ab"
+substr("abcd",1,0) == ""
+substr("abcd",1,1) == "a"
+substr("abcd",1,2) == "ab"
+substr("abcd",2,0) == ""
+substr("abcd",2,1) == "b"
+substr("abcd",2,2) == "bc";
+substr("abcd",2,3) == "bcd";
+substr("abcd",2,4) == "bcd";
+substr("abcd",2,5) == "bcd"; ## substr stops at end of string
+substr("abcd",4,0) == ""
+substr("abcd",4,1) == "d"
+substr("abcd",4,2) == "d"
+substr("abcd",4,3) == "d"
+substr("abcd",5,0) == ""
+substr("abcd",5,1) == ""
+substr("a\0c\0",2,2) == "\0c"  ## '\0' treated like other characters
+substr("a\0c\0",2,3) == "\0c\0"
+
+#"" == 0	## # operator counts number of bits
+#"\0" == 0
+# "a" == 3
+   #	  "ab" == 6	## white space ignored
+# "abc" == 10
+# 27 == 4
+# 0b1010111011 == 7
+
+7 # 9 == 2		## 7 # 9 = abs(7 - 9)
+3/4 # 2/3 == 1/12
+
+a = 5, a #= 2, a == 3
+a #= 4, a == 1
+
+## Binary # operator not defined for strings
+
+protect(set8700_A) == 0
+## Testing with one lvalue
+isnull(protect(set8700_A,65))
+protect(set8700_A) == 65
+isnull(protect(set8700_A, -1))
+protect(set8700_A) == 64
+protect(set8700_A,-2), protect(set8700_A) == 64
+protect(set8700_A,5), protect(set8700_A) == 69
+protect(set8700_A,-4), protect(set8700_A) == 65
+protect(set8700_A,0), protect(set8700_A) == 0
+protect(set8700_A,1234), protect(set8700_A) == 1234
+protect(set8700_A,-1234), protect(set8700_A) == 0
+protect(set8700_A,65535), protect(set8700_A) == 65535
+protect(set8700_A,-65535), protect(set8700_A) == 0
+
+## Simple assignments
+set8700_A = 42, protect(set8700_A,1024), set8700_B = set8700_A, protect(set8700_B) == 1024
+set8700_A = 6 * 7, protect(set8700_A) == 1024
+set8700_A == set8700_B
+
+## Testing matrix protectioon
+set8700_A = mat [3] = {1, 2, list(3,4)}; 1
+protect(set8700_A, 65, 1), protect(set8700_A) == 1089
+protect(set8700_A[0]) == 65
+protect(set8700_A[2]) == 65
+protect(set8700_A[2][1]) == 0
+protect(set8700_A, 65, 2), protect(set8700_A[2][1]) == 65
+protect(set8700_A,-1024), protect(set8700_A) == 65
+protect(set8700_A, -1, 1), protect(set8700_A) == 64
+protect(set8700_A[1]) == 64
+protect(set8700_A[2]) == 64
+protect(set8700_A[2][0]) == 65
+protect(set8700_A,0), protect(set8700_A) == 0
+protect(set8700_A[1]) == 64
+protect(set8700_A, 0, 2), protect(set8700_A) == 0
+protect(set8700_A[1]) == 0
+protect(set8700_A[2][1]) == 0
+protect(set8700_A,1024, 2), protect(set8700_A) == 1024
+protect(set8700_A[2]) == 1024
+protect(set8700_A[2][0], 512), protect(set8700_A[2][0]) == 1536
+
+## Testing simple assignment of matrix
+set8700_B = set8700_A, protect(set8700_B) == 1024	## protect(set8700_A) copied
+protect(set8700_B[2]) == 1024		## protect(set8700_A[2]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## copying matrix to list
+set8700_B = list(5,6,7), protect(set8700_B) == 1024
+protect(set8700_B[0]) == 0
+protect(set8700_B[2]) == 0
+protect(set8700_A,0), protect(set8700_A) == 0
+copy(set8700_A,set8700_B), set8700_B[0] == 1 && set8700_B[1] == 2
+set8700_B[2] == list(3,4)
+protect(set8700_B) == 1024		## protect(set8700_A) not copied
+protect(set8700_B[0]) == 1024		## protect(set8700_A[0]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## copying matrix to matrix
+set8700_B = mat[3], protect(set8700_B) == 1024
+protect(set8700_B[2]) == 0
+copy(set8700_A,set8700_B), set8700_B[0] == 1 && set8700_B[1] == 2
+set8700_B[2] == list(3,4)
+protect(set8700_B) == 1024		## protect(set8700_A) not copied
+protect(set8700_B[0]) == 1024		## protect(set8700_A[0]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## Testing list protection
+set8700_A = list(1, 2, list(3,4)), 1
+protect(set8700_A,1024, 2), protect(set8700_A) == 1024
+protect(set8700_A[2]) == 1024
+protect(set8700_A[2][0], 512), protect(set8700_A[2][0]) == 1536
+
+## Simple assignment of list
+set8700_B = set8700_A, protect(set8700_B) == 1024	## protect(set8700_A) copied
+protect(set8700_B[2]) == 1024		## protect(set8700_A[2]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## Copying list to list
+set8700_B = list(5,6,7), protect(set8700_B) == 1024
+protect(set8700_B[2]) == 0
+copy(set8700_A,set8700_B), set8700_B[0] == 1 && set8700_B[1] == 2
+set8700_B[2] == list(3,4)
+protect(set8700_B) == 1024		## protect(set8700_A) not copied
+protect(set8700_B[0]) == 1024		## protect(set8700_A[0]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## Copying list to matrix
+set8700_B = mat[3], protect(set8700_B) == 1024
+protect(set8700_B[2]) == 0
+copy(set8700_A,set8700_B), set8700_B[0] == 1 && set8700_B[1] == 2
+set8700_B[2] == list(3,4)
+protect(set8700_B) == 1024
+protect(set8700_B[0]) == 1024		## protect(set8700_A[0]) copied
+protect(set8700_B[2][0]) == 1536	## protect(set8700_A[2][0]) copied
+
+## Protecting one element of a list
+set8700_A = list(1,4,3,2), protect(set8700_A[1]) == 0
+protect(set8700_A[1], 1024), protect(set8700_A[1]) == 1024
+
+## Testing sort
+set8700_A = sort(set8700_A), set8700_A == list(1,2,3,4)
+protect(set8700_A[1]) == 0
+protect(set8700_A[3]) == 1024		## status of 4
+
+## Testings reverse
+set8700_A = reverse(set8700_A), set8700_A == list(4,3,2,1)
+protect(set8700_A[0]) == 1024		## status of 4
+
+## Testing swap
+swap(set8700_A[0], set8700_A[1]), set8700_A == list(3,4,2,1)
+protect(set8700_A[0]) == 0		## status moved
+protect(set8700_A[1]) == 1024		## 4 retains protection
+
+## Testing list with protected list argument
+protect(set8700_A, 0), protect(set8700_A) == 0
+protect(set8700_A, 512), protect(set8700_A) == 512
+protect(set8700_A[1]) == 1024
+set8700_L = list(1,set8700_A,3), protect(set8700_L) == 0
+protect(set8700_L[0]) == 0
+protect(set8700_L[1]) == 512		## protect(set8700_A) copied
+protect(set8700_L[1][1]) == 1024	## protect(set8700_A[1]) copied
+
+## Testing list with "intialization"
+set8700_L = list(1,2,3), protect(set8700_L) == 0
+protect(set8700_L[0]) | protect(set8700_L[1]) | protect(set8700_L[2]) == 0	## All zero
+set8700_L = {1,set8700_A}, set8700_L[1] == set8700_A
+protect(set8700_L[1]) == 512		## protect(set8700_A) copied
+protect(set8700_L[1][1]) == 1024	## protect(set8700_A[1]) copied
+set8700_L[1] = 2, protect(set8700_L[1]) == 512	## Not changed
+
+## Testing matrix with "initialization"
+set8700_M = mat[3] = {1,set8700_A}, protect(set8700_M) == 0
+protect(set8700_M[0]) == 0
+protect(set8700_M[1]) == 512		## protect(set8700_A) copied
+protect(set8700_M[2]) == 0
+protect(set8700_M[1][1]) == 1024	## protect(set8700_A[1]) copied
+
+## Testing push, pop, append, remove
+set8700_A = list(1,2), protect(set8700_A,0,1), protect(set8700_A[0]) == 0
+protect(set8700_A[0], 256), protect(set8700_A[0]) == 256
+protect(set8700_A[1]) == 0
+append(set8700_A, pop(set8700_A)), protect(set8700_A[0]) ==  0
+protect(set8700_A[1]) == 256
+push(set8700_A, remove(set8700_A)), protect(set8700_A[0]) == 256
+protect(set8700_A[1]) == 0
+
+## Testing operation-assignments
+set8700_A = 5, protect(set8700_A,1024), protect(set8700_A) == 1024
+protect(set8700_A, 1024), set8700_A = 7, protect(set8700_A) == 1024
+protect(set8700_A,1024), set8700_A += 2, protect(set8700_A) == 1024
+protect(set8700_A,1024), set8700_A *= 2, protect(set8700_A) == 1024
+protect(set8700_A,1024), set8700_A |= 2, protect(set8700_A) == 1024
+protect(set8700_A,1024), set8700_A &= 2, protect(set8700_A) == 1024
+protect(set8700_A,1024), set8700_A ^= 2, protect(set8700_A) == 1024
+
+protect(set8700_B,0), set8700_B = set8700_getA1(), protect(set8700_B) == 1024
+protect(set8700_B,0), set8700_B = set8700_getA2(), protect(set8700_B) == 1024
+set8700_B = set8700_getvar(), protect(set8700_B) == 1024 + 256
+
+set8700_x = 7,  protect(set8700_x) == 0
+protect(7,2) == error(10234)
+protect(set8700_x,2.5) == error(10235)
+protect(set8700_x,"abc") == error(10235)
+protect(set8700_x, 1e6) == error(10235)
+protect(set8700_x,1), (set8700_x = 2) == error(10366)
+(set8700_x = 3 + 4) == error(10366)
+
+protect(set8700_x,2), protect(set8700_x) == 3
+protect(set8700_x,-1), protect(set8700_x) == 2
+(set8700_x = 2) == error(10368)
+(set8700_x = 3 + 4) == 7
+protect(set8700_x,2), ++set8700_x == error(10379)
+set8700_x == 7
+--set8700_x == error(10382)
+set8700_x == 7
+set8700_x++ == error(10385)
+set8700_x == 7
+set8700_x-- == error(10388)
+
+protect(set8700_A,0), protect(set8700_A,16), 1
+set8700_A = "abcdef", protect(set8700_A) == 16		## No copy to set8700_A
+protect(set8700_B,0), set8700_B = "xyz", protect(set8700_B) == 0
+copy(set8700_B, set8700_A) == error(10226)
+set8700_A == "abcdef"				## set8700_A not changed
+protect(set8700_A,0), copy(set8700_B,set8700_A), set8700_A == "xyzdef"
+protect(set8700_B,128), protect(set8700_B) == 128	## No copy from set8700_B
+copy(set8700_B,set8700_A,,,3) == error(10225)
+set8700_A == "xyzdef"
+protect(set8700_B,0), copy(set8700_B,set8700_A,,,3), set8700_A == "xyzxyz"
+
+set8700_A = "abcdef", protect(set8700_A, 16), swap(set8700_A[0], set8700_A[5]) == error(10371)
+set8700_A == "abcdef"
+protect(set8700_A,0), isnull(swap(set8700_A[0], set8700_A[5]))
+set8700_A == "fbcdea"
+protect(set8700_A,2), ++set8700_A[0] == error(10377)
+--set8700_A[1] == error(10380)
+set8700_A[2]++ == error(10383)
+set8700_A[3]-- == error(10386)
+set8700_A == "fbcdea"
+protect(set8700_A,0), ++set8700_A[0] == 'g'
+--set8700_A[1] == 'a'
+set8700_A[2]++ == ord('c')
+set8700_A[3]-- == ord('d')
+set8700_A == "gadcea"
+
+protect(set8700_x,0), protect(set8700_y,0), protect(set8700_x,256), protect(set8700_y,512),1
+quomod(11,4,set8700_x,set8700_y), set8700_x == 2 && set8700_y == 3
+protect(set8700_x) == 256
+protect(set8700_y) == 512
+
+set8700_A = mat[3]; protect(set8700_A[0], 1024); protect(set8700_A[0]) == 1024
+set8700_x = 7, protect(set8700_x,0), protect(set8700_x, 512), 1
+set8700_A = {set8700_x,,set8700_x}, protect(set8700_A[0]) == 1536
+protect(set8700_A[1]) == 0
+protect(set8700_A[2]) == 512
+protect(set8700_A,16), protect(set8700_A) == 16		## No copy to
+set8700_A == (mat[3] = {7,0,7})
+set8700_A = {1,2,3}, errno() == 10390;
+set8700_A == (mat[3] = {7,0,7})
+
+protect(set8700_A,0), set8700_A = {1,2,3}, set8700_A == (mat[3] = {1,2,3})
+protect(set8700_A[1],1), protect(set8700_A[1]) == 1
+set8700_A = {4,5,6}, errno() == 10394
+set8700_A == (mat[3] = {4,2,6})
+modify(7, "set8700_f") == error(10405)
+set8700_A = list(2,3,5), modify(set8700_A, 7) == error(10406)
+protect(set8700_A,2), modify(set8700_A, "set8700_f") == error(10407)
+protect(set8700_A,0), modify(set8700_A, "h") == error(10408)
+set8700_B = 42, protect(set8700_B,0), modify(set8700_B, "set8700_f") == error(10409)
+set8700_A == list(2,3,5)		## set8700_A not affected by failures
+protect(set8700_A,0,1), modify(set8700_A, "set8700_f") == null()
+set8700_A == list(4,9,25)
+modify(set8700_A,"set8700_g") == null()
+protect(set8700_A[0]) == 0
+protect(set8700_A[1]) == 256 && protect(set8700_A[2]) == 256
+
+set8700_A = 0, protect(set8700_A,0), set8700_A = pop(2), set8700_A == error(10181)
+set8700_A = pop(list(1,2,3)), set8700_A == error(10181)
+set8700_B = set8700_A = pop(2), set8700_B == error(10181)
+set8700_A = 32, protect(set8700_A,8), (set8700_A = pop(2)) == error(10370)
+set8700_A == 32
+set8700_B = set8700_A = pop(2), set8700_B == error(10370)
+## Testing copying of protected elements and initialization
+set8700_M1 = mat[3], protect(set8700_M1,0), protect(set8700_M1[1],1), protect(set8700_M1[1]) == 1
+set8700_M2 = mat[3], protect(set8700_M2,0), protect(set8700_M2[2],4), protect(set8700_M2[2]) == 4
+set8700_L = list(set8700_M1, set8700_M2), protect(set8700_L[0][1]) == 1 && protect(set8700_L[1][2]) == 4
+set8700_L = {{1,2,3},{'a','b','c'}}, set8700_L[0] == (mat[3] = {1,0,3})
+set8700_L[1] == (mat[3] = {'a','b',0})
+set8700_M = mat[2], protect(set8700_M,0), set8700_M = {1,2,3,4}, set8700_M == (mat[2] = {1,2})
+set8700_x = 5, set8700_M = {set8700_x++, set8700_x++, set8700_x++, set8700_x++, set8700_x++}, set8700_M == (mat[2] = {5,6})
+set8700_x == 10		## All initialization terms evaluated
+set8700_S = "   ", set8700_S = {'a','b','c','d'}, set8700_S == "abc"
+
+set8700_P = obj set8700_point = {1,2,3,4}, set8700_P.set8700_x == 1 && set8700_P.set8700_y == 2 && set8700_P.set8700_z == 3
+protect(set8700_P,16), set8700_Q = set8700_P, set8700_Q = {5,6,7}, set8700_Q == set8700_P
+set8700_P == (obj set8700_point = {1,2,3})
+set8700_L = list(mat[1] = {set8700_P}), protect(set8700_L[0][0]) == 16
+set8700_L = {{{4,5,6}}}, set8700_L[0][0] == set8700_P
+protect(set8700_L,0,2), set8700_L = {{{4,5,6}}}, set8700_L[0][0] == (obj set8700_point = {4,5,6})
+
+## Testing quomod
+quomod(14,5,3,4) == error(10374)
+global set8700_a,set8700_b; quomod("abc", 4, set8700_a, set8700_b) == error(10375)
+quomod(14,5,set8700_a,set8700_b,0) == 1 && set8700_a == 2 && set8700_b == 4
+quomod(14,5,set8700_a,set8700_b,1) == 1 && set8700_a == 3 && set8700_b == -1
+quomod("abc",2,set8700_a,set8700_b) == error(10375)
+set8700_a = "abc"; quomod(14,5,set8700_a,set8700_b) == error(10375)
+set8700_a = null(); quomod(14,5,set8700_a,set8700_b,24) == 1; set8700_a == 3 && set8700_b == -1
+quomod(14,5,set8700_a,set8700_a) == error(10374)
+quomod(14,5,set8700_a,set8700_b,-1) == error(10375)
+protect(set8700_a,1); quomod(17,2,set8700_a,set8700_b) == error(10376)
+protect(set8700_a,0); quomod(17,2,set8700_a,set8700_b); set8700_a == 8 && set8700_b == 1
+set8700_p = &set8700_a, set8700_q = &set8700_b; quomod(14,5,*set8700_p,*set8700_q); *set8700_p == 2 && *set8700_q == 4
+
+## Testing estr
+base(1/3) == 10
+strcmp(estr(null()), "\"\"") == 0
+strcmp(estr(bernoulli(48)), "-5609403368997817686249127547/46410") == 0
+strcmp(estr(sin(3i)), "1001787492740990189897i/100000000000000000000") == 0
+base(10) == 1/3
+strcmp(estr("fizzbin"), "\"fizzbin\"") == 0
+strcmp(estr(set8700_c), "mat[5]={1,2+3i,-5+4i,6+5i,-7i}") == 0
+strcmp(estr(set8700_e), "mat[16]={0,1,0,0,2,-3/2,2,-1/2,-3,1/2,-1,1/2,1,0,0,0}") == 0
+strcmp(estr(list(2,3,5)), "list(2,3,5)") == 0

cal/sumtimes.cal

@@ -0,0 +1,186 @@
+/*
+ * sumtimes - runtimes evaluating sums & squares of large lists and mats
+ *
+ * Copyright (C) 2006  Ernest Bowen
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: sumtimes.cal,v 29.2 2006/12/16 11:18:46 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumtimes.cal,v $
+ *
+ * Under source code control:	2006/06/22 17:29
+ * File existed as early as:	2006
+ *
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+global sumtimes_t0, sumtimes_t1, sumtimes_t2, sumtimes_t3;
+global sumtimes_A, sumtimes_B;
+config("tilde", 0),;
+
+define timematsum(N) {
+    local n, s, p, ptop;
+
+    sumtimes_A = mat[N];
+
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+
+    ptop = &sumtimes_A[n-1];
+    sumtimes_t0 = usertime();
+    for (s = n = 0; n < N; n++) s += sumtimes_A[n];
+    sumtimes_t1 = usertime();
+    for (s = 0, p = &sumtimes_A[0]; p <= ptop; p++) s += *p;
+    sumtimes_t2 = usertime();
+    s = matsum(sumtimes_A);
+    sumtimes_t3 = usertime();
+
+    print "Matrix sum runtimes";
+    printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+    printf('\t"For" loop using pointers:\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
+    printf('\tUsing builtin "matsum":\t\t%.4f\n', sumtimes_t3 - sumtimes_t2);
+}
+
+define timelistsum(N) {
+    local n, s;
+
+    sumtimes_A = makelist(N);
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+
+    sumtimes_t0 = usertime();
+    for (s = n = 0; n < N; n++) s += sumtimes_A[n];
+    sumtimes_t1 = usertime();
+    s = sum(sumtimes_A);
+    sumtimes_t2 = usertime();
+    print "List sum runtimes";
+    printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+    printf('\tUsing builtin "sum":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
+}
+
+
+define timematsort(N) {
+    local n;
+
+    sumtimes_A = mat[N];
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+    sumtimes_t0 = usertime();
+    sort(sumtimes_A);
+    sumtimes_t1 = usertime();
+    printf('\tMatrix sort runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+}
+
+
+define timelistsort(N) {
+    local n;
+
+    sumtimes_A = makelist(N);
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+    sumtimes_t0 = usertime();
+    sort(sumtimes_A);
+    sumtimes_t1 = usertime();
+    printf('\tList sort runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+}
+
+define timematreverse(N) {
+    local n;
+
+    sumtimes_A = mat[N];
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+    sumtimes_t0 = usertime();
+    reverse(sumtimes_A);
+    sumtimes_t1 = usertime();
+    printf('\tMatrix reverse runtime        %.4f\n', sumtimes_t1 - sumtimes_t0);
+}
+
+define timelistreverse(N) {
+    local n;
+
+    sumtimes_A = makelist(N);
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+    sumtimes_t0 = usertime();
+    reverse(sumtimes_A);
+    sumtimes_t1 = usertime();
+    printf('\tList reverse runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+}
+
+define timematssq(N) {
+    local n, s, p, ptop;
+
+    sumtimes_A = mat[N];
+
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+
+    ptop = &sumtimes_A[n-1];
+    sumtimes_t0 = usertime();
+    for (s = n = 0; n < N; n++) s += sumtimes_A[n]^2;
+    sumtimes_t1 = usertime();
+    for (s = 0, p = &sumtimes_A[0]; p <= ptop; p++) s += (*p)^2;
+    sumtimes_t2 = usertime();
+
+    print "Matrix sum of squares runtimes";
+    printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+    printf('\t"For" loop using pointers:\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
+}
+
+define timelistssq(N) {
+    local n, s;
+
+    sumtimes_A = makelist(N);
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
+
+    sumtimes_t0 = usertime();
+    for (s = n = 0; n < N; n++) s += sumtimes_A[n]^2;
+    sumtimes_t1 = usertime();
+    s = ssq(sumtimes_A);
+    sumtimes_t2 = usertime();
+    print "List sum of squares runtimes";
+    printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+    printf('\tUsing builtin "ssq":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
+}
+
+define timehmean(N, M = 10) {
+    local n, s, v1, v2;
+
+    sumtimes_A = makelist(N);
+    for (n = 0; n < N; n++) sumtimes_A[n] = rand(1, M);
+
+    sumtimes_t0 = usertime();
+    for (s = n = 0; n < N; n++) s += 1/sumtimes_A[n];
+    v1 = N/s;
+    sumtimes_t1 = usertime();
+    v2 = hmean(sumtimes_A);
+    sumtimes_t2 = usertime();
+    print v1, v2;
+    print "List harmonic meanruntimes";
+    printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
+    printf('\tUsing builtin "hmean":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
+}
+
+define doalltimes(N) {
+    timematsum(N);
+    print;
+    timelistsum(N);
+    print;
+    timematssq(N);
+    print;
+    timelistssq(N);
+    print;
+    timematsort(N);
+    timelistsort(N);
+    timematreverse(N);
+    timelistreverse(N);
+    print;
+}

cal/test2700.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test2700.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: test2700.cal,v 29.4 2006/06/25 22:06:23 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2700.cal,v $
  *
  * Under source code control:	1995/11/01 22:52:25
@@ -41,8 +41,7 @@
  */
 
 
-global defaultverbose = 1;
-global err;
+defaultverbose = 1;
 
 define mknonnegreal() {
 	switch(rand(8)) {
@@ -89,11 +88,11 @@ define mkfrac() = rand(2) ? mkposfrac() : -mkposfrac();
 define mksquarereal() = mknonnegreal()^2;
 
 /*
- * XXX - Should be able to do better than the following.  For nonsquare
- * positive integer less than 1e6, could use
+ * We might be able to do better than the following.  For nonsquare
+ * positive integer less than 1e6, could use:
  *		 x = rand(1, 1000);
  *		 return rand(x^2 + 1, (x + 1)^2);
- * Maybe could do
+ * Maybe could do:
  *		do
  *			x = mkreal_2700();
  *		while

cal/test3300.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test3300.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: test3300.cal,v 29.5 2006/12/16 11:19:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3300.cal,v $
  *
  * Under source code control:	1995/12/02 04:27:41
@@ -30,8 +30,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 define testi(str, n, N, verbose)
 {
@@ -82,9 +81,9 @@ define testr(str, n, N, verbose)
 	for (i = 0; i < n; i++)
 		for (j = 0; j < n; j++)
 			A[i,j] = rand(-(N^2), N^2)/rand(1, N);
-	t = runtime();
+	t = usertime();
 	d1 = det(A);
-	t = runtime() - t;
+	t = usertime() - t;
 	d2 = det(A^2);
 	if (d2 != d1^2) {
 		if (verbose > 0) {

cal/test3400.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test3400.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: test3400.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3400.cal,v $
  *
  * Under source code control:	1995/12/02 05:20:11
@@ -54,8 +54,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 global pi1k = pi(1e-1000);
 

cal/test3500.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test3500.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: test3500.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3500.cal,v $
  *
  * Under source code control:	1995/12/18 22:50:46
@@ -53,8 +53,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 define testfrem(x,y,verbose)
 {

cal/test4000.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test4000.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: test4000.cal,v 29.4 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4000.cal,v $
  *
  * Under source code control:	1996/03/13 02:38:45
@@ -75,8 +75,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 /*
  * test defaults
@@ -146,7 +145,7 @@ define ptimes(str, N, n, count, skip, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = plen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (!p) {
@@ -160,7 +159,7 @@ define ptimes(str, N, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -195,7 +194,7 @@ define ctimes(str, N, n, count, skip, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = clen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (p) {
@@ -209,7 +208,7 @@ define ctimes(str, N, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -243,7 +242,7 @@ define crtimes(str, a, b, n, count, skip, verbose)
 		A[i] = rand(a,b);
 		P[i] = ptest(A[i], 20, 0);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (p != P[i]) {
@@ -258,7 +257,7 @@ define crtimes(str, a, b, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)?\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -296,16 +295,16 @@ define ntimes(str, N, n, count, skip, residue, modulus, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = rlen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = nextcand(A[i], count, skip, residue, modulus);
 	}
-	tnext = round(runtime() - t, 4);
-	t = runtime();
+	tnext = round(usertime() - t, 4);
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = prevcand(A[i], count, skip, residue, modulus);
 	}
-	tprev = round(runtime() - t, 4);
+	tprev = round(usertime() - t, 4);
 	if (verbose > 0) {
 		printf("%d evaluations, nextcand: %d, prevcand: %d\n", n, tnext, tprev);
 	}

cal/test4100.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test4100.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: test4100.cal,v 29.5 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4100.cal,v $
  *
  * Under source code control:	1996/03/13 03:53:22
@@ -70,18 +70,16 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 /*
  * test defaults
  */
-global K1 = 2^17;
-global K2 = 2^12;
-global BASEB = 16;
-global BASE = 2^BASEB;
+global test4100_K1 = 2^17;
+global test4100_K2 = 2^12;
+global test4100_BASE = 2^config("baseb");
 
-define rlen_4100(N) = rand(BASE^(N-1), BASE^N);
+define rlen_4100(N) = rand(test4100_BASE^(N-1), test4100_BASE^N);
 
 define olen(N)
 {
@@ -234,7 +232,7 @@ define times(str,N,n,verbose)
 	m = olen(N);
 	m2 = m^2;
 	if (isnull(n)) {
-		n = ceil(K1/power(N,1.585));
+		n = ceil(test4100_K1/power(N,1.585));
 		if (verbose > 1)
 			printf("n = %d\n", n);
 	}
@@ -247,38 +245,38 @@ define times(str,N,n,verbose)
 		C[i] = rand(m2);
 	}
 	z = rcin(0,m);	/* to initialize redc and maybe lastmod information */
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcin(A[i],m);
-	trcin = round(runtime() - t, 3);
-	t = runtime();
+	trcin = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcout(A[i],m);
-	trcout = round(runtime() - t, 3);
-	t = runtime();
+	trcout = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcmul(A[i],B[i],m);
-	trcmul = round(runtime() - t, 3);
-	t = runtime();
+	trcmul = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcsq(A[i],m);
-	trcsq = round(runtime() - t, 3);
-	t = runtime();
+	trcsq = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = A[i] * B[i];
-	tmul = round(runtime() - t, 3);
-	t = runtime();
+	tmul = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = A[i]^2;
-	tsq = round(runtime() - t, 3);
-	t = runtime();
+	tsq = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = C[i] % A[i];
-	tmod = round(runtime() - t, 3);
-	t = runtime();
+	tmod = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		quomod(C[i], A[i], x, y);
-	tquomod = round(runtime() - t,3);
+	tquomod = round(usertime() - t,3);
 
 	if (verbose > 1) {
 		printf("rcin: %d, rcout: %d, rcmul: %d, rcsq: %d\n",
@@ -308,7 +306,7 @@ define powtimes(str, N1, N2, n, verbose)
 		N2 = 1;
 
 	if (isnull(n)) {
-		n = ceil(K2/power(N1, 1.585)/N2);
+		n = ceil(test4100_K2/power(N1, 1.585)/N2);
 		printf ("n  = %d\n", n);
 	}
 	mat A[n];
@@ -316,8 +314,8 @@ define powtimes(str, N1, N2, n, verbose)
 	mat B[n];
 	v = olen(N1);
 
-	cp = config("pow2", 1);
-	crc = config("redc2", 1);
+	cp = config("pow2", 2);
+	crc = config("redc2", 2);
 
 	/* initialize redc and lastmod info */
 
@@ -328,29 +326,29 @@ define powtimes(str, N1, N2, n, verbose)
 		Ar[i] = rcin(A[i], v);
 		B[i] = rlen_4100(N2);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z1 += pmod(A[i], B[i], v);
-	tbignum = round(runtime() - t, 4);
+	tbignum = round(usertime() - t, 4);
 	config("pow2", 1e6);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z2 += pmod(A[i], B[i], v);
-	tnormal = round(runtime() - t, 4);
+	tnormal = round(usertime() - t, 4);
 	config("redc2",1e6);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z3 += pmod(A[i], B[i], v);
-	tsmall = round(runtime() - t, 4);
-	t = runtime();
+	tsmall = round(usertime() - t, 4);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z4 += rcpow(Ar[i], B[i], v);
-	trcsmall = round(runtime() - t, 4);
-	config("redc2", 1);
-	t = runtime();
+	trcsmall = round(usertime() - t, 4);
+	config("redc2", 2);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z5 += rcpow(Ar[i], B[i], v);
-	trcbig = round(runtime() - t, 4);
+	trcbig = round(usertime() - t, 4);
 
 	if (z1 != z2) {
 		++m;
@@ -408,7 +406,7 @@ define inittimes(str,N,n,verbose)
 	}
 	m = 0;
 	if (isnull(n)) {
-		n = ceil(K1/N^2);
+		n = ceil(test4100_K1/N^2);
 		if (verbose > 1) {
 			printf ("n = %d\n", n);
 		}
@@ -421,13 +419,13 @@ define inittimes(str,N,n,verbose)
 		M[i] = olen(N);
 		A[i] = rand(M[i]);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		R[i] = rcin(A[i], M[i]);
-	trcin = round(runtime() - t, 4);
+	trcin = round(usertime() - t, 4);
 	for (i = 0; i < n; i++)
 		B[i] = rcout(R[i], M[i]);
-	trcout = round(runtime() - t, 4);
+	trcout = round(usertime() - t, 4);
 	for (i = 0; i < n; i++) {
 		if (B[i] != A[i]) {
 			++m;

cal/test4600.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: test4600.cal,v 29.4 2001/04/10 22:09:02 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: test4600.cal,v 29.5 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4600.cal,v $
  *
  * Under source code control:	1996/07/02 20:04:40
@@ -30,8 +30,7 @@
  */
 
 
-global defaultverbose = 1		/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 /*
  * test globals

cal/test5100.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test5100.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: test5100.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5100.cal,v $
  *
  * Under source code control:	1996/12/02 23:57:10
@@ -30,8 +30,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 /*
  * We test the new code generator declaration scope and order.

cal/test5200.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: test5200.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: test5200.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5200.cal,v $
  *
  * Under source code control:	1997/02/07 02:48:10
@@ -30,8 +30,7 @@
  */
 
 
-global defaultverbose = 1;	/* default verbose value */
-global err;
+defaultverbose = 1;	/* default verbose value */
 
 /*
  * test the fix of a global/static bug

calc.c

@@ -1,7 +1,7 @@
 /*
  * calc - arbitrary precision calculator
  *
- * Copyright (C) 1999  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  David I. Bell, Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.8 $
- * @(#) $Id: calc.c,v 29.8 2001/04/10 22:03:13 chongo Exp $
+ * @(#) $Revision: 29.15 $
+ * @(#) $Id: calc.c,v 29.15 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:11
@@ -83,13 +83,15 @@
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif /* HAVE_STRDUP */
 
+#include "have_unused.h"
+
 
 /*
- * static definitions and functions
+ * S_FUNC definitions and functions
  */
-static void intint(int arg);	/* interrupt routine */
-static int nextcp(char **cpp, int *ip, int argc, char **argv, BOOL haveendstr);
-static void set_run_state(run state);
+S_FUNC void intint(int arg);	/* interrupt routine */
+S_FUNC int nextcp(char **cpp, int *ip, int argc, char **argv, BOOL haveendstr);
+S_FUNC void set_run_state(run state);
 
 /*
  * Top level calculator routine.
@@ -109,7 +111,7 @@ main(int argc, char **argv)
 	BOOL done = FALSE;
 	BOOL havearg;
 	BOOL haveendstr;
-	int len;
+	size_t len;
 
 	/*
 	 * parse args
@@ -214,7 +216,13 @@ main(int argc, char **argv)
 					havearg = TRUE;
 					break;
 				case 'n':
-					new_std = TRUE;
+					/*
+					 * -n is deprecated and may be reused
+					 * for another purpose in the future
+					 */
+					break;
+				case 'O':
+					use_old_std = TRUE;
 					break;
 				case 'p':
 					p_flag = TRUE;
@@ -385,7 +393,7 @@ main(int argc, char **argv)
 						}
 						/* XXX What if *cp = '\''? */
 						*bp++ = '\'';
-						strcpy(bp, cp);
+						strncpy(bp, cp, len+1);
 						bp += len;
 						*bp++ = '\'';
 						cp += len;
@@ -408,6 +416,7 @@ main(int argc, char **argv)
 						cp++;
 					*bp++ = ';';
 					cmdlen++;
+					s_flag = TRUE;	/* -f implies -s */
 					break;
 
 				case 's':
@@ -423,11 +432,13 @@ main(int argc, char **argv)
 					fprintf(stderr, "Illegal option -%c\n",
 							c);
 					fprintf(stderr,
-		"usage: %s [-a] [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
+		"usage: %s [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
 		"\t[-D calc_debug[:resource_debug[:user_debug]]]\n"
-		"\t[-n] [-p] [-q] [-u] [-v] "
-		"[--] [calc_cmd ...]\n",
-		program);
+		"\t[-O] [-p] [-q] [-s] [-u] [-v] "
+		"[--] [calc_cmd ...]\n"
+		"usage: %s ... -f filename\n"
+		"1st cscript line: #/path/to/calc ... -f\n",
+		program, program);
 					exit(1);
 			}
 			if (havearg)
@@ -444,16 +455,19 @@ main(int argc, char **argv)
 	}
 
 	while (index < maxindex) {
+		size_t cplen;
+
 		if (cmdlen > 0)
 			cmdbuf[cmdlen++] = ' ';
-		newcmdlen = cmdlen + strlen(cp);
+		cplen = strlen(cp);
+		newcmdlen = cmdlen + cplen;
 		if (newcmdlen > MAXCMD) {
 			fprintf(stderr,
 				"%s: commands too long\n",
 				program);
 			exit(1);
 		}
-		strcpy(cmdbuf + cmdlen, cp);
+		strncpy(cmdbuf + cmdlen, cp, cplen+1);
 		cmdlen = newcmdlen;
 		index++;
 		if (index < maxindex)
@@ -571,7 +585,7 @@ main(int argc, char **argv)
 	if (run_state == RUN_PRE_CMD_ARGS) {
 		if (havecommands) {
 			set_run_state(RUN_CMD_ARGS);
-			(void) openstring(cmdbuf, (long) strlen(cmdbuf));
+			(void) openstring(cmdbuf, strlen(cmdbuf));
 			getcommands(FALSE);
 			closeinput();
 		}
@@ -699,8 +713,8 @@ main(int argc, char **argv)
  *	arg		to keep ANSI C happy
  */
 /*ARGSUSED*/
-static void
-intint(int arg)
+S_FUNC void
+intint(int UNUSED arg)
 {
 	(void) signal(SIGINT, intint);
 	if (inputwait || (++abortlevel >= ABORT_NOW)) {
@@ -746,7 +760,7 @@ math_error(char *fmt, ...)
 	}
 }
 
-static int
+S_FUNC int
 nextcp(char **cpp, int *ip, int argc, char **argv, BOOL haveendstr)
 {
 	char *cp;
@@ -785,7 +799,7 @@ nextcp(char **cpp, int *ip, int argc, char **argv, BOOL haveendstr)
 }
 
 
-static void
+S_FUNC void
 set_run_state(run state)
 {
 	if (conf->calc_debug & CALCDBG_RUNSTATE)

calc.h

@@ -1,7 +1,7 @@
 /*
  * calc - definitions for calculator program
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.10 $
- * @(#) $Id: calc.h,v 29.10 2002/03/12 09:40:57 chongo Exp $
+ * @(#) $Revision: 29.21 $
+ * @(#) $Id: calc.h,v 29.21 2007/02/12 03:26:23 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -33,11 +33,11 @@
 
 #include <setjmp.h>
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "win32dll.h"
+# include "decl.h"
 # include "value.h"
 # include "have_const.h"
 #else
-# include <calc/win32dll.h>
+# include <calc/decl.h>
 # include <calc/value.h>
 # include <calc/have_const.h>
 #endif
@@ -98,145 +98,145 @@
 #define FILEID_STDIN	((FILEID) 0)
 #define FILEID_STDOUT	((FILEID) 1)
 #define FILEID_STDERR	((FILEID) 2)
-#define FILEID_NONE	((FILEID) -1)
+#define FILEID_NONE	((FILEID) -1)	/* must be < 0 */
 
 /*
  * File I/O routines.
  */
-extern DLL FILEID openid(char *name, char *mode);
-extern DLL FILEID indexid(long index);
-extern DLL BOOL validid(FILEID id);
-extern DLL BOOL errorid(FILEID id);
-extern DLL BOOL eofid(FILEID id);
-extern DLL int closeid(FILEID id);
-extern DLL int getcharid(FILEID id);
-extern DLL int idprintf(FILEID id, char *fmt, int count, VALUE **vals);
-extern DLL int idfputc(FILEID id, int ch);
-extern DLL int idfputs(FILEID id, char *str);
-extern DLL int printid(FILEID id, int flags);
-extern DLL int flushid(FILEID id);
-extern DLL int readid(FILEID id, int flags, char **retptr);
-extern DLL int getloc(FILEID id, ZVALUE *loc);
-extern DLL int setloc(FILEID id, ZVALUE zpos);
-extern DLL int getsize(FILEID id, ZVALUE *size);
-extern DLL int get_device(FILEID id, ZVALUE *dev);
-extern DLL int get_inode(FILEID id, ZVALUE *ino);
-extern DLL FILEID reopenid(FILEID id, char *mode, char *name);
-extern DLL int closeall(void);
+E_FUNC FILEID openid(char *name, char *mode);
+E_FUNC FILEID openpathid(char *name, char *mode, char *pathlist);
+E_FUNC FILEID indexid(long index);
+E_FUNC BOOL validid(FILEID id);
+E_FUNC BOOL errorid(FILEID id);
+E_FUNC BOOL eofid(FILEID id);
+E_FUNC int closeid(FILEID id);
+E_FUNC int getcharid(FILEID id);
+E_FUNC int idprintf(FILEID id, char *fmt, int count, VALUE **vals);
+E_FUNC int idfputc(FILEID id, int ch);
+E_FUNC int idfputs(FILEID id, STRING *str);
+E_FUNC int printid(FILEID id, int flags);
+E_FUNC int flushid(FILEID id);
+E_FUNC int readid(FILEID id, int flags, STRING **retptr);
+E_FUNC int getloc(FILEID id, ZVALUE *loc);
+E_FUNC int setloc(FILEID id, ZVALUE zpos);
+E_FUNC int getsize(FILEID id, ZVALUE *size);
+E_FUNC int get_device(FILEID id, ZVALUE *dev);
+E_FUNC int get_inode(FILEID id, ZVALUE *ino);
+E_FUNC FILEID reopenid(FILEID id, char *mode, char *name);
+E_FUNC int closeall(void);
 
 #if !defined(_WIN32)
-extern DLL int flushall(void);
+E_FUNC int flushall(void);
 #endif
 
-extern DLL int idfputstr(FILEID id, char *str);
-extern DLL int rewindid(FILEID id);
-extern DLL void rewindall(void);
-extern DLL ZVALUE zfilesize(FILEID id);
-extern DLL void showfiles(void);
-extern DLL int fscanfid(FILEID id, char *fmt, int count, VALUE **vals);
-extern DLL int scanfstr(char *str, char *fmt, int count, VALUE **vals);
-extern DLL int ftellid(FILEID id, ZVALUE *res);
-extern DLL int fseekid(FILEID id, ZVALUE offset, int whence);
-extern DLL int isattyid(FILEID id);
-extern DLL int fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res);
-extern DLL int frsearch(FILEID id, char *str, ZVALUE first, ZVALUE last, ZVALUE *res);
-extern DLL void showconstants(void);
-extern DLL void freeconstant(unsigned long);
-extern DLL void freestringconstant(long);
-extern DLL void trimconstants(void);
+E_FUNC int idfputstr(FILEID id, char *str);
+E_FUNC int rewindid(FILEID id);
+E_FUNC void rewindall(void);
+E_FUNC ZVALUE zfilesize(FILEID id);
+E_FUNC void showfiles(void);
+E_FUNC int fscanfid(FILEID id, char *fmt, int count, VALUE **vals);
+E_FUNC int scanfstr(char *str, char *fmt, int count, VALUE **vals);
+E_FUNC int ftellid(FILEID id, ZVALUE *res);
+E_FUNC int fseekid(FILEID id, ZVALUE offset, int whence);
+E_FUNC int isattyid(FILEID id);
+E_FUNC int fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res);
+E_FUNC int frsearch(FILEID id, char *str, ZVALUE first, ZVALUE last, ZVALUE *res);
+E_FUNC void showconstants(void);
+E_FUNC void freeconstant(unsigned long);
+E_FUNC void freestringconstant(long);
+E_FUNC void trimconstants(void);
 
 /*
  * Input routines.
  */
-extern DLL int openstring(char *str, long num);
-extern DLL int openterminal(void);
-extern DLL int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
-extern DLL char *nextline(void);
-extern DLL int nextchar(void);
-extern DLL void reread(void);
-extern DLL void resetinput(void);
-extern DLL void setprompt(char *);
-extern DLL BOOL inputisterminal(void);
-extern DLL int inputlevel(void);
-extern DLL long calclevel(void);
-extern DLL char *inputname(void);
-extern DLL long linenumber(void);
-extern DLL void runrcfiles(void);
-extern DLL void closeinput(void);
+E_FUNC int openstring(char *str, size_t num);
+E_FUNC int openterminal(void);
+E_FUNC int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
+E_FUNC char *nextline(void);
+E_FUNC int nextchar(void);
+E_FUNC void reread(void);
+E_FUNC void resetinput(void);
+E_FUNC void setprompt(char *);
+E_FUNC BOOL inputisterminal(void);
+E_FUNC int inputlevel(void);
+E_FUNC long calclevel(void);
+E_FUNC char *inputname(void);
+E_FUNC long linenumber(void);
+E_FUNC void runrcfiles(void);
+E_FUNC void closeinput(void);
 
 /*
  * Other routines.
  */
-extern DLL NUMBER *constvalue(unsigned long index);
-extern DLL long addnumber(char *str);
-extern DLL long addqconstant(NUMBER *q);
-extern DLL void initstack(void);
-extern DLL void getcommands(BOOL toplevel);
-extern DLL void givehelp(char *type);
-extern DLL void libcalc_call_me_first(void);
-extern DLL void libcalc_call_me_last(void);
-extern DLL BOOL calc_tty(int fd);
-extern DLL BOOL orig_tty(int fd);
-extern DLL void showerrors(void);
-extern DLL char *calc_strdup(CONST char *);
+E_FUNC NUMBER *constvalue(unsigned long index);
+E_FUNC long addnumber(char *str);
+E_FUNC long addqconstant(NUMBER *q);
+E_FUNC void initstack(void);
+E_FUNC void getcommands(BOOL toplevel);
+E_FUNC void givehelp(char *type);
+E_FUNC void libcalc_call_me_first(void);
+E_FUNC void libcalc_call_me_last(void);
+E_FUNC BOOL calc_tty(int fd);
+E_FUNC BOOL orig_tty(int fd);
+E_FUNC void showerrors(void);
+E_FUNC char *calc_strdup(CONST char *);
 
 /*
  * Initialization
  */
-extern DLL void initialize(void);
-extern DLL void reinitialize(void);
+E_FUNC void initialize(void);
+E_FUNC void reinitialize(void);
 #if !defined (_WIN32)
-extern DLL int isatty(int tty);	/* TRUE if fd is a tty */
+E_FUNC int isatty(int tty);	/* TRUE if fd is a tty */
 #endif
-extern DLL char *version(void);	/* return version string */
-extern DLL int post_init;	/* TRUE => math_error setjmp is ready */
+E_FUNC char *version(void);	/* return version string */
+EXTERN int post_init;	/* TRUE => math_error setjmp is ready */
 
 /*
  * global flags and definitions
  */
-extern DLL int abortlevel;	/* current level of aborts */
-extern DLL BOOL inputwait;	/* TRUE if in a terminal input wait */
-extern DLL jmp_buf jmpbuf;	/* for errors */
+EXTERN int abortlevel;	/* current level of aborts */
+EXTERN BOOL inputwait;	/* TRUE if in a terminal input wait */
+EXTERN jmp_buf jmpbuf;	/* for errors */
 
-extern DLL int p_flag;		/* TRUE => pipe mode */
-extern DLL int q_flag;		/* TRUE => don't execute rc files */
-extern DLL int u_flag;		/* TRUE => unbuffer stdin and stdout */
-extern DLL int d_flag;		/* TRUE => disable heading, resource_debug */
-extern DLL int c_flag;		/* TRUE => continue after error if permitted */
-extern DLL int i_flag;		/* TRUE => try to go interactive after error */
-extern DLL int s_flag;		/* TRUE => keep args as strings for argv() */
-extern DLL int stoponerror;	/* >0 => stop, <0 => continue, ==0 => use -c */
-extern DLL BOOL abort_now;	/* TRUE => try to go interactive */
+EXTERN int p_flag;		/* TRUE => pipe mode */
+EXTERN int q_flag;		/* TRUE => don't execute rc files */
+EXTERN int u_flag;		/* TRUE => unbuffer stdin and stdout */
+EXTERN int d_flag;		/* TRUE => disable heading, resource_debug */
+EXTERN int c_flag;		/* TRUE => continue after error if permitted */
+EXTERN int i_flag;		/* TRUE => try to go interactive after error */
+E_FUNC int s_flag;		/* TRUE => keep args as strings for argv() */
+EXTERN long stoponerror;	/* >0 => stop, <0 => continue, ==0 => use -c */
+EXTERN BOOL abort_now;	/* TRUE => try to go interactive */
 
-extern DLL int argc_value;	/* count of argv[] strings for argv() builtin */
-extern DLL char **argv_value;	/* argv[] strings for argv() builtin */
+E_FUNC int argc_value;	/* count of argv[] strings for argv() builtin */
+E_FUNC char **argv_value;	/* argv[] strings for argv() builtin */
 
-extern DLL char *pager;		/* $PAGER or default */
-extern DLL int stdin_tty;	/* TRUE if stdin is a tty */
-extern DLL int havecommands;	/* TRUE if have cmd args) */
-extern DLL char *program;	/* our name */
-extern DLL char *base_name;	/* basename of our name */
-extern DLL char cmdbuf[];	/* command line expression */
+EXTERN char *pager;		/* $PAGER or default */
+EXTERN int stdin_tty;	/* TRUE if stdin is a tty */
+EXTERN int havecommands;	/* TRUE if have cmd args) */
+EXTERN char *program;	/* our name */
+EXTERN char *base_name;	/* basename of our name */
+EXTERN char cmdbuf[];	/* command line expression */
 
-extern DLL int abortlevel;	/* current level of aborts */
-extern DLL BOOL inputwait;	/* TRUE if in a terminal input wait */
-extern DLL VALUE *stack;	/* execution stack */
-extern DLL int dumpnames;	/* TRUE => dump names rather than indices */
+EXTERN int abortlevel;	/* current level of aborts */
+EXTERN BOOL inputwait;	/* TRUE if in a terminal input wait */
+EXTERN VALUE *stack;	/* execution stack */
+EXTERN int dumpnames;	/* TRUE => dump names rather than indices */
 
-extern DLL char *calcpath;	/* $CALCPATH or default */
-extern DLL char *calcrc;	/* $CALCRC or default */
-extern DLL char *calcbindings;	/* $CALCBINDINGS or default */
-extern DLL char *home;		/* $HOME or default */
-extern DLL char *shell;		/* $SHELL or default */
-extern DLL char *program;	/* our name (argv[0]) */
+EXTERN char *calcpath;	/* $CALCPATH or default */
+EXTERN char *calcrc;	/* $CALCRC or default */
+EXTERN char *calcbindings;	/* $CALCBINDINGS or default */
+EXTERN char *home;		/* $HOME or default */
+EXTERN char *shell;		/* $SHELL or default */
 
-extern DLL int no_env;		/* TRUE (-e) => ignore env vars on startup */
-extern DLL int errmax;	/* if >= 0, error when errcount exceeds errmax */
-extern DLL int new_std;		/* TRUE (-n) => use newstd configuration */
+EXTERN int no_env;	/* TRUE (-e) => ignore env vars on startup */
+EXTERN long errmax;	/* if >= 0, error when errcount exceeds errmax */
+EXTERN int use_old_std;	/* TRUE (-O) => use classic configuration */
 
-extern DLL int allow_read;	/* FALSE => dont open any files for reading */
-extern DLL int allow_write; 	/* FALSE => dont open any files for writing */
-extern DLL int allow_exec;	/* FALSE => may not execute any commands */
+EXTERN int allow_read;	/* FALSE => dont open any files for reading */
+EXTERN int allow_write; 	/* FALSE => dont open any files for writing */
+EXTERN int allow_exec;	/* FALSE => may not execute any commands */
 
 /*
  * calc startup and run state
@@ -252,19 +252,19 @@ typedef enum {
     RUN_EXIT,			/* normal exit from calc */
     RUN_EXIT_WITH_ERROR		/* exit with error */
 } run;
-extern DLL run run_state;
-extern DLL char *run_state_name(run state);
+EXTERN run run_state;
+E_FUNC char *run_state_name(run state);
 
 /*
  * calc version information
  */
 #define CALC_TITLE "C-style arbitrary precision calculator"
-extern int calc_major_ver;
-extern int calc_minor_ver;
-extern int calc_major_patch;
-extern int calc_minor_patch;
-extern char *Copyright;
-extern DLL char *version(void);
+EXTERN int calc_major_ver;
+EXTERN int calc_minor_ver;
+EXTERN int calc_major_patch;
+EXTERN int calc_minor_patch;
+EXTERN char *Copyright;
+E_FUNC char *version(void);
 
 
 #endif /* !__CALC_H__ */

calc.man

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 1999	Landon Curt Noll
+.\" Copyright (C) 1999-2007	Landon Curt Noll
 .\"
 .\" Calc is open software; you can redistribute it and/or modify it under
 .\" the terms of the version 2.1 of the GNU Lesser General Public License
@@ -15,8 +15,8 @@
 .\" received a copy with calc; if not, write to Free Software Foundation, Inc.
 .\" 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 .\"
-.\" @(#) $Revision: 29.10 $
-.\" @(#) $Id: calc.man,v 29.10 2003/01/18 21:19:21 chongo Exp $
+.\" @(#) $Revision: 29.21 $
+.\" @(#) $Id: calc.man,v 29.21 2007/02/07 00:38:43 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -28,7 +28,7 @@
 .\" calculator by David I. Bell
 .\" man page by Landon Noll
 .\"
-.TH calc 1 "^..^" "1999-11-30"
+.TH calc 1 "^..^" "2007-02-06"
 .SH NAME
 calc \- arbitrary precision calculator
 .SH SYNOPSIS
@@ -44,17 +44,17 @@ calc \- arbitrary precision calculator
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.RB [ \-n ]
+.RB [ \-O ]
 .br
 .RB [ \-p ]
 .RB [ \-q ]
 .RB [ \-s ]
 .RB [ \-u ]
 .RB [ \-v ]
-.RB [ calc_cmd\ \&.\|.\|. ]
+.RB [ [\-\-]\ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ \fB\-f\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
 .SH DESCRIPTION
 \&
 .br
@@ -63,8 +63,11 @@ CALC OPTIONS
 
 .TP
 .B \-c
-Continue reading command lines even after an execution
+Continue reading command lines even after an scan/parse
 error has caused the abandonment of a line.
+Note that this option only deals with scanning and
+parsing of the calc language.
+It does not deal with execution or run-time errors.
 .sp 1
 For example:
 .sp 1
@@ -76,7 +79,7 @@ calc read many_errors.cal
 .sp 1
 will cause
 .B calc
-to abort on the first error, whereas:
+to abort on the first syntax error, whereas:
 .sp 1
 .in +5n
 .nf
@@ -88,7 +91,7 @@ will
 cause
 .B calc
 to try to process each line being read
-despite the errors that it encounters.
+despite the scan/parse errors that it encounters.
 .sp 1
 By default, calc startup resource files are silently
 ignored if not found.
@@ -119,7 +122,7 @@ as if \fBconfig("resource_debug", 0)\fP had been executed.
 For example:
 .sp 1
 .in +5n
-calc 'read qtime; qtime(2)'
+calc "read qtime; qtime(2)"
 .in -5n
 .sp 1
 will output something like:
@@ -135,7 +138,7 @@ whereas:
 .sp 1
 .in +5n
 .nf
-calc -d 'read qtime; qtime(2)'
+calc -d "read qtime; qtime(2)"
 .fi
 .in -5n
 .sp 1
@@ -183,6 +186,80 @@ help config
 Ignore any environment variables on startup.
 The getenv() builtin will still return values, however.
 
+.TP
+.B \-f
+This flag is required when using calc in
+.BR "shell script mode" .
+It must be at the end of the initial
+.B #!
+line of the script.
+.sp 1
+This flag is normally only at the end of a calc shell script.
+If the first line of an executable file begins
+.B #!
+followed by the absolute pathname of the
+.B calc
+program and the flag
+.B \-f
+as in:
+.sp 1
+.in +5n
+.nf
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+.fi
+.in -5n
+.sp 1
+the rest of the file will be processed in
+.BR "shell script mode" .
+See
+.B "SHELL SCRIPT MODE"
+section of this man page
+below for details.
+.sp 1
+The actual form of this flag is:
+.sp 1
+.in +5n
+.B \-f
+filename
+.in -5n
+.sp 1
+On systems that treat an executable that begins with
+.B #!
+as a script, the path of the execurable is appended by the kernel
+as the final argument to the exec() system call.
+This is why the
+.B \-f
+flag at the very end of the
+.B #!
+line.
+.sp 1
+It is possible use
+.B \-f\ filename
+on the command line:
+.sp 1
+.in +5n
+.nf
+\fIcalc\fP\ [other_flags\ \&...] \fB\-f\fP filename
+.fi
+.in -5n
+.sp 1
+This will cause calc to process lines in
+.B filename
+in
+.BR "shell script mode" .
+.sp 1
+Use of
+.B \-f
+implies
+.BR \-s .
+In addition,
+.B \-d
+and
+.B \-p
+are implied if
+.B \-i
+is not given.
+
 .TP
 .B \-h
 Print a help message.  This option implies
@@ -302,11 +379,22 @@ The reading of key bindings is also disabled
 when the mode disables opening of files for reading.
 
 .TP
-.B \-n
-Use the new configuration defaults instead of the old
-default classic defaults.
+.B \-O
+Use the old classic defaults instead of the
+default configuration.
 This flag as the same effect
-as executing \fBconfig("all", "newcfg")\fP at startup time.
+as executing \fBconfig("all", "oldcfg")\fP at startup time.
+.sp 1
+NOTE: Older versions of calc used
+.B \-n
+to setup a modified form of the default calc configuration.
+The
+.B \-n
+flag currently does nothing.
+Use of the
+.B \-n
+flag is now deprecated and may be used for
+something else in the future.
 
 .TP
 .B \-p
@@ -316,7 +404,7 @@ For example:
 .sp 1
 .in +5n
 .nf
-calc -p '2^21701-1' | fizzbin
+calc -p "2^21701-1" | fizzbin
 .fi
 .in -5n
 .sp 1
@@ -350,6 +438,21 @@ Disable buffering of stdin and stdout.
 Print the
 .B calc
 version number and exit.
+
+.TP
+.B \-\-
+The double dash indicates to calc that no more option follow.
+Thus calc will ignore a later argument on the command line
+even if it starts with a dash.
+This is useful when entering negative values on the command line as in:
+.sp 1
+.in +5n
+.nf
+calc \-p \-\- \-1 - -7
+.sp 1
+.fi
+.in -5n
+
 .PP
 
 \&
@@ -392,32 +495,50 @@ calc 23 + 47
 .fi
 .in -5n
 .sp 1
-should respond with display of 70, but
+will print 70.
+However, command lines will have problems:
 .sp 1
 .in +5n
 .nf
 calc 23 * 47
+.sp 1
+calc -23 + 47
 .fi
 .in -5n
 .sp 1
-may fail.
-Such cases can usually be made to work as expected by
-enclosing the command between single marks as in:
+The first example above fails because the shell interprets the '*'
+as a file glob.
+The second example fails because '\-23' is viewed as a calc option
+(which it is not) and do calc objects to that it thinks of as an unknown option.
+These cases can usually be made to work as expected by
+enclosing the command between quotes:
 .sp 1
 .in +5n
 .nf
 calc '23 * 47'
+.sp 1
+calc "print sqrt(2), exp(1)"
 .fi
 .in -5n
 .sp 1
-and
+or in parentheses and quotes to avoid leading \-'s as in:
 .sp 1
 .in +5n
 .nf
-calc 'print sqrt(2), exp(1)'
+calc '(-23 + 47)'
 .fi
 .in -5n
-.sp
+.sp 1
+One may also use a double dash to denote that calc options have ended as in:
+.sp 1
+.in +5n
+.nf
+calc -- -23 + 47
+.sp 1
+calc -q -- -23 + 47
+.fi
+.in -5n
+.sp 1
 If '!' is to be used to indicate the factorial function, for
 shells like
 .BI csh (1)
@@ -567,7 +688,7 @@ help config
 .br
 SHELL SCRIPT MODE
 .PP
-If first line of an executable file begins
+If the first line of an executable file begins
 .B #!
 followed by the absolute pathname of the
 .B calc
@@ -577,7 +698,7 @@ as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-f\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
 .fi
 .in -5n
 .sp 1
@@ -585,10 +706,10 @@ the rest of the file will be processed in
 .BR "shell script mode" .
 Note that
 .B \-f
-must be the first \-flag on the ``#!'' line.
+must at the end of the intiial ``#!'' line.
 Any other optional
 .B "other_flags"
-must come after
+must come before
 the
 .BR \-f .
 .sp 1
@@ -606,8 +727,6 @@ the later lines within the script itself.
 In
 .BR "shell script mode" ,
 .B \-s
-(lower case
-.BR \-s )
 is always assumed.
 In addition,
 .B \-d
@@ -623,7 +742,7 @@ the file
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-f\fP\ \&\fB\-q\fP
+\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP
 #
 # mersenne - an example of a calc \fBshell script file\fP
 

calc.spec.in

@@ -0,0 +1,125 @@
+#****h* calc/calc.spec.in
+#
+# calc.spec.in - template specfile for calc
+#
+# Copyright (C) 2003-2005  Petteri Kettunen and Landon Curt Noll
+#
+# Calc is open software; you can redistribute it and/or modify it under
+# the terms of the version 2.1 of the GNU Lesser General Public License
+# as published by the Free Software Foundation.
+#
+# Calc is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+# Public License for more details.
+#
+# A copy of version 2.1 of the GNU Lesser General Public License is
+# distributed with calc under the filename COPYING-LGPL.  You should have
+# received a copy with calc; if not, write to Free Software Foundation, Inc.
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+#
+# @(#) $Revision: 29.16 $
+# @(#) $Id: calc.spec.in,v 29.16 2006/06/26 05:50:44 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
+#
+# Under source code control:	2003/02/16 20:21:39
+# File existed as early as:	2003
+#
+# calculator by David I. Bell with help/mods from others
+# Makefile by Petteri Kettunen with modifications from Landon Curt Noll
+
+# BUGS
+#  - Uninstalling calc and calc-devel leaves empty dirs /usr/include/calc
+#    and /usr/share/calc and its subdirs. In case e.g. %{_includedir}/calc
+#    is defined in `%files devel' section, then rpmbuild complains that
+#    header files are defined twice - rpmbuild bug or bug in specfile conf???
+
+Summary: Arbitrary precision calculator.
+Name: calc
+Version: <<<PROJECT_VERSION>>>
+Release: 0
+License: LGPL
+Group: Applications/Engineering
+Source: %{name}-%{version}.tar.gz
+URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
+Requires: ncurses >= 5.2-26, readline >= 4.2, less >= 358
+BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+Calc is arbitrary precision C-like arithmetic system that is a
+calculator, an algorithm prototype and mathematical research
+tool. Calc comes with a rich set of builtin mathematical and
+programmatic functions.
+
+For the latest calc release, see the calc project home page:
+
+    http://www.isthe.com/chongo/tech/comp/calc/index.html
+
+%package devel
+Summary: Development files and documentation for calc.
+Group: Development/Libraries
+PreReq: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and static libraries for developing
+calc (arbitrary precision calculator).
+
+For the latest calc release, see the project home page:
+
+    http://www.isthe.com/chongo/tech/comp/calc/index.html
+
+%prep
+%setup -q
+
+%build
+make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 all chk
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+make T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 install
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root)
+%doc BUGS CHANGES COPYING COPYING-LGPL
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/%{name}/*/*
+%{_datadir}/%{name}/bindings
+%{_datadir}/%{name}/README
+%{_datadir}/%{name}/*.cal
+%{_datadir}/%{name}/*.line
+
+%files devel
+%defattr(-, root, root)
+%doc BUGS COPYING COPYING-LGPL LIBRARY
+%attr(644, root, root) %{_includedir}/calc/*
+%attr(644, root, root) %{_libdir}/*.a
+
+%changelog
+* Sun Jun 25 2006 Landon Curt Noll http://www.isthe.com/chongo
+- Changed Copyright to License as per new rpm v4.4 syntax
+* Sun May 20 2006 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.12.0
+- Added *.line set files to the list of packaged files
+* Sun Dec 11 2005 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.11.11
+- Fixed description in spec file
+* Wed Feb 26 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.11.7-2
+- Fixed attributes on include and lib calc-devel files
+- Added BUGS to calc-devel as well as calc
+* Tue Feb 25 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.11.7-1
+- Require ncurses, readline and less to install.
+- Require ncurses-devel and readline-devel to build.
+* Tue Feb 18 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Misc changes to fit local directory setup
+* Sun Feb 16 2003 Petteri Kettunen <petterik@users.sourceforge.net>
+- initial RPM build
+
+#****

calcerr.tbl

@@ -1,7 +1,7 @@
 #
 # calcerr - error codes and messages
 #
-# Copyright (C) 1999  Ernest Bowen
+# Copyright (C) 1999-2006  Ernest Bowen
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.4 $
-# @(#) $Id: calcerr.tbl,v 29.4 2001/04/10 22:06:46 chongo Exp $
+# @(#) $Revision: 29.10 $
+# @(#) $Id: calcerr.tbl,v 29.10 2006/08/20 15:01:30 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr.tbl,v $
 #
 # Under source code control:	1996/05/23 17:38:44
@@ -164,7 +164,7 @@ E_RSEARCH3	Bad third argument for rsearch
 E_RSEARCH4	Bad fourth argument for rsearch
 E_RSEARCH5	Cannot find fsize or fpos for rsearch
 E_RSEARCH6	File not readable for rsearch
-E_FOPEN3	Too many open files
+E_MANYOPEN	Too many open files
 E_REWIND2	Attempt to rewind a file that is not open
 E_STRERROR1	Bad argument type for strerror
 E_STRERROR2	Index out of range for strerror
@@ -260,14 +260,14 @@ E_COPY13	No-copy-from source variable
 E_COPY14	No-copy-to destination variable
 E_COPY15	No-copy-from source named block
 E_COPY16	No-copy-to destination named block
-E_COPY17	No-relocation destination for copy
+E_COPY17	No-relocate destination for copy
 E_COPYF1	File not open for copy
 E_COPYF2	fseek or fsize failure for copy
 E_COPYF3	fwrite error for copy
 E_COPYF4	fread error for copy
 E_PROTECT1	Non-variable first argument for protect
-E_PROTECT2	Non-integer second argument for protect
-E_PROTECT3	Out-of-range second argument for protect
+E_PROTECT2	Bad second argument for protect
+E_PROTECT3	Bad third argument for protect
 E_MATFILL3	No-copy-to destination for matfill
 E_MATFILL4	No-assign-from source for matfill
 E_MATTRACE1	Non-matrix argument for mattrace
@@ -393,3 +393,59 @@ E_BERN		Bad argument for bern
 E_EULER		Bad argument for euler
 E_SLEEP		Bad argument for sleep
 E_TTY		calc_tty failure
+E_ASSIGN1	No-copy-to destination for octet assign
+E_ASSIGN2	No-copy-from source for octet assign
+E_ASSIGN3	No-change destination for octet assign
+E_ASSIGN4	Non-variable destination for assign
+E_ASSIGN5	No-assign-to destination for assign
+E_ASSIGN6	No-assign-from source for assign
+E_ASSIGN7	No-change destination for assign
+E_ASSIGN8	No-type-change destination for assign
+E_ASSIGN9	No-error-value destination for assign
+E_SWAP1		No-copy argument for octet swap
+E_SWAP2		No-assign-to-or-from argument for swap
+E_SWAP3		Non-lvalue argument for swap
+E_QUOMOD1	Non-lvalue argument 3 or 4 for quomod
+E_QUOMOD2	Non-real-number arg 1 or 2 or bad arg 5 for quomod
+E_QUOMOD3	No-assign-to argument 3 or 4 for quomod
+E_PREINC1	No-copy-to or no-change argument for octet preinc
+E_PREINC2	Non-variable argument for preinc
+E_PREINC3	No-assign-to or no-change argument for preinc
+E_PREDEC1	No-copy-to or no-change argument for octet predec
+E_PREDEC2	Non-variable argument for predec
+E_PREDEC3	No-assign-to or no-change argument for predec
+E_POSTINC1	No-copy-to or no-change argument for octet postinc
+E_POSTINC2	Non-variable argument for postinc
+E_POSTINC3	No-assign-to or no-change argument for postinc
+E_POSTDEC1	No-copy-to or no-change argument for octet postdec
+E_POSTDEC2	Non-variable argument for postdec
+E_POSTDEC3	No-assign-to or no-change argument for postdec
+E_INIT1		Error-type structure for initialization
+E_INIT2		No-copy-to structure for initialization
+E_INIT3		Too many initializer values
+E_INIT4		Attempt to initialize freed named block
+E_INIT5		Bad structure type for initialization
+E_INIT6		No-assign-to element for initialization
+E_INIT7		No-change element for initialization
+E_INIT8		No-type-change element for initialization
+E_INIT9		No-error-value element for initialization
+E_INIT10	No-assign-or-copy-from source for initialization
+E_LIST1		No-relocate for list insert
+E_LIST2		No-relocate for list delete
+E_LIST3		No-relocate for list push
+E_LIST4		No-relocate for list append
+E_LIST5		No-relocate for list pop
+E_LIST6		No-relocate for list remove
+E_MODIFY1	Non-variable first argument for modify
+E_MODIFY2	Non-string second argument for modify
+E_MODIFY3	No-change first argument for modify
+E_MODIFY4	Undefined function for modify
+E_MODIFY5	Unacceptable type first argument for modify
+E_FPATHOPEN1	Non-string arguments for fpathopen
+E_FPATHOPEN2	Unrecognized mode for fpathopen
+E_LOG1		Bad epsilon argument for log
+E_LOG2		Non-numeric first argument for log
+E_FGETFILE1	Non-file argument for fgetfile
+E_FGETFILE2	File argument for fgetfile not open for reading
+E_FGETFILE3	Unable to set file position in fgetfile
+E_ESTR		Non-representable type for estr

check.awk

@@ -2,7 +2,7 @@
 #
 # check - check the regression output for problems
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.2 $
-# @(#) $Id: check.awk,v 29.2 2000/06/07 14:02:13 chongo Exp $
+# @(#) $Revision: 29.5 $
+# @(#) $Id: check.awk,v 29.5 2006/09/18 08:01:13 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/check.awk,v $
 #
 # Under source code control:	1996/05/25 22:07:58
@@ -64,7 +64,7 @@ NF == 0 {
 	end_seen = 1;
 }
 
-$1 ~ /^[0-9]+:/ {
+$1 ~ /^[0-9]+:/ || $1 ~ /^[0-9]+-[0-9]*:/ || $1 ~ /^"\)\)$/ {
 	if (error > 0) {
 		if (havebuf2) {
 			print buf2;

cmath.h

@@ -1,7 +1,7 @@
 /*
  * cmath - data structures for extended precision complex arithmetic
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: cmath.h,v 29.6 2002/03/12 09:38:26 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: cmath.h,v 29.7 2005/10/18 10:43:49 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:45
@@ -52,83 +52,84 @@ typedef struct {
 /*
  * Input, output, and conversion routines.
  */
-extern COMPLEX *comalloc(void);
-extern COMPLEX *qqtoc(NUMBER *q1, NUMBER *q2);
-extern void comfree(COMPLEX *c);
-extern void comprint(COMPLEX *c);
-extern void cprintfr(COMPLEX *c);
+E_FUNC COMPLEX *comalloc(void);
+E_FUNC COMPLEX *qqtoc(NUMBER *q1, NUMBER *q2);
+E_FUNC void comfree(COMPLEX *c);
+E_FUNC void comprint(COMPLEX *c);
+E_FUNC void cprintfr(COMPLEX *c);
 
 
 /*
  * Basic numeric routines.
  */
 
-extern COMPLEX *cadd(COMPLEX *c1, COMPLEX *c2);
-extern COMPLEX *csub(COMPLEX *c1, COMPLEX *c2);
-extern COMPLEX *cmul(COMPLEX *c1, COMPLEX *c2);
-extern COMPLEX *cdiv(COMPLEX *c1, COMPLEX *c2);
-extern COMPLEX *caddq(COMPLEX *c, NUMBER *q);
-extern COMPLEX *csubq(COMPLEX *c, NUMBER *q);
-extern COMPLEX *cmulq(COMPLEX *c, NUMBER *q);
-extern COMPLEX *cdivq(COMPLEX *c, NUMBER *q);
-extern COMPLEX *cscale(COMPLEX *c, long i);
-extern COMPLEX *cshift(COMPLEX *c, long i);
-extern COMPLEX *csquare(COMPLEX *c);
-extern COMPLEX *cconj(COMPLEX *c);
-extern COMPLEX *c_real(COMPLEX *c);
-extern COMPLEX *c_imag(COMPLEX *c);
-extern COMPLEX *cneg(COMPLEX *c);
-extern COMPLEX *cinv(COMPLEX *c);
-extern COMPLEX *cint(COMPLEX *c);
-extern COMPLEX *cfrac(COMPLEX *c);
-extern BOOL ccmp(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_add(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_sub(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_mul(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_div(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_addq(COMPLEX *c, NUMBER *q);
+E_FUNC COMPLEX *c_subq(COMPLEX *c, NUMBER *q);
+E_FUNC COMPLEX *c_mulq(COMPLEX *c, NUMBER *q);
+E_FUNC COMPLEX *c_divq(COMPLEX *c, NUMBER *q);
+E_FUNC COMPLEX *c_scale(COMPLEX *c, long i);
+E_FUNC COMPLEX *c_shift(COMPLEX *c, long i);
+E_FUNC COMPLEX *c_square(COMPLEX *c);
+E_FUNC COMPLEX *c_conj(COMPLEX *c);
+E_FUNC COMPLEX *c_real(COMPLEX *c);
+E_FUNC COMPLEX *c_imag(COMPLEX *c);
+E_FUNC COMPLEX *c_neg(COMPLEX *c);
+E_FUNC COMPLEX *c_inv(COMPLEX *c);
+E_FUNC COMPLEX *c_int(COMPLEX *c);
+E_FUNC COMPLEX *c_frac(COMPLEX *c);
+E_FUNC BOOL c_cmp(COMPLEX *c1, COMPLEX *c2);
 
 
 /*
  * More complicated functions.
  */
-extern COMPLEX *cpowi(COMPLEX *c, NUMBER *q);
-extern NUMBER *cilog(COMPLEX *c, ZVALUE base);
+E_FUNC COMPLEX *c_powi(COMPLEX *c, NUMBER *q);
+E_FUNC NUMBER *c_ilog(COMPLEX *c, ZVALUE base);
 
 
 /*
  * Transcendental routines.  These all take an epsilon argument to
  * specify how accurately these are to be calculated.
  */
-extern COMPLEX *cpower(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon);
-extern COMPLEX *csqrt(COMPLEX *c, NUMBER *epsilon, long R);
-extern COMPLEX *croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon);
-extern COMPLEX *cexp(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cln(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *ccos(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *csin(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *ccosh(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *csinh(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cpolar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon);
-extern COMPLEX *crel(COMPLEX *c1, COMPLEX *c2);
-extern COMPLEX *casin(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacos(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *catan(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacot(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *casec(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacsc(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *casinh(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacosh(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *catanh(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacoth(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *casech(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cacsch(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cgd(COMPLEX *c, NUMBER *epsilon);
-extern COMPLEX *cagd(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_power(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon);
+E_FUNC COMPLEX *c_sqrt(COMPLEX *c, NUMBER *epsilon, long R);
+E_FUNC COMPLEX *c_root(COMPLEX *c, NUMBER *q, NUMBER *epsilon);
+E_FUNC COMPLEX *c_exp(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_ln(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_log(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_cos(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_sin(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_cosh(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_sinh(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_polar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon);
+E_FUNC COMPLEX *c_rel(COMPLEX *c1, COMPLEX *c2);
+E_FUNC COMPLEX *c_asin(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acos(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_atan(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acot(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_asec(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acsc(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_asinh(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acosh(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_atanh(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acoth(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_asech(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_acsch(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_gd(COMPLEX *c, NUMBER *epsilon);
+E_FUNC COMPLEX *c_agd(COMPLEX *c, NUMBER *epsilon);
 
 
 
 /*
  * external functions
  */
-extern COMPLEX *swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
-extern COMPLEX *swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
-extern COMPLEX *swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
+E_FUNC COMPLEX *swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
+E_FUNC COMPLEX *swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
+E_FUNC COMPLEX *swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
 
 
 /*
@@ -152,7 +153,7 @@ extern COMPLEX *swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all);
 /*
  * Pre-defined values.
  */
-extern COMPLEX _czero_, _cone_, _conei_;
+EXTERN COMPLEX _czero_, _cone_, _conei_;
 
 
 #endif /* !__CMATH_H__ */

comfunc.c

@@ -1,7 +1,7 @@
 /*
  * comfunc - extended precision complex arithmetic non-primitive routines
  *
- * Copyright (C) 1999  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: comfunc.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: comfunc.c,v 29.7 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/comfunc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
@@ -33,6 +33,16 @@
 #include "config.h"
 #include "cmath.h"
 
+/*
+ * cache the natural logarithm of 10
+ */
+STATIC COMPLEX *cln_10 = NULL;
+STATIC NUMBER *cln_10_epsilon = NULL;
+STATIC NUMBER _q10_ = { { _tenval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
+STATIC NUMBER _q0_ = { { _zeroval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
+COMPLEX _cten_ = { &_q10_, &_q0_, 1 };
+
+
 /*
  * Compute the result of raising a complex number to an integer power.
  *
@@ -41,7 +51,7 @@
  *	q		power to raise it to
  */
 COMPLEX *
-cpowi(COMPLEX *c, NUMBER *q)
+c_powi(COMPLEX *c, NUMBER *q)
 {
 	COMPLEX *tmp, *res;	/* temporary values */
 	long power;		/* power to raise to */
@@ -69,29 +79,29 @@ cpowi(COMPLEX *c, NUMBER *q)
 	 */
 	if (power <= 4) {
 		switch ((int) (power * sign)) {
-			case 0:
-				return clink(&_cone_);
-			case 1:
-				return clink(c);
-			case -1:
-				return cinv(c);
-			case 2:
-				return csquare(c);
-			case -2:
-				tmp = csquare(c);
-				res = cinv(tmp);
-				comfree(tmp);
-				return res;
-			case 3:
-				tmp = csquare(c);
-				res = cmul(c, tmp);
-				comfree(tmp);
-				return res;
-			case 4:
-				tmp = csquare(c);
-				res = csquare(tmp);
-				comfree(tmp);
-				return res;
+		case 0:
+			return clink(&_cone_);
+		case 1:
+			return clink(c);
+		case -1:
+			return c_inv(c);
+		case 2:
+			return c_square(c);
+		case -2:
+			tmp = c_square(c);
+			res = c_inv(tmp);
+			comfree(tmp);
+			return res;
+		case 3:
+			tmp = c_square(c);
+			res = c_mul(c, tmp);
+			comfree(tmp);
+			return res;
+		case 4:
+			tmp = c_square(c);
+			res = c_square(tmp);
+			comfree(tmp);
+			return res;
 		}
 	}
 	/*
@@ -102,26 +112,26 @@ cpowi(COMPLEX *c, NUMBER *q)
 	while ((bit & power) == 0)
 		bit >>= 1L;
 	bit >>= 1L;
-	res = csquare(c);
+	res = c_square(c);
 	if (bit & power) {
-		tmp = cmul(res, c);
+		tmp = c_mul(res, c);
 		comfree(res);
 		res = tmp;
 	}
 	bit >>= 1L;
 	while (bit) {
-		tmp = csquare(res);
+		tmp = c_square(res);
 		comfree(res);
 		res = tmp;
 		if (bit & power) {
-			tmp = cmul(res, c);
+			tmp = c_mul(res, c);
 			comfree(res);
 			res = tmp;
 		}
 		bit >>= 1L;
 	}
 	if (sign < 0) {
-		tmp = cinv(res);
+		tmp = c_inv(res);
 		comfree(res);
 		res = tmp;
 	}
@@ -134,7 +144,7 @@ cpowi(COMPLEX *c, NUMBER *q)
  * Type of rounding of each component specified by R as for qsqrt().
  */
 COMPLEX *
-csqrt(COMPLEX *c, NUMBER *epsilon, long R)
+c_sqrt(COMPLEX *c, NUMBER *epsilon, long R)
 {
 	COMPLEX *r;
 	NUMBER *es, *aes, *bes, *u, *v, qtemp;
@@ -363,7 +373,7 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
  * Each component of the result is within the specified error.
  */
 COMPLEX *
-croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
+c_root(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
 {
 	COMPLEX *r;
 	NUMBER *a2pb2, *root, *tmp1, *tmp2, *epsilon2;
@@ -376,7 +386,7 @@ croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
 	if (cisone(c) || qisone(q))
 		return clink(c);
 	if (qistwo(q))
-		return csqrt(c, epsilon, 24L);
+		return c_sqrt(c, epsilon, 24L);
 	if (cisreal(c) && !qisneg(c->real)) {
 		tmp1 = qroot(c->real, q, epsilon);
 		if (tmp1 == NULL)
@@ -388,8 +398,8 @@ croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
 	}
 	/*
 	 * Calculate the root using the formula:
-	 *	croot(a + bi, n) =
-	 *		cpolar(qroot(a^2 + b^2, 2 * n), qatan2(b, a) / n).
+	 *	c_root(a + bi, n) =
+	 *		c_polar(qroot(a^2 + b^2, 2 * n), qatan2(b, a) / n).
 	 */
 	n = qilog2(epsilon);
 	epsilon2 = qbitvalue(n - 4);
@@ -415,7 +425,7 @@ croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
 	qfree(epsilon2);
 	tmp2 = qqdiv(tmp1, q);
 	qfree(tmp1);
-	r = cpolar(root, tmp2, epsilon);
+	r = c_polar(root, tmp2, epsilon);
 	qfree(root);
 	qfree(tmp2);
 	return r;
@@ -428,7 +438,7 @@ croot(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
  *	exp(a + bi) = exp(a) * (cos(b) + i * sin(b)).
  */
 COMPLEX *
-cexp(COMPLEX *c, NUMBER *epsilon)
+c_exp(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *r;
 	NUMBER *sin, *cos, *tmp1, *tmp2, *epsilon1;
@@ -485,13 +495,13 @@ cexp(COMPLEX *c, NUMBER *epsilon)
  *	ln(a + bi) = ln(a^2 + b^2) / 2 + i * atan2(b, a).
  */
 COMPLEX *
-cln(COMPLEX *c, NUMBER *epsilon)
+c_ln(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *r;
 	NUMBER *a2b2, *tmp1, *tmp2, *epsilon1;
 
 	if (ciszero(c)) {
-		math_error("Logarithm of zero");
+		math_error("logarithm of zero");
 		/*NOTREACHED*/
 	}
 	if (cisone(c))
@@ -519,6 +529,60 @@ cln(COMPLEX *c, NUMBER *epsilon)
 	return r;
 }
 
+/*
+ * Calculate base 10 logarithm by:
+ *
+ *	log(c) = ln(c) / ln(10)
+ */
+COMPLEX *
+c_log(COMPLEX *c, NUMBER *epsilon)
+{
+	int need_new_cln_10 = TRUE;	/* FALSE => use cached cln_10 value */
+	COMPLEX *ln_c;			/* ln(x) */
+	COMPLEX *ret;			/* base 10 logarithm of x */
+
+	/*
+	 * compute ln(c) first
+	 */
+	ln_c = c_ln(c, epsilon);
+	/* log(1) == 0 */
+	if (ciszero(ln_c)) {
+		return ln_c;
+	}
+
+	/*
+	 * save epsilon for ln(10) if needed
+	 */
+	if (cln_10_epsilon == NULL) {
+		/* first time call */
+		cln_10_epsilon = qcopy(epsilon);
+	} else if (qcmp(cln_10_epsilon, epsilon) == FALSE) {
+		/* replaced cacheed value with epsilon arg */
+		qfree(cln_10_epsilon);
+		cln_10_epsilon = qcopy(epsilon);
+	} else if (cln_10 != NULL) {
+		/* the previously computed ln(2) is OK to use */
+		need_new_cln_10 = FALSE;
+	}
+
+	/*
+	 * compute ln(10) if needed
+	 */
+	if (need_new_cln_10 == TRUE) {
+		if (cln_10 != NULL) {
+			comfree(cln_10);
+		}
+		cln_10 = c_ln(&_cten_, cln_10_epsilon);
+	}
+
+	/*
+	 * return ln(c) / ln(10)
+	 */
+	ret = c_div(ln_c, cln_10);
+	comfree(ln_c);
+	return ret;
+}
+
 
 /*
  * Calculate the complex cosine within the specified accuracy.
@@ -526,7 +590,7 @@ cln(COMPLEX *c, NUMBER *epsilon)
  *	cos(x) = (exp(1i * x) + exp(-1i * x))/2;
  */
 COMPLEX *
-ccos(COMPLEX *c, NUMBER *epsilon)
+c_cos(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *r, *ctmp1, *ctmp2, *ctmp3;
 	NUMBER *epsilon1;
@@ -545,7 +609,7 @@ ccos(COMPLEX *c, NUMBER *epsilon)
 	ctmp1->real = neg ? qneg(c->imag) : qlink(c->imag);
 	ctmp1->imag = neg ? qlink(c->real) : qneg(c->real);
 	epsilon1 = qbitvalue(n - 2);
-	ctmp2 = cexp(ctmp1, epsilon1);
+	ctmp2 = c_exp(ctmp1, epsilon1);
 	comfree(ctmp1);
 	qfree(epsilon1);
 	if (ctmp2 == NULL)
@@ -554,11 +618,11 @@ ccos(COMPLEX *c, NUMBER *epsilon)
 		comfree(ctmp2);
 		return clink(&_czero_);
 	}
-	ctmp1 = cinv(ctmp2);
-	ctmp3 = cadd(ctmp2, ctmp1);
+	ctmp1 = c_inv(ctmp2);
+	ctmp3 = c_add(ctmp2, ctmp1);
 	comfree(ctmp1);
 	comfree(ctmp2);
-	ctmp1 = cscale(ctmp3, -1);
+	ctmp1 = c_scale(ctmp3, -1);
 	comfree(ctmp3);
 	r = comalloc();
 	qfree(r->real);
@@ -576,7 +640,7 @@ ccos(COMPLEX *c, NUMBER *epsilon)
  *	sin(x) = (exp(1i * x) - exp(-i1*x))/(2i).
  */
 COMPLEX *
-csin(COMPLEX *c, NUMBER *epsilon)
+c_sin(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *r, *ctmp1, *ctmp2, *ctmp3;
 	NUMBER *qtmp, *epsilon1;
@@ -597,7 +661,7 @@ csin(COMPLEX *c, NUMBER *epsilon)
 	ctmp1->real = neg ? qneg(c->imag) : qlink(c->imag);
 	ctmp1->imag = neg ? qlink(c->real) : qneg(c->real);
 	epsilon1 = qbitvalue(n - 2);
-	ctmp2 = cexp(ctmp1, epsilon1);
+	ctmp2 = c_exp(ctmp1, epsilon1);
 	comfree(ctmp1);
 	qfree(epsilon1);
 	if (ctmp2 == NULL)
@@ -606,11 +670,11 @@ csin(COMPLEX *c, NUMBER *epsilon)
 		comfree(ctmp2);
 		return clink(&_czero_);
 	}
-	ctmp1 = cinv(ctmp2);
-	ctmp3 = csub(ctmp2, ctmp1);
+	ctmp1 = c_inv(ctmp2);
+	ctmp3 = c_sub(ctmp2, ctmp1);
 	comfree(ctmp1);
 	comfree(ctmp2);
-	ctmp1 = cscale(ctmp3, -1);
+	ctmp1 = c_scale(ctmp3, -1);
 	comfree(ctmp3);
 	r = comalloc();
 	qtmp = neg ? qlink(ctmp1->imag) : qneg(ctmp1->imag);
@@ -627,105 +691,105 @@ csin(COMPLEX *c, NUMBER *epsilon)
 
 
 COMPLEX *
-ccosh(COMPLEX *c, NUMBER *epsilon)
+c_cosh(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
-	tmp1 = cexp(c, epsilon);
+	tmp1 = c_exp(c, epsilon);
 	if (tmp1 == NULL)
 		return NULL;
-	tmp2 = cneg(c);
-	tmp3 = cexp(tmp2, epsilon);
+	tmp2 = c_neg(c);
+	tmp3 = c_exp(tmp2, epsilon);
 	comfree(tmp2);
 	if (tmp3 == NULL)
 		return NULL;
-	tmp2 = cadd(tmp1, tmp3);
+	tmp2 = c_add(tmp1, tmp3);
 	comfree(tmp1);
 	comfree(tmp3);
-	tmp1 = cscale(tmp2, -1);
+	tmp1 = c_scale(tmp2, -1);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-csinh(COMPLEX *c, NUMBER *epsilon)
+c_sinh(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
-	tmp1 = cexp(c, epsilon);
+	tmp1 = c_exp(c, epsilon);
 	if (tmp1 == NULL)
 		return NULL;
-	tmp2 = cneg(c);
-	tmp3 = cexp(tmp2, epsilon);
+	tmp2 = c_neg(c);
+	tmp3 = c_exp(tmp2, epsilon);
 	comfree(tmp2);
 	if (tmp3 == NULL)
 		return NULL;
-	tmp2 = csub(tmp1, tmp3);
+	tmp2 = c_sub(tmp1, tmp3);
 	comfree(tmp1);
 	comfree(tmp3);
-	tmp1 = cscale(tmp2, -1);
+	tmp1 = c_scale(tmp2, -1);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-casin(COMPLEX *c, NUMBER *epsilon)
+c_asin(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cmul(&_conei_, c);
-	tmp2 = casinh(tmp1, epsilon);
+	tmp1 = c_mul(&_conei_, c);
+	tmp2 = c_asinh(tmp1, epsilon);
 	comfree(tmp1);
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-cacos(COMPLEX *c, NUMBER *epsilon)
+c_acos(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = csquare(c);
-	tmp2 = csub(&_cone_, tmp1);
+	tmp1 = c_square(c);
+	tmp2 = c_sub(&_cone_, tmp1);
 	comfree(tmp1);
-	tmp1 = csqrt(tmp2, epsilon, 24);
+	tmp1 = c_sqrt(tmp2, epsilon, 24);
 	comfree(tmp2);
-	tmp2 = cmul(&_conei_, tmp1);
+	tmp2 = c_mul(&_conei_, tmp1);
 	comfree(tmp1);
-	tmp1 = cadd(c, tmp2);
+	tmp1 = c_add(c, tmp2);
 	comfree(tmp2);
-	tmp2 = cln(tmp1, epsilon);
+	tmp2 = c_ln(tmp1, epsilon);
 	comfree(tmp1);
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-casinh(COMPLEX *c, NUMBER *epsilon)
+c_asinh(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 	BOOL neg;
 
 	neg = qisneg(c->real);
-	tmp1 = neg ? cneg(c) : clink(c);
-	tmp2 = csquare(tmp1);
-	tmp3 = cadd(&_cone_, tmp2);
+	tmp1 = neg ? c_neg(c) : clink(c);
+	tmp2 = c_square(tmp1);
+	tmp3 = c_add(&_cone_, tmp2);
 	comfree(tmp2);
-	tmp2 = csqrt(tmp3, epsilon, 24);
+	tmp2 = c_sqrt(tmp3, epsilon, 24);
 	comfree(tmp3);
-	tmp3 = cadd(tmp2, tmp1);
+	tmp3 = c_add(tmp2, tmp1);
 	comfree(tmp1);
 	comfree(tmp2);
-	tmp1 = cln(tmp3, epsilon);
+	tmp1 = c_ln(tmp3, epsilon);
 	comfree(tmp3);
 	if (neg) {
-		tmp2 = cneg(tmp1);
+		tmp2 = c_neg(tmp1);
 		comfree(tmp1);
 		return tmp2;
 	}
@@ -734,153 +798,153 @@ casinh(COMPLEX *c, NUMBER *epsilon)
 
 
 COMPLEX *
-cacosh(COMPLEX *c, NUMBER *epsilon)
+c_acosh(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = csquare(c);
-	tmp2 = csub(tmp1, &_cone_);
+	tmp1 = c_square(c);
+	tmp2 = c_sub(tmp1, &_cone_);
 	comfree(tmp1);
-	tmp1 = csqrt(tmp2, epsilon, 24);
+	tmp1 = c_sqrt(tmp2, epsilon, 24);
 	comfree(tmp2);
-	tmp2 = cadd(c, tmp1);
+	tmp2 = c_add(c, tmp1);
 	comfree(tmp1);
-	tmp1 = cln(tmp2, epsilon);
+	tmp1 = c_ln(tmp2, epsilon);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-catan(COMPLEX *c, NUMBER *epsilon)
+c_atan(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
 	if (qiszero(c->real) && qisunit(c->imag))
 		return NULL;
-	tmp1 = csub(&_conei_, c);
-	tmp2 = cadd(&_conei_, c);
-	tmp3 = cdiv(tmp1, tmp2);
+	tmp1 = c_sub(&_conei_, c);
+	tmp2 = c_add(&_conei_, c);
+	tmp3 = c_div(tmp1, tmp2);
 	comfree(tmp1);
 	comfree(tmp2);
-	tmp1 = cln(tmp3, epsilon);
+	tmp1 = c_ln(tmp3, epsilon);
 	comfree(tmp3);
-	tmp2 = cscale(tmp1, -1);
+	tmp2 = c_scale(tmp1, -1);
 	comfree(tmp1);
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	return tmp1;
 }
 
 
 COMPLEX *
-cacot(COMPLEX *c, NUMBER *epsilon)
+c_acot(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
 	if (qiszero(c->real) && qisunit(c->imag))
 		return NULL;
-	tmp1 = cadd(c, &_conei_);
-	tmp2 = csub(c, &_conei_);
-	tmp3 = cdiv(tmp1, tmp2);
+	tmp1 = c_add(c, &_conei_);
+	tmp2 = c_sub(c, &_conei_);
+	tmp3 = c_div(tmp1, tmp2);
 	comfree(tmp1);
 	comfree(tmp2);
-	tmp1 = cln(tmp3, epsilon);
+	tmp1 = c_ln(tmp3, epsilon);
 	comfree(tmp3);
-	tmp2 = cscale(tmp1, -1);
+	tmp2 = c_scale(tmp1, -1);
 	comfree(tmp1);
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	return tmp1;
 }
 
 COMPLEX *
-casec(COMPLEX *c, NUMBER *epsilon)
+c_asec(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cinv(c);
-	tmp2 = cacos(tmp1, epsilon);
+	tmp1 = c_inv(c);
+	tmp2 = c_acos(tmp1, epsilon);
 	comfree(tmp1);
 	return tmp2;
 }
 
 COMPLEX *
-cacsc(COMPLEX *c, NUMBER *epsilon)
+c_acsc(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cinv(c);
-	tmp2 = casin(tmp1, epsilon);
+	tmp1 = c_inv(c);
+	tmp2 = c_asin(tmp1, epsilon);
 	comfree(tmp1);
 	return tmp2;
 }
 
 
 COMPLEX *
-catanh(COMPLEX *c, NUMBER *epsilon)
+c_atanh(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
 	if (qiszero(c->imag) && qisunit(c->real))
 		return NULL;
-	tmp1 = cadd(&_cone_, c);
-	tmp2 = csub(&_cone_, c);
-	tmp3 = cdiv(tmp1, tmp2);
+	tmp1 = c_add(&_cone_, c);
+	tmp2 = c_sub(&_cone_, c);
+	tmp3 = c_div(tmp1, tmp2);
 	comfree(tmp1);
 	comfree(tmp2);
-	tmp1 = cln(tmp3, epsilon);
+	tmp1 = c_ln(tmp3, epsilon);
 	comfree(tmp3);
-	tmp2 = cscale(tmp1, -1);
+	tmp2 = c_scale(tmp1, -1);
 	comfree(tmp1);
 	return tmp2;
 }
 
 
 COMPLEX *
-cacoth(COMPLEX *c, NUMBER *epsilon)
+c_acoth(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 
 	if (qiszero(c->imag) && qisunit(c->real))
 		return NULL;
-	tmp1 = cadd(c, &_cone_);
-	tmp2 = csub(c, &_cone_);
-	tmp3 = cdiv(tmp1, tmp2);
+	tmp1 = c_add(c, &_cone_);
+	tmp2 = c_sub(c, &_cone_);
+	tmp3 = c_div(tmp1, tmp2);
 	comfree(tmp1);
 	comfree(tmp2);
-	tmp1 = cln(tmp3, epsilon);
+	tmp1 = c_ln(tmp3, epsilon);
 	comfree(tmp3);
-	tmp2 = cscale(tmp1, -1);
+	tmp2 = c_scale(tmp1, -1);
 	comfree(tmp1);
 	return tmp2;
 }
 
 COMPLEX *
-casech(COMPLEX *c, NUMBER *epsilon)
+c_asech(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cinv(c);
-	tmp2 = cacosh(tmp1, epsilon);
+	tmp1 = c_inv(c);
+	tmp2 = c_acosh(tmp1, epsilon);
 	comfree(tmp1);
 	return tmp2;
 }
 
 COMPLEX *
-cacsch(COMPLEX *c, NUMBER *epsilon)
+c_acsch(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cinv(c);
-	tmp2 = casinh(tmp1, epsilon);
+	tmp1 = c_inv(c);
+	tmp2 = c_asinh(tmp1, epsilon);
 	comfree(tmp1);
 	return tmp2;
 }
 
 
 COMPLEX *
-cgd(COMPLEX *c, NUMBER *epsilon)
+c_gd(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2, *tmp3;
 	NUMBER *q1, *q2;
@@ -947,30 +1011,30 @@ cgd(COMPLEX *c, NUMBER *epsilon)
 		return tmp1;
 	}
 	neg = qisneg(c->real);
-	tmp1 = neg ? cneg(c) : clink(c);
-	tmp2 = cexp(tmp1, epsilon);
+	tmp1 = neg ? c_neg(c) : clink(c);
+	tmp2 = c_exp(tmp1, epsilon);
 	comfree(tmp1);
 	if (tmp2 == NULL)
 		return NULL;
-	tmp1 = cmul(&_conei_, tmp2);
-	tmp3 = cadd(&_conei_, tmp2);
+	tmp1 = c_mul(&_conei_, tmp2);
+	tmp3 = c_add(&_conei_, tmp2);
 	comfree(tmp2);
-	tmp2 = cadd(tmp1, &_cone_);
+	tmp2 = c_add(tmp1, &_cone_);
 	comfree(tmp1);
 	if (ciszero(tmp2) || ciszero(tmp3)) {
 		comfree(tmp2);
 		comfree(tmp3);
 		return NULL;
 	}
-	tmp1 = cdiv(tmp2, tmp3);
+	tmp1 = c_div(tmp2, tmp3);
 	comfree(tmp2);
 	comfree(tmp3);
-	tmp2 = cln(tmp1, epsilon);
+	tmp2 = c_ln(tmp1, epsilon);
 	comfree(tmp1);
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	if (neg) {
-		tmp2 = cneg(tmp1);
+		tmp2 = c_neg(tmp1);
 		comfree(tmp1);
 		return tmp2;
 	}
@@ -979,16 +1043,16 @@ cgd(COMPLEX *c, NUMBER *epsilon)
 
 
 COMPLEX *
-cagd(COMPLEX *c, NUMBER *epsilon)
+c_agd(COMPLEX *c, NUMBER *epsilon)
 {
 	COMPLEX *tmp1, *tmp2;
 
-	tmp1 = cmul(&_conei_, c);
-	tmp2 = cgd(tmp1, epsilon);
+	tmp1 = c_mul(&_conei_, c);
+	tmp2 = c_gd(tmp1, epsilon);
 	comfree(tmp1);
 	if (tmp2 == NULL)
 		return NULL;
-	tmp1 = cdiv(tmp2, &_conei_);
+	tmp1 = c_div(tmp2, &_conei_);
 	comfree(tmp2);
 	return tmp1;
 }
@@ -1000,7 +1064,7 @@ cagd(COMPLEX *c, NUMBER *epsilon)
  *	q1 * cos(q2) + q1 * sin(q2) * i.
  */
 COMPLEX *
-cpolar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
+c_polar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
 {
 	COMPLEX *r;
 	NUMBER *tmp, *cos, *sin;
@@ -1042,7 +1106,7 @@ cpolar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
  * specified error.
  */
 COMPLEX *
-cpower(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon)
+c_power(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon)
 {
 	COMPLEX *ctmp1, *ctmp2;
 	long k1, k2, k, m1, m2, m, n;
@@ -1099,11 +1163,11 @@ cpower(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon)
 	if (k < n)
 		return clink(&_czero_);
 	epsilon1 = qbitvalue(n - k - m - 2);
-	ctmp1 = cln(c1, epsilon1);
+	ctmp1 = c_ln(c1, epsilon1);
 	qfree(epsilon1);
-	ctmp2 = cmul(ctmp1, c2);
+	ctmp2 = c_mul(ctmp1, c2);
 	comfree(ctmp1);
-	ctmp1 = cexp(ctmp2, epsilon);
+	ctmp1 = c_exp(ctmp2, epsilon);
 	comfree(ctmp2);
 	return ctmp1;
 }
@@ -1165,7 +1229,7 @@ cprintfr(COMPLEX *c)
 
 
 NUMBER *
-cilog(COMPLEX *c, ZVALUE base)
+c_ilog(COMPLEX *c, ZVALUE base)
 {
 	NUMBER *qr, *qi;
 

commath.c

@@ -1,7 +1,7 @@
 /*
  * commath - extended precision complex arithmetic primitive routines
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: commath.c,v 29.3 2002/03/12 09:38:26 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: commath.c,v 29.5 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/commath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -35,14 +35,14 @@ COMPLEX _czero_ =		{ &_qzero_, &_qzero_, 1 };
 COMPLEX _cone_ =		{ &_qone_, &_qzero_, 1 };
 COMPLEX _conei_ =		{ &_qzero_, &_qone_, 1 };
 
-static COMPLEX _cnegone_ =	{ &_qnegone_, &_qzero_, 1 };
+STATIC COMPLEX _cnegone_ =	{ &_qnegone_, &_qzero_, 1 };
 
 
 /*
  * Add two complex numbers.
  */
 COMPLEX *
-cadd(COMPLEX *c1, COMPLEX *c2)
+c_add(COMPLEX *c1, COMPLEX *c2)
 {
 	COMPLEX *r;
 
@@ -67,7 +67,7 @@ cadd(COMPLEX *c1, COMPLEX *c2)
  * Subtract two complex numbers.
  */
 COMPLEX *
-csub(COMPLEX *c1, COMPLEX *c2)
+c_sub(COMPLEX *c1, COMPLEX *c2)
 {
 	COMPLEX *r;
 
@@ -98,7 +98,7 @@ csub(COMPLEX *c1, COMPLEX *c2)
  * Then (a+bi) * (c+di) = (q2 - q3) + (q1 - q2 - q3)i.
  */
 COMPLEX *
-cmul(COMPLEX *c1, COMPLEX *c2)
+c_mul(COMPLEX *c1, COMPLEX *c2)
 {
 	COMPLEX *r;
 	NUMBER *q1, *q2, *q3, *q4;
@@ -110,9 +110,9 @@ cmul(COMPLEX *c1, COMPLEX *c2)
 	if (cisone(c2))
 		return clink(c1);
 	if (cisreal(c2))
-		return cmulq(c1, c2->real);
+		return c_mulq(c1, c2->real);
 	if (cisreal(c1))
-		return cmulq(c2, c1->real);
+		return c_mulq(c2, c1->real);
 	/*
 	 * Need to do the full calculation.
 	 */
@@ -141,7 +141,7 @@ cmul(COMPLEX *c1, COMPLEX *c2)
  * Square a complex number.
  */
 COMPLEX *
-csquare(COMPLEX *c)
+c_square(COMPLEX *c)
 {
 	COMPLEX *r;
 	NUMBER *q1, *q2;
@@ -183,7 +183,7 @@ csquare(COMPLEX *c)
  * Divide two complex numbers.
  */
 COMPLEX *
-cdiv(COMPLEX *c1, COMPLEX *c2)
+c_div(COMPLEX *c1, COMPLEX *c2)
 {
 	COMPLEX *r;
 	NUMBER *q1, *q2, *q3, *den;
@@ -254,7 +254,7 @@ cdiv(COMPLEX *c1, COMPLEX *c2)
  * Invert a complex number.
  */
 COMPLEX *
-cinv(COMPLEX *c)
+c_inv(COMPLEX *c)
 {
 	COMPLEX *r;
 	NUMBER *q1, *q2, *den;
@@ -296,7 +296,7 @@ cinv(COMPLEX *c)
  * Negate a complex number.
  */
 COMPLEX *
-cneg(COMPLEX *c)
+c_neg(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -320,7 +320,7 @@ cneg(COMPLEX *c)
  * This means take the integer part of both components.
  */
 COMPLEX *
-cint(COMPLEX *c)
+c_int(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -340,7 +340,7 @@ cint(COMPLEX *c)
  * This means take the fractional part of both components.
  */
 COMPLEX *
-cfrac(COMPLEX *c)
+c_frac(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -360,7 +360,7 @@ cfrac(COMPLEX *c)
  * This negates the complex part.
  */
 COMPLEX *
-cconj(COMPLEX *c)
+c_conj(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -417,7 +417,7 @@ c_imag(COMPLEX *c)
  * Add a real number to a complex number.
  */
 COMPLEX *
-caddq(COMPLEX *c, NUMBER *q)
+c_addq(COMPLEX *c, NUMBER *q)
 {
 	COMPLEX *r;
 
@@ -436,7 +436,7 @@ caddq(COMPLEX *c, NUMBER *q)
  * Subtract a real number from a complex number.
  */
 COMPLEX *
-csubq(COMPLEX *c, NUMBER *q)
+c_subq(COMPLEX *c, NUMBER *q)
 {
 	COMPLEX *r;
 
@@ -456,7 +456,7 @@ csubq(COMPLEX *c, NUMBER *q)
  * number of bits.  Negative values shift to the right.
  */
 COMPLEX *
-cshift(COMPLEX *c, long n)
+c_shift(COMPLEX *c, long n)
 {
 	COMPLEX *r;
 
@@ -475,7 +475,7 @@ cshift(COMPLEX *c, long n)
  * Scale a complex number by a power of two.
  */
 COMPLEX *
-cscale(COMPLEX *c, long n)
+c_scale(COMPLEX *c, long n)
 {
 	COMPLEX *r;
 
@@ -494,7 +494,7 @@ cscale(COMPLEX *c, long n)
  * Multiply a complex number by a real number.
  */
 COMPLEX *
-cmulq(COMPLEX *c, NUMBER *q)
+c_mulq(COMPLEX *c, NUMBER *q)
 {
 	COMPLEX *r;
 
@@ -503,7 +503,7 @@ cmulq(COMPLEX *c, NUMBER *q)
 	if (qisone(q))
 		return clink(c);
 	if (qisnegone(q))
-		return cneg(c);
+		return c_neg(c);
 	r = comalloc();
 	qfree(r->real);
 	qfree(r->imag);
@@ -517,7 +517,7 @@ cmulq(COMPLEX *c, NUMBER *q)
  * Divide a complex number by a real number.
  */
 COMPLEX *
-cdivq(COMPLEX *c, NUMBER *q)
+c_divq(COMPLEX *c, NUMBER *q)
 {
 	COMPLEX *r;
 
@@ -528,7 +528,7 @@ cdivq(COMPLEX *c, NUMBER *q)
 	if (qisone(q))
 		return clink(c);
 	if (qisnegone(q))
-		return cneg(c);
+		return c_neg(c);
 	r = comalloc();
 	qfree(r->real);
 	qfree(r->imag);
@@ -564,7 +564,7 @@ qqtoc(NUMBER *q1, NUMBER *q2)
  * and TRUE if they differ.
  */
 BOOL
-ccmp(COMPLEX *c1, COMPLEX *c2)
+c_cmp(COMPLEX *c1, COMPLEX *c2)
 {
 	BOOL i;
 
@@ -581,7 +581,7 @@ ccmp(COMPLEX *c1, COMPLEX *c2)
  * imaginary parts of the two numbers.
  */
 COMPLEX *
-crel(COMPLEX *c1, COMPLEX *c2)
+c_rel(COMPLEX *c1, COMPLEX *c2)
 {
 	COMPLEX *c;
 

config.c

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999-2002  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.8 $
- * @(#) $Id: config.c,v 29.8 2002/12/29 09:20:25 chongo Exp $
+ * @(#) $Revision: 29.24 $
+ * @(#) $Id: config.c,v 29.24 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -31,6 +31,24 @@
 
 
 #include <stdio.h>
+
+#include "have_times.h"
+#if defined(HAVE_TIME_H)
+#include <time.h>
+#endif
+
+#if defined(HAVE_TIMES_H)
+#include <times.h>
+#endif
+
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+
+#if defined(HAVE_SYS_TIMES_H)
+#include <sys/times.h>
+#endif
+
 #include "calc.h"
 #include "token.h"
 #include "zrand.h"
@@ -38,12 +56,22 @@
 #include "nametype.h"
 #include "config.h"
 #include "string.h"
+#include "custom.h"
 
 #include "have_strdup.h"
 #if !defined(HAVE_STRDUP)
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif /* HAVE_STRDUP */
 
+/*
+ * deal with systems that lack a defined CLK_TCK
+ */
+#if defined(CLK_TCK)
+# define CALC_HZ ((long)(CLK_TCK))
+#else
+# define CALC_HZ (0L)	/* no defined clock tick rate */
+#endif
+
 
 /*
  * Table of configuration types that can be set or read.
@@ -92,7 +120,14 @@ NAMETYPE configs[] = {
 	{"program",	CONFIG_PROGRAM},
 	{"basename",	CONFIG_BASENAME},
 	{"windows",	CONFIG_WINDOWS},
+	{"cygwin",	CONFIG_CYGWIN},
+	{"compile_custom",	CONFIG_COMPILE_CUSTOM},
+	{"allow_custom",	CONFIG_ALLOW_CUSTOM},
 	{"version",	CONFIG_VERSION},
+	{"baseb",	CONFIG_BASEB},
+	{"redecl_warn",	CONFIG_REDECL_WARN},
+	{"dupvar_warn",	CONFIG_DUPVAR_WARN},
+	{"hz",		CONFIG_HZ},
 	{NULL,		0}
 };
 
@@ -144,14 +179,28 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 #else
 	FALSE,			/* congrats, you are not using windows */
 #endif
-	NULL			/* version */
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
+#endif
+#if defined(CUSTOM)
+	TRUE,			/* compiled with -DCUSTOM */
+#else
+	FALSE,			/* compiled without -DCUSTOM */
+#endif
+	&allow_custom,		/* *TRUE=> custom functions are enabled */
+	NULL,			/* version */
+	BASEB,			/* base for calculations */
+	TRUE,			/* warn when redeclaring */
+	TRUE,			/* warn when variable names collide */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
 	MODE2_INITIAL,		/* current output mode */
-	10,			/* current output digits for float or exp */
+	20,			/* current output digits for float or exp */
 	NULL,	/* loaded in at startup - default error for real functions */
-	NEW_EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
+	EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
 	FALSE,			/* tracing flags */
 	MAXPRINT_DEFAULT,	/* number of elements to print */
 	MUL_ALG2,		/* size of number to use multiply alg 2 */
@@ -161,7 +210,7 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	TRUE,			/* ok to print a tilde on approximations */
 	TRUE,			/* ok to print tab before numeric values */
 	0,			/* quomod() default rounding mode */
-	0,			/* quotient // default rounding mode */
+	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
 	24,			/* sqrt() default rounding mode */
 	24,			/* appr() default rounding mode */
@@ -170,7 +219,7 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	24,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
 	TRUE,			/* ok to print leading 0 before decimal pt */
-	1,			/* ok to print trailing 0's */
+	0,			/* ok to print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	"; ",			/* normal prompt */
 	";; ",			/* prompt when inside multi-line input */
@@ -190,7 +239,21 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 #else
 	FALSE,			/* congrats, you are not using windows */
 #endif
-	NULL			/* version */
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
+#endif
+#if defined(CUSTOM)
+	TRUE,			/* compiled with -DCUSTOM */
+#else
+	FALSE,			/* compiled without -DCUSTOM */
+#endif
+	&allow_custom,		/* *TRUE=> custom functions are enabled */
+	NULL,			/* version */
+	BASEB,			/* base for calculations */
+	TRUE,			/* warn when redeclaring */
+	TRUE,			/* warn when variable names collide */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
 
@@ -198,7 +261,7 @@ CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
 /*
  * Possible output modes.
  */
-static NAMETYPE modes[] = {
+STATIC NAMETYPE modes[] = {
 	{"fraction",	MODE_FRAC},
 	{"frac",	MODE_FRAC},
 	{"integer",	MODE_INT},
@@ -223,7 +286,7 @@ static NAMETYPE modes[] = {
 /*
  * Possible block base output modes
  */
-static NAMETYPE blk_base[] = {
+STATIC NAMETYPE blk_base[] = {
 	{"hexadecimal", BLK_BASE_HEX},
 	{"hex",		BLK_BASE_HEX},
 	{"default",	BLK_BASE_HEX},
@@ -242,7 +305,7 @@ static NAMETYPE blk_base[] = {
 /*
  * Possible block output formats
  */
-static NAMETYPE blk_fmt[] = {
+STATIC NAMETYPE blk_fmt[] = {
 	{"lines",	BLK_FMT_LINE},
 	{"line",	BLK_FMT_LINE},
 	{"strings",	BLK_FMT_STRING},
@@ -262,7 +325,7 @@ static NAMETYPE blk_fmt[] = {
 /*
  * Possible ctrl_d styles
  */
-static NAMETYPE ctrl_d[] = {
+STATIC NAMETYPE ctrl_d[] = {
 	{"virgin_eof",	CTRL_D_VIRGIN_EOF},
 	{"virgineof",	CTRL_D_VIRGIN_EOF},
 	{"virgin",	CTRL_D_VIRGIN_EOF},
@@ -282,7 +345,7 @@ static NAMETYPE ctrl_d[] = {
  */
 #define TRUE_STRING	"true"
 #define FALSE_STRING	"false"
-static NAMETYPE truth[] = {
+STATIC NAMETYPE truth[] = {
 	{TRUE_STRING,	TRUE},
 	{"t",		TRUE},
 	{"on",		TRUE},
@@ -304,9 +367,9 @@ static NAMETYPE truth[] = {
 /*
  * declare static functions
  */
-static long lookup_long(NAMETYPE *set, char *name);
-static char *lookup_name(NAMETYPE *set, long val);
-static int getlen(VALUE *vp, LEN *lp);
+S_FUNC long lookup_long(NAMETYPE *set, char *name);
+S_FUNC char *lookup_name(NAMETYPE *set, long val);
+S_FUNC int getlen(VALUE *vp, LEN *lp);
 
 
 /*
@@ -340,7 +403,7 @@ configtype(char *name)
  * returns:
  *	numeric value of the name or -1 if not found
  */
-static long
+S_FUNC long
 lookup_long(NAMETYPE *set, char *name)
 {
 	NAMETYPE *cp;		/* current config pointer */
@@ -363,7 +426,7 @@ lookup_long(NAMETYPE *set, char *name)
  * returns:
  *	name of the value found of NULL
  */
-static char *
+S_FUNC char *
 lookup_name(NAMETYPE *set, long val)
 {
 	NAMETYPE *cp;		/* current config pointer */
@@ -379,10 +442,11 @@ lookup_name(NAMETYPE *set, long val)
 /*
  * Check whether VALUE at vp is a LEN (32-bit signed integer) and if so,
  * copy that integer to lp.
- * Return: 1, 2, 0, or -1 XXX
+ *
+ * Return: 1 ==> not an integer, 2 ==> int > 2^31, 0 ==> OK, -1 ==> error
  */
 
-static int
+S_FUNC int
 getlen(VALUE *vp, LEN *lp)
 {
 	if (vp->v_type != V_NUM || !qisint(vp->v_num))
@@ -406,7 +470,7 @@ setconfig(int type, VALUE *vp)
 	NUMBER *q;
 	CONFIG *newconf;	/* new configuration to set */
 	long temp;
-	LEN len;
+	LEN len = 0;
 	char *p;
 
 	switch (type) {
@@ -501,7 +565,7 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_MUL2:
-		if (getlen(vp, &len)) {
+		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for mul2");
 			/*NOTREACHED*/
 		}
@@ -511,7 +575,7 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_SQ2:
-		if (getlen(vp, &len)) {
+		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for sq2");
 			/*NOTREACHED*/
 		}
@@ -521,7 +585,7 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_POW2:
-		if (getlen(vp, &len)) {
+		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for pow2");
 			/*NOTREACHED*/
 		}
@@ -531,7 +595,7 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_REDC2:
-		if (getlen(vp, &len)) {
+		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for redc2");
 			/*NOTREACHED*/
 		}
@@ -696,7 +760,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Cannot duplicate new prompt");
 			/*NOTREACHED*/
 		}
-		strcpy(p, vp->v_str->s_str);
+		strncpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt1);
 		conf->prompt1 = p;
 		break;
@@ -711,7 +775,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Cannot duplicate new more prompt");
 			/*NOTREACHED*/
 		}
-		strcpy(p, vp->v_str->s_str);
+		strncpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt2);
 		conf->prompt2 = p;
 		break;
@@ -857,10 +921,58 @@ setconfig(int type, VALUE *vp)
 		math_error("The windows config parameter is read-only");
 		/*NOTREACHED*/
 
+	case CONFIG_CYGWIN:
+		math_error("The cygwin config parameter is read-only");
+		/*NOTREACHED*/
+
+	case CONFIG_COMPILE_CUSTOM:
+		math_error("The custom config parameter is read-only");
+		/*NOTREACHED*/
+
+	case CONFIG_ALLOW_CUSTOM:
+		math_error("The allow_custom config parameter is read-only");
+		/*NOTREACHED*/
+
 	case CONFIG_VERSION:
 		math_error("The version config parameter is read-only");
 		/*NOTREACHED*/
 
+	case CONFIG_BASEB:
+		math_error("The baseb config parameter is read-only");
+		/*NOTREACHED*/
+
+	case CONFIG_REDECL_WARN:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->redecl_warn = !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 redecl_warn");
+				/*NOTREACHED*/
+			}
+			conf->redecl_warn = (int)temp;
+		}
+		break;
+
+	case CONFIG_DUPVAR_WARN:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->dupvar_warn = !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 dupvar_warn");
+				/*NOTREACHED*/
+			}
+			conf->dupvar_warn = (int)temp;
+		}
+		break;
+
+	case CONFIG_HZ:
+		math_error("The clock tick rate config parameter is read-only");
+		/*NOTREACHED*/
+
 	default:
 		math_error("Setting illegal config parameter");
 		/*NOTREACHED*/
@@ -921,6 +1033,7 @@ config_copy(CONFIG *src)
 	} else {
 		dest->base_name = strdup(src->base_name);
 	}
+	/* NOTE: allow_custom points to a global variable, so do not clone it */
 	if (src->version == NULL) {
 		dest->version = strdup(version());
 	} else {
@@ -968,6 +1081,7 @@ config_free(CONFIG *cfg)
 	if (cfg->base_name != NULL) {
 		free(cfg->base_name);
 	}
+	/* NOTE: allow_custom points to a global variable, so do not free it */
 	if (cfg->version != NULL) {
 		free(cfg->version);
 	}
@@ -1070,20 +1184,12 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_TILDE:
-		if (cfg->tilde_ok) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->tilde_ok ? 1 : 0);
+		break;
 
 	case CONFIG_TAB:
-		if (cfg->tab_ok) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->tab_ok ? 1 : 0);
+		break;
 
 	case CONFIG_QUOMOD:
 		i = cfg->quomod;
@@ -1122,20 +1228,12 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_LEADZERO:
-		if (cfg->leadzero) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->leadzero ? 1 : 0);
+		break;
 
 	case CONFIG_FULLZERO:
-		if (cfg->fullzero) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->fullzero ? 1 : 0);
+		break;
 
 	case CONFIG_MAXSCAN:
 		i = cfg->maxscancount;
@@ -1156,12 +1254,8 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_BLKVERBOSE:
-		if (cfg->blkverbose) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->blkverbose ? 1 : 0);
+		break;
 
 	case CONFIG_BLKBASE:
 		vp->v_type = V_STR;
@@ -1196,12 +1290,8 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_VERBOSE_QUIT:
-		if (cfg->verbose_quit) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
-		}
-		return;
+		i = (cfg->verbose_quit ? 1 : 0);
+		break;
 
 	case CONFIG_CTRL_D:
 		vp->v_type = V_STR;
@@ -1232,12 +1322,24 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		return;
 
 	case CONFIG_WINDOWS:
-		if (cfg->windows) {
-			vp->v_num = itoq(1);
-		} else {
-			vp->v_num = itoq(0);
+		i = (cfg->windows ? 1 : 0);
+		break;
+
+	case CONFIG_CYGWIN:
+		i = (cfg->cygwin ? 1 : 0);
+		break;
+
+	case CONFIG_COMPILE_CUSTOM:
+		i = (cfg->compile_custom ? 1 : 0);
+		break;
+
+	case CONFIG_ALLOW_CUSTOM:
+		/* firewall */
+		if (cfg->allow_custom == NULL) {
+			cfg->allow_custom = &allow_custom;
 		}
-		return;
+		i = (*(cfg->allow_custom) ? 1 : 0);
+		break;
 
 	case CONFIG_VERSION:
 		vp->v_type = V_STR;
@@ -1248,6 +1350,22 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		}
 		return;
 
+	case CONFIG_BASEB:
+		i = BASEB;
+		break;
+
+	case CONFIG_REDECL_WARN:
+		i = (cfg->redecl_warn ? 1 : 0);
+		break;
+
+	case CONFIG_DUPVAR_WARN:
+		i = (cfg->dupvar_warn ? 1 : 0);
+		break;
+
+	case CONFIG_HZ:
+		i = CALC_HZ;
+		break;
+
 	default:
 		math_error("Getting illegal CONFIG element");
 		/*NOTREACHED*/
@@ -1338,9 +1456,21 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	       (cfg1->base_name != NULL && cfg2->base_name != NULL &&
 		strcmp(cfg1->base_name, cfg2->base_name) != 0) ||
 
+	       cfg1->windows != cfg2->windows ||
+
+	       cfg1->cygwin != cfg2->cygwin ||
+
+	       cfg1->compile_custom != cfg2->compile_custom ||
+
+	       (cfg1->allow_custom == NULL && cfg2->allow_custom != NULL) ||
+	       (cfg1->allow_custom != NULL && cfg2->allow_custom == NULL) ||
+	       (cfg1->allow_custom != NULL && cfg2->allow_custom != NULL &&
+		*(cfg1->allow_custom) != *(cfg2->allow_custom)) ||
+
 	       (cfg1->version == NULL && cfg2->version != NULL) ||
 	       (cfg1->version != NULL && cfg2->version == NULL) ||
-	       cfg1->windows != cfg2->windows ||
 	       (cfg1->version != NULL && cfg2->version != NULL &&
-		strcmp(cfg1->version, cfg2->version) != 0);
+		strcmp(cfg1->version, cfg2->version) != 0) ||
+
+	       cfg1->baseb != cfg2->baseb;
 }

config.h

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999-2002  Landon Curt Noll and David I. Bell
+ * Copyright (C) 1999-2007  Landon Curt Noll and David I. Bell
  *
  * Primary author:  Landon Curt Noll
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.12 $
- * @(#) $Id: config.h,v 29.12 2002/12/29 09:20:25 chongo Exp $
+ * @(#) $Revision: 29.22 $
+ * @(#) $Id: config.h,v 29.22 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -36,11 +36,11 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "win32dll.h"
+# include "decl.h"
 # include "nametype.h"
 # include "qmath.h"
 #else
-# include <calc/win32dll.h>
+# include <calc/decl.h>
 # include <calc/nametype.h>
 # include <calc/qmath.h>
 #endif
@@ -78,19 +78,26 @@
 #define CONFIG_MORE	25
 #define CONFIG_BLKMAXPRINT 26
 #define CONFIG_BLKVERBOSE 27
-#define CONFIG_BLKBASE 28
-#define CONFIG_BLKFMT 29
+#define CONFIG_BLKBASE	28
+#define CONFIG_BLKFMT	29
 #define CONFIG_RESOURCE_DEBUG 30
 #define CONFIG_LIB_DEBUG CONFIG_RESOURCE_DEBUG
 #define CONFIG_CALC_DEBUG 31
 #define CONFIG_USER_DEBUG 32
 #define CONFIG_VERBOSE_QUIT 33
-#define CONFIG_CTRL_D 34
-#define CONFIG_PROGRAM 35
-#define CONFIG_BASENAME 36
-#define CONFIG_VERSION 37
-#define CONFIG_WINDOWS 38
+#define CONFIG_CTRL_D	34
+#define CONFIG_PROGRAM	35
+#define CONFIG_BASENAME	36
+#define CONFIG_VERSION	37
+#define CONFIG_WINDOWS	38
 #define CONFIG_MODE2	39
+#define CONFIG_CYGWIN	40
+#define CONFIG_COMPILE_CUSTOM	41
+#define CONFIG_ALLOW_CUSTOM	42
+#define CONFIG_BASEB	43
+#define CONFIG_REDECL_WARN	44
+#define CONFIG_DUPVAR_WARN	45
+#define CONFIG_HZ	46
 
 
 /*
@@ -99,8 +106,6 @@
 #define DISPLAY_DEFAULT 20	/* default digits for float display */
 #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 */
 #define MAXPRINT_DEFAULT 16	/* default number of elements printed */
 #define MAXSCANCOUNT 20		/* default max scan errors before an abort */
 
@@ -149,15 +154,21 @@ struct config {
 	BOOL blkverbose;	/* TRUE => print all lines if a block */
 	int blkbase;		/* block output base */
 	int blkfmt;		/* block output style */
-	long calc_debug;	/* internal debug, see CALC_DEBUG_XXX below */
-	long resource_debug;	/* resource debug, see RSCDBG_XXX below */
+	long calc_debug;	/* internal debug, see CALC_DEBUG_XYZ below */
+	long resource_debug;	/* resource debug, see RSCDBG_XYZ below */
 	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 */
 	char *program;		/* our name */
 	char *base_name;	/* basename of our name */
 	BOOL windows;		/* TRUE => running under MS windows */
+	BOOL cygwin;		/* TRUE => compiled with cygwin */
+	BOOL compile_custom;	/* TRUE => compiled with -DCUSTOM */
+	BOOL *allow_custom;	/* ptr to if custom functions are allowed */
 	char *version;		/* calc version string */
+	int baseb;		/* base for calculations */
+	BOOL redecl_warn;	/* TRUE => warn of redeclating variables */
+	BOOL dupvar_warn;	/* TRUE => warn of var name collisions */
 };
 typedef struct config CONFIG;
 
@@ -195,23 +206,23 @@ typedef struct config CONFIG;
 /*
  * global configuration states and aliases
  */
-extern DLL CONFIG *conf;	/* current configuration */
-extern DLL CONFIG oldstd;	/* backward compatible standard configuration */
-extern DLL CONFIG newstd;	/* new non-backward compatible configuration */
-extern DLL char *calc_debug;	/* !=NULL => value of config("calc_debug") */
-extern DLL char *resource_debug; /* !=NULL => config("resource_debug") value */
-extern DLL char *user_debug;	/* !=NULL => value of config("user_debug") */
+EXTERN CONFIG *conf;	/* current configuration */
+EXTERN CONFIG oldstd;	/* old classic standard configuration */
+EXTERN CONFIG newstd;	/* default compatible configuration */
+E_FUNC char *calc_debug;	/* !=NULL => value of config("calc_debug") */
+E_FUNC char *resource_debug; /* !=NULL => config("resource_debug") value */
+E_FUNC char *user_debug;	/* !=NULL => value of config("user_debug") */
 
 
 /*
  * configuration externals
  */
-extern DLL CONFIG *config_copy(CONFIG *src);
-extern DLL void config_free(CONFIG *cfg);
-extern DLL void config_print(CONFIG *cfg);
-extern DLL int configtype(char*);
-extern DLL void config_print(CONFIG*);
-extern DLL BOOL config_cmp(CONFIG*, CONFIG*);
+E_FUNC CONFIG *config_copy(CONFIG *src);
+E_FUNC void config_free(CONFIG *cfg);
+E_FUNC void config_print(CONFIG *cfg);
+E_FUNC int configtype(char*);
+E_FUNC void config_print(CONFIG*);
+E_FUNC BOOL config_cmp(CONFIG*, CONFIG*);
 
 
 #endif /* !__CONFIG_H__ */

const.c

@@ -1,7 +1,7 @@
 /*
  * const - constant number storage module
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: const.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: const.c,v 29.5 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/const.c,v $
  *
  * Under source code control:	1990/02/15 01:48:14
@@ -34,9 +34,9 @@
 
 #define CONSTALLOCSIZE 400	/* number of constants to allocate */
 
-static long constcount;		/* number of constants defined */
-static long constavail;		/* number of constants available */
-static NUMBER **consttable;	/* table of constants */
+STATIC unsigned long constcount;/* number of constants defined */
+STATIC long constavail;		/* number of constants available */
+STATIC NUMBER **consttable;	/* table of constants */
 
 
 void
@@ -92,7 +92,7 @@ addqconstant(NUMBER *q)
 {
 	register NUMBER **tp;	/* pointer to current number */
 	register NUMBER *t;	/* number being tested */
-	long index;		/* index into constant table */
+	unsigned long index;	/* index into constant table */
 	long numlen;		/* numerator length */
 	long denlen;		/* denominator length */
 	HALF numlow;		/* bottom value of numerator */
@@ -221,7 +221,7 @@ trimconstants(void)
 void
 showconstants(void)
 {
-	long index;
+	unsigned long index;
 	NUMBER **qp;
 	long count;
 

cscript/4dsphere.calc

@@ -26,8 +26,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 1.3 $
- * @(#) $Id: 4dsphere.calc,v 1.3 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Revision: 1.5 $
+ * @(#) $Id: 4dsphere.calc,v 1.5 2007/02/11 10:05:56 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/4dsphere.calc,v $
  *
  * Under source code control:   2001/05/03 19:02:03

cscript/Makefile

@@ -1,7 +1,7 @@
 #
 # cscript - makefile for calc shell script files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.23 2003/01/14 01:58:18 chongo Exp $
+# @(#) $Revision: 29.32 $
+# @(#) $Id: Makefile,v 29.32 2007/02/08 21:21:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -34,7 +34,7 @@
 # required vars
 #
 SHELL= /bin/sh
-MAKE_FILE = Makefile
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -96,12 +96,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -166,6 +166,14 @@ SED= sed
 SORT= sort
 FMT= fmt
 CMP= cmp
+MKDIR= mkdir
+RMDIR= rmdir
+RM= rm
+TOUCH= touch
+MV= mv
+CP= cp
+CO= co
+TRUE= true
 
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
@@ -191,7 +199,7 @@ SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
 
 # These files are found (but not built) in the distribution
 #
-DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README
+DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README.src
 
 # These files are used to make (but not build) a calc .a library
 #
@@ -199,24 +207,28 @@ CALCLIBLIST=
 
 # complete list of targets
 #
-# NOTE: This list MUST be co-ordinated with the ${CSCRIPT_TARGETS} variable
+# NOTE: This list MUST be coordinated with the ${CSCRIPT_TARGETS} variable
 #	in the upper level ../Makefile
 #
 CSCRIPT_TARGETS= ${SCRIPT}
-TARGETS= ${CSCRIPT_TARGETS}
+TARGETS= ${CSCRIPT_TARGETS} README
 
 # The reason for this Makefile
 #
 all: ${TARGETS} .all
 
+README: README.src
+	@${RM} -f $@
+	@${SED} -e "s:#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+
 # used by the upper level Makefile to determine if we have done all
 #
 # NOTE: Due to bogus shells found on one common system we must have
 #	a non-empty else clause for every if condition.  *sigh*
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -229,21 +241,22 @@ all: ${TARGETS} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cscript/$$i; \
 	    fi; \
 	done | LANG=C ${SORT}
 
 distdir:
-	${Q}echo cscript
+	${Q} echo cscript
 
 calcliblist:
 
-# These next rule help me form the ${DETAIL_HELP} makefile variables above.
+# These next rule help me form the ${SCRIPT} and ${SCRIPT_SRC} makefile
+# variables above.
 #
 detaillist:
-	${Q}-(echo "xxxxxxx"; \
+	${Q} -(echo "xxxxxxx"; \
 	   for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ ! -f RCS/$$i.calc,v ]; then \
@@ -255,9 +268,9 @@ detaillist:
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
-	${Q}echo
-	${Q}-(echo "xxxxxxxxxxx"; \
-	   for i in ${SCRIPT} /dev/null; do \
+	${Q} echo
+	${Q} -(echo "xxxxxxxxxxx"; \
+	    for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ ! -f RCS/$$i.calc,v ]; then \
 		    echo "WARNING: $$i.calc not under RCS control" 1>&2; \
@@ -282,46 +295,46 @@ detaillist:
 ##
 
 depend:
-	${Q}if [ -f Makefile.bak ]; then \
-		echo "Makefile.bak exists, remove or move it out of the way"; \
-		exit 1; \
+	${Q} if [ -f Makefile.bak ]; then \
+	    echo "Makefile.bak exists, remove or move it out of the way"; \
+	    exit 1; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}rm -f makedep.out
-	${Q}echo forming cscript dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} ${RM} -f makedep.out
+	${Q} echo forming cscript dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 		makedep.out
-	${Q}echo "" >> makedep.out
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} echo "" >> makedep.out
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i: $$i.calc"; \
-		echo '	@rm -f $$@'; \
+		echo '	@$${RM} -f $$@'; \
 		echo '	@$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
 		echo '	@$${CHMOD} +x $$@'; \
 	    fi; \
 	done >> makedep.out
-	${Q}echo sample dependency list formed
-	${Q}echo forming new cscript/Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' makedep.out >> Makefile
-	-${Q}rm -f makedep.out
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
-		echo 'sample Makefile was already up to date'; \
-		mv -f Makefile.bak Makefile; \
+	${Q} echo sample dependency list formed
+	${Q} echo forming new cscript/Makefile
+	-${Q} ${RM} -f Makefile.bak
+	${Q} ${MV} Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' makedep.out >> Makefile
+	-${Q} ${RM} -f makedep.out
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
+	    echo 'sample Makefile was already up to date'; \
+	    ${MV} -f Makefile.bak Makefile; \
 	else \
-		rm -f Makefile.tmp; \
-		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then \
-		    co -l Makefile; \
-		fi; \
-		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then \
-		    echo new sample Makefile formed, you need to check it in; \
-		fi; \
+	    ${RM} -f Makefile.tmp; \
+	    ${MV} Makefile Makefile.tmp; \
+	    if [ -d RCS ]; then \
+		${CO} -l Makefile; \
+	    fi; \
+	    ${MV} Makefile.tmp Makefile; \
+	    if [ -d RCS ]; then \
+		echo new sample Makefile formed, you need to check it in; \
+	    fi; \
 	fi
 
 ##
@@ -331,7 +344,7 @@ depend:
 ##
 
 echo_inst_files:
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${SCRIPTDIR}/$$i; \
 	    fi; \
@@ -344,82 +357,111 @@ echo_inst_files:
 ##
 
 clean:
-	-rm -f makedep.out
+	-${RM} -f makedep.out
 
 clobber:
-	-rm -f ${TARGETS}
+	-${RM} -f ${TARGETS}
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
-	-${Q}if [ ! -d $T${BINDIR} ]; then \
-	    echo mkdir $T${BINDIR}; \
-	    mkdir $T${BINDIR}; \
-	    if [ ! -d "$T${BINDIR}" ]; then \
-		echo mkdir -p "$T${BINDIR}"; \
-		mkdir -p "$T${BINDIR}"; \
+	-${Q} if [ ! -d ${T}${BINDIR} ]; then \
+	    echo ${MKDIR} ${T}${BINDIR}; \
+	    ${MKDIR} ${T}${BINDIR}; \
+	    if [ ! -d "${T}${BINDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${BINDIR}"; \
+		${MKDIR} -p "${T}${BINDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${BINDIR}; \
-	    ${CHMOD} 0755 $T${BINDIR}; \
+	    echo ${CHMOD} 0755 ${T}${BINDIR}; \
+	    ${CHMOD} 0755 ${T}${BINDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
-	    echo mkdir $T${SCRIPTDIR}; \
-	    mkdir $T${SCRIPTDIR}; \
-	    if [ ! -d "$T${SCRIPTDIR}" ]; then \
-		echo mkdir -p "$T${SCRIPTDIR}"; \
-		mkdir -p "$T${SCRIPTDIR}"; \
+	-${Q} if [ ! -d ${T}${SCRIPTDIR} ]; then \
+	    echo ${MKDIR} ${T}${SCRIPTDIR}; \
+	    ${MKDIR} ${T}${SCRIPTDIR}; \
+	    if [ ! -d "${T}${SCRIPTDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${SCRIPTDIR}"; \
+		${MKDIR} -p "${T}${SCRIPTDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${SCRIPTDIR}; \
-	    ${CHMOD} 0755 $T${SCRIPTDIR}; \
+	    echo ${CHMOD} 0755 ${T}${SCRIPTDIR}; \
+	    ${CHMOD} 0755 ${T}${SCRIPTDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${SCRIPTDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${SCRIPTDIR}/$$i.new; \
-		cp -f $$i $T${SCRIPTDIR}/$$i.new; \
-		${CHMOD} 0555 $T${SCRIPTDIR}/$$i.new; \
-		mv -f $T${SCRIPTDIR}/$$i.new $T${SCRIPTDIR}/$$i; \
-		echo "installed $T${SCRIPTDIR}/$$i"; \
+		${RM} -f ${T}${SCRIPTDIR}/$$i.new; \
+		${CP} -f $$i ${T}${SCRIPTDIR}/$$i.new; \
+		${CHMOD} 0755 ${T}${SCRIPTDIR}/$$i.new; \
+		${MV} -f ${T}${SCRIPTDIR}/$$i.new ${T}${SCRIPTDIR}/$$i; \
+		echo "installed ${T}${SCRIPTDIR}/$$i"; \
+	    fi; \
+	done
+
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q} for i in ${SCRIPT} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${SCRIPTDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${SCRIPTDIR}/$$i"; \
+		if [ -f "${T}${SCRIPTDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${SCRIPTDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${SCRIPTDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${SCRIPTDIR} ${BINDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 4dsphere: 4dsphere.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 fproduct: fproduct.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 mersenne: mersenne.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 piforever: piforever.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 plus: plus.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 powerterm: powerterm.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 simple: simple.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 square: square.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@

cscript/README.src

@@ -5,6 +5,46 @@ These calc shell scripts are provided because they serve as examples of
 how use the calc language, and/or because the authors thought them to
 be useful!
 
+Please note that calc shell scripts must start with the line:
+
+    #!/usr/local/src/cmd/calc/calc -q -f
+
+The above line MUST start in column 1 of the first line.   The first line
+must also end in -f.  The -q is optional, but is recommended to disable
+the processing of calc startup scripts.
+
+Also please note that single # shell line comments are not supported in calc.
+Comments must be /* c-like comment */ or start with a double ## symbol.
+
+This is the correct way to form a calc shell script:
+
+    #!/usr/local/src/cmd/calc/calc -q -f
+
+    /* a correct comment */
+    ## another correct comment
+    ### two or more together is also a comment
+    /*
+     * another correct comment
+     */
+    print "2+2 =", 2+2;	## yet another comment
+
+The first argument after the path to calc executable must be an -S.
+The next arguments are optional.  The -q is often recommended because
+it will disable the processing of the startup scripts.
+
+For more informaton about calc command lines, see "help usage".
+
+This next example WRONG:
+
+    #!/usr/local/src/cmd/calc/calc -q
+
+    # This is not a calc calc comment because it has only a single #
+    # You must to start comments with ## or /*
+    # is is also wrong because the first line does not end in -f
+    print "This example has invalid comments"
+
+#####
+
 If you write something that you think is useful, please send it to:
 
     calc-contrib at asthe dot com
@@ -77,9 +117,9 @@ simple
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.10 $
-## @(#) $Id: README,v 29.10 2001/06/10 19:34:40 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $
+## @(#) $Revision: 29.11 $
+## @(#) $Id: README.src,v 29.11 2007/02/07 00:33:10 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README.src,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40
 ## File existed as early as:	1999

cscript/fproduct.calc

@@ -24,8 +24,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: fproduct.calc,v 29.2 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: fproduct.calc,v 29.4 2007/02/11 10:05:56 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/fproduct.calc,v $
  *
  * Under source code control:   2001/04/07 20:13:11

cscript/mersenne.calc

@@ -1,35 +1,36 @@
 #!/usr/local/src/cmd/calc/calc -q -s -f
-#
-# mersenne - print the value of a mersenne number
-#
-# Copyright (C) 1999  Landon Curt Noll
-#
-# Calc is open software; you can redistribute it and/or modify it under
-# the terms of the version 2.1 of the GNU Lesser General Public License
-# as published by the Free Software Foundation.
-#
-# Calc is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
-# Public License for more details.
-#
-# A copy of version 2.1 of the GNU Lesser General Public License is
-# distributed with calc under the filename COPYING-LGPL.  You should have
-# received a copy with calc; if not, write to Free Software Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-#
-# @(#) $Revision: 29.3 $
-# @(#) $Id: mersenne.calc,v 29.3 2000/12/15 14:56:54 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/mersenne.calc,v $
-#
-# Under source code control:	1999/11/30 00:09:01;
-# File existed as early as:	1999
-#
-# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-
-# usage:
-#	mersenne exp
+/*
+ * mersenne - print the value of a mersenne number
+ *
+ * Copyright (C) 1999-2007  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: mersenne.calc,v 29.5 2007/02/11 10:05:56 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/mersenne.calc,v $
+ *
+ * Under source code control:	1999/11/30 00:09:01;
+ * File existed as early as:	1999
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+ *
+ * usage:
+ *	mersenne exp
+ */
 
 
 /*

cscript/piforever.calc

@@ -1,35 +1,36 @@
 #!/usr/local/src/cmd/calc/calc -q -f
-#
-# piforever - print digits of pi forever (or as long as your mem/cpu allow)
-#
-# Copyright (C) 1999  Landon Curt Noll
-#
-# Calc is open software; you can redistribute it and/or modify it under
-# the terms of the version 2.1 of the GNU Lesser General Public License
-# as published by the Free Software Foundation.
-#
-# Calc is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
-# Public License for more details.
-#
-# A copy of version 2.1 of the GNU Lesser General Public License is
-# distributed with calc under the filename COPYING-LGPL.  You should have
-# received a copy with calc; if not, write to Free Software Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-#
-# @(#) $Revision: 29.3 $
-# @(#) $Id: piforever.calc,v 29.3 2000/12/15 14:56:54 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/piforever.calc,v $
-#
-# Under source code control:	1999/11/30 00:11:36
-# File existed as early as:	1999
-#
-# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-
-# usage:
-#	piforever
+/*
+ * piforever - print digits of pi forever (or as long as your mem/cpu allow)
+ *
+ * Copyright (C) 1999-2007  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: piforever.calc,v 29.4 2007/02/07 00:34:04 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/piforever.calc,v $
+ *
+ * Under source code control:	1999/11/30 00:11:36
+ * File existed as early as:	1999
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+ *
+ * usage:
+ *	piforever
+ */
 
 
 read -once pi.cal

cscript/plus.calc

@@ -1,35 +1,36 @@
-#!/usr/local/src/cmd/calc/calc -q -s -f
-#
-# plus - add two or more arguments together
-#
-# Copyright (C) 1999  Landon Curt Noll
-#
-# Calc is open software; you can redistribute it and/or modify it under
-# the terms of the version 2.1 of the GNU Lesser General Public License
-# as published by the Free Software Foundation.
-#
-# Calc is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
-# Public License for more details.
-#
-# A copy of version 2.1 of the GNU Lesser General Public License is
-# distributed with calc under the filename COPYING-LGPL.  You should have
-# received a copy with calc; if not, write to Free Software Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-#
-# @(#) $Revision: 29.3 $
-# @(#) $Id: plus.calc,v 29.3 2000/12/15 14:56:54 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/plus.calc,v $
-#
-# Under source code control:	1999/11/29 10:22:37
-# File existed as early as:	1999
-#
-# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-
-# usage:
-#	plus val ...
+#!/usr/local/src/cmd/calc/calc -q -f
+/*
+ * plus - add two or more arguments together
+ *
+ * Copyright (C) 1999-2007  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: plus.calc,v 29.4 2007/02/07 00:34:04 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/plus.calc,v $
+ *
+ * Under source code control:	1999/11/29 10:22:37
+ * File existed as early as:	1999
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+ *
+ * usage:
+ *	plus val ...
+ */
 
 
 /*

cscript/powerterm.calc

@@ -24,8 +24,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: powerterm.calc,v 29.6 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Revision: 29.8 $
+ * @(#) $Id: powerterm.calc,v 29.8 2007/02/11 10:05:56 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/powerterm.calc,v $
  *
  * Under source code control:   2001/04/24 23:49:11

cscript/simple.calc

@@ -1,32 +1,33 @@
 #!/usr/local/src/cmd/calc/calc -q -f
-#
-# simple - an example of a simple calc shell script
-#
-# Copyright (C) 1999  Landon Curt Noll
-#
-# Calc is open software; you can redistribute it and/or modify it under
-# the terms of the version 2.1 of the GNU Lesser General Public License
-# as published by the Free Software Foundation.
-#
-# Calc is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
-# Public License for more details.
-#
-# A copy of version 2.1 of the GNU Lesser General Public License is
-# distributed with calc under the filename COPYING-LGPL.  You should have
-# received a copy with calc; if not, write to Free Software Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-#
-# @(#) $Revision: 29.3 $
-# @(#) $Id: simple.calc,v 29.3 2000/12/15 14:56:54 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/simple.calc,v $
-#
-# Under source code control:	1999/11/29 10:22:37
-# File existed as early as:	1999
-#
-# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+/*
+ * simple - an example of a simple calc shell script
+ *
+ * Copyright (C) 1999-2007  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: simple.calc,v 29.4 2007/02/07 00:34:04 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/simple.calc,v $
+ *
+ * Under source code control:	1999/11/29 10:22:37
+ * File existed as early as:	1999
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+ */
 
 
 /*

cscript/square.calc

@@ -1,64 +1,67 @@
 #!/usr/local/src/cmd/calc/calc -q -f
-#
-# sqaure - print the squares of input values
-#
-# Copyright (C) 2000  Ernest Bowen
-#
-# Calc is open software; you can redistribute it and/or modify it under
-# the terms of the version 2.1 of the GNU Lesser General Public License
-# as published by the Free Software Foundation.
-#
-# Calc is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
-# Public License for more details.
-#
-# A copy of version 2.1 of the GNU Lesser General Public License is
-# distributed with calc under the filename COPYING-LGPL.  You should have
-# received a copy with calc; if not, write to Free Software Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-#
-# @(#) $Revision: 29.3 $
-# @(#) $Id: square.calc,v 29.3 2000/12/17 14:31:58 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/square.calc,v $
-#
-# Under source code control:	2000/12/15 06:52:01
-# File existed as early as:	2000
-#
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+/*
+ * sqaure - print the squares of input values
+ *
+ * Copyright (C) 2000-2007  Ernest Bowen
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: square.calc,v 29.4 2007/02/07 00:34:04 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/square.calc,v $
+ *
+ * Under source code control:	2000/12/15 06:52:01
+ * File existed as early as:	2000
+ *
+ * Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * Usage:
+ *
+ *       From the shell:
+ *
+ *               ./square
+ *               cat file | ./square
+ *               echo "123" | ./square
+ *
+ *       Within calc:
+ *
+ *               > read square
+ *
+ *  With input from a terminal, there is no prompt but each non-empty
+ *  line of input is evaluated as a calc expression and if it can be
+ *  calculated, the square of the value of that expression is displayed.
+ *  Execution stops when an empty line is input.
+ *
+ *  From the shell:
+ *
+ *       ./square
+ *
+ *  The following shows lines of input followed by output:
+ *
+ *       1234
+ *               1522756
+ *       ln(2)
+ *               ~.48045301391820142467
+ *       config("mode","frac"), bernoulli(10)
+ *               25/4356
+ *       config("mode", "hex"), 0xff
+ *               0xfe01
+ */
 
-# Usage:
-#
-#       From the shell:
-#
-#               ./square
-#               cat file | ./square
-#               echo "123" | ./square
-#
-#       Within calc:
-#
-#               > read square
-#
-#  With input from a terminal, there is no prompt but each non-empty
-#  line of input is evaluated as a calc expression and if it can be
-#  calculated, the square of the value of that expression is displayed.
-#  Execution stops when an empty line is input.
-#
-#  From the shell:
-#
-#       ./square
-#
-#  The following shows lines of input followed by output:
-#
-#       1234
-#               1522756
-#       ln(2)
-#               ~.48045301391820142467
-#       config("mode","frac"), bernoulli(10)
-#               25/4356
-#       config("mode", "hex"), 0xff
-#               0xfe01
-#
 
 global s;
 while ((s = prompt("")))

custom.c

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2006  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: custom.c,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: custom.c,v 29.6 2006/05/19 15:26:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/custom.c,v $
  *
  * Under source code control:	1997/03/03 04:53:08
@@ -51,7 +51,7 @@
 
 #endif /* CUSTOM */
 
-int allow_custom = FALSE;	 /* TRUE => custom builtins allowed */
+BOOL allow_custom = FALSE;	 /* TRUE => custom builtins allowed */
 
 
 /*
@@ -189,7 +189,7 @@ customhelp(char *name)
 	/*
 	 * form the custom help name
 	 */
-	customname = (char *)malloc(sizeof("custhelp")+strlen(name)+1);
+	customname = (char *)malloc(sizeof("custhelp")+1+strlen(name)+1);
 	if (customname == NULL) {
 		math_error("bad malloc of customname");
 		/*NOTREACHED*/

custom.h

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: custom.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: custom.h,v 29.4 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/custom.h,v $
  *
  * Under source code control:	1997/03/03 04:53:08
@@ -71,10 +71,10 @@ struct custom {
  *
  * These are the required interfaces.  The dummy.c stubs these interfaces too.
  */
-extern VALUE custom(char*, int, VALUE**);	/* master custom interface */
-extern int allow_custom;		/* TRUE => custom builtins allowed */
-extern void showcustom(void);		/* print custom functions */
-extern void customhelp(char *);		/* direct custom help */
-extern CONST struct custom cust[];	/* custom interface table */
+E_FUNC VALUE custom(char*, int, VALUE**);	/* master custom interface */
+EXTERN BOOL allow_custom;		/* TRUE => custom builtins allowed */
+E_FUNC void showcustom(void);		/* print custom functions */
+E_FUNC void customhelp(char *);		/* direct custom help */
+EXTERN CONST struct custom cust[];	/* custom interface table */
 
 #endif /* !CUSTOM_H */

custom/HOW_TO_ADD

@@ -36,13 +36,14 @@ Step 1: Do some background work
     anything in Steps 2 and beyond!
 
     If you are not familiar with calc internals, we recommend that
-    you look at some examples of custom functions.  Check out
+    you look at some examples of custom functions.  Look at the
     the following source files:
 
 	custom.c
-	custom/custom.h
+	custom.h
 	custom/custtbl.c
 	custom/c_*.[ch]
+	custom/*.cal
 	help/custom		(or run:  calc help custom)
 
     You would be well advised to look at a more recent calc source
@@ -83,14 +84,15 @@ Step 3: Document your custom function
 
     Take a look at one of the example custom help files:
 
-	devnull
-	argv
-	help
-	sysinfo
+	custom/devnull
+	custom/argv
+	custom/help
+	custom/sysinfo
 
     You can save time by using one of the custom help files
     as a template.  Copy one of these files to your own help file:
 
+	cd custom
 	cp sysinfo curds
 
     and edit it accordingly.
@@ -107,15 +109,16 @@ Step 4: Write your test code
     test code will be an import part of your submission.  Your test
     code will also service as additional for your custom function.
 
-    Coops ... we said we would stop preaching, sorry about that ...
+    Oops ... we said we would stop preaching, sorry about that ...
 
     You can use one of the following as a template:
 
-	argv.cal
-	halflen.cal
+	custom/argv.cal
+	custom/halflen.cal
 
     Copy one of these to your own file:
 
+	cd custom
 	cp halflen.cal curds.cal
 
     and exit it accordingly.  In particular you will want to:
@@ -152,6 +155,7 @@ Step 5: Write your custom function
     We recommend that you use one of the c_*.c files as a template.
     Copy an appropriate file to your file:
 
+	cd custom
 	cp c_argv.c u_curds.c
 
     Before you edit it, you should note that there are several important
@@ -179,9 +183,6 @@ Step 5: Write your custom function
 		VALUE
 		u_curds(char *name, int count, VALUE **vals)
 
-	   The /*ARGSUSED*/ may be needed if you do not make use
-	   of all 3 function parameters.
-
 	   The 3 args are passed in by the custom interface
 	   and have the following meaning:
 
@@ -222,6 +223,15 @@ Step 5: Write your custom function
 			    vals[1]  points to	b
 			    vals[2]  points to	c
 
+	   NOTE: If you do not use any of the 3 function parameters,
+	   then you should declare that function parameter to be UNUSED.
+	   For example, if the count and vals parameters were not used
+	   in your custom function, then your declaraction should be:
+
+		/*ARGSUSED*/
+		VALUE
+		u_curds(char *name, int UNUSED count, VALUE UNUSED **vals)
+
 	c) The return value is the function must be a VALUE.
 
 	   The typical way to form a VALUE to return is by declaring
@@ -239,6 +249,8 @@ Step 5: Write your custom function
 		#include "../value.h"
 		#include "custom.h"
 
+		#include "../have_unused.h"
+
 	    Typically these will be included just below any system
 	    includes and just below the #if defined(CUSTOM) line.
 
@@ -362,7 +374,7 @@ Step 6: Register the function in the custom interface table
 
     To allow the custom() builtin to transfer control to your function,
     you need to add an entry into the CONST struct custom cust table
-    found in custtbl.c:
+    found in custom/custtbl.c:
 
 	/*
 	 * custom interface table
@@ -468,24 +480,24 @@ Step 6: Register the function in the custom interface table
 	 *
 	 * Declare custom functions as follows:
 	 *
-	 *	extern VALUE c_xyz(char*, int, VALUE**);
+	 *	E_FUNC VALUE c_xyz(char*, int, VALUE**);
 	 *
 	 * We suggest that you sort the entries below by name.
 	 */
-	extern VALUE c_argv(char*, int, VALUE**);
-	extern VALUE c_devnull(char*, int, VALUE**);
-	extern VALUE c_help(char*, int, VALUE**);
-	extern VALUE c_sysinfo(char*, int, VALUE**);
+	E_FUNC VALUE c_argv(char*, int, VALUE**);
+	E_FUNC VALUE c_devnull(char*, int, VALUE**);
+	E_FUNC VALUE c_help(char*, int, VALUE**);
+	E_FUNC VALUE c_sysinfo(char*, int, VALUE**);
 
     For u_curds we would add the line:
 
-	extern VALUE u_curds(char*, int, VALUE**);
+	E_FUNC VALUE u_curds(char*, int, VALUE**);
 
 
-Step 7: Add the required information to the Makefile
+Step 7: Add the required information to the custom/Makefile
 
     The calc test script, curds.cal, should be added to the
-    CUSTOM_CALC_FILES Makefile variable:
+    CUSTOM_CALC_FILES Makefile variable found in custom/Makefile:
 
 	CUSTOM_CALC_FILES= argv.cal halflen.cal curds.cal
 
@@ -619,7 +631,7 @@ Step 12: Contribute
     and consider submitting your custom function for possible
     inclusion in later versions of calc.
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2007  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -635,8 +647,8 @@ Step 12: Contribute
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: HOW_TO_ADD,v 29.2 2000/06/07 14:03:03 chongo Exp $
+## @(#) $Revision: 29.6 $
+## @(#) $Id: HOW_TO_ADD,v 29.6 2007/02/11 10:22:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/HOW_TO_ADD,v $
 ##
 ## Under source code control:	1997/03/10 03:03:21

custom/Makefile

@@ -2,7 +2,7 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.20 $
-# @(#) $Id: Makefile,v 29.20 2003/01/14 02:18:45 chongo Exp $
+# @(#) $Revision: 29.31 $
+# @(#) $Id: Makefile,v 29.31 2007/02/12 04:19:17 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -40,13 +40,13 @@
 #
 # Put your custom calc resource files here.
 #
-CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal
+CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal
 
 # The custom help files to install
 #
 # Put your custom help files here.
 #
-CUSTOM_HELP= argv devnull help sysinfo pzasusb8
+CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127
 
 # Any .h files that are needed by programs that use libcustcalc.a
 #
@@ -62,7 +62,7 @@ CUSTOM_H_SRC=
 #
 # Put your custom .c files here.
 #
-CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c
+CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c c_pmodm127.c
 
 # Any .o files that are needed by program that use libcustcalc.a.
 # Don't put ${REQUIRED_OBJ} files in this list.
@@ -71,7 +71,7 @@ CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c
 #
 # Put your custom .o files here.
 #
-CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o
+CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o c_pmodm127.o
 
 ##############################################################################
 #-=-=-=-=-=-=- Defaults in case you want to build from this dir -=-=-=-=-=-=-#
@@ -114,9 +114,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -148,12 +148,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -173,8 +173,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -194,10 +194,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -249,6 +249,20 @@ NO_SHARED=
 #NO_SHARED= -dn
 #NO_SHARED= -non_shared
 
+# On some systems where you are disabling dynamic shared link libs, you may
+# need to pass a special flag to ${CC} and ${LCC} during linking stage.
+#
+#    System type			    NO_SHARED recommendation
+#
+#	IRIX with NO_SHARED= -non_shared    LD_NO_SHARED= -Wl,-rdata_shared
+#	IRIX with NO_SHARED=		    LD_NO_SHARED=
+#	others				    LD_NO_SHARED=
+#
+# If in doubt, use LD_NO_SHARED=
+#
+LD_NO_SHARED=
+#LD_NO_SHARED= -Wl,-rdata_shared
+
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
@@ -275,12 +289,13 @@ MAKE_FILE= Makefile
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
-# If you do not wish to use purify, leave PURIFY commented out.
+# If you do not wish to use purify, set PURIFY to an empty string.
 #
-# If in doubt, leave PURIFY commented out.
+# If in doubt, use PURIFY=
 #
 #PURIFY= purify -logfile=pure.out
 #PURIFY= purify
+PURIFY=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -402,6 +417,16 @@ MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
 CMP= cmp
+AR= ar
+RM= rm
+TOUCH= touch
+MKDIR= mkdir
+RMDIR= rmdir
+MV= mv
+CP= cp
+CO= co
+TRUE= true
+MAKE= make
 
 ##
 #
@@ -413,8 +438,8 @@ all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 	${CUSTOM_HELP} ${MAKE_FILE} .all
 
 libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../${MAKE_FILE}
-	-rm -f libcustcalc.a
-	ar qc libcustcalc.a ${CUSTCALC_OBJ}
+	-${RM} -f libcustcalc.a
+	${AR} qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
 
 ##
@@ -435,8 +460,8 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 # to determine of we have done all
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -452,17 +477,17 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
 	    fi; \
 	done
 
 distdir:
-	${Q}echo custom
+	${Q} echo custom
 
 calcliblist: ${CALCLIBLIST}
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
 	    fi; \
@@ -481,81 +506,81 @@ calcliblist: ${CALCLIBLIST}
 ##
 
 depend:
-	${Q}if [ -f Makefile.bak ]; then \
-		echo "Makefile.bak exists, remove or move it out of the way"; \
-		exit 1; \
+	${Q} if [ -f Makefile.bak ]; then \
+	    echo "Makefile.bak exists, remove or move it out of the way"; \
+	    exit 1; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}echo forming custom/skel
-	-${Q}rm -rf skel
-	${Q}mkdir skel
-	${Q}mkdir skel/custom
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} echo forming custom/skel
+	-${Q} ${RM} -rf skel
+	${Q} ${MKDIR} skel
+	${Q} ${MKDIR} skel/custom
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' \
 		    "$$i" > "skel/custom/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${H_SRC} /dev/null; do \
-		if [ "$$i" = "/dev/null" ]; then \
-		    continue; \
-		fi; \
-		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#if !defined($$tag)" > "skel/custom/$$i"; \
-		echo "#define $$tag" >> "skel/custom/$$i"; \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
-		    >> "skel/custom/$$i"; \
-		echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
+	-${Q} for i in ${H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
+	    echo "#define $$tag" >> "skel/custom/$$i"; \
+	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
+		>> "skel/custom/$$i"; \
+	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
-	${Q}(cd ..; ${MAKE} hsrc)
-	${Q}for i in `cd ..; ${MAKE} h_list 2>&1 | \
-			     ${SED} -e '/Entering directory/d' \
-				    -e '/Nothing to be done/d' \
-				    -e '/Leaving directory/d'` /dev/null; do \
-		if [ "$$i" = "/dev/null" ]; then \
-		    continue; \
-		fi; \
-		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#if !defined($$tag)" > "skel/$$i"; \
-		echo "#define $$tag" >> "skel/$$i"; \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		    >> "skel/$$i"; \
-		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
+	${Q} (cd ..; $(MAKE) hsrc)
+	${Q} for i in `cd ..; $(MAKE) h_list 2>&1 | \
+	    ${SED} -e '/Entering directory/d' \
+		   -e '/Nothing to be done/d' \
+		   -e '/Leaving directory/d'` /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+	    echo "#if !defined($$tag)" > "skel/$$i"; \
+	    echo "#define $$tag" >> "skel/$$i"; \
+	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
+		>> "skel/$$i"; \
+	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
 	done
-	-${Q}rm -f skel/custom/makedep.out
-	${Q}echo custom/skel formed
-	${Q}echo forming custom dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} ${RM} -f skel/custom/makedep.out
+	${Q} echo custom/skel formed
+	${Q} echo forming custom dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/custom/makedep.out
-	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	    fi; \
 	done >> skel/custom/makedep.out
-	${Q}echo custom dependency list formed
-	${Q}echo forming new custom/Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/custom/makedep.out | \
+	${Q} echo custom dependency list formed
+	${Q} echo forming new custom/Makefile
+	-${Q} ${RM} -f Makefile.bak
+	${Q} ${MV} Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' skel/custom/makedep.out | \
 		LANG=C ${SORT} -u >> Makefile
-	-${Q}rm -rf skel
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
-		echo 'custom Makefile was already up to date'; \
-		mv -f Makefile.bak Makefile; \
+	-${Q} ${RM} -rf skel
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
+	    echo 'custom Makefile was already up to date'; \
+	    ${MV} -f Makefile.bak Makefile; \
 	else \
-		rm -f Makefile.tmp; \
-		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then \
-		    co -l Makefile; \
-		fi ;\
-		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then \
-		echo 'new custom Makefile formed -- you need to check it in'; \
-		fi; \
+	    ${RM} -f Makefile.tmp; \
+	    ${MV} Makefile Makefile.tmp; \
+	    if [ -d RCS ]; then \
+		${CO} -l Makefile; \
+	    fi ;\
+	    ${MV} Makefile.tmp Makefile; \
+	    if [ -d RCS ]; then \
+	    echo 'new custom Makefile formed -- you need to check it in'; \
+	    fi; \
 	fi
 
 ##
@@ -565,22 +590,22 @@ depend:
 ##
 
 echo_inst_files:
-	${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMINCDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	${Q} for i in ${CUSTOM_HELP} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMHELPDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \
+	${Q} for i in ${CALC_LIBCUSTOM} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
@@ -593,154 +618,217 @@ echo_inst_files:
 ##
 
 clean:
-	-rm -f ${CUSTCALC_OBJ}
+	-${RM} -f ${CUSTCALC_OBJ}
 
 clobber:
-	-rm -f ${TARGETS}
-	rm -f .all Makefile.tmp Makefile.bak
+	-${RM} -f ${TARGETS}
+	${RM} -f .all Makefile.tmp Makefile.bak
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
-	-${Q}if [ ! -d $T${INCDIR} ]; then \
-	    echo mkdir $T${INCDIR}; \
-	    mkdir $T${INCDIR}; \
-	    if [ ! -d "$T${INCDIR}" ]; then \
-		echo mkdir -p "$T${INCDIR}"; \
-		mkdir -p "$T${INCDIR}"; \
+	-${Q} if [ ! -d ${T}${INCDIR} ]; then \
+	    echo ${MKDIR} ${T}${INCDIR}; \
+	    ${MKDIR} ${T}${INCDIR}; \
+	    if [ ! -d "${T}${INCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${INCDIR}"; \
+		${MKDIR} -p "${T}${INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${INCDIR}; \
-	    ${CHMOD} 0755 $T${INCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${INCDIR}; \
+	    ${CHMOD} 0755 ${T}${INCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-	    echo mkdir $T${CALC_INCDIR}; \
-	    mkdir $T${CALC_INCDIR}; \
-	    if [ ! -d "$T${CALC_INCDIR}" ]; then \
-		echo mkdir -p "$T${CALC_INCDIR}"; \
-		mkdir -p "$T${CALC_INCDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_INCDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_INCDIR}; \
+	    ${MKDIR} ${T}${CALC_INCDIR}; \
+	    if [ ! -d "${T}${CALC_INCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_INCDIR}"; \
+		${MKDIR} -p "${T}${CALC_INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_INCDIR}; \
-	    ${CHMOD} 0755 $T${CALC_INCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-	    echo mkdir $T${HELPDIR}; \
-	    mkdir $T${HELPDIR}; \
-	    if [ ! -d "$T${HELPDIR}" ]; then \
-		echo mkdir -p "$T${HELPDIR}"; \
-		mkdir -p "$T${HELPDIR}"; \
+	-${Q} if [ ! -d ${T}${HELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${HELPDIR}; \
+	    ${MKDIR} ${T}${HELPDIR}; \
+	    if [ ! -d "${T}${HELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${HELPDIR}"; \
+		${MKDIR} -p "${T}${HELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${HELPDIR}; \
-	    ${CHMOD} 0755 $T${HELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${HELPDIR}; \
+	    ${CHMOD} 0755 ${T}${HELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-	    echo mkdir $T${CUSTOMCALDIR}; \
-	    mkdir $T${CUSTOMCALDIR}; \
-	    if [ ! -d "$T${CUSTOMCALDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMCALDIR}"; \
-		mkdir -p "$T${CUSTOMCALDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMCALDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMCALDIR}; \
+	    ${MKDIR} ${T}${CUSTOMCALDIR}; \
+	    if [ ! -d "${T}${CUSTOMCALDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
-	    echo mkdir $T${CUSTOMHELPDIR}; \
-	    mkdir $T${CUSTOMHELPDIR}; \
-	    if [ ! -d "$T${CUSTOMHELPDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMHELPDIR}"; \
-		mkdir -p "$T${CUSTOMHELPDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMHELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMHELPDIR}; \
+	    ${MKDIR} ${T}${CUSTOMHELPDIR}; \
+	    if [ ! -d "${T}${CUSTOMHELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
-	    echo mkdir $T${CUSTOMINCDIR}; \
-	    mkdir $T${CUSTOMINCDIR}; \
-	    if [ ! -d "$T${CUSTOMINCDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMINCDIR}"; \
-		mkdir -p "$T${CUSTOMINCDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMINCDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMINCDIR}; \
+	    ${MKDIR} ${T}${CUSTOMINCDIR}; \
+	    if [ ! -d "${T}${CUSTOMINCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s tmp $T${CUSTOMINCDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s "$$i" ${T}${CUSTOMINCDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMINCDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMINCDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMINCDIR}/$$i.new; \
-		mv -f $T${CUSTOMINCDIR}/$$i.new $T${CUSTOMINCDIR}/$$i; \
-		echo "installed $T${CUSTOMINCDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMINCDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMINCDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMINCDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMINCDIR}/$$i.new ${T}${CUSTOMINCDIR}/$$i; \
+		echo "installed ${T}${CUSTOMINCDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}rm -f tmp
-	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CUSTOMCALDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CUSTOMCALDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMCALDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMCALDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMCALDIR}/$$i.new; \
-		mv -f $T${CUSTOMCALDIR}/$$i.new $T${CUSTOMCALDIR}/$$i; \
-		echo "installed $T${CUSTOMCALDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMCALDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMCALDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMCALDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMCALDIR}/$$i.new ${T}${CUSTOMCALDIR}/$$i; \
+		echo "installed ${T}${CUSTOMCALDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CUSTOMHELPDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CUSTOMHELPDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMHELPDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMHELPDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMHELPDIR}/$$i.new; \
-		mv -f $T${CUSTOMHELPDIR}/$$i.new $T${CUSTOMHELPDIR}/$$i; \
-		echo "installed $T${CUSTOMHELPDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMHELPDIR}/$$i.new ${T}${CUSTOMHELPDIR}/$$i; \
+		echo "installed ${T}${CUSTOMHELPDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \
-	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
-		true; \
+	-${Q} if [ ! -z ${ALLOW_CUSTOM} ]; then \
+	    if ${CMP} -s libcustcalc.a ${T}${CUSTOMCALDIR}/libcustcalc.a; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		cp -f libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		mv -f $T${CUSTOMCALDIR}/libcustcalc.a.new \
-		      $T${CUSTOMCALDIR}/libcustcalc.a; \
-		${RANLIB} $T${CUSTOMCALDIR}/libcustcalc.a; \
-		echo "installed $T${CUSTOMCALDIR}/libcustcalc.a"; \
+		${RM} -f ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${CP} -f libcustcalc.a ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${CHMOD} 0644 ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${MV} -f ${T}${CUSTOMCALDIR}/libcustcalc.a.new \
+		      ${T}${CUSTOMCALDIR}/libcustcalc.a; \
+		${RANLIB} ${T}${CUSTOMCALDIR}/libcustcalc.a; \
+		echo "installed ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q} if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+	    ${RM} -f "${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+	    if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+		echo "cannot uninstall ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+	    else \
+		echo "uninstalled ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+	    fi; \
+	fi
+	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMHELPDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMHELPDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${CUSTOMHELPDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMCALDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMCALDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${CUSTOMCALDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMINCDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMINCDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${CUSTOMINCDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
+		    ${HELPDIR} ${CALC_INCDIR} ${CALC_SHAREDIR} ${INCDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
+	    fi; \
+	done
+
 ##
 #
 # make depend stuff
@@ -757,14 +845,15 @@ c_argv.o: ../calcerr.h
 c_argv.o: ../cmath.h
 c_argv.o: ../config.h
 c_argv.o: ../custom.h
+c_argv.o: ../decl.h
 c_argv.o: ../endian_calc.h
 c_argv.o: ../hash.h
 c_argv.o: ../have_const.h
-c_argv.o: ../have_malloc.h
 c_argv.o: ../have_memmv.h
 c_argv.o: ../have_newstr.h
 c_argv.o: ../have_stdlib.h
 c_argv.o: ../have_string.h
+c_argv.o: ../have_unused.h
 c_argv.o: ../longbits.h
 c_argv.o: ../md5.h
 c_argv.o: ../nametype.h
@@ -773,7 +862,6 @@ c_argv.o: ../shs.h
 c_argv.o: ../shs1.h
 c_argv.o: ../string.h
 c_argv.o: ../value.h
-c_argv.o: ../win32dll.h
 c_argv.o: ../zmath.h
 c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
@@ -783,14 +871,15 @@ c_devnull.o: ../calcerr.h
 c_devnull.o: ../cmath.h
 c_devnull.o: ../config.h
 c_devnull.o: ../custom.h
+c_devnull.o: ../decl.h
 c_devnull.o: ../endian_calc.h
 c_devnull.o: ../hash.h
 c_devnull.o: ../have_const.h
-c_devnull.o: ../have_malloc.h
 c_devnull.o: ../have_memmv.h
 c_devnull.o: ../have_newstr.h
 c_devnull.o: ../have_stdlib.h
 c_devnull.o: ../have_string.h
+c_devnull.o: ../have_unused.h
 c_devnull.o: ../longbits.h
 c_devnull.o: ../md5.h
 c_devnull.o: ../nametype.h
@@ -799,7 +888,6 @@ c_devnull.o: ../shs.h
 c_devnull.o: ../shs1.h
 c_devnull.o: ../string.h
 c_devnull.o: ../value.h
-c_devnull.o: ../win32dll.h
 c_devnull.o: ../zmath.h
 c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
@@ -809,14 +897,15 @@ c_help.o: ../calcerr.h
 c_help.o: ../cmath.h
 c_help.o: ../config.h
 c_help.o: ../custom.h
+c_help.o: ../decl.h
 c_help.o: ../endian_calc.h
 c_help.o: ../hash.h
 c_help.o: ../have_const.h
-c_help.o: ../have_malloc.h
 c_help.o: ../have_memmv.h
 c_help.o: ../have_newstr.h
 c_help.o: ../have_stdlib.h
 c_help.o: ../have_string.h
+c_help.o: ../have_unused.h
 c_help.o: ../longbits.h
 c_help.o: ../md5.h
 c_help.o: ../nametype.h
@@ -825,9 +914,34 @@ c_help.o: ../shs.h
 c_help.o: ../shs1.h
 c_help.o: ../string.h
 c_help.o: ../value.h
-c_help.o: ../win32dll.h
 c_help.o: ../zmath.h
 c_help.o: c_help.c
+c_pmodm127.o: ../alloc.h
+c_pmodm127.o: ../block.h
+c_pmodm127.o: ../byteswap.h
+c_pmodm127.o: ../calcerr.h
+c_pmodm127.o: ../cmath.h
+c_pmodm127.o: ../config.h
+c_pmodm127.o: ../custom.h
+c_pmodm127.o: ../decl.h
+c_pmodm127.o: ../endian_calc.h
+c_pmodm127.o: ../hash.h
+c_pmodm127.o: ../have_const.h
+c_pmodm127.o: ../have_memmv.h
+c_pmodm127.o: ../have_newstr.h
+c_pmodm127.o: ../have_stdlib.h
+c_pmodm127.o: ../have_string.h
+c_pmodm127.o: ../have_unused.h
+c_pmodm127.o: ../longbits.h
+c_pmodm127.o: ../md5.h
+c_pmodm127.o: ../nametype.h
+c_pmodm127.o: ../qmath.h
+c_pmodm127.o: ../shs.h
+c_pmodm127.o: ../shs1.h
+c_pmodm127.o: ../string.h
+c_pmodm127.o: ../value.h
+c_pmodm127.o: ../zmath.h
+c_pmodm127.o: c_pmodm127.c
 c_pzasusb8.o: ../alloc.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
@@ -835,14 +949,15 @@ c_pzasusb8.o: ../calcerr.h
 c_pzasusb8.o: ../cmath.h
 c_pzasusb8.o: ../config.h
 c_pzasusb8.o: ../custom.h
+c_pzasusb8.o: ../decl.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
 c_pzasusb8.o: ../have_const.h
-c_pzasusb8.o: ../have_malloc.h
 c_pzasusb8.o: ../have_memmv.h
 c_pzasusb8.o: ../have_newstr.h
 c_pzasusb8.o: ../have_stdlib.h
 c_pzasusb8.o: ../have_string.h
+c_pzasusb8.o: ../have_unused.h
 c_pzasusb8.o: ../longbits.h
 c_pzasusb8.o: ../md5.h
 c_pzasusb8.o: ../nametype.h
@@ -851,7 +966,6 @@ c_pzasusb8.o: ../shs.h
 c_pzasusb8.o: ../shs1.h
 c_pzasusb8.o: ../string.h
 c_pzasusb8.o: ../value.h
-c_pzasusb8.o: ../win32dll.h
 c_pzasusb8.o: ../zmath.h
 c_pzasusb8.o: c_pzasusb8.c
 c_sysinfo.o: ../alloc.h
@@ -863,18 +977,18 @@ c_sysinfo.o: ../cmath.h
 c_sysinfo.o: ../conf.h
 c_sysinfo.o: ../config.h
 c_sysinfo.o: ../custom.h
+c_sysinfo.o: ../decl.h
 c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
 c_sysinfo.o: ../hash.h
 c_sysinfo.o: ../have_const.h
-c_sysinfo.o: ../have_malloc.h
 c_sysinfo.o: ../have_memmv.h
 c_sysinfo.o: ../have_newstr.h
 c_sysinfo.o: ../have_stdlib.h
 c_sysinfo.o: ../have_string.h
+c_sysinfo.o: ../have_unused.h
 c_sysinfo.o: ../hist.h
 c_sysinfo.o: ../longbits.h
-c_sysinfo.o: ../longlong.h
 c_sysinfo.o: ../md5.h
 c_sysinfo.o: ../nametype.h
 c_sysinfo.o: ../prime.h
@@ -883,7 +997,6 @@ c_sysinfo.o: ../shs.h
 c_sysinfo.o: ../shs1.h
 c_sysinfo.o: ../string.h
 c_sysinfo.o: ../value.h
-c_sysinfo.o: ../win32dll.h
 c_sysinfo.o: ../zmath.h
 c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
@@ -895,10 +1008,10 @@ custtbl.o: ../calcerr.h
 custtbl.o: ../cmath.h
 custtbl.o: ../config.h
 custtbl.o: ../custom.h
+custtbl.o: ../decl.h
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
 custtbl.o: ../have_const.h
-custtbl.o: ../have_malloc.h
 custtbl.o: ../have_memmv.h
 custtbl.o: ../have_newstr.h
 custtbl.o: ../have_stdlib.h
@@ -911,6 +1024,5 @@ custtbl.o: ../shs.h
 custtbl.o: ../shs1.h
 custtbl.o: ../string.h
 custtbl.o: ../value.h
-custtbl.o: ../win32dll.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c

custom/argv.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: argv.cal,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: argv.cal,v 29.3 2004/03/31 05:03:02 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/argv.cal,v $
  *
  * Under source code control:	1997/03/10 00:27:17
@@ -34,9 +34,14 @@
  * NOTE: You must use a calc that was compiled with ALLOW_CUSTOM= -DCUSTOM
  *	 and run with a -C arg.
  */
+if (config("compile_custom") == 0) {
+	quit "calc compiled without -DCUSTOM";
+} else if (config("allow_custom") == 0) {
+	quit "calc was run without the -D command line option";
+}
 
 
-define argv()
+define argv_test()
 {
 	local i;	/* arg number */
 	local junk;	/* throw away value */
@@ -54,7 +59,3 @@ define argv()
 	}
 	return i-1;
 }
-
-if (config("resource_debug") >= 0) {
-    print "argv(var, ...) defined";
-}

custom/c_argv.c

@@ -1,7 +1,7 @@
 /*
  * c_argv - a custom function display info about its args
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2006  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: c_argv.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.8 $
+ * @(#) $Id: c_argv.c,v 29.8 2006/06/25 22:06:23 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_argv.c,v $
  *
  * Under source code control:	1997/03/09 20:27:37
@@ -40,6 +40,8 @@
 #include "../config.h"
 #include "../calc.h"
 
+#include "../have_unused.h"
+
 /*
  * c_argv - a custom function display info about its args
  *
@@ -51,7 +53,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_argv(char *name, int count, VALUE **vals)
+c_argv(char UNUSED *name, int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE zfilelen;	/* length of a file as a ZVALUE */
@@ -121,12 +123,9 @@ c_argv(char *name, int count, VALUE **vals)
 		case V_BLOCK:	/* memory block */
 			type = "octet_block";
 			break;
-#if 0
-		/* XXX - V_OCTET is subject to change */
 		case V_OCTET:	/* octet (unsigned char) */
 			type = "octet";
 			break;
-#endif
 		default:
 			type = "unknown";
 			break;
@@ -150,10 +149,10 @@ c_argv(char *name, int count, VALUE **vals)
 				/* getsize error */
 				printf("\tsize=unknown");
 			}
-			printf("\tsizeof=%ld\n", lsizeof(vals[i]));
+			printf("\tsizeof=%ld\n", (long int)lsizeof(vals[i]));
 		} else {
 			printf("\tsize=%ld\tsizeof=%ld\n",
-			    elm_count(vals[i]), lsizeof(vals[i]));
+			    elm_count(vals[i]), (long int)lsizeof(vals[i]));
 		}
 	}
 

custom/c_devnull.c

@@ -1,7 +1,7 @@
 /*
  * c_devnull - a custom function that does nothing
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2004  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: c_devnull.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: c_devnull.c,v 29.4 2004/02/23 14:04:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_devnull.c,v $
  *
  * Under source code control:	1997/03/09 17:49:12
@@ -36,6 +36,8 @@
 #include "../value.h"
 #include "../custom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * c_devnull - a custom function that does nothing
@@ -45,7 +47,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_devnull(char *name, int count, VALUE **vals)
+c_devnull(char UNUSED *name, int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE result;		/* what we will return */
 

custom/c_help.c

@@ -1,7 +1,7 @@
 /*
  * c_help - custom help function
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2004  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: c_help.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: c_help.c,v 29.4 2004/02/23 14:04:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_help.c,v $
  *
  * Under source code control:	1997/03/09 05:25:41
@@ -36,6 +36,8 @@
 #include "../value.h"
 #include "../custom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * c_help - custom help function
@@ -56,7 +58,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_help(char *name, int count, VALUE **vals)
+c_help(char UNUSED *name, int UNUSED count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 

custom/c_pmodm127.c

@@ -0,0 +1,276 @@
+/*
+ * c_pmodm127 - calculate q mod 2^(2^127-1)
+ *
+ * Copyright (C) 2004-2007  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: c_pmodm127.c,v 29.6 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_pmodm127.c,v $
+ *
+ * Under source code control:	2004/07/28 22:12:25
+ * File existed as early as:	2004
+ *
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+#if defined(CUSTOM)
+
+#include <stdio.h>
+
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"
+#include "../zmath.h"
+
+#include "../have_unused.h"
+
+/* 2^255 */
+STATIC HALF h255[] = {
+#if BASEB == 32
+	(HALF)0x00000000, (HALF)0x00000000, (HALF)0x00000000, (HALF)0x00000000,
+	(HALF)0x00000000, (HALF)0x00000000, (HALF)0x00000000, (HALF)0x80000000
+#else /* BASEB == 32 */
+	(HALF)0x0000, (HALF)0x0000, (HALF)0x0000, (HALF)0x0000,
+	(HALF)0x0000, (HALF)0x0000, (HALF)0x0000, (HALF)0x0000,
+	(HALF)0x0000, (HALF)0x0000, (HALF)0x0000, (HALF)0x0000,
+	(HALF)0x0000, (HALF)0x0000, (HALF)0x0000, (HALF)0x8000
+#endif /* BASEB == 32 */
+};
+ZVALUE p255 = {
+    h255, 8, 0
+};
+
+
+/* static declarations */
+S_FUNC void zmod5_or_zmod(ZVALUE *zp);
+STATIC BOOL havelastmod = FALSE;
+STATIC ZVALUE lastmod[1];
+STATIC ZVALUE lastmodinv[1];
+
+
+/*
+ * c_pmodm127 - calculate q mod 2^(2^127-1)
+ *
+ * given:
+ *    count = 1;
+ *    vals[0]	real number;	(q - potential factor)
+ *
+ * returns:
+ *    result	real number;	(q mod 2^(2^127-1))
+ */
+/*ARGSUSED*/
+VALUE
+c_pmodm127(char UNUSED *name, int UNUSED count, VALUE **vals)
+{
+	VALUE result;		/* what we will return */
+	ZVALUE q;		/* test factor */
+	ZVALUE temp;		/* temp calculation value */
+	int i;			/* exponent value */
+
+	/*
+	 * arg check
+	 */
+	result.v_type = V_NULL;
+	if (vals[0]->v_type != V_NUM) {
+		math_error("Non-numeric argument for pmodm127");
+		/*NOTREACHED*/
+	}
+	if (qisfrac(vals[0]->v_num)) {
+		math_error("Non-integer argument for pmodm127");
+		/*NOTREACHED*/
+	}
+	if (qisneg(vals[0]->v_num) || qiszero(vals[0]->v_num)) {
+		math_error("argument for pmodm127 <= 0");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * look at the numerator
+	 */
+	q = vals[0]->v_num->num;
+
+	/*
+	 * setup lastmod with q
+	 */
+	if (havelastmod && zcmp(q, *lastmod)) {
+		zfree(*lastmod);
+		zfree(*lastmodinv);
+		havelastmod = FALSE;
+	}
+	if (!havelastmod) {
+		zcopy(q, lastmod);
+		zbitvalue(2 * q.len * BASEB, &temp);
+		zquo(temp, q, lastmodinv, 0);
+		zfree(temp);
+		havelastmod = TRUE;
+	}
+
+	/*
+	 * start with 2^255
+	 */
+	result.v_num = qalloc();
+	zcopy(p255, &result.v_num->num);
+	result.v_type = V_NUM;
+
+	/*
+	 * compute 2^(2^127-1) mod q by modular exponentation
+	 *
+	 * We implement the following calc code in C:
+	 *
+	 *	(* given q, our test factor, as the arg to this function *)
+	 *	result = 2^255;
+	 *	for (i=8; i < 127; ++i) {
+	 *		result %= q;	  (* mod *)
+	 *		result *= result; (* square *)
+	 *		result <<= 1;     (* times 2 *)
+	 *	}
+	 *	result %= q;	          (* result is now 2^(2^127-1) % q *)
+	 */
+	for (i=8; i<127; ++i) {
+#if 0
+		/* use of zmod is a bit slower than zmod5_or_zmod */
+		(void) zmod(result.v_num->num, *lastmod, &temp, 0);
+		zfree(result.v_num->num);
+		result.v_num->num = temp;
+#else
+		zmod5_or_zmod(&result.v_num->num);	/* mod */
+#endif
+#if 0
+		/* use of zmul is slightly slower than zsquare */
+		zmul(result.v_num->num, result.v_num->num, &temp);  /* square */
+#else
+		zsquare(result.v_num->num, &temp);	/* square */
+#endif
+		/*
+		 * We could manually shift here, but this would o speed
+		 * up the operation only a very tiny bit at the expense
+		 * of a bunch of special code.
+		 */
+		zfree(result.v_num->num);
+		zshift(temp, 1, &result.v_num->num);	/* times 2 */
+		zfree(temp);
+	}
+	zmod5_or_zmod(&result.v_num->num);	/* result = 2^(2^127-1) % q */
+
+	/*
+	 * cleanup and return result
+	 */
+	return result;
+}
+
+
+/*
+ * zmod5_or_zmod - fast integer modulo the modulus computation
+ *
+ * "borrowed" from ../zmod.c
+ *
+ * Given the address of a positive integer whose word count does not
+ * exceed twice that of the modulus stored at lastmod, to evaluate and store
+ * at that address the value of the integer modulo the modulus.
+ *
+ * Unlike the static routine in ../zmod.c, we will call the zmod and return
+ * the result of the zmod5_or_zmod conditions do not apply to the argument
+ * and saved mod.
+ */
+S_FUNC void
+zmod5_or_zmod(ZVALUE *zp)
+{
+	LEN len, modlen, j;
+	ZVALUE tmp1, tmp2;
+	ZVALUE z1, z2, z3;
+	HALF *a, *b;
+	FULL f;
+	HALF u;
+
+	int subcount = 0;
+
+	if (zrel(*zp, *lastmod) < 0)
+		return;
+	modlen = lastmod->len;
+	len = zp->len;
+	z1.v = zp->v + modlen - 1;
+	z1.len = len - modlen + 1;
+	z1.sign = z2.sign = z3.sign = 0;
+	if (z1.len > modlen + 1) {
+		/* in ../zmod.c we did a math_error("Bad call to zmod5!!!"); */
+		/* here we just call the slower zmod and return the result */
+		(void) zmod(*zp, *lastmod, &tmp1, 0);
+		/* replace zp with tmp1 mod result */
+		zfree(*zp);
+		*zp = tmp1;
+		return;
+	}
+	z2.v = lastmodinv->v + modlen + 1 - z1.len;
+	z2.len = lastmodinv->len - modlen - 1 + z1.len;
+	zmul(z1, z2, &tmp1);
+	z3.v = tmp1.v + z1.len;
+	z3.len = tmp1.len - z1.len;
+	if (z3.len > 0) {
+		zmul(z3, *lastmod, &tmp2);
+		j = modlen;
+		a = zp->v;
+		b = tmp2.v;
+		u = 0;
+		len = modlen;
+		while (j-- > 0) {
+			f = (FULL) *a - (FULL) *b++ - (FULL) u;
+			*a++ = (HALF) f;
+			u = - (HALF) (f >> BASEB);
+		}
+		if (z1.len > 1) {
+			len++;
+			if (tmp2.len > modlen)
+				f = (FULL) *a - (FULL) *b - (FULL) u;
+			else
+				f = (FULL) *a - (FULL) u;
+			*a++ = (HALF) f;
+		}
+		while (len > 0 && *--a == 0)
+			len--;
+		zp->len = len;
+		zfree(tmp2);
+	}
+	zfree(tmp1);
+	while (len > 0 && zrel(*zp, *lastmod) >= 0) {
+		subcount++;
+		if (subcount > 2) {
+			math_error("Too many subtractions in zmod5_or_zmod");
+			/*NOTREACHED*/
+		}
+		j = modlen;
+		a = zp->v;
+		b = lastmod->v;
+		u = 0;
+		while (j-- > 0) {
+			f = (FULL) *a - (FULL) *b++ - (FULL) u;
+			*a++ = (HALF) f;
+			u = - (HALF) (f >> BASEB);
+		}
+		if (len > modlen) {
+			f = (FULL) *a - (FULL) u;
+			*a++ = (HALF) f;
+		}
+		while (len > 0 && *--a == 0)
+			len--;
+		zp->len = len;
+	}
+	if (len == 0)
+		zp->len = 1;
+}
+
+#endif /* CUSTOM */

custom/c_pzasusb8.c

@@ -1,7 +1,7 @@
 /*
  * c_pzasusb8 - print numereator as a string of USB8s
  *
- * Copyright (C) 1999  Ernest Bowen
+ * Copyright (C) 1999-2004  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: c_pzasusb8.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: c_pzasusb8.c,v 29.4 2004/02/23 14:04:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_pzasusb8.c,v $
  *
  * Under source code control:	1999/10/06 03:12:25
@@ -37,6 +37,8 @@
 #include "../custom.h"
 #include "../zmath.h"
 
+#include "../have_unused.h"
+
 /*
  * c_pzasusb8 - print numereator as a string of USB8s
  *
@@ -49,7 +51,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_pzasusb8(char *name, int count, VALUE **vals)
+c_pzasusb8(char UNUSED *name, int UNUSED count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE z;		/* numerator of the value */

custom/c_sysinfo.c

@@ -1,7 +1,7 @@
 /*
  * c_sysinfo - names and values of selected #defines
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: c_sysinfo.c,v 29.5 2001/04/14 23:04:17 chongo Exp $
+ * @(#) $Revision: 29.13 $
+ * @(#) $Id: c_sysinfo.c,v 29.13 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -42,7 +42,6 @@
 #include "../calc.h"
 #include "../longbits.h"
 #define CHECK_L_FORMAT
-#include "../longlong.h"
 #include "../block.h"
 #include "../calcerr.h"
 #include "../conf.h"
@@ -53,6 +52,8 @@
 #include "../zrand.h"
 #include "../zrandom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * sys_info - names and values of selected #defines
@@ -63,7 +64,7 @@ struct infoname {
 	char *str;	/* non-NULL ==> value of #define is a string */
 	FULL nmbr;	/* if str==NULL ==> value fo #define as a FULL */
 };
-static struct infoname sys_info[] = {
+STATIC struct infoname sys_info[] = {
     {"S100", "slots in an subtractive 100 table", NULL, (FULL)S100},
     {"BASE", "base for calculations", NULL, (FULL)BASE},
     {"BASE1", "one less than base", NULL, (FULL)BASE},
@@ -84,7 +85,6 @@ static struct infoname sys_info[] = {
     {"DEFAULTSHELL", "default shell to use", DEFAULTSHELL, (FULL)0},
     {"DEV_BITS", "device number size in bits", NULL, (FULL)DEV_BITS},
     {"DISPLAY_DEFAULT", "default digits for float display", NULL, (FULL)DISPLAY_DEFAULT},
-    {"ECHO_PROG", "where the echo command is located", ECHO_PROG, (FULL)0},
     {"EPSILONPREC_DEFAULT", "2^-EPSILON_DEFAULT <= EPSILON_DEFAULT", NULL, (FULL)EPSILONPREC_DEFAULT},
     {"EPSILON_DEFAULT", "allowed error for float calculations", EPSILON_DEFAULT, (FULL)0},
     {"ERRMAX", "default errmax value", NULL, (FULL)ERRMAX},
@@ -102,7 +102,6 @@ static struct infoname sys_info[] = {
     {"INIT_K", "initial 2nd walking a55 table index", NULL, (FULL)INIT_K},
     {"INODE_BITS", "inode number size in bits", NULL, (FULL)INODE_BITS},
     {"LITTLE_ENDIAN", "Least Significant Byte first symbol", NULL, (FULL)LITTLE_ENDIAN},
-    {"LONGLONG_BITS", "length of a long long, or 0", NULL, (FULL)LONGLONG_BITS},
     {"LONG_BITS", "bit length of a long", NULL, (FULL)LONG_BITS},
     {"MAP_POPCNT", "number of odd primes in pr_map", NULL, (FULL)MAP_POPCNT},
     {"MAX_CALCRC", "maximum allowed length of $CALCRC", NULL, (FULL)MAX_CALCRC},
@@ -128,8 +127,6 @@ static struct infoname sys_info[] = {
     {"MAX_SM_PRIME", "larest 32 bit prime", NULL, (FULL)MAX_SM_PRIME},
     {"MAX_SM_VAL", "larest 32 bit value", NULL, (FULL)MAX_SM_VAL},
     {"MUL_ALG2", "default size for alternative multiply", NULL, (FULL)MUL_ALG2},
-    {"NEW_EPSILONPREC_DEFAULT", "2^-EPSILON_DEFAULT <= EPSILON_DEFAULT", NULL, (FULL)NEW_EPSILONPREC_DEFAULT},
-    {"NEW_EPSILON_DEFAULT", "newstd EPSILON_DEFAULT", NEW_EPSILON_DEFAULT, (FULL)0},
     {"NXT_MAP_PRIME", "smallest odd prime not in pr_map", NULL, (FULL)NXT_MAP_PRIME},
     {"NXT_PFACT_VAL", "next prime for higher pfact values", NULL, (FULL)NXT_PFACT_VAL},
     {"OFF_T_BITS", "file offset size in bits", NULL, (FULL)OFF_T_BITS},
@@ -163,9 +160,9 @@ static struct infoname sys_info[] = {
 /*
  * forward declarations
  */
-static void dump_name_meaning(void);	/* custom("sysinfo", 0) */
-static void dump_name_value(void);	/* custom("sysinfo", 1) */
-static void dump_mening_value(void);	/* custom("sysinfo", 2) */
+S_FUNC void dump_name_meaning(void);	/* custom("sysinfo", 0) */
+S_FUNC void dump_name_value(void);	/* custom("sysinfo", 1) */
+S_FUNC void dump_mening_value(void);	/* custom("sysinfo", 2) */
 
 
 /*
@@ -181,7 +178,7 @@ static void dump_mening_value(void);	/* custom("sysinfo", 2) */
  */
 /*ARGSUSED*/
 VALUE
-c_sysinfo(char *name, int count, VALUE **vals)
+c_sysinfo(char UNUSED *name, int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	struct infoname *p;	/* current infoname */
@@ -193,6 +190,7 @@ c_sysinfo(char *name, int count, VALUE **vals)
 	 * we will return NULL if a value was not found
 	 */
 	result.v_type = V_NULL;
+	result.v_subtype = V_NOSUBTYPE;
 
 	/*
 	 * case 0: if no args, then dump the table with no values
@@ -292,7 +290,7 @@ c_sysinfo(char *name, int count, VALUE **vals)
 /*
  * dump_name_meaning - print all infonames and meanings
  */
-static void
+S_FUNC void
 dump_name_meaning(void)
 {
 	struct infoname *p;	/* current infoname */
@@ -309,7 +307,7 @@ dump_name_meaning(void)
 /*
  * dump_name_value - print all infonames and values
  */
-static void
+S_FUNC void
 dump_name_value(void)
 {
 	struct infoname *p;	/* current infoname */
@@ -317,30 +315,16 @@ dump_name_value(void)
 	/* 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)
+#if LONG_BITS == FULL_BITS || FULL_BITS == 32
 			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-			/*
-			 * 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 defined(L64_FORMAT)
-			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
-			    (conf->tab_ok ? "\t" : ""), p->name,
-			    (unsigned long long)p->nmbr,
-			    (unsigned long long)p->nmbr);
-# else /* L64_FORMAT */
 			printf("%s%-23s\t%-8llu\t(0x%llx)\n",
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);
-# endif /* L64_FORMAT */
 #endif
 		} else {
 			printf("%s%-23s\t\"%s\"\n",
@@ -354,7 +338,7 @@ dump_name_value(void)
 /*
  * dump_mening_value - print all values and meanings
  */
-static void
+S_FUNC void
 dump_mening_value(void)
 {
 	struct infoname *p;	/* current infoname */
@@ -362,25 +346,16 @@ dump_mening_value(void)
 	/* 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)
+#if LONG_BITS == FULL_BITS || FULL_BITS == 32
 			printf("%s%-36.36s\t%-8lu\t(0x%lx)\n",
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-# if defined(L64_FORMAT)
-			/* %ld prints all 64 bits, use %ld */
-			printf("%s%-36.36s\t%-8lu\t(0x%lx)\n",
-			    (conf->tab_ok ? "\t" : ""), p->meaning,
-			    (unsigned long long)p->nmbr,
-			    (unsigned long long)p->nmbr);
-# else /* L64_FORMAT */
-			/* %ld prints lower 32 bits only, use %lld */
 			printf("%s%-36.36s\t%-8llu\t(0x%llx)\n",
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);
-# endif /* L64_FORMAT */
 #endif
 		} else {
 			printf("%s%-36.36s\t\"%s\"\n",

custom/custtbl.c

@@ -1,7 +1,7 @@
 /*
  * custtbl - custom interface table
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: custtbl.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: custtbl.c,v 29.5 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/custtbl.c,v $
  *
  * Under source code control:	1997/03/09 02:28:54
@@ -47,15 +47,16 @@
  *
  * Declare custom functions as follows:
  *
- *	extern VALUE c_xyz(char*, int, VALUE**);
+ *	E_FUNC VALUE c_xyz(char*, int, VALUE**);
  *
  * We suggest that you sort the entries below by name.
  */
-extern VALUE c_argv(char*, int, VALUE**);
-extern VALUE c_devnull(char*, int, VALUE**);
-extern VALUE c_help(char*, int, VALUE**);
-extern VALUE c_sysinfo(char*, int, VALUE**);
-extern VALUE c_pzasusb8(char*, int, VALUE**);
+E_FUNC VALUE c_argv(char*, int, VALUE**);
+E_FUNC VALUE c_devnull(char*, int, VALUE**);
+E_FUNC VALUE c_help(char*, int, VALUE**);
+E_FUNC VALUE c_sysinfo(char*, int, VALUE**);
+E_FUNC VALUE c_pzasusb8(char*, int, VALUE**);
+E_FUNC VALUE c_pmodm127(char*, int, VALUE**);
 
 
 #endif /* CUSTOM */
@@ -105,9 +106,12 @@ CONST struct custom cust[] = {
 	{ "sysinfo", "return a calc #define value",
 	 0, 1, c_sysinfo },
 
-	{ "pzasusb8", "print ZCALUE as USB8",
+	{ "pzasusb8", "print ZVALUE as USB8",
 	 0, 1, c_pzasusb8 },
 
+	{ "pmodm127", "calculate q mod 2^(2^127-1)",
+	 1, 1, c_pmodm127 },
+
 
 #endif /* CUSTOM */
 

custom/halflen.cal

@@ -1,7 +1,7 @@
 /*
  * halflen - determine the length of numeric value in HALFs
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2004  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: halflen.cal,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: halflen.cal,v 29.3 2004/03/31 05:03:02 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/halflen.cal,v $
  *
  * Under source code control:	1997/03/08 20:51:32
@@ -34,11 +34,16 @@
  * NOTE: You must use a calc that was compiled with ALLOW_CUSTOM= -DCUSTOM
  *	 and run with a -C arg.
  */
+if (config("compile_custom") == 0) {
+	quit "calc compiled without -DCUSTOM";
+} else if (config("allow_custom") == 0) {
+	quit "calc was run without the -D command line option";
+}
 
 
 define halflen(num)
 {
-	local baseb = custom("sysinfo","BASEB");    /* bit len of a HALF */
+	local baseb;	    /* bit len of a HALF */
 
 	/*
 	 * firewall
@@ -47,6 +52,11 @@ define halflen(num)
 		return newerror("halflen only works on numeric values");
 	}
 
+	/*
+	 * determine baseb
+	 */
+	baseb = custom("sysinfo","BASEB");
+
 	/*
 	 * determine the HALF length of a numeric value
 	 */
@@ -63,7 +73,3 @@ define halflen(num)
 		return newerror("halflen only works on numeric values");
 	}
 }
-
-if (config("resource_debug") >= 0) {
-    print "halflen(num) defined";
-}

custom/pmodm127

@@ -0,0 +1,78 @@
+NAME
+    pmodm127 - calculate q mod 2^(2^127-1)
+
+SYNOPSIS
+    custom("pmodm127", q)
+
+TYPES
+    q		int > 0
+
+    return	int
+
+DESCRIPTION
+
+    This custom function will return the value:
+
+    	q mod 2^(2^127-1)
+
+    This custom function serves as a demonstration of how to write
+    a custom function.  It performs the equivalent of:
+
+	pmod(2, 2^127-1, q)
+
+    The return value is integer in the half open range: [0, q).
+
+    SPECIAL NOTE:
+
+	Can you find a value, q, for which this custom function returns 1?
+	If you do, send the value of q to chongo using the EMail address
+	found at:
+
+	    http://www.isthe.com/chongo/address.html
+
+EXAMPLE
+    > custom("pmodm127", 65537)
+	    32769
+
+    > custom("pmodm127", 2^31-1)
+	    8
+
+    > custom("pmodm127", 7^51+2)
+	    11228202966269457258557496419097462731193173
+
+LIMITS
+    calc must be built with ALLOW_CUSTOM= -DCUSTOM
+    calc must be executed with a -C arg.
+    q must be an integer > 0
+
+LIBRARY
+    none
+
+SEE ALSO
+    custom
+
+## Copyright (C) 2004  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+##
+## @(#) $Revision: 29.2 $
+## @(#) $Id: pmodm127,v 29.2 2004/07/29 09:28:58 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/pmodm127,v $
+##
+## Under source code control:	2004/02/25 07:13:15
+## File existed as early as:	2004
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

custom/pmodm127.cal

@@ -0,0 +1,137 @@
+/*
+ * pmodm127 - test pmodm127's ability to calculate q mod 2^(2^127-1)
+ *
+ * Copyright (C) 2004  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: pmodm127.cal,v 29.2 2004/07/29 08:35:36 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/pmodm127.cal,v $
+ *
+ * Under source code control:	2004/02/25 14:25:32
+ * File existed as early as:	2004
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * This file is part of the custom sample calc files.
+ *
+ * NOTE: You must use a calc that was compiled with ALLOW_CUSTOM= -DCUSTOM
+ *	 and run with a -C arg.
+ */
+if (config("compile_custom") == 0) {
+	quit "calc compiled without -DCUSTOM";
+} else if (config("allow_custom") == 0) {
+	quit "calc was run without the -D command line option";
+}
+
+
+define pmodm127_test1(testcnt)
+{
+	local q;	/* test factor */
+	local m127;	/* 2^127-1 */
+	local i;
+
+	/*
+	 * firewall
+	 */
+	if (!isint(testcnt) || testcnt <= 0) {
+		return newerror("pmodm127_test1 must have an integer count>0");
+	}
+
+	/*
+	 * perform testcnt divisor tests for primes of form 2*k*(2^127-1)+1
+	 *
+	 * NOTE: Since this is just a test, we do not need to be optimal.
+	 */
+	m127 = 2^127 - 1;
+	q = 2*4949132165849*m127+1;
+	for (i=0; i < testcnt; ++i) {
+
+		/*
+		 * determine next prime divisor
+		 */
+		q = nextcand(q, -1, 0, 1, 2*m127);
+
+		/* compare custom function with its pmod() equivalent */
+		if (config("resource_debug") & 8) {
+			print "testing", q;
+		}
+		if (pmod(2, m127, q) != custom("pmodm127", q)) {
+			print "ERROR: pmodm127 failed for ", str(q);
+			return newerror("pmodm127 failed for " + str(q));
+		}
+	}
+
+	/* return success count */
+	if (config("resource_debug") & 8) {
+		print "passed", testcnt, "tests";
+	}
+	return testcnt;
+}
+
+define pmodm127_test2(testcnt, seed)
+{
+	local q;	/* test factor */
+	local m127;	/* 2^127-1 */
+	local i;
+
+	/*
+	 * firewall
+	 */
+	if (!isint(testcnt) || testcnt <= 0) {
+		return newerror("pmodm127_test2 must have an integer count>0");
+	}
+	if (!isint(seed)) {
+		return newerror("pmodm127_test2 must an integer seed");
+	}
+
+	/*
+	 * perform testcnt divisor tests random integers over [1e51, 1e52)
+	 *
+	 * NOTE: Since this is just a test, we do not need to be optimal.
+	 */
+	m127 = 2^127 - 1;
+	for (i=0; i < testcnt; ++i) {
+
+		/*
+		 * determine next prime divisor
+		 */
+		q = rand(1e51, 1e52) | 0x1;
+		if (config("resource_debug") & 8) {
+			print "testing", q;
+		}
+
+		/* compare custom function with its pmod() equivalent */
+		if (pmod(2, m127, q) != custom("pmodm127", q)) {
+			print "ERROR: pmodm127 failed for ", str(q);
+			print "ERROR: ", pmod(2,m127,q), " != ", custom("pmodm127", q);
+			return newerror("pmodm127 failed for " + str(q));
+		}
+	}
+
+	/* return success count */
+	if (config("resource_debug") & 8) {
+		print "passed", testcnt, "tests";
+	}
+	return testcnt;
+}
+
+if ((config("resource_debug") & 3) && !(config("resource_debug") & 8)) {
+    print "DEBUG: use config('resource_debug',", config("resource_debug")|8:") to enable more debugging";
+}

custom/pzasusb8

@@ -19,7 +19,7 @@ DESCRIPTION
 		custom("sysinfo", "BASEB")
 		custom("sysinfo", "CALC_BYTE_ORDER")
 
-    foe details.
+    for details.
 
     This custom function is intented for testing of the general
     custom interface.
@@ -65,8 +65,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: pzasusb8,v 29.2 2000/06/07 14:03:03 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: pzasusb8,v 29.3 2005/10/18 11:18:34 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/pzasusb8,v $
 ##
 ## Under source code control:	1999/10/06 04:05:43

custom/pzasusb8.cal

@@ -1,7 +1,7 @@
 /*
  * pzasusb8 - print numereator as a string of USB8s
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2004  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: pzasusb8.cal,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: pzasusb8.cal,v 29.3 2004/03/31 05:03:02 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/pzasusb8.cal,v $
  *
  * Under source code control:	1999/10/06 03:11:12
@@ -31,6 +31,15 @@
  */
 
 
+/*
+ * firewall
+ */
+if (config("compile_custom") == 0) {
+	quit "calc compiled without -DCUSTOM";
+} else if (config("allow_custom") == 0) {
+	quit "calc was run without the -D command line option";
+}
+
 print "p(n) prints array in which numerator of n is stored as a";
 print "sequence of 2-hex-digits representing unsigned characters.";
 print "h(n) printx n in hex notation.  This should be the same as";
@@ -52,6 +61,5 @@ print "CALC_BYTE_ORDER: ", custom("sysinfo", "CALC_BYTE_ORDER");
 print "BIG_ENDIAN: ", custom("sysinfo", "BIG_ENDIAN");
 print "LITTLE_ENDIAN: ", custom("sysinfo", "LITTLE_ENDIAN");
 print "LONG_BITS: ", custom("sysinfo", "LONG_BITS");
-print "LONGLONG_BITS: ", custom("sysinfo", "LONGLONG_BITS");
 print "Calc sizes:";
 show sizes;

decl.h

@@ -0,0 +1,97 @@
+/*
+ * decl - variable and function declaration macros
+ *
+ * Copyright (C) 2007  Landon Curt Noll
+ *
+ * Primary author:  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: decl.h,v 29.4 2007/02/12 03:38:42 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/decl.h,v $
+ *
+ * Under source code control:	2007/02/09 05:24:25
+ * File existed as early as:	2007
+ *
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+#include "have_const.h"
+
+
+#if !defined(__DECL_H__)
+#define __DECL_H__
+
+
+/*
+ * Mac OS X Thread Local Storage macros
+ *
+ * NOTE: The use of -DMACOSX_TLS is extremely experimental.  Calc may not
+ *	 compile with MACOSX_TLS defined.
+ */
+#if defined(MACOSX_TLS)
+
+
+  /* variable related macros */
+# define EXTERN extern __thread
+# define STATIC static __thread
+
+  /* function related macros */
+# define E_FUNC extern
+# define S_FUNC static
+
+
+/*
+ * MS windoz macros
+ */
+#elif defined(_WIN32) || defined(WINDOZ)
+
+
+  /* determine which type of DLL we must generate */
+# if defined(_EXPORTING)
+#  define DLL __declspec(dllexport)
+# else
+#  define DLL __declspec(dllimport)
+# endif
+
+  /* variable related macros */
+# define EXTERN extern DLL
+# define STATIC static
+
+  /* function related macros */
+# define E_FUNC extern DLL
+# define S_FUNC static
+
+
+/*
+ * default macros
+ */
+#else
+
+
+  /* variable related macros */
+# define EXTERN extern
+# define STATIC static
+
+  /* function related macros */
+# define E_FUNC extern
+# define S_FUNC static
+
+
+#endif
+
+#endif /* !__DECL_H__ */

file.h

@@ -1,7 +1,7 @@
 /*
  * file - file I/O routines callable by users
  *
- * Copyright (C) 1999  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: file.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
+ * @(#) $Revision: 29.9 $
+ * @(#) $Id: file.h,v 29.9 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.h,v $
  *
  * Under source code control:	1996/05/24 05:55:58
@@ -53,8 +53,10 @@ typedef struct {
 	char *name;		/* file name */
 	BOOL reading;		/* TRUE if opened for reading */
 	BOOL writing;		/* TRUE if opened for writing */
+	BOOL appending;		/* TRUE if also opened for appending */
+	BOOL binary;		/* TRUE if binary mode - mode ignored/unused */
 	char action;		/* most recent use for 'r', 'w' or 0 */
-	char mode[sizeof("rb+")];/* open mode */
+	char mode[sizeof("rb+")+1];/* open mode */
 } FILEIO;
 
 
@@ -89,11 +91,12 @@ typedef struct {
 /*
  * external functions
  */
-extern FILEIO * findid(FILEID id, int writable);
-extern int fgetposid(FILEID id, FILEPOS *ptr);
-extern int fsetposid(FILEID id, FILEPOS *ptr);
-extern int get_open_siz(FILE *fp, ZVALUE *res);
-extern char* findfname(FILEID);
+E_FUNC FILEIO * findid(FILEID id, int writable);
+E_FUNC int fgetposid(FILEID id, FILEPOS *ptr);
+E_FUNC int fsetposid(FILEID id, FILEPOS *ptr);
+E_FUNC int get_open_siz(FILE *fp, ZVALUE *res);
+E_FUNC char* findfname(FILEID);
+E_FUNC FILE *f_pathopen(char *name, char *mode, char *pathlist, char **openpath);
 
 
 #endif /* !__FILE_H__ */

func.h

@@ -1,7 +1,7 @@
 /*
  * func - built-in function interface definitions
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2007  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: func.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: func.h,v 29.6 2007/02/12 03:40:06 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -72,42 +72,42 @@ struct func {
 /*
  * The current function being compiled.
  */
-extern FUNC *curfunc;
+E_FUNC FUNC *curfunc;	/* NOTE: This is a function pointer, we need E_FUNC */
 
 
 /*
  * Functions to handle functions.
  */
-extern FUNC *findfunc(long index);
-extern char *namefunc(long index);
-extern BOOL evaluate(BOOL nestflag);
-extern long adduserfunc(char *name);
-extern void rmuserfunc(char *name);
-extern void rmalluserfunc(void);
-extern long getuserfunc(char *name);
-extern void beginfunc(char *name, BOOL newflag);
-extern int builtinopcode(long index);
-extern char *builtinname(long index);
-extern int dumpop(unsigned long *pc);
-extern void addop(long op);
-extern void endfunc(void);
-extern void addopone(long op, long arg);
-extern void addoptwo(long op, long arg1, long arg2);
-extern void addoplabel(long op, LABEL *label);
-extern void addopptr(long op, char *ptr);
-extern void writeindexop(void);
-extern void showbuiltins(void);
-extern int getbuiltinfunc(char *name);
-extern void builtincheck(long index, int count);
-extern void addopfunction(long op, long index, int count);
-extern void showfunctions(void);
-extern void initfunctions(void);
-extern void clearopt(void);
-extern void updateoldvalue(FUNC *fp);
-extern void calculate(FUNC *fp, int argcount);
-extern VALUE builtinfunc(long index, int argcount, VALUE *stck);
-extern void freenumbers(FUNC *);
-extern void freefunc(FUNC *);
+E_FUNC FUNC *findfunc(long index);
+E_FUNC char *namefunc(long index);
+E_FUNC BOOL evaluate(BOOL nestflag);
+E_FUNC long adduserfunc(char *name);
+E_FUNC void rmuserfunc(char *name);
+E_FUNC void rmalluserfunc(void);
+E_FUNC long getuserfunc(char *name);
+E_FUNC void beginfunc(char *name, BOOL newflag);
+E_FUNC int builtinopcode(long index);
+E_FUNC char *builtinname(long index);
+E_FUNC int dumpop(unsigned long *pc);
+E_FUNC void addop(long op);
+E_FUNC void endfunc(void);
+E_FUNC void addopone(long op, long arg);
+E_FUNC void addoptwo(long op, long arg1, long arg2);
+E_FUNC void addoplabel(long op, LABEL *label);
+E_FUNC void addopptr(long op, char *ptr);
+E_FUNC void writeindexop(void);
+E_FUNC void showbuiltins(void);
+E_FUNC int getbuiltinfunc(char *name);
+E_FUNC void builtincheck(long index, int count);
+E_FUNC void addopfunction(long op, long index, int count);
+E_FUNC void showfunctions(void);
+E_FUNC void initfunctions(void);
+E_FUNC void clearopt(void);
+E_FUNC void updateoldvalue(FUNC *fp);
+E_FUNC void calculate(FUNC *fp, int argcount);
+E_FUNC VALUE builtinfunc(long index, int argcount, VALUE *stck);
+E_FUNC void freenumbers(FUNC *);
+E_FUNC void freefunc(FUNC *);
 
 
 #endif /* !__FUNC_H__ */

hash.c

@@ -1,7 +1,7 @@
 /*
  * hash - one-way hash routines
  *
- * Copyright (C) 1999-2002  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: hash.c,v 29.5 2002/12/29 09:20:25 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: hash.c,v 29.11 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.c,v $
  *
  * Under source code control:	1995/11/23 05:13:11
@@ -43,9 +43,9 @@
 /*
  * external hash_setup functions
  */
-extern void shs_init_state(HASH*);
-extern void shs1_init_state(HASH*);
-extern void MD5_init_state(HASH*);
+E_FUNC void shs_init_state(HASH*);
+E_FUNC void shs1_init_state(HASH*);
+E_FUNC void MD5_init_state(HASH*);
 
 
 /*
@@ -60,7 +60,7 @@ extern void MD5_init_state(HASH*);
 /*
  * hash_setup - setup the hash state for a given hash
  */
-static struct hash_setup {
+STATIC struct hash_setup {
 	int type;		/* hash type (see XYZ_HASH_TYPE below) */
 	void (*init_state)(HASH*);	/* initialize a hash state */
 } htbl[] = {
@@ -596,7 +596,7 @@ hash_complex(int type, void *c, HASH *state)
 HASH *
 hash_str(int type, char *str, HASH *state)
 {
-	USB32 len;		/* string length */
+	size_t len;		/* string length */
 
 	/*
 	 * initialize if state is NULL
@@ -985,7 +985,19 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_int(type, value->v_config->ctrl_d, state);
 		state = hash_str(type, value->v_config->program, state);
 		state = hash_str(type, value->v_config->base_name, state);
+		state = hash_bool(type, value->v_config->windows, state);
+		state = hash_bool(type, value->v_config->cygwin, state);
+		state = hash_bool(type, value->v_config->compile_custom, state);
+		if (value->v_config->allow_custom != NULL &&
+		    *(value->v_config->allow_custom)) {
+			state = hash_bool(type, TRUE, state);
+		} else {
+			state = hash_bool(type, FALSE, state);
+		}
 		state = hash_str(type, value->v_config->version, state);
+		state = hash_int(type, value->v_config->baseb, state);
+		state = hash_bool(type, value->v_config->redecl_warn, state);
+		state = hash_bool(type, value->v_config->dupvar_warn, state);
 		break;
 
 	case V_HASH:

hash.h

@@ -1,7 +1,7 @@
 /*
  * hash - one-way hash routines
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: hash.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: hash.h,v 29.5 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.h,v $
  *
  * Under source code control:	1995/11/14 23:57:45
@@ -123,19 +123,19 @@ struct hashstate {
 /*
  * external functions
  */
-extern HASH* hash_init(int, HASH*);
-extern void hash_free(HASH*);
-extern HASH* hash_copy(HASH*);
-extern int hash_cmp(HASH*, HASH*);
-extern void hash_print(HASH*);
-extern ZVALUE hash_final(HASH*);
-extern HASH* hash_long(int, long, HASH*);
-extern HASH* hash_zvalue(int, ZVALUE, HASH*);
-extern HASH* hash_number(int, void*, HASH*);
-extern HASH* hash_complex(int, void*, HASH*);
-extern HASH* hash_str(int, char*, HASH*);
-extern HASH* hash_usb8(int, USB8*, int, HASH*);
-extern HASH* hash_value(int, void*, HASH*);
+E_FUNC HASH* hash_init(int, HASH*);
+E_FUNC void hash_free(HASH*);
+E_FUNC HASH* hash_copy(HASH*);
+E_FUNC int hash_cmp(HASH*, HASH*);
+E_FUNC void hash_print(HASH*);
+E_FUNC ZVALUE hash_final(HASH*);
+E_FUNC HASH* hash_long(int, long, HASH*);
+E_FUNC HASH* hash_zvalue(int, ZVALUE, HASH*);
+E_FUNC HASH* hash_number(int, void*, HASH*);
+E_FUNC HASH* hash_complex(int, void*, HASH*);
+E_FUNC HASH* hash_str(int, char*, HASH*);
+E_FUNC HASH* hash_usb8(int, USB8*, int, HASH*);
+E_FUNC HASH* hash_value(int, void*, HASH*);
 
 
 #endif /* !__HASH_H__ */

have_stdvs.c

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: have_stdvs.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: have_stdvs.c,v 29.3 2007/02/07 20:53:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/have_stdvs.c,v $
  *
  * Under source code control:	1995/09/09 22:41:10
@@ -56,6 +56,13 @@
 # include <string.h>
 #endif
 
+#undef VSPRINTF_SIZE_T
+#if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
+# define VSPRINTF_SIZE_T size_t
+#else
+# define VSPRINTF_SIZE_T long
+#endif
+
 char buf[BUFSIZ];
 
 
@@ -74,6 +81,21 @@ try_this(char *fmt, ...)
 }
 
 
+void
+try_nthis(char *fmt, VSPRINTF_SIZE_T size, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+#if !defined(DONT_HAVE_VSPRINTF)
+	vsnprintf(buf, size, fmt, ap);
+#else
+	snprintf(buf, size, fmt, ap);
+#endif
+	va_end(ap);
+}
+
+
 int
 main(void)
 {
@@ -95,9 +117,9 @@ main(void)
 	    exit(1);
 	}
 	try_this("%s %d%s%d%d %s",
-	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
+	    "Landon Noll 1st coproved that", 2, "^", 21701, -1, "was prime");
 	if (strcmp(buf,
-		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
+		   "Landon Noll 1st coproved that 2^21701-1 was prime") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
 	    /* <stdarg.h> with vsprintf() didn't work */
 #else
@@ -106,6 +128,30 @@ main(void)
 	    exit(1);
 	}
 
+	/*
+	 * test variable args and vsnprintf/snprintf
+	 */
+	try_nthis("@%d:%s:%d@", sizeof(buf)-1, 1, "hello", 5);
+	if (strcmp(buf, "@1:hello:5@") != 0) {
+#if !defined(DONT_HAVE_VSPRINTF)
+	    /* <stdarg.h> with vsnprintf() didn't work */
+#else
+	    /* <stdarg.h> with snprintf() simulating vsnprintf() didn't work */
+#endif
+	    exit(1);
+	}
+	try_nthis("%s %d%s%d%d %s", sizeof(buf)-1,
+	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
+	if (strcmp(buf,
+		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
+#if !defined(DONT_HAVE_VSPRINTF)
+	    /* <stdarg.h> with vsnprintf() didn't work */
+#else
+	    /* <stdarg.h> with snprintf() simulating vsnprintf() didn't work */
+#endif
+	    exit(1);
+	}
+
 	/*
 	 * report the result
 	 */
@@ -128,19 +174,22 @@ main(void)
 	puts("#define STDARG /* use <stdarg.h> */");
 	puts("#include <stdarg.h>");
 #endif
-	puts("\n/* should we use vsprintf()? */");
+	puts("\n/* should we use vsprintf() and vsnprintf()? */");
 #if !defined(DONT_HAVE_VSPRINTF)
-	puts("#define HAVE_VS /* yes */");
+	puts("#define HAVE_VSPRINTF /* yes */");
 #else
 	puts("/*");
 	puts(" * Hack aleart!!!");
 	puts(" *");
 	puts(" * Systems that do not have vsprintf() need something.  In some");
 	puts(" * cases the sprintf function will deal correctly with the");
-	puts(" * va_alist 3rd arg.  Hope for the best!");
+	puts(" * va_alist 3rd arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * function.  In either case we use the #defines below and");
+	puts(" * hope for the best!");
 	puts(" */");
 	puts("#define vsprintf sprintf");
-	puts("#undef HAVE_VS");
+	puts("#define vsnprintf snprintf");
+	puts("#undef HAVE_VSPRINTF");
 #endif
 	/* exit(0); */
 	return 0;

have_unused.c

@@ -0,0 +1,89 @@
+/*
+ * have_unused - Determine if we want or can support the unused attribute
+ *
+ * Copyright (C) 2004  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: have_unused.c,v 29.2 2004/02/23 08:35:42 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/have_unused.c,v $
+ *
+ * Under source code control:	2004/02/22 22:36:10
+ * File existed as early as:	2004
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_unused
+ *
+ * Not all compilers support the unused attribute, so this may not compile
+ * on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_UNUSED
+ *		defined ==> ok to use unused
+ *		undefined ==> do not use unused
+ *
+ *	UNUSED
+ *		unused ==> use unused
+ *		(nothing) ==> unused not used
+ */
+
+
+#include <stdio.h>
+
+#if !defined(HAVE_NO_UNUSED)
+
+/* make sure that we can use the __attribute__((unused)) in #define's */
+#undef UNUSED
+#define UNUSED __attribute__((unused))
+
+/*
+ * unused_str - a function with an unused argument
+ */
+static char *
+unused_str(char UNUSED *str)
+{
+    return "__attribute__((unused))";
+}
+
+#endif /* !HAVE_NO_UNUSED */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_UNUSED)
+
+	printf("#undef HAVE_UNUSED /* no */\n");
+	printf("#undef UNUSED\n");
+	printf("#define UNUSED /* no */\n");
+
+#else /* HAVE_NO_UNUSED */
+
+	printf("#define HAVE_UNUSED /* yes */\n");
+	printf("#undef UNUSED\n");
+	printf("#define UNUSED %s /* yes */\n", unused_str(NULL));
+
+#endif /* HAVE_NO_UNUSED */
+
+	/* exit(0); */
+	return 0;
+}

have_varvs.c

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: have_varvs.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: have_varvs.c,v 29.3 2007/02/07 20:53:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/have_varvs.c,v $
  *
  * Under source code control:	1995/09/09 22:41:10
@@ -52,6 +52,13 @@
 # include <string.h>
 #endif
 
+#undef VSPRINTF_SIZE_T
+#if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
+# define VSPRINTF_SIZE_T size_t
+#else
+# define VSPRINTF_SIZE_T long
+#endif
+
 char buf[BUFSIZ];
 
 #if !defined(STDARG) && !defined(SIMULATE_STDARG)
@@ -73,6 +80,22 @@ try_this(char *fmt, ...)
     va_end(ap);
 }
 
+void
+try_nthis(char *fmt, VSPRINTF_SIZE_T size, ...)
+{
+    va_list ap;
+
+    va_start(ap);
+
+#if !defined(DONT_HAVE_VSPRINTF)
+    vsnprintf(buf, size, fmt, ap);
+#else
+    snprintf(buf, size, fmt, ap);
+#endif
+
+    va_end(ap);
+}
+
 #else
 
 void
@@ -81,6 +104,12 @@ try_this(char *a, int b, char *c, int d)
     return;
 }
 
+void
+try_nthis(char *a, VSPRINTF_SIZE_T size, int b, char *c, int d)
+{
+    return;
+}
+
 #endif
 
 
@@ -109,9 +138,33 @@ main(void)
 	if (strcmp(buf,
 		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
-	    /* <stdarg.h> with vsprintf() didn't work */
+	    /* <varargs.h> with vsprintf() didn't work */
 #else
-	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
+	    /* <varargs.h> with sprintf() simulating vsprintf() didn't work */
+#endif
+	    exit(1);
+	}
+
+	/*
+	 * test variable args and vsnprintf/snprintf
+	 */
+	try_nthis("@%d:%s:%d@", sizeof(buf)-1, 1, "hello", 5);
+	if (strcmp(buf, "@1:hello:5@") != 0) {
+#if !defined(DONT_HAVE_VSPRINTF)
+	    /* <varargs.h> with vsnprintf() didn't work */
+#else
+	    /* <varargs.h> with snprintf() simulating vsnprintf() didn't work */
+#endif
+	    exit(1);
+	}
+	try_nthis("%s %d%s%d%d %s", sizeof(buf)-1,
+	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
+	if (strcmp(buf,
+		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
+#if !defined(DONT_HAVE_VSPRINTF)
+	    /* <varargs.h> with vsnprintf() didn't work */
+#else
+	    /* <varargs.h> with snprintf() simulating vsnprintf() didn't work */
 #endif
 	    exit(1);
 	}
@@ -122,19 +175,22 @@ main(void)
 	puts("/* what type of variable args do we have? */");
 	puts("#define VARARGS /* use <varargs.h> */");
 	puts("#include <varargs.h>");
-	puts("\n/* should we use vsprintf()? */");
+	puts("\n/* should we use vsprintf() and vsnprintf()? */");
 #if !defined(DONT_HAVE_VSPRINTF)
-	puts("#define HAVE_VS /* yes */");
+	puts("#define HAVE_VSPRINTF /* yes */");
 #else
 	puts("/*");
 	puts(" * Hack aleart!!!");
 	puts(" *");
 	puts(" * Systems that do not have vsprintf() need something.  In some");
 	puts(" * cases the sprintf function will deal correctly with the");
-	puts(" * va_alist 3rd arg.  Hope for the best!");
+	puts(" * va_alist 3rd arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * function.  In either case we use the #defines below and");
+	puts(" * hope for the best!");
 	puts(" */");
 	puts("#define vsprintf sprintf");
-	puts("#undef HAVE_VS");
+	puts("#define vsnprintf snprintf");
+	puts("#undef HAVE_VSPRINTF");
 #endif
 	/* exit(0); */
 	return 0;

help.c

@@ -1,7 +1,7 @@
 /*
  * help - display help for calc
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2007  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.8 $
- * @(#) $Id: help.c,v 29.8 2001/04/08 08:29:28 chongo Exp $
+ * @(#) $Revision: 29.10 $
+ * @(#) $Id: help.c,v 29.10 2007/02/11 10:19:14 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/help.c,v $
  *
  * Under source code control:	1997/09/14 10:58:30
@@ -51,7 +51,7 @@
 /*
  * some help topics are symbols, so we alias them to nice filenames
  */
-static struct help_alias {
+STATIC struct help_alias {
 	char *topic;
 	char *filename;
 } halias[] = {
@@ -62,6 +62,8 @@ static struct help_alias {
 	{".", "oldvalue"},
 	{"%", "mod"},
 	{"//", "quo"},
+	{"#", "pound"},
+	{"calc", "help"},
 	{"copy", "blkcpy"},
 	{"copying", "COPYING"},
 	{"copying-lgpl", "COPYING-LGPL"},
@@ -71,6 +73,7 @@ static struct help_alias {
 	{"COPYRIGHT", "copyright"},
 	{"Copyleft", "copyright"},
 	{"COPYLEFT", "copyright"},
+	{"define", "command"},
 	{"read", "command"},
 	{"write", "command"},
 	{"quit", "command"},
@@ -86,7 +89,7 @@ static struct help_alias {
 /*
  * external values
  */
-extern char *pager;		/* $PAGER or default */
+EXTERN char *pager;		/* $PAGER or default */
 
 
 /*
@@ -101,7 +104,7 @@ extern char *pager;		/* $PAGER or default */
  * given:
  *	stream	open file stream of the file to send to the pager
  */
-static void
+S_FUNC void
 page_file(FILE *stream)
 {
 	FILE *cmd;		/* pager command */

help/Makefile

@@ -2,7 +2,7 @@
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999-2002  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.23 2003/01/14 02:24:48 chongo Exp $
+# @(#) $Revision: 29.36 $
+# @(#) $Id: Makefile,v 29.36 2007/02/07 00:31:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -34,7 +34,7 @@
 # required vars
 #
 SHELL= /bin/sh
-MAKE_FILE = Makefile
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -99,9 +99,9 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CUSTOMINCPDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -169,6 +169,27 @@ SED= sed
 SORT= sort
 FMT= fmt
 CMP= cmp
+CP= cp
+MV= mv
+TRUE= true
+RM= rm
+MKDIR= mkdir
+RMDIR= rmdir
+TOUCH= touch
+CAT= cat
+
+# Some out of date operating systems require / want an executable to
+# end with a certain file extension.  Some compile systems such as
+# Cygwin build calc as calc.exe.  The EXT variable is used to denote
+# the extension required by such.
+#
+# EXT=				# normal Un*x / Linux / GNU/Linux systems
+# EXT=.exe			# windoz / Cygwin
+#
+# If in doubt, use EXT=
+#
+EXT=
+#EXT=.exe
 
 # Standard and Builtin help files
 #
@@ -193,9 +214,9 @@ STD_HELP_FILES_8= operator statement
 
 BLT_HELP_FILES_9= resource
 
-STD_HELP_FILES_10= types usage script
+STD_HELP_FILES_10= types script
 
-BLT_HELP_FILES_10a= cscript
+BLT_HELP_FILES_10a= usage cscript
 
 STD_HELP_FILES_10b= unexpected variable
 
@@ -245,32 +266,41 @@ BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \
 
 # This list is prodiced by the detaillist rule when no WARNINGS are detected.
 #
+# Please use:
+#
+#	make detaillist
+#
+# to keep this list in nice sorted order and to check that these
+# non-special help files are under RCS control.
+#
 DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	appr arg argv arrow asec asech asin asinh assign atan atan2 atanh \
-	avg base base2 bernoulli bit blk blkcpy blkfree blocks bround btrunc \
-	calc_tty calclevel catalan ceil cfappr cfsim char cmdbuf cmp comb \
-	conj cos cosh cot coth count cp csc csch ctime delete den dereference \
-	det digit digits dp epsilon errcount errmax errno error euler eval \
-	exp fact factor fclose fcnt feof ferror fflush fgetc fgetfield \
-	fgetline fgets fgetstr fib files floor fopen forall fprintf fputc \
-	fputs fputstr frac free freebernoulli freeeuler freeglobals freeredc \
-	freestatics frem freopen fscan fscanf fseek fsize ftell gcd gcdrem \
-	gd getenv hash head highbit hmean hnrmod hypot ilog ilog10 ilog2 \
-	im indices inputlevel insert int inverse iroot isassoc isatty isblk \
-	isconfig isdefined iserror iseven isfile ishash isident isint islist \
-	ismat ismult isnull isnum isobj isobjtype isodd isprime isptr isqrt \
-	isrand israndom isreal isrel issimple issq isstr istype jacobi join \
-	lcm lcmfact lfactor ln lowbit ltol makelist matdim matfill matmax \
-	matmin matsum mattrace mattrans max md5 memsize meq min minv mmin \
-	mne mod modify name near newerror nextcand nextprime norm null \
-	num oldvalue ord param perm pfact pi pix places pmod polar poly \
-	pop popcnt power prevcand prevprime printf prompt protect ptest \
-	push putenv quo quomod rand randbit random randombit randperm rcin \
-	rcmul rcout rcpow rcsq re remove reverse rewind rm root round rsearch \
-	runtime saveval scale scan scanf search sec sech seed segment select \
-	sgn sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom \
-	ssq str strcat strerror strlen strpos strprintf strscan strscanf \
-	substr sum swap system tail tan tanh test time trunc version xor
+	avg base base2 bernoulli bit blk blkcpy blkfree blocks bround \
+	btrunc calc_tty calclevel catalan ceil cfappr cfsim char cmdbuf \
+	cmp comb conj cos cosh cot coth count csc csch ctime delete den \
+	dereference det digit digits display dp epsilon errcount errmax \
+	errno error estr euler eval exp fact factor fclose fcnt feof ferror \
+	fflush fgetc fgetfield fgetfile fgetline fgets fgetstr fib files \
+	floor fopen forall fpathopen fprintf fputc fputs fputstr frac free \
+	freebernoulli freeeuler freeglobals freeredc freestatics frem freopen \
+	fscan fscanf fseek fsize ftell gcd gcdrem gd getenv hash head highbit \
+	hmean hnrmod hypot ilog ilog10 ilog2 im indices inputlevel insert \
+	int inverse iroot isassoc isatty isblk isconfig isdefined iserror \
+	iseven isfile ishash isident isint islist ismat ismult isnull isnum \
+	isobj isobjtype isodd isprime isptr isqrt isrand israndom isreal \
+	isrel issimple issq isstr istype jacobi join lcm lcmfact lfactor \
+	ln log lowbit ltol makelist matdim matfill matmax matmin matsum \
+	mattrace mattrans max md5 memsize meq min minv mmin mne mod modify \
+	name near newerror nextcand nextprime norm null num oldvalue ord \
+	param perm pfact pi pix places pmod polar poly pop popcnt pound \
+	power prevcand prevprime printf prompt protect ptest push putenv \
+	quo quomod rand randbit random randombit randperm rcin rcmul rcout \
+	rcpow rcsq re remove reverse rewind rm root round rsearch runtime \
+	saveval scale scan scanf search sec sech seed segment select sgn \
+	sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom ssq \
+	str strcat strcmp strcpy strerror strlen strncmp strncpy strpos \
+	strprintf strscan strscanf substr sum swap system systime tail tan \
+	tanh test time trunc usertime version xor
 
 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
@@ -295,7 +325,7 @@ DISTLIST= ${STD_HELP_FILES} ${DETAIL_HELP} ${MAKE_FILE} \
 CALCLIBLIST=
 
 all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
-     ${SINGULAR_FILES} calc .all
+     ${SINGULAR_FILES} .all
 
 # used by the upper level Makefile to determine of we have done all
 #
@@ -303,175 +333,183 @@ all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
 #	an non-emoty else clause for every if condition.  *sigh*
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 bindings: ../cal/bindings
-	rm -f $@
-	cp ../cal/bindings $@
+	${RM} -f $@
+	${CP} ../cal/bindings $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 resource: ../cal/README
-	rm -f $@
-	cp ../cal/README $@
+	${RM} -f $@
+	${CP} ../cal/README $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 changes: ../CHANGES
-	rm -f $@
-	cp ../CHANGES $@
+	${RM} -f $@
+	${CP} ../CHANGES $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 libcalc: ../LIBRARY
-	rm -f $@
+	${RM} -f $@
 	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
 	       -e 's:$${CALC_INCDIR}:${CALC_INCDIR}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 bugs: ../BUGS
-	rm -f $@
-	cp ../BUGS $@
+	${RM} -f $@
+	${CP} ../BUGS $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 errorcodes: ../calcerr.h errorcodes.hdr errorcodes.sed
-	rm -f $@
-	cat errorcodes.hdr > $@
+	${RM} -f $@
+	${CAT} errorcodes.hdr > $@
 	${SED} -n -f errorcodes.sed < ../calcerr.h >> $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
-calc: usage
-	rm -f $@
-	cp usage $@
+usage: ../calc.usage
+	${RM} -f $@
+	${CP} ../calc.usage $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
+../calc.usage:
+	(cd ..; $(MAKE) calc.usage)
+
 custom_cal: ../custom/CUSTOM_CAL
-	rm -f $@
-	cp ../custom/CUSTOM_CAL $@
+	${RM} -f $@
+	${CP} ../custom/CUSTOM_CAL $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 new_custom: ../custom/HOW_TO_ADD
-	rm -f $@
-	cp ../custom/HOW_TO_ADD $@
+	${RM} -f $@
+	${CP} ../custom/HOW_TO_ADD $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 copy: blkcpy
-	rm -f $@
-	cp blkcpy $@
+	${RM} -f $@
+	${CP} blkcpy $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 COPYING: ../COPYING
-	rm -f $@
-	cp ../COPYING $@
+	${RM} -f $@
+	${CP} ../COPYING $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 COPYING-LGPL: ../COPYING-LGPL
-	rm -f $@
-	cp ../COPYING-LGPL $@
+	${RM} -f $@
+	${CP} ../COPYING-LGPL $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 cscript: ../cscript/README
-	rm -f $@
-	cp ../cscript/README $@
+	${RM} -f $@
+	${CP} ../cscript/README $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
+../cscript/README: ../cscript/README.src
+	${Q} echo "forming cscript/README"
+	-${Q} ${RM} -f $@
+	(cd ../cscript; $(MAKE) README)
+
 full: ${FULL_HELP_FILES} ${MAKE_FILE}
-	${Q}echo "forming full"
-	-${Q}rm -f $@
-	-${Q}for i in ${FULL_HELP_FILES}; do \
+	${Q} echo "forming full"
+	-${Q} ${RM} -f $@
+	-${Q} for i in ${FULL_HELP_FILES}; do \
 	    if [ Xintro != X"$$i" ]; then \
 		echo ""; \
 	    else \
-		true; \
+		${TRUE}; \
 	    fi; \
 	    if [ Xobj.file = X"$$i" ]; then \
 		j=obj; \
@@ -482,34 +520,34 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE}
 	    echo "* $$j"; \
 	    echo "*************"; \
 	    echo ""; \
-	    cat $$i; \
+	    ${CAT} $$i; \
 	done > $@
-	${Q}echo "full formed"
+	${Q} echo "full formed"
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 # Singular files are the same files as their plural form.
 #
 ${SINGULAR_FILES}: ${PLURAL_FILES}
-	${Q}for i in ${SINGULAR_FILES} /dev/null; do \
+	${Q} for i in ${SINGULAR_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo "rm -f $${i}"; \
-		rm -f $${i}; \
-		echo "cp $${i}s $${i}"; \
-		cp $${i}s $${i}; \
+		echo "${RM} -f $${i}"; \
+		${RM} -f $${i}; \
+		echo "${CP} $${i}s $${i}"; \
+		${CP} $${i}s $${i}; \
 	    fi; \
 	done
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/SINGULAR_FILES =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/SINGULAR_FILES =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 # Form the builtin file
@@ -531,25 +569,25 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 # do not treat -I.. correctly!
 #
 builtin: builtin.top builtin.end ../func.c funclist.sed
-	${Q}echo "forming builtin help file"
-	-${Q}rm -f funclist.c
-	${Q}${SED} -n -f funclist.sed ../func.c > funclist.c
-	-${Q}rm -f funclist.o funclist
-	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
+	${Q} echo "forming builtin help file"
+	-${Q} ${RM} -f funclist.c
+	${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c
+	-${Q} ${RM} -f funclist.o funclist${EXT}
+	${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
 	    -I.. funclist.c -c 2>/dev/null
-	${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist
-	-${Q}rm -f builtin
-	${Q}cat builtin.top > builtin
-	${Q}./funclist | \
+	${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT}
+	-${Q} ${RM} -f builtin
+	${Q} ${CAT} builtin.top > builtin
+	${Q} ./funclist${EXT} | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
-	${Q}cat builtin.end >> builtin
-	${Q}echo "builtin help file formed"
+	${Q} ${CAT} builtin.end >> builtin
+	${Q} echo "builtin help file formed"
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 ##
@@ -563,17 +601,17 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo help/$$i; \
 	    fi; \
 	done | LANG=C ${SORT}
 
 distdir:
-	${Q}echo help
+	${Q} echo help
 
 calcliblist:
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo help/$$i; \
 	    fi; \
@@ -584,21 +622,21 @@ calcliblist:
 # ignore this rule.
 #
 bsdi: all
-	rm -f obj
-	cp obj.file obj
+	${RM} -f obj
+	${CP} obj.file obj
 
 # These next rule help me form the ${DETAIL_HELP} makefile variables above.
 #
 detaillist:
-	${Q}-(echo "xxxxx"; \
+	${Q} -(echo "xxxxx"; \
 	   for i in ${DETAIL_HELP} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		if [ ! -f RCS/$$i,v ]; then \
-		    echo "WARNING: $$i not under RCS control" 1>&2; \
-		else \
-		    echo $$i; \
+		if [ X"$$i" != X"/dev/null" ]; then \
+		    if [ ! -f RCS/$$i,v ]; then \
+			echo "WARNING: $$i not under RCS control" 1>&2; \
+		    else \
+			echo $$i; \
+		    fi; \
 		fi; \
-	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxx/DETAIL_HELP=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
@@ -610,13 +648,13 @@ detaillist:
 ##
 
 echo_inst_files:
-	${Q}for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
+	${Q} for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
 		  builtin ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${HELPDIR}/$$i; \
 	    fi; \
 	done
-	${Q}echo __file__ ${HELPDIR}/obj
+	${Q} echo __file__ ${HELPDIR}/obj
 
 ##
 #
@@ -625,61 +663,99 @@ echo_inst_files:
 ##
 
 clean:
-	rm -f obj mkbuiltin funclist.c funclist.o funclist
-	rm -f COPYING COPYING-LGPL
+	${RM} -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
+	${RM} -f COPYING COPYING-LGPL
 
 clobber:
-	rm -f ${BLT_HELP_FILES} full .all calc
-	rm -f obj mkbuiltin funclist.c funclist.o funclist
-	rm -f COPYING COPYING-LGPL
-	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
+	${RM} -f ${BLT_HELP_FILES} full .all calc
+	${RM} -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
+	${RM} -f COPYING COPYING-LGPL
+	${RM} -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-	    echo mkdir $T${HELPDIR}; \
-	    mkdir $T${HELPDIR}; \
-	    if [ ! -d "$T${HELPDIR}" ]; then \
-		echo mkdir -p "$T${HELPDIR}"; \
-		mkdir -p "$T${HELPDIR}"; \
+	-${Q} if [ ! -d ${T}${HELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${HELPDIR}; \
+	    ${MKDIR} ${T}${HELPDIR}; \
+	    if [ ! -d "${T}${HELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${HELPDIR}"; \
+		${MKDIR} -p "${T}${HELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${HELPDIR}; \
-	    ${CHMOD} 0755 $T${HELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${HELPDIR}; \
+	    ${CHMOD} 0755 ${T}${HELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
+	-${Q} for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
 		  full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${HELPDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${HELPDIR}/$$i.new; \
-		cp -f $$i $T${HELPDIR}/$$i.new; \
-		${CHMOD} 0444 $T${HELPDIR}/$$i.new; \
-		mv -f $T${HELPDIR}/$$i.new $T${HELPDIR}/$$i; \
-		echo "installed $T${HELPDIR}/$$i"; \
+		${RM} -f ${T}${HELPDIR}/$$i.new; \
+		${CP} -f $$i ${T}${HELPDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${HELPDIR}/$$i.new; \
+		${MV} -f ${T}${HELPDIR}/$$i.new ${T}${HELPDIR}/$$i; \
+		echo "installed ${T}${HELPDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
-	    true; \
+	-${Q} if ${CMP} -s obj.file ${T}${HELPDIR}/obj; then \
+	    ${TRUE}; \
 	else \
-	    rm -f $T${HELPDIR}/obj.new; \
-	    cp -f obj.file $T${HELPDIR}/obj.new; \
-	    ${CHMOD} 0444 $T${HELPDIR}/obj.new; \
-	    mv -f $T${HELPDIR}/obj.new $T${HELPDIR}/obj; \
-	    echo "installed $T${HELPDIR}/obj"; \
+	    ${RM} -f ${T}${HELPDIR}/obj.new; \
+	    ${CP} -f obj.file ${T}${HELPDIR}/obj.new; \
+	    ${CHMOD} 0444 ${T}${HELPDIR}/obj.new; \
+	    ${MV} -f ${T}${HELPDIR}/obj.new ${T}${HELPDIR}/obj; \
+	    echo "installed ${T}${HELPDIR}/obj"; \
 	fi
+
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q} if [ -f "${T}${HELPDIR}/obj" ]; then \
+	    ${RM} -f "${T}${HELPDIR}/obj"; \
+	    if [ -f "${T}${HELPDIR}/obj" ]; then \
+		echo "cannot uninstall ${T}${HELPDIR}/obj"; \
+	    else \
+		echo "uninstalled ${T}${HELPDIR}/obj"; \
+	    fi; \
+	fi
+	-${Q} for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \
+	    ${BLT_HELP_FILES} ${STD_HELP_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "${T}${HELPDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${HELPDIR}/$$i"; \
+		if [ -f "${T}${HELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${HELPDIR}/$$i"; \
+		else \
+		   echo "uninstalled ${T}${HELPDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q} for i in ${HELPDIR} ${CALC_SHAREDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
+	    fi; \
+	done

help/abs

@@ -29,10 +29,10 @@ DESCRIPTION
     the result will be the absolute value correct to n decimal places.
 
 EXAMPLE
-    > print abs(3.4), abs(-3.4)
+    ; print abs(3.4), abs(-3.4)
     3.4 3.4
 
-    > print abs(3+4i, 1e-5), abs(4+5i, 1e-5), abs(4+5i, 1e-10)
+    ; print abs(3+4i, 1e-5), abs(4+5i, 1e-5), abs(4+5i, 1e-10)
     5 6.40312 6.4031242374
 
 LIMITS
@@ -60,8 +60,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: abs,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: abs,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/abs,v $
 ##
 ## Under source code control:	1994/03/19 01:40:22

help/access

@@ -23,19 +23,19 @@ EXAMPLE
     The system error-numbers and messages may differ for different
 	implementations
 
-    > !rm -f junk
-    > access("junk")
+    ; !rm -f junk
+    ; access("junk")
 	System error 2
-    > strerror(.)
+    ; strerror(.)
 	"No such file or directory"
-    > f = fopen("junk", "w")
-    > access("junk")
-    > fputs(f, "Alpha")
-    > fclose(f)
-    > !chmod u-w junk
-    > access("junk", "w")
+    ; f = fopen("junk", "w")
+    ; access("junk")
+    ; fputs(f, "Alpha")
+    ; fclose(f)
+    ; !chmod u-w junk
+    ; access("junk", "w")
 	System error 13
-    > strerror(.)
+    ; strerror(.)
 	"Permission denied"
 
 LIMITS
@@ -64,8 +64,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: access,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: access,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/access,v $
 ##
 ## Under source code control:	1996/04/30 03:36:20

help/acos

@@ -17,7 +17,7 @@ DESCRIPTION
     v = acos(x) is the number in [0, pi] for which cos(v) = x.
 
 EXAMPLE
-    > print acos(.5, 1e-5), acos(.5, 1e-10), acos(.5, 1e-15), acos(.5, 1e-20)
+    ; print acos(.5, 1e-5), acos(.5, 1e-10), acos(.5, 1e-15), acos(.5, 1e-20)
     1.0472 1.0471975512 1.047197551196598 1.04719755119659774615
 
 LIMITS
@@ -45,8 +45,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acos,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acos,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acos,v $
 ##
 ## Under source code control:	1994/03/19 01:40:23

help/acosh

@@ -20,7 +20,7 @@ DESCRIPTION
 		 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)
+    ; print acosh(2, 1e-5), acosh(2, 1e-10), acosh(2, 1e-15), acosh(2, 1e-20)
     1.31696 1.3169578969 1.316957896924817 1.31695789692481670862
 
 LIMITS
@@ -48,8 +48,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acosh,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acosh,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acosh,v $
 ##
 ## Under source code control:	1994/03/19 01:40:24

help/acot

@@ -17,7 +17,7 @@ DESCRIPTION
     v = acot(x) is the number in (0, pi) for which cot(v) = x.
 
 EXAMPLE
-    > print acot(2, 1e-5),  acot(2, 1e-10), acot(2, 1e-15), acot(2, 1e-20)
+    ; print acot(2, 1e-5),  acot(2, 1e-10), acot(2, 1e-15), acot(2, 1e-20)
     .46365 .463647609 .463647609000806 .46364760900080611621
 
 LIMITS
@@ -45,8 +45,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acot,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acot,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acot,v $
 ##
 ## Under source code control:	1995/11/13 03:49:00

help/acoth

@@ -19,7 +19,7 @@ DESCRIPTION
 		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)
+    ; print acoth(2, 1e-5), acoth(2, 1e-10), acoth(2, 1e-15), acoth(2, 1e-20)
     .54931 .5493061443 .549306144334055 .5493061443340548457
 
 LIMITS
@@ -47,8 +47,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acoth,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acoth,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acoth,v $
 ##
 ## Under source code control:	1995/11/13 03:49:01

help/acsc

@@ -17,7 +17,7 @@ DESCRIPTION
     v = acsc(x) is the number in [-pi/2, pi/2] for which csc(v) = x.
 
 EXAMPLE
-    > print acsc(2, 1e-5), acsc(2, 1e-10), acsc(2, 1e-15), acsc(2, 1e-20)
+    ; print acsc(2, 1e-5), acsc(2, 1e-10), acsc(2, 1e-15), acsc(2, 1e-20)
     .5236 .5235987756 .523598775598299 .52359877559829887308
 
 LIMITS
@@ -45,8 +45,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acsc,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acsc,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acsc,v $
 ##
 ## Under source code control:	1995/11/13 03:49:00

help/acsch

@@ -20,7 +20,7 @@ DESCRIPTION
 
 
 EXAMPLE
-    > print acsch(2, 1e-5), acsch(2, 1e-10), acsch(2, 1e-15), acsch(2, 1e-20)
+    ; print acsch(2, 1e-5), acsch(2, 1e-10), acsch(2, 1e-15), acsch(2, 1e-20)
     .48121 .4812118251 .481211825059603 .4812118250596034475
 
 LIMITS
@@ -48,8 +48,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: acsch,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: acsch,v 29.3 2006/05/07 07:25:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/acsch,v $
 ##
 ## Under source code control:	1995/11/13 03:49:01