Release calc version 2.11.9.2

BUGS

@@ -29,13 +29,20 @@ The calc web site is located at:
 =-=
 
 If you have tried all of the above and things still are not right,
-then it may be time to send in a bug report.  You can send bug reports to:
+then it may be time to send in a bug report.  You can send bug
+and bug fixes reports to:
 
     calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 When you send your report, please include the following information:
 
     * a description of the problem
@@ -54,18 +61,8 @@ When you send your report, please include the following information:
 
 Stack traces from core dumps are useful to send as well.
 
-=-=
+Fell free to use the above address to send in big fixes (in the form
-
+of a context diff patch).
-Send any comments, compiler warning messages, suggestions and most
-importantly, fixes (in the form of a context diff patch) to:
-
-    calc-bugs at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
-
-You should use the above calc-bugs address for bug reports, if you are
-not currently a member of the calc-tester mailing list.
 
 =-=
 
@@ -75,14 +72,104 @@ 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:
+
+	  compiled optimized (-O, -O1, -O2 or -O3)
+
+	  	AND
+
+      	  compiled with debugging (-g or -g3)
+
+	  	AND
+
+	  when calc is compiled with readline (see USE_READLINE,
+	    READLINE_LIB and READLINE_INCLUDE in the Makefile)
+
+      On Redhat, the gcc -v which has this problem is:
+
+	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,:
@@ -163,6 +250,28 @@ Problems with known work-a-rounds:
       or performance.  The work-a-round is to ignore these warnings
       under BSDI.
 
+    * The chi.cal resource file does not work well with odd degrees
+      of freedom.  Can someone improve this algorithm?
+
+    * The intfile.cal resource file reads and writes big or little Endian
+      integers to/from files the hard way.  It does NOT use blkcpy.  The
+      following code:
+
+	i = (ord("\n") << 16) | (ord("i") << 8) | ord("H")
+	b = blk()
+	copy(i, b)
+	fd = fopen("file", "w")
+	copy(b, fd);
+	fclose(fd)
+
+      will write an extra NUL octet to the file.  Where as:
+
+	read intfile
+	i = (ord("\n") << 16) | (ord("i") << 8) | ord("H")
+	be2file(i, "file2")
+
+      will not.
+
 ## Copyright (C) 1999  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
@@ -179,8 +288,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.5 $
+## @(#) $Revision: 29.17 $
-## @(#) $Id: BUGS,v 29.5 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Id: BUGS,v 29.17 2001/12/31 22:12:35 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.2 $
+    # @(#) $Revision: 29.7 $
-    # @(#) $Id: COPYING,v 29.2 2000/06/07 14:02:13 chongo Exp $
+    # @(#) $Id: COPYING,v 29.7 2003/02/26 16:54:59 chongo Exp $
     # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $
 
 =-=
@@ -55,13 +55,18 @@ Calc is covered by the GNU Lesser General Public License
 
     The contact addresses for calc is as follows:
 
-	Web:	http://www.isthe.com/chongo/tech/comp/calc/index.html
+	Web:	http://www.isthe.com/chongo/tech/comp/calc/email.html
-	EMail:	calc-contrib at asthe dot com
 
-    To join the calc-tester mailing list.  Send a request to:
+    To join the low volume calc mailing list.  Send a EMail message to:
 
 	calc-tester-request at asthe dot com
 
+    Your subject must contain the words:
+
+	calc mailing list subscription
+
+    You may have additional words in your subject line.
+
     Your message body (not the subject) should consist of:
 
 	 subscribe calc-tester address
@@ -71,13 +76,23 @@ Calc is covered by the GNU Lesser General Public License
     where ``address'' is your EMail address and ``your_full_name'' is
     your full name.
 
-    Calc bug reports, however should be sent to:
+    Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+    Calc bug reports and calc bug fixes should be sent to:
 
 	calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+    Your subject must contain the words:
+
+	   calc bug report
+
+    You may have additional words in your subject line.
+
 =-=
 
 Calc's relationship to the GNU Lesser General Public License
@@ -140,7 +155,7 @@ Calc copyrights and exception files
 -----------------------------------
 
     With the exception of the files listed below, Calc is covered under
-    the following Copyrights:
+    the following GNU Lesser General Public License Copyrights:
 
 	Copyright (C) year  David I. Bell
 	Copyright (C) year  David I. Bell and Landon Curt Noll
@@ -149,13 +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
 
-    A few files are not covered under the GNU Lesser General Public
+    These files are not covered under one of the Copyrights listed above:
-    License.  The source files not covered are:
 
-	    shs1.c	    shs1.h	shs.c		 shs.h
+	    shs1.c	    shs1.h	 shs.c		shs.h
-	    md5.c	    md5.h	lib/qtime.cal	 COPYING
+	    md5.c	    md5.h	 COPYING	COPYING-LGPL
-	    COPYING-LGPL
+	    cal/qtime.cal
 
     The file COPYING-LGPL, which contains a copy of the version 2.1
     GNU Lesser General Public License, is itself Copyrighted by the
@@ -167,6 +182,14 @@ 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.
+
+    In all cases one may use and distribute these exception files freely.
+    And because one may freely distribute the LGPL covered files, the
+    entire calc source may be freely used and distributed.
+
 =-=
 
 General Copyleft and License info

HOWTO.INSTALL

@@ -1,34 +1,130 @@
-Installing calc in 4 easy steps:
+Installing calc from the gziped tarball in 4 easy steps:
 
-    1) Look at the makefile, and adjust it to suit your needs.
+    0)  If your platform supports i686 RPMs, you may want to go to:
 
-       Here are some Makefile hints:
+	    http://www.isthe.com/chongo/src/calc/
 
-	   Select a compiler set by commenting in the appropriate set
+	and use these RPMs:
-	   of cc options.  As shipped the Makefile assumes a gcc-like
-	   environment such as Linux.  If a more appropriate cc set if
-	   found below, comment out the Linux set and comment in that
-	   set or edit the gcc set or the common cc set as needed.
 
-	   You may or may not need RANLIB when building libraries.
+	    * calc*.i686.rpm
-	   As shipped the Makefile assumes RANLIB is needed.
+		- all that is needed if you just want to use calc
-	   Comment the in/out the RANLIB value if ranlib does
-	   not work or does not exist.
 
-	   You may want to change the default pager used by calc.
+	    * calc-devel-*.i686.rpm
-	   As shipped the Makefile assumes 'more'.  On your system
+	        - calc *.h header and *.a lib files for use in other programs
-	   you may find 'less' to be a better pager.
 
-	   Set TOPDIR to be the place under which help files, calc,
+	    * calc.*.src.rpm
-	   include files and calc libs are to be installed.  As shipped
+	        - calc source in RPM package form
-	   the Makefile assumes a TOPDIR of /usr/local/lib.
 
-	   Set BINDIR to the place where calc is installed.  As shipped
+	The following 4 steps apply to calc source tree that comes from either:
-	   the Makefile assumes a BINDIR /usr/local/bin.
+
+		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.
+
+	The Makefile, as shipped, is suitable for installation under
+	Linux and Un*x-like environments.  For the most part, the default
+	values should work.  If in doubt, follow the 'When in doubt'
+	suggestion.
+
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! If you are building under Windoz or a Windoz-like environment !
+	! (such as Cygwin or DJGPP), read the README.WINDOWS file.      !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+	You should determine if these Makefile variables are reasonable:
+
+	    INCDIR		Where the system include (.h) files are kept.
+	    BINDIR		Where to install calc binary files.
+	    LIBDIR		Where to install calc link library (*.a) files.
+	    CALC_SHAREDIR	Where to install calc help, .cal, startup, and
+	    			config files.
+
+	You may want to change the default installation locations for
+	these values, which are based on the 4 values listed above:
+
+	    HELPDIR            where the help directory is installed
+	    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
+	    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
+	    to install calc somewhere other than into the system area.
+
+	    For example, if:
+
+	    	BINDIR= /usr/bin
+		LIBDIR= /usr/lib
+		CALC_SHAREDIR= /usr/share/calc
+
+	    and if:
+
+	    	T= /var/tmp/testing
+
+	    Then the installation locations will be:
+
+		calc binary files:	/var/tmp/testing/usr/bin
+		calc link library:	/var/tmp/testing/usr/lib
+		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.
+
+	Look for the section that starts:
+
+	    ################
+	    # compiler set #
+	    ################
+
+	    Select a compiler set by commenting in the appropriate set
+	    of cc options.  As shipped the Makefile assumes a gcc-like
+	    environment such as Linux.  If a more appropriate cc set if
+	    found below, comment out the Linux set and comment in that
+	    set or edit the gcc set or the common cc set as needed.
+
+	You may want to change these Makrfile variables from their defaults:
+
+	    RANLIB
+
+		You may or may not need RANLIB when building libraries.
+		As shipped the Makefile assumes RANLIB is needed.
+		Comment the in/out the RANLIB value if ranlib does
+		not work or does not exist.
+
+	    CALCPAGER
+
+		You may want to change the default pager used by calc.
+		As shipped the Makefile assumes 'more'.  On your system
+		you may find 'less' to be a better pager.
+
+	    DEBUG
+
+	       Some compilers (to put it mildly) have bugs.  Sometimes the
+	       DEBUG Makefile variable causes the compiler / optimizer to
+	       produce bad code.  Other compilers do just fine.
+
+	       If possible try to use DEBUG=-O3 -g3 (maximum optimization
+	       and debug symbols).  If the calc test fails (see step 3),
+	       try lowering either the -O value and/or the -g3.  Also try
+	       using -Osomething without -g.
 
 	   Adjust other Makefile variables as needed.
 
-    2) build calc:
+    2)	build calc:
 
 	make all
 
@@ -36,13 +132,14 @@ Installing calc in 4 easy steps:
 	    you may find.  See the BUGS file if you find any compiler
 	    warning or errors.
 
-    3) test calc:
+    3)	test calc:
 
 	make check
 
-	==> If you run into problems, follow the BUGS file instructions.
+	==> If you run into problems, read the BUGS file and follow
+	    the instructions found in there.
 
-    4) install calc:
+    4)	install calc:
 
 	make install
 
@@ -65,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.2 $
+## @(#) $Revision: 29.7 $
-## @(#) $Id: HOWTO.INSTALL,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Id: HOWTO.INSTALL,v 29.7 2003/04/15 03:38:34 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

LIBRARY

@@ -48,12 +48,30 @@ convenient for outside use.  So you should read the source for a routine
 to see if it really does what you think it does.  I won't guarantee that
 obscure internal routines won't change or disappear in future releases!
 
-When calc is installed, all of the include files needed to build
+When calc is installed, all of libraries are installed into ${LIBDIR}.
-libcalc.a along with the link library itself are installed into ${LIBDIR}.
+All of the calc header files are installed under ${INCDIRCALC}.
+
+If CALC_SRC is defined, then the calc header files will assume that
+they are in or under the current directory.  However, most external
+programs most likely will not be located under calc'c source tree.
+External programs most likely want to use the installed calc header
+files under ${INCDIRCALC}.  External programs most likely NOT want
+to define CALC_SRC.
 
 External programs may want to compile with:
 
-	-I${LIBDIR} -L${LIBDIR} -lcalc
+	-L${LIBDIR} -lcalc
+
+If custom functions are also used, they may want to compile with:
+
+	-L${LIBDIR} -lcalc -lcustcalc
+
+The CALC_SRC symbol should NOT be defined by default.  However if you are
+feeling pedantic you may want to force CALC_SRC to be undefined:
+
+	-UCALC_SRC
+
+as well.
 
 --------------
 ERROR HANDLING
@@ -471,8 +489,8 @@ need call libcalc_call_me_last() only once.
 ## 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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: LIBRARY,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Id: LIBRARY,v 29.5 2001/06/08 22:57:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/LIBRARY,v $
 ##
 ## Under source code control:	1993/07/30 19:44:49

README

@@ -73,13 +73,19 @@ for a wish/todo list.  Code contributions are welcome.
 
 =-=
 
-To join the calc-tester mailing list.  Send a request to:
+To join the calc-tester mailing list.  Send an EMail message to:
 
     calc-tester-request at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
 Your message body (not the subject) should consist of:
 
      subscribe calc-tester address
@@ -89,7 +95,11 @@ Your message body (not the subject) should consist of:
 where ``address'' is your EMail address and ``your_full_name'' is
 your full name.
 
-Calc bug reports, however should be sent to:
+Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+Send Calc bug and bug fixes to:
 
     calc-bugs at asthe dot com
 
@@ -98,6 +108,12 @@ Calc bug reports, however should be sent to:
 
 but see the BUGS file first.
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 The calc web site is located at:
 
 	http://www.isthe.com/chongo/tech/comp/calc/
@@ -118,8 +134,8 @@ The calc web site is located at:
 ## 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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: README,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Id: README,v 29.3 2001/06/01 11:26:53 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README,v $
 ##
 ## Under source code control:	1995/10/25 05:27:59

README.WINDOWS

@@ -0,0 +1,166 @@
+Dear calc user on a Windoz based system,
+
+See the HOWTO.INSTALL file for information on how to build and install calc.
+See also the README file.
+
+NOTE: The main developers do not have access to a Windoz based platform.
+      While we will make an effort to not break calc Windoz based system,
+      our lack of a Windoz test environment will mean we will make mistakes
+      from time to time.  Hopefully Windowz users can overcome these mistakes.
+      Of course you are welcome to send us any patches that fix your
+      Windoz build environment.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling under DJGPP =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+You might want to try using the DJGPP system to compile calc.  See:
+
+	http://www.delorie.com/djgpp/
+
+for DJGPP details and availability.
+
+To compile with DJGPP, one needs to select a number of Makefile
+variable changes.  Eli Zaretskii <eliz at is dot elta dot co dot il>
+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
+	DEV_BITS= 32
+	INODE_BITS= 32
+	HAVE_USTAT= -DHAVE_NO_USTAT
+	HAVE_GETSID= -DHAVE_NO_GETSID
+	HAVE_GETPGID= -DHAVE_NO_GETPGID
+	HAVE_GETTIME= -DHAVE_NO_GETTIME
+	HAVE_GETPRID= -DHAVE_NO_GETPRID
+	HAVE_URANDOM_H= NO
+	ALIGN32= -UMUST_ALIGN32
+	HAVE_MALLOC_H= YES
+	HAVE_STDLIB_H= YES
+	HAVE_STRING_H= YES
+	HAVE_TIMES_H= NO
+	HAVE_SYS_TIMES_H= YES
+	HAVE_TIME_H= YES
+	HAVE_SYS_TIME_H= YES
+	HAVE_UNISTD_H= YES
+	BINDIR= /dev/env/DJDIR/bin
+	INCDIR= /dev/env/DJDIR/include
+	LIBDIR= /dev/env/DJDIR/lib
+	MANDIR= /dev/env/DJDIR/man/man1
+	CATDIR= /dev/env/DJDIR/man/cat1
+	NROFF= groff
+	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
+	CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+	CALCPAGER= less.exe -ci
+	DEBUG= -O2 -gstabs+
+
+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.
+
+Look for Makefile comments of the form:
+
+	# Select ...something... for DJGPP.
+
+Follow those recommendations.  In cases where they conflict with
+the above Makefile list, follow the recommendation in the Makefile.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling with Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+An effort is being made to allow windows users to compile calc using the
+Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
+and Un*x tools for Windows.
+
+The major porting work was performed by Thomas Jones-Low
+(tjoneslo at softstart dot com).  He said:
+
+    I had previous stated to this group that I have successfully managed
+    to port a version of Calc to Windows, and promised some point to
+    post what was required, so here it is.
+
+    One obvious manner of doing this port is to get the latest version
+    of the Cygwin project (http://sources.redhat.com/cygwin/) with the
+    GCC compiler and Un*x tools for Windows and recompile.
+
+    I built my working version using Calc ... I am using Visual C++
+    version 7.0, which is an older version of the Microsoft development
+    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.
+
+He recommends that you generate by hand all of the header files generated
+by the make file:
+
+    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
+
+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.
+
+People who maintain calc need to keep in mind the following:
+
+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*);
+
+
+## Copyright (C) 2002  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
+## 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.8 $
+## @(#) $Id: README.WINDOWS,v 29.8 2002/03/14 00:28:28 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
+##
+## Under source code control:	2001/02/25 14:00:05
+## File existed as early as:	2001
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

addop.c

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: addop.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: addop.c,v 29.4 2004/02/23 07:25:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -44,7 +44,7 @@
 #define OPCODEALLOCSIZE 100	/* reallocate size for opcodes in functions */
 
 
-static long maxopcodes;		/* number of opcodes available */
+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 */
@@ -185,7 +185,7 @@ endfunc(void)
 {
 	register FUNC *fp;		/* function just finished */
 	unsigned long size;		/* size of just created function */
-	long index;
+	unsigned long index;
 
 	if (oldop != OP_RETURN) {
 		addop(OP_UNDEF);
@@ -208,7 +208,7 @@ endfunc(void)
 	memcpy((char *) fp, (char *) curfunc, size);
 	if (curfunc != functemplate)
 		free(curfunc);
-	if (conf->traceflags & TRACE_FNCODES) {
+	if (newname[0] != '*' && (conf->traceflags & TRACE_FNCODES)) {
 		dumpnames = TRUE;
 		for (size = 0; size < fp->f_opcodecount; ) {
 			printf("%ld: ", (long)size);
@@ -302,7 +302,7 @@ void
 freefunc(FUNC *fp)
 {
 	long index;
-	long i;
+	unsigned long i;
 
 	if (fp == NULL)
 		return;
@@ -318,7 +318,7 @@ freefunc(FUNC *fp)
 			/*NOTREACHED*/
 		}
 	}
-	if (conf->traceflags & TRACE_FNCODES) {
+	if (newname[0] != '*' && (conf->traceflags & TRACE_FNCODES)) {
 		printf("Freeing function \"%s\"\n",namestr(&funcnames,index));
 		dumpnames = FALSE;
 		for (i = 0; i < fp->f_opcodecount; ) {
@@ -383,7 +383,7 @@ clearopt(void)
 FUNC *
 findfunc(long index)
 {
-	if ((unsigned long) index >= funccount) {
+	if (index >= funccount) {
 		math_error("Undefined function");
 		/*NOTREACHED*/
 	}

alloc.h

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: alloc.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: alloc.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:29
@@ -32,10 +32,17 @@
 #define __ALLOC_H__
 
 
-#include "have_malloc.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "have_newstr.h"
+# include "have_malloc.h"
-#include "have_string.h"
+# include "have_newstr.h"
-#include "have_memmv.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>

blkcpy.c

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: blkcpy.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: blkcpy.c,v 29.4 2004/02/23 07:47:31 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
  *
  * Under source code control:	1997/04/18 20:41:26
@@ -287,13 +287,13 @@ copymat2mat(MATRIX *smat, long ssi, long num, MATRIX *dmat, long dsi)
 
 	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) {
@@ -335,13 +335,13 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 		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));
@@ -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;
@@ -436,11 +436,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) {
@@ -484,11 +484,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) {
@@ -533,11 +533,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) {
@@ -572,7 +572,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;
@@ -581,7 +581,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 	if (num == 0)
 		return 0;
 
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return E_COPYF1;
 	fp = fiop->fp;
@@ -609,7 +609,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;
@@ -618,7 +618,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 
 	if (id < 3)			/* excludes copying from stdin */
 		return E_COPYF1;
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return E_COPYF1;
 
@@ -639,7 +639,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 +677,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,9 +688,9 @@ 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, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return E_COPYF1;
 	fp = fiop->fp;
@@ -726,7 +726,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;
@@ -888,7 +888,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 
 	if (ssi > len)
 		return E_COPY2;
-	if (num < 0 || (unsigned long) ssi + num > len)
+	if (num < 0 || ssi + num > len)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
@@ -991,7 +991,7 @@ 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;
@@ -1044,7 +1044,7 @@ 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;

byteswap.h

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: byteswap.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: byteswap.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
  *
  * Under source code control:	1995/10/11 04:44:01
@@ -33,7 +33,11 @@
 #define __BYTESWAP_H__
 
 
-#include "longbits.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "longbits.h"
+#else
+# include <calc/longbits.h>
+#endif
 
 
 /*

cal/Makefile

@@ -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 $
+# @(#) $Revision: 29.15 $
-# @(#) $Id: Makefile,v 29.2 2000/06/07 14:02:25 chongo Exp $
+# @(#) $Id: Makefile,v 29.15 2003/01/05 08:10:56 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -36,15 +36,120 @@
 SHELL = /bin/sh
 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.
-#
+####
-# where to install things
-TOPDIR= /usr/local/lib
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
 
-LIBDIR= ${TOPDIR}/calc
+# Where the system include (.h) files are kept
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Makefile debug
 #
@@ -57,6 +162,7 @@ Q=@
 # standard tools
 #
 CHMOD= chmod
+CMP= cmp
 
 # The calc files to install
 #
@@ -69,8 +175,8 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \
 	test2700.cal test3100.cal test3300.cal test3400.cal prompt.cal \
 	test3500.cal seedrandom.cal test4000.cal test4100.cal test4600.cal \
 	beer.cal hello.cal test5100.cal test5200.cal randombitrun.cal \
-	randomrun.cal xx_print.cal natnumset.cal qtime.cal test8400.cal \
+	randomrun.cal repeat.cal xx_print.cal natnumset.cal qtime.cal \
-	test8500.cal
+	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal
 
 # These files are found (but not built) in the distribution
 #
@@ -102,8 +208,10 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
+	    fi; \
 	done
 
 distdir:
@@ -116,34 +224,54 @@ calcliblist:
 	    fi; \
 	done
 
+##
+#
+# rpm rules
+#
+##
+
+echo_inst_files:
+	${Q}for i in ${CALC_FILES} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CALC_SHAREDIR}/$$i; \
+	    fi; \
+	done
+
+##
+#
+# Utility rules
+#
+##
+
 clean:
 
 clobber:
 	rm -f .all
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${TOPDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${LIBDIR} ]; then \
+	${Q}for i in ${CALC_FILES} /dev/null; do \
-		echo mkdir ${LIBDIR}; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		mkdir ${LIBDIR}; \
+		continue; \
-	else \
+	    fi; \
-	    true; \
+	    if ${CMP} -s $$i $T${CALC_SHAREDIR}/$$i; then \
-	fi
+		true; \
-	${Q}for i in ${CALC_FILES}; do \
+	    else \
-		echo rm -f ${LIBDIR}/$$i; \
+		rm -f $T${CALC_SHAREDIR}/$$i.new; \
-		rm -f ${LIBDIR}/$$i; \
+		cp -f $$i $T${CALC_SHAREDIR}/$$i.new; \
-		echo cp $$i ${LIBDIR}; \
+		${CHMOD} 0444 $T${CALC_SHAREDIR}/$$i.new; \
-		cp $$i ${LIBDIR}; \
+		mv -f $T${CALC_SHAREDIR}/$$i.new $T${CALC_SHAREDIR}/$$i; \
-		echo ${CHMOD} 0444 ${LIBDIR}/$$i; \
+		echo "installed $T${CALC_SHAREDIR}/$$i"; \
-		${CHMOD} 0444 ${LIBDIR}/$$i; \
+	    fi; \
 	done
-	${Q}echo remove files that are obsolete
-	-rm -f nextprime.cal nextprim.cal
-	-rm -f test1000.cal test2000.cal ${LIBDIR}/test2000.cal
-	-rm -f ${LIBDIR}/nextprime.cal ${LIBDIR}/nextprim.cal
-	-rm -f ${LIBDIR}/test1000.cal ${LIBDIR}/cryrand.cal

cal/README

@@ -1,7 +1,7 @@
 Calc standard resource files
 ----------------------------
 
-To load a reosurce file, try:
+To load a resource file, try:
 
     read filename
 
@@ -59,12 +59,12 @@ files have already been read, the read -once will act as a noop.
 
 The "resource_debug" parameter is intended for controlling the possible
 display of special information relating to functions, objects, and
-other structures created by instructions in calc resoure files.
+other structures created by instructions in calc resource files.
 Zero value of config("resource_debug") means that no such information
 is displayed.  For other values, the non-zero bits which currently
 have meanings are as follows:
 
-    n	    Meaning of bit n of config("resource_debug")
+    n		Meaning of bit n of config("resource_debug")
 
     0	When a function is defined, redefined or undefined at
 	interactive level, a message saying what has been done
@@ -74,6 +74,12 @@ have meanings are as follows:
 	the reading of a file, a message saying what has been done
 	is displayed.
 
+    2	Show func will display more information about a functions
+	arguments as well as more argument sdummary information.
+
+    3	During execution, allow calc standard resource files
+	to output additional debugging information.
+
 The value for config("resource_debug") in both oldstd and newstd is 3,
 but if calc is invoked with the -d flag, its initial value is zero.
 Thus, if calc is started without the -d flag, until config("resource_debug")
@@ -97,6 +103,14 @@ either of the bottom 2 bits set:
 		print "funcB(size, mass, ...) defined";
 	}
 
+If your the resource file needs to output special debugging informatin,
+we recommend that you check for bit 3 of the config("resource_debug")
+before printing the debug statement:
+
+	if (config("resource_debug") & 8) {
+		print "DEBUG: This a sample debug statement";
+	}
+
 =-=
 
 The following is a brief description of some of the calc resource files
@@ -116,6 +130,10 @@ bernoulli.cal
 
     Calculate the nth Bernoulli number.
 
+    NOTE: There is now a bernoulli() builtin function.  This file is
+    	  left here for backward compatibility and now simply returns
+	  the buildin function.
+
 
 bigprime.cal
 
@@ -124,6 +142,24 @@ bigprime.cal
     A prime test, base a, on p*2^x+1 for even x>m.
 
 
+chi.cal
+
+    Z(x[, eps])
+    P(x[, eps])
+    chi_prob(chi_sq, v[, eps])
+
+    Computes the Probability, given the Null Hypothesis, that a given
+    Chi squared values >= chi_sq with v degrees of freedom.
+
+    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).
+
+    The Z(x) and P(x) are internal statistical funcions.
+
+    eps is an optional epsilon() like error term.
+
+
 chrem.cal
 
     chrem(r1,m1 [,r2,m2, ...])
@@ -159,6 +195,33 @@ hello.cal
 	http://www.latech.edu/~acm/helloworld/calc.html
 
 
+intfile.cal
+
+    file2be(filename)
+
+	Read filename and return an integer that is built from the
+	octets in that file in Big Endian order.  The first octets
+	of the file become the most significant bits of the integer.
+
+    file2le(filename)
+
+	Read filename and return an integer that is built from the
+	octets in that file in Little Endian order.  The first octets
+	of the file become the most significant bits of the integer.
+
+    be2file(v, filename)
+
+	Write the absolute value of v into filename in Big Endian order.
+	The v argument must be on integer.  The most significant bits
+	of the integer become the first octets of the file.
+
+    le2file(v, filename)
+
+	Write the absolute value of v into filename in Little Endian order.
+	The v argument must be on integer.  The least significant bits
+	of the integer become the last octets of the file.
+
+
 lucas.cal
 
     lucas(h, n)
@@ -274,7 +337,7 @@ pell.cal
     pell(D)
 
     Solve Pell's equation; Returns the solution X to: X^2 - D * Y^2 = 1.
-    Type the solution to pells equation for a particular D.
+    Type the solution to Pell's equation for a particular D.
 
 
 pi.cal
@@ -288,7 +351,7 @@ pi.cal
     The piforever() prints digits of pi, nicely formatted, for as long
     as your free memory space and system up time allows.
 
-    The piforever() funcion (written by Klaus Alexander Seistrup
+    The piforever() function (written by Klaus Alexander Seistrup
     <klaus@seistrup.dk>) was inspired by an algorithm conceived by
     Lambert Meertens.  See also the ABC Programmer's Handbook, by Geurts,
     Meertens & Pemberton, published by Prentice-Hall (UK) Ltd., 1990.
@@ -356,7 +419,7 @@ quat.cal
     quat_shift(a, b)
 
     Calculate using quaternions of the form: a + bi + cj + dk.	In these
-    functions, quaternians are manipulated in the form: s + v, where
+    functions, quaternions are manipulated in the form: s + v, where
     s is a scalar and v is a vector of size 3.
 
 
@@ -386,7 +449,7 @@ randombitrun.cal
     randombitrun([run_cnt])
 
     Using randombit(1) to generate a sequence of random bits, determine if
-    the number and kength of identical bits runs match what is expected.
+    the number and length of identical bits runs match what is expected.
     By default, run_cnt is to test the next 65536 random values.
 
     This tests the Blum-Blum-Shub generator.
@@ -417,6 +480,16 @@ randrun.cal
 
     This tests the a55 generator.
 
+repeat.cal
+
+    repeat(digit_set, repeat_count)
+
+    Return the value of the digit_set repeated repeat_count times.
+    Both digit_set and repeat_count must be integers > 0.
+
+    For example repeat(423,5) returns the value 423423423423423,
+    which is the digit_set 423 repeated 5 times.
+
 
 regress.cal
 
@@ -489,7 +562,7 @@ test1700.cal
 
     value
 
-    This resoure files is used by regress.cal to test the read and use keywords.
+    This resource files is used by regress.cal to test the read and use keywords.
 
 
 test2600.cal
@@ -514,7 +587,7 @@ test2600.cal
     checkresult(x, y, z, a)
     test2600(verbose, tnum)
 
-    This resoure files is used by regress.cal to test some of builtin functions
+    This resource files is used by regress.cal to test some of builtin functions
     in terms of accuracy and roundoff.
 
 
@@ -537,7 +610,7 @@ test2700.cal
     iscomsq(x)
     test2700(verbose, tnum)
 
-    This resoure files is used by regress.cal to test sqrt() for real and
+    This resource files is used by regress.cal to test sqrt() for real and
     complex values.
 
 
@@ -625,7 +698,7 @@ test4000.cal
     test4000(verbose, tnum) defined
 
     This resource file is used by regress.cal to test ptest, nextcand and
-    prevcand buildins.
+    prevcand builtins.
 
 test4100.cal
 
@@ -677,6 +750,35 @@ test5200.cal
     This resource file is used by regress.cal to test the fix of a
     global/static bug.
 
+test8400.cal
+
+    test8400() defined
+
+    This resource file is used by regress.cal to check for quit-based
+    memory leaks.
+
+test8500.cal
+
+    global err_8500
+    global L_8500
+    global ver_8500
+    global old_seed_8500
+    global cfg_8500
+    onetest_8500(a,b,rnd) defined
+    divmod_8500(N, M1, M2, testnum) defined
+
+    This resource file is used by regress.cal to the // and % operators.
+
+test8600.cal
+
+    global min_8600
+    global max_8600
+    global hash_8600
+    global hmean_8600
+
+    This resource file is used by regress.cal to test a change of
+    allowing up to 1024 args to be passed to a builtin function.
+
 unitfrac.cal
 
     unitfrac(x)
@@ -705,7 +807,7 @@ xx_print.cal
 
     Demo for the xx_print object routines.
 
-## Copyright (C) 1999  David I. Bell and Landon Curt Noll
+## Copyright (C) 2000  David I. Bell and Landon Curt Noll
 ##
 ## Primary author: Landon Curt Noll
 ##
@@ -723,8 +825,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.2 $
+## @(#) $Revision: 29.9 $
-## @(#) $Id: README,v 29.2 2000/06/07 14:02:25 chongo Exp $
+## @(#) $Id: README,v 29.9 2003/01/05 08:10:56 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32

cal/bernoulli.cal

@@ -1,7 +1,7 @@
 /*
  * bernoulli - clculate the Nth Bernoulli number B(n)
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 2000  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.2 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: bernoulli.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: bernoulli.cal,v 29.3 2000/12/17 12:26:04 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bernoulli.cal,v $
  *
  * Under source code control:	1991/09/30 11:18:41
@@ -29,12 +29,16 @@
 
 /*
  * Calculate the Nth Bernoulli number B(n).
- * This uses the following symbolic formula to calculate B(n):
+ *
+ * NOTE: This is now a bulitin function.
+ *
+ * The non-buildin code used the following symbolic formula to calculate B(n):
  *
  *	(b+1)^(n+1) - b^(n+1) = 0
  *
  * where b is a dummy value, and each power b^i gets replaced by B(i).
  * For example, for n = 3:
+ *
  *	(b+1)^4 - b^4 = 0
  *	b^4 + 4*b^3 + 6*b^2 + 4*b + 1 - b^4 = 0
  *	4*b^3 + 6*b^2 + 4*b + 1 = 0
@@ -48,11 +52,14 @@
  */
 
 
+/*
 static Bnmax;
 static mat Bn[1001];
+*/
 
 define B(n)
 {
+/*
 	local	nn, np1, i, sum, mulval, divval, combval;
 
 	if (!isint(n) || (n < 0))
@@ -85,4 +92,6 @@ define B(n)
 	}
 	Bnmax = n;
 	return Bn[n];
+*/
+	return bernoulli(n);
 }

cal/chi.cal

@@ -0,0 +1,251 @@
+/*
+ * chi - chi^2 probabilities with degrees of freedom for null hypothesis
+ *
+ * Copyright (C) 2001  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: chi.cal,v 29.2 2001/04/08 10:21:23 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chi.cal,v $
+ *
+ * Under source code control:	2001/03/27 14:10:11
+ * File existed as early as:	2001
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * Z(x)
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * Section 26.2.1, p931.
+ */
+define Z(x, eps_term)
+{
+    local eps;		/* error term */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+    	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /* compute Z(x) value */
+    return exp(-x*x/2, eps) / sqrt(2*pi(eps), eps);
+}
+
+
+/*
+ * P(x[, eps]) asymtotic P(x) expansion for x>0 to an given epsilon error term
+ *
+ * NOTE: If eps is omitted, the stored epsilon value is used.
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * 26.2.11, p932:
+ *
+ *	P(x) = 1/2 + Z(x) * sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)};
+ *
+ * We continue the fraction until it is less than epsilon error term.
+ *
+ * Also note 26.2.5:
+ *
+ *	P(x) + Q(x) = 1
+ */
+define P(x, eps_term)
+{
+    local eps;		/* error term */
+    local s;		/* sum */
+    local x2;		/* x^2 */
+    local x_term;	/* x^(2*r+1) */
+    local odd_prod;	/* 1*3*5* ... */
+    local odd_term;	/* next odd value to multiply into odd_prod */
+    local term;		/* the recent term added to the sum */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+    	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /* firewall */
+    if (x <= 0) {
+	if (x == 0) {
+	    return 0;	/* hack */
+	} else {
+	    quit "Q(x[,eps]) 1st argument must be >= 0";
+	}
+    }
+    if (eps <= 0) {
+	quit "Q(x[,eps]) 2nd argument must be > 0";
+    }
+
+    /*
+     * aproximate sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)}
+     */
+    x2 = x*x;
+    x_term = x;
+    s = x_term;	/* 1st term */
+    odd_term = 1;
+    odd_prod = 1;
+    do {
+
+	/* compute the term */
+	odd_term += 2;
+	odd_prod *= odd_term;
+	x_term *= x2;
+	term = x_term / odd_prod;
+	s += term;
+
+    } while (term >= eps);
+
+    /* apply term and factor */
+    return 0.5 + Z(x,eps)*s;
+}
+
+
+/*
+ * chi_prob(chi_sq, v[, eps]) -  Prob of >= chi^2 with v degrees of freedom
+ *
+ *    Computes the Probability, given the Null Hypothesis, that a given
+ *    Chi squared values >= chi_sq with v degrees of freedom.
+ *
+ *    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).
+ *
+ * NOTE: This function does not work well with odd degrees of freedom.
+ *	 Can somebody help / find a bug / provide a better method of
+ *	 this odd degrees of freedom case?
+ *
+ * NOTE: This function works well with even degrees of freedom.  However
+ *	 when the even degrees gets large (say, as you approach 100), you
+ *	 need to increase your error term.
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * Section 26.4.4, p941:
+ *
+ *   For odd v:
+ *
+ *	Q(chi_sq, v) = 2*Q(chi) + 2*Z(chi) * (
+ *		     sum(r=1, r<=(r-1)/2) {(chi_sq^r/chi) / (1*3*5*...(2*r-1)});
+ *
+ *	chi = sqrt(chi_sq)
+ *
+ *	NOTE: Q(x) = 1-P(x)
+ *
+ * Section 26.4.5, p941.
+ *
+ *   For even v:
+ *
+ *	Q(chi_sq, v) = sqrt(2*pi()) * Z(chi) * ( 1 +
+ *		       sum(r=1, r=((v-2)/2)) { chi_sq^r / (2*4*...*(2r)) } );
+ *
+ *	chi = sqrt(chi_sq)
+ *
+ * Observe that:
+ *
+ *	Z(x) = exp(-x*x/2) / sqrt(2*pi());	(Section 26.2.1, p931)
+ *
+ * and thus:
+ *
+ *	sqrt(2*pi()) * Z(chi) =
+ *	sqrt(2*pi()) * Z(sqrt(chi_sq)) =
+ *	sqrt(2*pi()) * exp(-sqrt(chi_sq)*sqrt(chi_sq)/2) / sqrt(2*pi()) =
+ *	exp(-sqrt(chi_sq)*sqrt(chi_sq)/2) =
+ *	exp(-sqrt(-chi_sq/2)
+ *
+ * So:
+ *
+ *	Q(chi_sq, v) = exp(-sqrt(-chi_sq/2) * ( 1 + sum(....){...} );
+ */
+define chi_prob(chi_sq, v, eps_term)
+{
+    local eps;		/* error term */
+    local r;		/* index in finite sum */
+    local r_lim;	/* limit value for r */
+    local s;		/* sum */
+    local d;		/* demoninator (2*4*6*... or 1*3*5...) */
+    local chi_term;	/* chi_sq^r */
+    local ret;		/* return value */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /*
+     * odd degrees of freedom
+     */
+    if (isodd(v)) {
+
+	local chi;		/* sqrt(chi_sq) */
+
+	/* setup for sum */
+	s = 1;
+	d = 1;
+	chi = sqrt(abs(chi_sq), eps);
+	chi_term = chi;
+	r_lim = (v-1)/2;
+
+	/* compute sum(r=1, r=((v-1)/2)) {(chi_sq^r/chi) / (1*3*5...*(2r-1))} */
+	for (r=2; r <= r_lim; ++r) {
+	    chi_term *= chi_sq;
+	    d *= (2*r)-1;
+	    s += chi_term/d;
+	}
+
+	/* apply term and factor, Q(x) = 1-P(x) */
+	ret = 2*(1-P(chi)) + 2*Z(chi)*s;
+
+    /*
+     * even degrees of freedom
+     */
+    } else {
+
+	/* setup for sum */
+	s =1;
+	d = 1;
+	chi_term = 1;
+	r_lim = (v-2)/2;
+
+	/* compute sum(r=1, r=((v-2)/2)) { chi_sq^r / (2*4*...*(2r)) } */
+	for (r=1; r <= r_lim; ++r) {
+	    chi_term *= chi_sq;
+	    d *= r*2;
+	    s += chi_term/d;
+	}
+
+	/* apply factor - see observation in the main comment above */
+	ret = exp(-chi_sq/2, eps) * s;
+    }
+
+    return ret;
+}

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: deg.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $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
@@ -42,7 +42,7 @@ define dms(deg, min, sec)
 	ans.deg = deg;
 	ans.min = min;
 	ans.sec = sec;
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 
@@ -66,7 +66,7 @@ define dms_add(a, b)
 		ans.sec += b.sec;
 	} else
 		ans.deg += b;
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 
@@ -75,9 +75,9 @@ define dms_neg(a)
 {
 	local obj dms	ans;
 
-	ans.deg = -ans.deg;
+	ans.deg = -a.deg;
-	ans.min = -ans.min;
+	ans.min = -a.min;
-	ans.sec = -ans.sec;
+	ans.sec = -a.sec;
 	return ans;
 }
 
@@ -103,7 +103,7 @@ define dms_mul(a, b)
 		ans.min = b.min * a;
 		ans.sec = b.sec * a;
 	}
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 

cal/intfile.cal

@@ -0,0 +1,222 @@
+/*
+ * intfile - integer to file and file to integer conversion
+ *
+ * Copyright (C) 2001  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: intfile.cal,v 29.5 2001/04/10 22:09:34 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/intfile.cal,v $
+ *
+ * Under source code control:   2001/03/31 08:13:11
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * NOTE: Because leading HALF values are trimmed from integer, a file
+ *	 that begins with lots of 0 bits (in the case of big endian)
+ *	 or that ends with lots of 0 bits (in the case of little endian)
+ *	 will be changed when the subsequent integer is written back.
+ */
+
+
+/*
+ * file2be - convert a file into an big endian integer
+ *
+ * given:
+ *	filename	filename to read
+ *
+ * returns:
+ *	integer read from its contents on big endian order
+ */
+define file2be(filename)
+{
+    local fd;	/* open file */
+    local ret;	/* integer to return */
+    local c;	/* character read from the file */
+    local i;
+
+    /*
+     * open the file for reading
+     */
+    fd = fopen(filename, "rb");
+    if (!isfile(fd)) quit "file2be: cannot open file for reading";
+
+    /*
+     * read the contents of the file
+     *
+     * The first octets become the most significant bits of the integer.
+     */
+    ret = 0;
+    while (! isnull(c = fgetc(fd))) {
+	ret <<= 8;
+	ret += ord(c);
+    }
+
+    /*
+     * cleanup and return the integer
+     */
+    fclose(fd);
+    return ret;
+}
+
+
+/*
+ * file2le - convert a file into an little endian integer
+ *
+ * given:
+ *	filename	filename to read
+ *
+ * returns:
+ *	integer read from its contents on little endian order
+ */
+define file2le(filename)
+{
+    local fd;	/* open file */
+    local ret;	/* integer to return */
+    local c;	/* character read from the file */
+    local shft;	/* bit shift for the c value */
+    local i;
+
+    /*
+     * open the file for reading
+     */
+    fd = fopen(filename, "rb");
+    if (!isfile(fd)) quit "file2le: cannot open file for reading";
+
+    /*
+     * read the contents of the file into a string
+     *
+     * The first octets become are the least significant bits of the integer.
+     */
+    ret = 0;
+    shft = 0;
+    while (! isnull(c = fgetc(fd))) {
+	ret |= (ord(c) << shft);
+	shft += 8;
+    }
+
+    /*
+     * cleanup and return the integer
+     */
+    fclose(fd);
+    return ret;
+}
+
+
+/*
+ * be2file - convert a big endian integer into a file
+ *
+ * given:
+ *	v		integer to write to the file
+ *	filename	filename to write
+ *
+ * returns:
+ *	The number of octets written to the file.
+ *
+ * NOTE: The absolute value of the integer is written to the file.
+ */
+define be2file(v, filename)
+{
+    local fd;		/* open file */
+    local octlen;	/* length of v in octets */
+    local i;
+
+    /*
+     * firewall
+     */
+    if (!isint(v)) {
+	quit "be2file: 1st arg not an integer";
+    }
+    v = abs(v);
+
+    /*
+     * open the file for writing
+     */
+    fd = fopen(filename, "wb");
+    if (!isfile(fd)) quit "be2file: cannot open file for writing";
+
+    /*
+     * write the octets to the file
+     *
+     * The most significant bits of the integer become the first file octets.
+     */
+    octlen = int((highbit(v)+8) / 8);
+    for (i=octlen-1; i >= 0; --i) {
+    	fputc(fd, char(v >> (i*8)));
+    }
+
+    /*
+     * cleanup
+     */
+    fclose(fd);
+    return octlen;
+}
+
+
+/*
+ * le2file - convert a little endian integer into a file
+ *
+ * given:
+ *	v		integer to write to the file
+ *	filename	filename to write
+ *
+ * returns:
+ *	The number of octets written to the file.
+ *
+ * NOTE: The absolute value of the integer is written to the file.
+ */
+define le2file(v, filename)
+{
+    local fd;	/* open file */
+    local cnt;	/* octets written */
+
+    /*
+     * firewall
+     */
+    if (!isint(v)) {
+	quit "be2file: 1st arg not an integer";
+    }
+    v = abs(v);
+
+    /*
+     * open the file for writing
+     */
+    fd = fopen(filename, "wb");
+    if (!isfile(fd)) quit "le2file: cannot open file for writing";
+
+    /*
+     * Write the octets to the file.
+     *
+     * The least significant bits of the integer become the first file octets.
+     */
+    cnt = 0;
+    while (v > 0) {
+	fputc(fd, char(v));
+	v >>= 8;
+	++cnt;
+    }
+
+    /*
+     * cleanup
+     */
+    fclose(fd);
+    return cnt;
+}

cal/lucas.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 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: lucas.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: lucas.cal,v 29.6 2002/07/10 09:43:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas.cal,v $
  *
  * Under source code control:	1990/05/03 16:49:51
@@ -28,6 +28,16 @@
  * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
  */
 
+/*
+ * NOTE: This is a standard calc resource file.  For information on calc see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/index.html
+ *
+ * To obtain your own copy of calc, see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
+ */
+
 /*
  * HISTORICAL NOTE:
  *
@@ -52,12 +62,19 @@
  *
  * At the time of discovery, this was the largest known twin prime pair.
  *
+ * See:
+ *
+ *	http://www.isthe.com/chongo/tech/math/prime/amdahl6.html
+ *
+ * for more information on the Amdahl 6 group.
+ *
  * NOTE: Both largest known and largest known twin prime records have been
  *	 broken.  Rather than update this file each time, I'll just
  *	 congratulate the finders and encourage others to try for
  *	 larger finds.	Records were made to be broken afterall!
- *
+ */
- * ON GAINING A WORLD RECORD:
+
+/* ON GAINING A WORLD RECORD:
  *
  * The routines in calc were designed to be portable, and to work on
  * numbers of 'sane' size.  The Amdahl 6 team used a 'ultra-high speed
@@ -73,7 +90,7 @@
  *
  *	test numbers of the form h*2^n-1
  *	fix a value of n and vary the value h
- *	n mod 128 == 0
+ *	n mod 2^x == 0  for some value of x, say > 7 or more
  *	h*2^n-1 is not divisible by any small prime < 2^40
  *	0 < h < 2^39
  *	h*2^n+1 is not divisible by any small prime < 2^40
@@ -1030,7 +1047,7 @@ gen_v1(h, n)
 define
 ldebug(funct, str)
 {
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "DEBUG:", funct:":", str;
 	}
 	return;

cal/lucas_chk.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: lucas_chk.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: lucas_chk.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_chk.cal,v $
  *
  * Under source code control:	1991/01/11 05:41:43
@@ -336,7 +336,7 @@ lucas_chk(high_n, quiet)
 
 		/* skip primes where h>=2^n */
 		if (highbit(h_p[i]) >= n_p[i]) {
-			if (config("resource_debug") & 3) {
+			if (config("resource_debug") & 8) {
 				print "h>=2^n skip:", h_p[i]:"*2^":n_p[i]:"-1";
 			}
 			continue;

cal/pi.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: pi.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: pi.cal,v 29.3 2004/02/23 06:06:38 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,8 @@ define piforever()
 		* Next approximation
 		*/
 		p = k * k;
-		q = k + k++;
+		q = k << 1;
+		++k;
 
 		a2 = a;
 		b2 = b;

cal/qtime.cal

@@ -1,24 +1,46 @@
 /*
  * qtime - Display time as English sentence
  *
+ * Copyright (C) 1999  Klaus Alexander Seistrup and Landon Curt Noll
+ *
+ * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
+ * With mods by: Landon Curt Noll <http://www.isthe.com/chongo/>
+ *
+ * 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: qtime.cal,v 29.4 2000/12/18 10:18:40 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/qtime.cal,v $
+ *
+ * Under source code control:	1999/10/13 04:10:33
+ * 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:
  *	qtime(utc_hr_offset)
  *
  *	utc_hr_offset	Offset from UTC in hours.
  *
- * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
- * With minor mods by: Landon Curt Noll <http://www.isthe.com/chongo/>
- *
  * See:
  *	http://www.magnetic-ink.dk/download/qtime.html
  *
  * for examples of qtime() written on other languages.
- *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: qtime.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/qtime.cal,v $
- *
- * This file is not covered under version 2.1 of the GNU LGPL.
  */
 
 

cal/regress.cal

@@ -1,7 +1,7 @@
 /*
  * regress - calc regression and correctness test suite
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2003  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.3 $
+ * @(#) $Revision: 29.18 $
- * @(#) $Id: regress.cal,v 29.3 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: regress.cal,v 29.18 2004/02/23 05:58:45 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 */
@@ -380,19 +381,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")';
+	print				'503: callcfg = config("all","oldstd")';
-	oldcfg = config("all", "newstd");
-	print				'503: oldcfg = config("all","newstd")';
 	vrfy(callcfg == startcfg,	'504: callcfg == startcfg');
-	newcfg = config("all");
+	oldcfg = config("all");
-	print				'505: newcfg = config("all")';
+	print				'505: oldcfg = config("all");';
-	vrfy(config("all") == newcfg,	'506: config("all") == newcfg');
+	vrfy(config("all") == oldcfg,	'506: config("all") == oldcfg');
-	vrfy(config("all", oldcfg) == newcfg,
+	vrfy(oldcfg==config("all","newstd"),
-					'507: config("all", oldcfg) == newcfg');
+					'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,
@@ -411,10 +412,10 @@ define test_config()
 					'516: config("pow2") == 40');
 	vrfy(config("redc2") == 50,
 					'517: config("redc2") == 50');
-	vrfy(config("tilde") == "true",
+	vrfy(config("tilde"),
-					'518: config("tilde") == "true"');
+					'518: config("tilde")');
-	vrfy(config("tab") == "true",
+	vrfy(config("tab"),
-					'519: config("tab") == "true"');
+					'519: config("tab")');
 	vrfy(config("quomod") == 0,
 					'520: config("quomod") == 0');
 	vrfy(config("quo") == 2,
@@ -429,58 +430,59 @@ define test_config()
 					'525: config("cfappr") == 0');
 	vrfy(config("cfsim") == 8,
 					'526: config("cfsim") == 8');
-	vrfy(config("outround") == 2,
+	vrfy(config("outround") == 24,
-					'527: config("outround") == 2');
+					'527: config("outround") == 24');
 	vrfy(config("round") == 24,
 					'528: config("round") == 24');
-	vrfy(config("leadzero") == "false",
+	vrfy(config("leadzero") == 1,
-					'529: config("leadzero") == "false"');
+					'529: config("leadzero") == 1');
-	vrfy(config("fullzero") == "false",
+	vrfy(config("fullzero") == 0,
-					'530: config("fullzero") == "false"');
+					'530: config("fullzero") == 0');
 	vrfy(config("maxscan") == 20,
 					'531: config("maxscan") == 20');
-	vrfy(config("prompt") == "> ",
+	vrfy(config("prompt") == "; ",
-					'532: config("prompt") == "> "');
+					'532: config("prompt") == "; "');
-	vrfy(config("more") == ">> ",
+	vrfy(config("more") == ";; ",
-					'533: config("more") == ">> "');
+					'533: config("more") == ";; "');
 
-	/* convert to "newstd" config by individual changes */
+	/* convert to "oldstd" config by individual changes */
-	vrfy(config("display", 10) == 20,
+	print				'534: test unused';
-					'534: config("display") == 20');
+	vrfy(config("outround", 2) == 24,
-	vrfy(config("epsilon",1e-10)==1e-20,
+					'535: config("outround", 2) == 24');
-					'535: config("epsilon",1e-10)==1e-20');
+	vrfy(config("leadzero","n") == 1,
-	vrfy(config("quo", 0) == 2,	'536: config("quo", 0) == 2');
+					'536: config("leadzero","n") == 1');
-	vrfy(config("outround", 24) == 2,
+	print				'537: test unused';
-					'537: config("outround", 24) == 2');
+	vrfy(config("prompt", "> ") == "; ",
-	vrfy(config("leadzero","y") == "false",
+					'538: config("prompt", "> ") == "; "');
-				'538: config("leadzero","y") == "false"');
+	vrfy(config("more", ">> ") == ";; ",
-	vrfy(config("fullzero", 1) == "false",
+					'539: config("more", ">> ") == ";; "');
-				'539: config("fullzero", 1) == "false"');
+	vrfy(config("all") == oldcfg,	'540: config("all") == oldcfg');
-	vrfy(config("prompt", "; ") == "> ",
-					'540: config("prompt", "; ") == "> "');
-	vrfy(config("more", ";; ") == ">> ",
-					'541: config("more", ";; ") == ">> "');
-	vrfy(config("all") == newcfg,	'542: config("all") == newcfg');
 
-	/* check on the new config("fullzero") effect */
+	/* restore the configation at the start of this function */
-	vrfy(config("all","oldstd") == newcfg,
+	vrfy(config("all",callcfg) == oldcfg,
-					'543: config("all",callcfg) == newcfg');
+					'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("fullzero",1) == "false",
+	vrfy(config("leadzero",0) == 1,
-					'545: config("fullzero",1) == "false"');
+					'543: config("leadzero",0) == 1');
+	vrfy(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');
+					'546: config("display",20) == 2');
-	vrfy(config("fullzero",0) == "true",
+	vrfy(config("leadzero",1) == 0,
-					'548: config("fullzero",0) == "true"');
+					'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,
+	vrfy(config("all",callcfg) == startcfg,
-					'550: config("all",callcfg) == oldcfg');
+		'550: config("all",callcfg) == startcfg');
 	vrfy(config("all") == callcfg,	'551: config("all") == callcfg');
 	vrfy(config("all") == startcfg, '552: config("all") == startcfg');
 
@@ -492,7 +494,11 @@ define test_config()
 	vrfy(strlen(config("version")) > 0,
 					'555: strlen(config("version")) > 0');
 
-	print '556: Ending test_config';
+	/* mode2 is off by default */
+	vrfy(config("mode2") == "off",
+					'556: config("mode2") == "off"');
+
+	print '557: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -996,8 +1002,13 @@ 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');
-	vrfy(system("") == 0,		'949: system("") == 0');
+	if (config("windows") || config("cygwin")) {
-	vrfy(system("true") == 0,	'950: system("true") == 0');
+	    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');
+	}
 	print		'951: test disabled due to stdin dependency';
 	print				'952: test removed';
 	print				'953: test removed';
@@ -1223,7 +1234,85 @@ define test_functions()
 	vrfy(hnrmod(21<<500+7,3,500,-1) == (21<<500+7)%(3<<500-1),
 		'1112: hnrmod(21<<500+7,3,500,-1) == (21<<500+7)%(3<<500-1)');
 
-	print '1113: Ending test_functions';
+	/*
+	 * catalan testing
+	 */
+	vrfy(catalan(2) == 2,		'1113: catalan(2) == 2');
+	vrfy(catalan(3) == 5,		'1114: catalan(3) == 5');
+	vrfy(catalan(4) == 14,		'1115: catalan(4) == 14');
+	vrfy(catalan(20) == 6564120420,	'1116: catalan(20) == 6564120420');
+
+	/*
+	 * bernoulli builtin function testing
+	 */
+	vrfy(bernoulli(0) == 1,		'1117: bernoulli(0) == 1');
+	vrfy(bernoulli(1) == -1/2,	'1118: bernoulli(1) == -1/2');
+	vrfy(bernoulli(2) == 1/6,	'1119: bernoulli(2) == 1/6');
+	vrfy(bernoulli(3) == 0,		'1120: bernoulli(3) == 0');
+	vrfy(bernoulli(4) == -1/30,	'1121: bernoulli(4) == -1/30');
+	vrfy(bernoulli(5) == 0,		'1122: bernoulli(5) == 0');
+	vrfy(bernoulli(6) == 1/42,	'1123: bernoulli(6) == 1/42');
+	vrfy(bernoulli(32) == -7709321041217/510,
+		    '1124: bernoulli(32) == -7709321041217/510');
+
+	/*
+	 * euler function testing
+	 */
+	vrfy(euler(0) == 1,		'1125: euler(0) == 1');
+	vrfy(euler(1) == 0,		'1126: euler(1) == 0');
+	vrfy(euler(2) == -1,		'1127: euler(2) == -1');
+	vrfy(euler(3) == 0,		'1128: euler(3) == 0');
+	vrfy(freeeuler() == null(),	'1129: freeeuler() == null()');
+	vrfy(euler(4) == 5,		'1130: euler(4) == 5');
+	vrfy(euler(5) == 0,		'1131: euler(5) == 0');
+	vrfy(euler(6) == -61,		'1132: euler(6) == -61');
+	vrfy(euler(32) == 177519391579539289436664789665,
+		    '1130: euler(32) == 177519391579539289436664789665');
+	vrfy(freeeuler() == null(),	'1133: freeeuler() == null()');
+
+	/*
+	 * digit with non-10 base
+	 */
+        a = 123456.789;
+	print				'1134: a = 123456.789';
+	vrfy(digit(a, 6, 100) == 0,	'1135: digit(a, 6, 100) == 0');
+	vrfy(digit(a, 5, 100) == 0,	'1136: digit(a, 5, 100) == 0');
+	vrfy(digit(a, 4, 100) == 0,	'1137: digit(a, 4, 100) == 0');
+	vrfy(digit(a, 3, 100) == 0,	'1138: digit(a, 3, 100) == 0');
+	vrfy(digit(a, 2, 100) == 12,	'1139: digit(a, 2, 100) == 12');
+	vrfy(digit(a, 1, 100) == 34,	'1140: digit(a, 1, 100) == 34');
+	vrfy(digit(a, 0, 100) == 56,	'1141: digit(a, 0, 100) == 56');
+	vrfy(digit(a, -1, 100) == 78,	'1142: digit(a, -1, 100) == 78');
+	vrfy(digit(a, -2, 100) == 90,	'1143: digit(a, -2, 100) == 90');
+	vrfy(digit(a, -3, 100) == 0,	'1144: digit(a, -3, 100) == 0');
+	vrfy(digit(a, -4, 100) == 0,	'1145: digit(a, -4, 100) == 0');
+	vrfy(digit(a, -5, 100) == 0,	'1146: digit(a, -5, 100) == 0');
+	vrfy(digit(a, -6, 100) == 0,	'1146: digit(a, -6, 100) == 0');
+
+	/*
+	 * digits with a non-10 base
+	 */
+	vrfy(digits(a, 100) == 3,	'1147: digits(a, 100) == 3');
+	vrfy(digits(2^256-1, 256) == 32,'1148: digits(2^256-1, 256) == 32');
+
+	/*
+	 * places with a non-10 base
+	 */
+	vrfy(places(0.0123, 2) == -1,	'1149: places(0.0123, 2) == -1');
+	vrfy(places(0.625, 2) == 3,	'1150: places(0.625, 2) == 3');
+	vrfy(places(0.625, 8) == 1,	'1151: places(0.625, 8) == 1');
+	vrfy(places(171/2^712, 2) == 712,
+				'1152: places(171/2^7120.625, 2) == 712');
+	vrfy(places(171/2^712, 64) == 119,
+				'1152: places(171/2^7120.625, 64) == 119');
+
+	/*
+	 * verify sleep
+	 */
+	vrfy(sleep(1/5) == null(),	'1153: sleep(1/5) == null()');
+	vrfy(sleep(1) == null(),	'1154: sleep(1) == null()');
+
+	print '1155: Ending test_functions';
 }
 print '017: parsed test_functions()';
 
@@ -1484,31 +1573,31 @@ define test_rand()
 	/* test the additive 55 shuffle generator */
 	tmp = srand(0);
 	print				  '1505: tmp = srand(0)';
-	vrfy(rand() == 0xc79ef743e2e6849c, \
+	vrfy(rand() == 0x1fe5b46fba7e069d, \
-		  '1506: rand() == 0xc79ef743e2e6849c');
+		  '1506: rand() == 0x1fe5b46fba7e069d');
-	vrfy(rand() == 0x8d2dcb2bed321284, \
+	vrfy(rand() == 0x308d32d9bdf2dc6f, \
-		  '1507: rand() == 0x8d2dcb2bed321284');
+		  '1507: rand() == 0x308d32d9bdf2dc6f');
 	tmp = srand(init);
 	print				  '1508: tmp = srand(init)';
-	vrfy(rand() == 0xc79ef743e2e6849c, \
+	vrfy(rand() == 0x1fe5b46fba7e069d, \
-		  '1509: rand() == 0xc79ef743e2e6849c');
+		  '1509: rand() == 0x1fe5b46fba7e069d');
-	vrfy(rand() == 0x8d2dcb2bed321284, \
+	vrfy(rand() == 0x308d32d9bdf2dc6f, \
-		  '1510: rand() == 0x8d2dcb2bed321284');
+		  '1510: rand() == 0x308d32d9bdf2dc6f');
 
 	/* test range interface */
 	tmp = srand(0);
 	print				  '1511: tmp = srand(0)';
-	vrfy(rand(12345678901234567890) == 0x8d2dcb2bed321284, \
+	vrfy(rand(12345678901234567890) == 0x1fe5b46fba7e069d, \
-		  '1512: rand(12345678901234567890) == 0x8d2dcb2bed321284');
+		  '1512: rand(12345678901234567890) == 0x1fe5b46fba7e069d');
-	vrfy(rand(216091) == 0x13d2b,	  '1513: rand(216091) == 0x13d2b');
+	vrfy(rand(216091) == 0xc234,	  '1513: rand(216091) == 0xc234');
-	vrfy(rand(100) == 0x26,	  '1514: rand(100) == 0x26');
+	vrfy(rand(100) == 0x59,	  '1514: rand(100) == 0x59');
-	vrfy(rand(-46,46) == -0xf,	  '1515: rand(-46,46) == -0xf');
+	vrfy(rand(-46,46) == 0x2d,	  '1515: rand(-46,46) == 0x2d');
 	tmp = srand(0);
 	print				  '1516: tmp = srand(0)';
-	vrfy(rand(2^64) == 0xc79ef743e2e6849c, \
+	vrfy(rand(2^64) == 0x1fe5b46fba7e069d, \
-		  '1517: rand(2^64) == 0xc79ef743e2e6849c');
+		  '1517: rand(2^64) == 0x1fe5b46fba7e069d');
-	vrfy(rand(0,2^64) == 0x8d2dcb2bed321284, \
+	vrfy(rand(0,2^64) == 0x308d32d9bdf2dc6f, \
-		  '1518: rand(0,2^64) == 0x8d2dcb2bed321284');
+		  '1518: rand(0,2^64) == 0x308d32d9bdf2dc6f');
 
 	/* test different forms of seeding the initial state */
 	tmp = srand(0);
@@ -1516,7 +1605,7 @@ define test_rand()
 	vrfy(srand() == init,		  '1520: srand() == init');
 	tmp = srand(0x87e6ec938ff55aa5<<64);
 	print	  '1521: tmp = srand(0x87e6ec938ff55aa5<<64)';
-	vrfy(srand() == init,		  '1522: srand() == init');
+	print	  '1522: test disabled';
 	tmp = srand(state0);
 	print				  '1523: tmp = srand(state0)';
 	vrfy(srand() == init,		  '1524: srand() == init');
@@ -1528,35 +1617,35 @@ define test_rand()
 	/* test the bit length interface */
 	tmp = srand(0);
 	print				  '1528: tmp = srand(0)';
-	vrfy(randbit(64) == 0xc79ef743e2e6849c, \
+	vrfy(randbit(64) == 0x1fe5b46fba7e069d, \
-		  '1529: randbit(64) == 0xc79ef743e2e6849c');
+		  '1529: randbit(64) == 0x1fe5b46fba7e069d');
-	vrfy(randbit(128) == 0x8d2dcb2bed3212844f4ad31f3818af34, \
+	vrfy(randbit(128) == 0x308d32d9bdf2dc6f45d3e3b3361b79e4, \
-		  '1530: randbit(128) == 0x8d2dcb2bed3212844f4ad31f3818af34');
+		  '1530: randbit(128) == 0x308d32d9bdf2dc6f45d3e3b3361b79e4');
-	vrfy(randbit(64) == 0x23a252f60bae4907, \
+	vrfy(randbit(64) == 0xd4ef1e3336022d81, \
-		  '1531: randbit(64) == 0x23a252f60bae4907');
+		  '1531: randbit(64) == 0xd4ef1e3336022d81');
-	vrfy(randbit(128) == 0xa8ed5b6203e2b1da32848cd9b3f1e3fa, \
+	vrfy(randbit(128) == 0x66b086e6c34e42124a1fc5d4e5c6f598, \
-		  '1532: randbit(128) == 0xa8ed5b6203e2b1da32848cd9b3f1e3fa');
+		  '1532: randbit(128) == 0x66b086e6c34e42124a1fc5d4e5c6f598');
 	tmp = srand(0);
 	print				  '1533: tmp = srand(0)';
-	vrfy(randbit(32) == 0xc79ef743,	  '1534: randbit(32) == 0xc79ef743');
+	vrfy(randbit(32) == 0x1fe5b46f,	  '1534: randbit(32) == 0x1fe5b46f');
-	vrfy(randbit(32) == 0xe2e6849c,	  '1535: randbit(32) == 0xe2e6849c');
+	vrfy(randbit(32) == 0xba7e069d,	  '1535: randbit(32) == 0xba7e069d');
-	vrfy(randbit(1) == 0x1,		  '1536: randbit(1) == 0x1');
+	vrfy(randbit(1) == 0x0,		  '1536: randbit(1) == 0x0');
-	vrfy(randbit(5) == 0x3,		  '1537: randbit(5) == 0x3');
+	vrfy(randbit(5) == 0xc,		  '1537: randbit(5) == 0xc');
-	vrfy(randbit(33) == 0x96e595f6,	  '1538: randbit(33) == 0x96e595f6');
+	vrfy(randbit(33) == 0x46996cde,	  '1538: randbit(33) == 0x46996cde');
-	vrfy(randbit(25) == 0x1321284,	  '1539: randbit(25) == 0x1321284');
+	vrfy(randbit(25) == 0x1f2dc6f,	  '1539: randbit(25) == 0x1f2dc6f');
 	vrfy(randbit(2) == 0x1,		  '1540: randbit(2) == 0x1');
-	vrfy(randbit(13) == 0x7a5,	  '1541: randbit(13) == 0x7a5');
+	vrfy(randbit(13) == 0x2e9,	  '1541: randbit(13) == 0x2e9');
-	vrfy(randbit(18) == 0x1a63e,	  '1542: randbit(18) == 0x1a63e');
+	vrfy(randbit(18) == 0x3c766,	  '1542: randbit(18) == 0x3c766');
-	vrfy(randbit(8) == 0x70,	  '1543: randbit(8) == 0x70');
+	vrfy(randbit(8) == 0x6c,	  '1543: randbit(8) == 0x6c');
-	vrfy(randbit(9) == 0x62,	  '1544: randbit(9) == 0x62');
+	vrfy(randbit(9) == 0x6d,	  '1544: randbit(9) == 0x6d');
-	vrfy(randbit(70) == 0x2f3423a252f60bae49, \
+	vrfy(randbit(70) == 0x39e4d4ef1e3336022d, \
-		  '1545: randbit(70) == 0x2f3423a252f60bae49');
+		  '1545: randbit(70) == 0x39e4d4ef1e3336022d');
 	print				  '1546: test unused';
-	vrfy(randbit(8) == 0x7,		  '1547: randbit(8) == 0x7');
+	vrfy(randbit(8) == 0x81,		  '1547: randbit(8) == 0x81');
-	vrfy(randbit(65) == 0x151dab6c407c563b4, \
+	vrfy(randbit(65) == 0xcd610dcd869c8424, \
-		  '1548: randbit(65) == 0x151dab6c407c563b4');
+		  '1548: randbit(65) == 0xcd610dcd869c8424');
-	vrfy(randbit(63) == 0x32848cd9b3f1e3fa, \
+	vrfy(randbit(63) == 0x4a1fc5d4e5c6f598, \
-		  '1549: randbit(63) == 0x32848cd9b3f1e3fa');
+		  '1549: randbit(63) == 0x4a1fc5d4e5c6f598');
 
 	/* check to be sure that the srand(1) bug was fixed */
 	tmp = srand(1);
@@ -1565,36 +1654,36 @@ define test_rand()
 	print				  '1551: n = 1';
 	vrfy(num(n),			  '1552: num(n)');
 	vrfy(den(n),			  '1553: den(n)');
-	vrfy(randbit(64) == 0x4280429f8069cb27, \
+	vrfy(randbit(64) == 0xbf989a4c504a541d, \
-		  '1554: randbit(64) == 0x4280429f8069cb27');
+		  '1554: randbit(64) == 0xbf989a4c504a541d');
-
 	/* test randbit skip interface */
 	tmp = srand(0);
 	print				  '1555: tmp = srand(0)';
-	vrfy(randbit(20) == 817647,	  '1556: randbit(20) == 817647');
+	vrfy(randbit(20) == 0x1fe5b,	  '1556: randbit(20) == 0x1fe5b');
-	vrfy(randbit(20) == 476130,	  '1557: randbit(20) == 476130');
+	vrfy(randbit(20) == 0x46fba,	  '1557: randbit(20) == 0x46fba');
-	vrfy(randbit(20) == 944201,	  '1558: randbit(20) == 944201');
+	vrfy(randbit(20) == 0x7e069,	  '1558: randbit(20) == 0x7e069');
-	vrfy(randbit(20) == 822573,	  '1559: randbit(20) == 822573');
+	vrfy(randbit(20) == 0xd308d,	  '1559: randbit(20) == 0xd308d');
 	tmp = srand(0);
 	print				  '1560: tmp = srand(0)';
 	vrfy(randbit(-20) == 20,	  '1561: randbit(-20) == 20');
-	vrfy(randbit(20) == 476130,	  '1562: randbit(20) == 476130');
+	vrfy(randbit(20) == 290746,	  '1562: randbit(20) == 290746');
 	vrfy(randbit(-20) == 20,	  '1563: randbit(-20) == 20');
-	vrfy(randbit(20) == 822573,	  '1564: randbit(20) == 822573');
+	vrfy(randbit(20) == 864397,	  '1564: randbit(20) == 864397');
 
 	/* test randbit without and arg */
 	tmp = srand(0);
 	print				  '1565: tmp = srand(0)';
-	vrfy(randbit() == 1,		  '1566: randbit() == 1');
+	vrfy(randbit() == 0,		  '1566: randbit() == 0');
-	vrfy(randbit() == 1,		  '1567: randbit() == 1');
+	vrfy(randbit() == 0,		  '1567: randbit() == 0');
 	vrfy(randbit() == 0,		  '1568: randbit() == 0');
+	vrfy(randbit() == 1,		  '1569: randbit() == 1');
 
 	/* test seed() as best as we can */
-	vrfy(seed() >= 0,		  '1569: seed() >= 0');
+	vrfy(seed() >= 0,		  '1570: seed() >= 0');
-	vrfy(seed() < 2^64,		  '1570: seed() < 2^64');
+	vrfy(seed() < 2^64,		  '1571: seed() < 2^64');
-	vrfy(isrand(srand(seed())),	  '1571: isrand(srand(seed()))');
+	vrfy(isrand(srand(seed())),	  '1572: isrand(srand(seed()))');
 
-	print '1572: Ending rand test';
+	print '1573: Ending rand test';
 }
 print '025: parsed test_rand()';
 
@@ -1710,7 +1799,23 @@ define test_mode()
 	vrfy(str(3e9) == "3000000000", \
 		'1650: str(3e9) == \"3000000000\"');
 
-	print '1651: Ending mode/base test';
+	/* test base2() functionality */
+	vrfy(base2() == 0,		'1651: base2() == 0');
+	vrfy(base2(0) == 0,		'1652: base2(0) == 0');
+	vrfy(base2() == 0,		'1653: base2() == 0');
+	vrfy(base2(16) == 0,		'1654: base2(16) == 0');
+	vrfy(base2() == 16,		'1655: base2() == 16');
+	vrfy(str(3e9) == "3000000000 /* 0xb2d05e00 */",
+		'1656: str(3e9) == "3000000000 /* 0xb2d05e00 */"');
+	vrfy(base2(1/3) == 16,		'1657: base2(16) == 16');
+	vrfy(str(23209) == "23209 /* 23209 */",
+		'1658: str(23209) == "23209 /* 23209 */"');
+	vrfy(str(3/2) == "1.5 /* 3/2 */",
+		'1659: str(3/2) == "1.5 /* 3/2 */"');
+	vrfy(base() == 10,		'1660: base() == 10');
+	vrfy(base2(0) == 1/3,		'1661: base2(0) == 1/3');
+
+	print '1662: Ending mode/base test';
 }
 print '026: parsed test_mode()';
 
@@ -2105,6 +2210,7 @@ print '033: read -once test2300';
 define test_xx_incdec()
 {
 	local A, B;
+	local n;
 
 	print '2300: Beginning object increment/decrement test';
 
@@ -2137,6 +2243,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()';
@@ -2987,7 +3107,7 @@ define test_error()
 	vrfy(root(3,2,0) == error(10029),
 				    '3644: root(3,2,0) == error(10029)');
 	vrfy(norm("x") == error(10030), '3645: norm("x") == error(10030)');
-	vrfy(null() << 2 == error(10031),'3646: null() << 2 == error(10031)');
+	vrfy(list() << 2 == error(10031),'3646: list() << 2 == error(10031)');
 	vrfy(1.5 << 2 == error(10031),	'3647: 1.5 << 2 == error(10031)');
 	vrfy(3 << "x" == error(10032),	'3648: 3 << "x" == error(10032)');
 	vrfy(3 << 1.5 == error(10032),	'3649: 3 << 1.5 == error(10032)');
@@ -4464,7 +4584,14 @@ define test_random()
 	vrfy(seed() < 2^64,		  '5465: seed() < 2^64');
 	vrfy(israndom(srandom(seed())),	  '5466: israndom(srandom(seed()))');
 
-	print '5467: Ending test_random';
+	/* verify random(10,11) double bug fix */
+	vrfy(random(10,11) == 10,	  '5467: random(10,11) == 10');
+	vrfy(random(10,11) == 10,	  '5468: random(10,11) == 10');
+	vrfy(random(10,11) == 10,	  '5469: random(10,11) == 10');
+	vrfy(random(0,1) == 0,		  '5470: random(0,1) == 0');
+	vrfy(random(0,1) == 0,		  '5471: random(0,1) == 0');
+
+	print '5472: Ending test_random';
 }
 print '137: parsed test_random()';
 
@@ -5034,10 +5161,17 @@ define test_is()
 	 */
 	a = assoc();
 	print				  '5901: a = assoc()';
-	ofd = fopen("/dev/null", "r");
+	if (config("windows")) {
-	print				  '5902: ofd = fopen("/dev/null", "r")';
+	    ofd = fopen("NUL:", "rb");
-	cfd = fopen("/dev/null", "r");
+	    print			  '5902: ofd = fopen("NUL:", "rb")';
-	print				  '5903: cfd = fopen("/dev/null", "r")';
+	    cfd = fopen("NUL:", "rb");
+	    print			  '5903: cfd = fopen("NUL:", "rb")';
+	} else {
+	    ofd = fopen("/dev/null","rb");
+	    print			  '5902: ofd = fopen("/dev/null","rb")';
+	    cfd = fopen("/dev/null","rb");
+	    print			  '5903: cfd = fopen("/dev/null","rb")';
+	}
 	fclose(cfd);
 	print				  '5904: fclose(cfd)';
 	blk = blk();
@@ -6215,8 +6349,8 @@ define test_blkcpy()
 
 	/* blkcpy the last 5 octets of B1 to a new block C */
 
-	blkcpy(C = blk(), B1, 5, ,100);
+	blkcpy(C = blk(), B1,5,,100);
-	print				  '6821: blkcpy(C = blk(), B1, 5, ,100);';
+	print				  '6821: blkcpy(C = blk(), B1,5,,100);';
 	vrfy(C == A,			  '6822: C == A');
 
 	/* blkcpy to and from a file */
@@ -6232,8 +6366,8 @@ define test_blkcpy()
 	blkcpy(fs, A, ,100);
 	print				  '6828: blkcpy(fs, A, ,100);';
 	vrfy(size(fs) == 105,		  '6829: size(f) == 105');
-	blkcpy(C = blk(), fs, 2, ,100);
+	blkcpy(C = blk(), fs,2,,100);
-	print				  '6830: blkcpy(C = blk(), fs, 2, ,100)';
+	print				  '6830: blkcpy(C = blk(), fs,2,,100)';
 	vrfy(C == (blk() = {1,2}),	  '6831: C == (blk() = {1,2}');
 
 	/* blkcpy string to a block */
@@ -7515,7 +7649,9 @@ vrfy(j8300(10) == 11,		'8307: j8300(10) == 11');
 {static k8300 = 5} define l8300(x) = k8300 + x;
 print	'8308: {static k8300 = 5} define l8300(x) = k8300 + x;';
 vrfy(l8300(10) == 15,		'8309: l8300(10) == 15');
-print	'8310: Ending define tests';
+static a8300 = 1, b8300;
+vrfy(a8300 == 1,		'8310: a8300 == 1');
+print	'8311: Ending define tests';
 
 
 /*
@@ -7538,6 +7674,15 @@ read -once "test8500";
 /* 85xx: Ending test_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'
+read -once "test8600";
+/* 86xx: Ending test_1024args is printed by test8600.cal */
+
+
 /*
  * read various calc resource files
  *

cal/repeat.cal

@@ -0,0 +1,53 @@
+/*
+ * repeat - return the value of a repeated set of digits
+ *
+ * Copyright (C) 2003  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: 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
+ * File existed as early as:	2003
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * repeat - return the value of a repeated set of digits
+ *
+ * usage:
+ *	repeat(digit_set, repeat_count)
+ */
+define repeat(digit_set, repeat_count)
+{
+    local digit_count;	/* digits in the digit_set */
+
+    /* firewall */
+    if (!isint(digit_set) || digit_set <= 0) {
+	quit "digit set must be an integer > 0";
+    }
+    if (!isint(repeat_count) || repeat_count <= 0) {
+	quit "repeat count must be an integer > 0";
+    }
+
+    /* return repeated set of digits */
+    digit_count = digits(digit_set);
+    return digit_set * (10^(digit_count*repeat_count)-1) / (10^digit_count-1);
+}

cal/seedrandom.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: seedrandom.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: seedrandom.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/seedrandom.cal,v $
  *
  * Under source code control:	1996/01/01 08:21:00
@@ -115,7 +115,7 @@ define seedrandom(seed1, seed2, size, trials)
 			p = 2*fp+1;
 		} while (ptest(p,1,0) == 0);
 	} while(ptest(p, trials) == 0 || ptest(fp, trials) == 0);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* 1st Blum prime */ p=", p;
 	}
 
@@ -129,7 +129,7 @@ define seedrandom(seed1, seed2, size, trials)
 			q = 2*fq+1;
 		} while (ptest(q,1,0) == 0);
 	} while(ptest(q, trials) == 0 || ptest(fq, trials) == 0);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* 2nd Blum prime */ q=", q;
 	}
 
@@ -139,7 +139,7 @@ define seedrandom(seed1, seed2, size, trials)
 	n = p*q;				/* the Blum modulus */
 	binsize = highbit(n)+1;			/* smallest power of 2 > p*q */
 	r = pmod(rand(1<<ceil(binsize*4/5), 1<<(binsize-2)), 2, n);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* seed quadratic residue */ r=", r;
 		print "/* newn", binsize, "bit quadratic residue*/ newn=", n;
 	}

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: test4600.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: test4600.cal,v 29.4 2001/04/10 22:09:02 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4600.cal,v $
  *
  * Under source code control:	1996/07/02 20:04:40
@@ -53,10 +53,10 @@ define stest(str, verbose)
 	/*
 	 * do file operations
 	 */
-	f = fopen("junk4600", "w");
+	f = fopen("junk4600", "wb");
 	if (iserror(f)) {
 		print 'failed';
-		print '**** fopen("junk4600", "w") failed';
+		print '**** fopen("junk4600", "wb") failed';
 		return 1;
 	}
 	if (iserror(fputs(f,
@@ -67,9 +67,9 @@ define stest(str, verbose)
 		print '**** fputs(f, "Fourscore ... failed';
 		return 1;
 	}
-	if (iserror(freopen(f, "r"))) {
+	if (iserror(freopen(f, "rb"))) {
 		print 'failed';
-		print '**** iserror(freopen(f, "r")) failed';
+		print '**** iserror(freopen(f, "rb")) failed';
 		return 1;
 	}
 	if (iserror(rewind(f))) {
@@ -173,7 +173,7 @@ define ttest(str, m, n, verbose)
 		print str:":",:;
 	}
 	i = rm("-f", "junk4600");
-	f = fopen("junk4600", "w");
+	f = fopen("junk4600", "wb");
 
 	if (isnull(n))
 		n = 4;
@@ -198,7 +198,7 @@ define ttest(str, m, n, verbose)
 	fflush(f);
 	if (verbose > 1)
 		printf("File has size %d\n", pos[i]);
-	freopen(f, "r");
+	freopen(f, "rb");
 	if (size(f) != pos[i]) {
 		print 'failed';
 		printf("**** Failure 1 for file size\n");

calc.h

@@ -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 $
+ * @(#) $Revision: 29.11 $
- * @(#) $Id: calc.h,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: calc.h,v 29.11 2003/08/26 04:36:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -32,10 +32,15 @@
 #define __CALC_H__
 
 #include <setjmp.h>
-
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "value.h"
+# include "win32dll.h"
-
+# include "value.h"
-#include "have_const.h"
+# include "have_const.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/value.h>
+# include <calc/have_const.h>
+#endif
 
 
 /*
@@ -55,15 +60,18 @@
 #define HOMECHAR	'~'	/* char which indicates home directory */
 #define DOTCHAR		'.'	/* char which indicates current directory */
 #define PATHCHAR	'/'	/* char which separates path components */
+#if defined(__MSDOS__) || defined(__WIN32)
+#define LISTCHAR	';'	/* char which separates paths in a list */
+#else
 #define LISTCHAR	':'	/* char which separates paths in a list */
+#endif
 #define MAXCMD		16384	/* maximum length of command invocation */
 #define MAXERROR	512	/* maximum length of error message string */
 
 #define SYMBOLSIZE	256	/* maximum symbol name size */
-#define MAXINDICES	20	/* maximum number of indices for objects */
 #define MAXLABELS	100	/* maximum number of user labels in function */
 #define MAXSTRING	1024	/* maximum size of string constant */
-#define MAXSTACK	1000	/* maximum depth of evaluation stack */
+#define MAXSTACK	2048	/* maximum depth of evaluation stack */
 #define MAXFILES	20	/* maximum number of opened files */
 #define PROMPT1		"> "	/* default normal prompt*/
 #define PROMPT2		">> "	/* default prompt inside multi-line input */
@@ -95,152 +103,157 @@
 /*
  * File I/O routines.
  */
-extern FILEID openid(char *name, char *mode);
+extern DLL FILEID openid(char *name, char *mode);
-extern FILEID indexid(long index);
+extern DLL FILEID indexid(long index);
-extern BOOL validid(FILEID id);
+extern DLL BOOL validid(FILEID id);
-extern BOOL errorid(FILEID id);
+extern DLL BOOL errorid(FILEID id);
-extern BOOL eofid(FILEID id);
+extern DLL BOOL eofid(FILEID id);
-extern int closeid(FILEID id);
+extern DLL int closeid(FILEID id);
-extern int getcharid(FILEID id);
+extern DLL int getcharid(FILEID id);
-extern int idprintf(FILEID id, char *fmt, int count, VALUE **vals);
+extern DLL int idprintf(FILEID id, char *fmt, int count, VALUE **vals);
-extern int idfputc(FILEID id, int ch);
+extern DLL int idfputc(FILEID id, int ch);
-extern int idfputs(FILEID id, char *str);
+extern DLL int idfputs(FILEID id, char *str);
-extern int printid(FILEID id, int flags);
+extern DLL int printid(FILEID id, int flags);
-extern int flushid(FILEID id);
+extern DLL int flushid(FILEID id);
-extern int readid(FILEID id, int flags, char **retptr);
+extern DLL int readid(FILEID id, int flags, char **retptr);
-extern int getloc(FILEID id, ZVALUE *loc);
+extern DLL int getloc(FILEID id, ZVALUE *loc);
-extern int setloc(FILEID id, ZVALUE zpos);
+extern DLL int setloc(FILEID id, ZVALUE zpos);
-extern int getsize(FILEID id, ZVALUE *size);
+extern DLL int getsize(FILEID id, ZVALUE *size);
-extern int get_device(FILEID id, ZVALUE *dev);
+extern DLL int get_device(FILEID id, ZVALUE *dev);
-extern int get_inode(FILEID id, ZVALUE *ino);
+extern DLL int get_inode(FILEID id, ZVALUE *ino);
-extern FILEID reopenid(FILEID id, char *mode, char *name);
+extern DLL FILEID reopenid(FILEID id, char *mode, char *name);
-extern int closeall(void);
+extern DLL int closeall(void);
-extern int flushall(void);
+
-extern int idfputstr(FILEID id, char *str);
+#if !defined(_WIN32)
-extern int rewindid(FILEID id);
+extern DLL int flushall(void);
-extern void rewindall(void);
+#endif
-extern ZVALUE zfilesize(FILEID id);
+
-extern void showfiles(void);
+extern DLL int idfputstr(FILEID id, char *str);
-extern int fscanfid(FILEID id, char *fmt, int count, VALUE **vals);
+extern DLL int rewindid(FILEID id);
-extern int scanfstr(char *str, char *fmt, int count, VALUE **vals);
+extern DLL void rewindall(void);
-extern int ftellid(FILEID id, ZVALUE *res);
+extern DLL ZVALUE zfilesize(FILEID id);
-extern int fseekid(FILEID id, ZVALUE offset, int whence);
+extern DLL void showfiles(void);
-extern int isattyid(FILEID id);
+extern DLL int fscanfid(FILEID id, char *fmt, int count, VALUE **vals);
-extern int fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res);
+extern DLL int scanfstr(char *str, char *fmt, int count, VALUE **vals);
-extern int frsearch(FILEID id, char *str, ZVALUE first, ZVALUE last, ZVALUE *res);
+extern DLL int ftellid(FILEID id, ZVALUE *res);
-extern void showconstants(void);
+extern DLL int fseekid(FILEID id, ZVALUE offset, int whence);
-extern void freeconstant(unsigned long);
+extern DLL int isattyid(FILEID id);
-extern void freestringconstant(long);
+extern DLL int fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res);
-extern void trimconstants(void);
+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);
 
 /*
  * Input routines.
  */
-extern int openstring(char *str, long num);
+extern DLL int openstring(char *str, long num);
-extern int openterminal(void);
+extern DLL int openterminal(void);
-extern int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
+extern DLL int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
-extern char *nextline(void);
+extern DLL char *nextline(void);
-extern int nextchar(void);
+extern DLL int nextchar(void);
-extern void reread(void);
+extern DLL void reread(void);
-extern void resetinput(void);
+extern DLL void resetinput(void);
-extern void setprompt(char *);
+extern DLL void setprompt(char *);
-extern BOOL inputisterminal(void);
+extern DLL BOOL inputisterminal(void);
-extern int inputlevel(void);
+extern DLL int inputlevel(void);
-extern long calclevel(void);
+extern DLL long calclevel(void);
-extern char *inputname(void);
+extern DLL char *inputname(void);
-extern long linenumber(void);
+extern DLL long linenumber(void);
-extern void runrcfiles(void);
+extern DLL void runrcfiles(void);
-extern void closeinput(void);
+extern DLL void closeinput(void);
 
 /*
  * Other routines.
  */
-extern NUMBER *constvalue(unsigned long index);
+extern DLL NUMBER *constvalue(unsigned long index);
-extern long addnumber(char *str);
+extern DLL long addnumber(char *str);
-extern long addqconstant(NUMBER *q);
+extern DLL long addqconstant(NUMBER *q);
-extern void initstack(void);
+extern DLL void initstack(void);
-extern void getcommands(BOOL toplevel);
+extern DLL void getcommands(BOOL toplevel);
-extern void givehelp(char *type);
+extern DLL void givehelp(char *type);
-extern void libcalc_call_me_first(void);
+extern DLL void libcalc_call_me_first(void);
-extern void libcalc_call_me_last(void);
+extern DLL void libcalc_call_me_last(void);
-extern BOOL calc_tty(int fd);
+extern DLL BOOL calc_tty(int fd);
-extern BOOL orig_tty(int fd);
+extern DLL BOOL orig_tty(int fd);
-extern void showerrors(void);
+extern DLL void showerrors(void);
-extern char *calc_strdup(CONST char *);
+extern DLL char *calc_strdup(CONST char *);
-extern void getshellfile(char *shellfile);
 
 /*
  * Initialization
  */
-extern void initialize(void);
+extern DLL void initialize(void);
-extern void reinitialize(void);
+extern DLL void reinitialize(void);
-extern int isatty(int tty);	/* TRUE if fd is a tty */
+#if !defined (_WIN32)
-extern char *version(void);	/* return version string */
+extern DLL int isatty(int tty);	/* TRUE if fd is a tty */
-extern int post_init;		/* TRUE => setjmp for math_error is ready */
+#endif
+extern DLL char *version(void);	/* return version string */
+extern DLL int post_init;	/* TRUE => math_error setjmp is ready */
 
 /*
  * global flags and definitions
  */
-extern int abortlevel;		/* current level of aborts */
+extern DLL int abortlevel;	/* current level of aborts */
-extern BOOL inputwait;		/* TRUE if in a terminal input wait */
+extern DLL BOOL inputwait;	/* TRUE if in a terminal input wait */
-extern jmp_buf jmpbuf;		/* for errors */
+extern DLL jmp_buf jmpbuf;	/* for errors */
 
-extern int p_flag;		/* TRUE => pipe mode */
+extern DLL int p_flag;		/* TRUE => pipe mode */
-extern int q_flag;		/* TRUE => don't execute rc files */
+extern DLL int q_flag;		/* TRUE => don't execute rc files */
-extern int u_flag;		/* TRUE => unbuffer stdin and stdout */
+extern DLL int u_flag;		/* TRUE => unbuffer stdin and stdout */
-extern int d_flag;		/* TRUE => disable heading, resource_debug */
+extern DLL int d_flag;		/* TRUE => disable heading, resource_debug */
-extern int c_flag;		/* TRUE => continue after error if permitted */
+extern DLL int c_flag;		/* TRUE => continue after error if permitted */
-extern int i_flag;		/* TRUE => try to go interactive after error */
+extern DLL int i_flag;		/* TRUE => try to go interactive after error */
-extern int s_flag;		/* TRUE => keep args as strings for argv() */
+extern DLL int s_flag;		/* TRUE => keep args as strings for argv() */
-extern int stoponerror;		/* >0 => stop, <0 => continue, ==0 => use -c */
+extern DLL int stoponerror;	/* >0 => stop, <0 => continue, ==0 => use -c */
-extern BOOL abort_now;		/* TRUE => try to go interactive */
+extern DLL BOOL abort_now;	/* TRUE => try to go interactive */
 
-extern int argc_value;		/* count of argv[] strings for argv() builtin */
+extern DLL int argc_value;	/* count of argv[] strings for argv() builtin */
-extern char **argv_value;	/* argv[] strings for argv() builtin */
+extern DLL char **argv_value;	/* argv[] strings for argv() builtin */
 
-extern char *pager;		/* $PAGER or default */
+extern DLL char *pager;		/* $PAGER or default */
-extern int stdin_tty;		/* TRUE if stdin is a tty */
+extern DLL int stdin_tty;	/* TRUE if stdin is a tty */
-extern int havecommands;	/* TRUE if have cmd args) */
+extern DLL int havecommands;	/* TRUE if have cmd args) */
-extern char *program;		/* our name */
+extern DLL char *program;	/* our name */
-extern char *base_name;		/* basename of our name */
+extern DLL char *base_name;	/* basename of our name */
-extern char cmdbuf[];		/* command line expression */
+extern DLL char cmdbuf[];	/* command line expression */
 
-extern int abortlevel;		/* current level of aborts */
+extern DLL int abortlevel;	/* current level of aborts */
-extern BOOL inputwait;		/* TRUE if in a terminal input wait */
+extern DLL BOOL inputwait;	/* TRUE if in a terminal input wait */
-extern VALUE *stack;		/* execution stack */
+extern DLL VALUE *stack;	/* execution stack */
-extern int dumpnames;		/* TRUE => dump names rather than indices */
+extern DLL int dumpnames;	/* TRUE => dump names rather than indices */
 
-extern char *calcpath;		/* $CALCPATH or default */
+extern DLL char *calcpath;	/* $CALCPATH or default */
-extern char *calcrc;		/* $CALCRC or default */
+extern DLL char *calcrc;	/* $CALCRC or default */
-extern char *calcbindings;	/* $CALCBINDINGS or default */
+extern DLL char *calcbindings;	/* $CALCBINDINGS or default */
-extern char *home;		/* $HOME or default */
+extern DLL char *home;		/* $HOME or default */
-extern char *shell;		/* $SHELL or default */
+extern DLL char *shell;		/* $SHELL or default */
-extern char *program;		/* our name (argv[0]) */
+extern DLL char *program;	/* our name (argv[0]) */
 
-extern int no_env;	/* TRUE (-e) => ignore env vars on startup */
+extern DLL int no_env;		/* TRUE (-e) => ignore env vars on startup */
-extern int errmax;	/* if >= 0, error when errcount exceeds errmax */
+extern DLL int errmax;	/* if >= 0, error when errcount exceeds errmax */
-extern int new_std;	/* TRUE (-n) => use newstd configuration */
+extern DLL int use_old_std;	/* TRUE (-O) => use classic configuration */
 
-extern int allow_read;	/* FALSE => may not open any files for reading */
+extern DLL int allow_read;	/* FALSE => dont open any files for reading */
-extern int allow_write; /* FALSE => may not open any files for writing */
+extern DLL int allow_write; 	/* FALSE => dont open any files for writing */
-extern int allow_exec;	/* FALSE => may not execute any commands */
+extern DLL int allow_exec;	/* FALSE => may not execute any commands */
 
 /*
  * calc startup and run state
  */
 typedef enum {
-    RUN_UNKNOWN = -1,		/* unknown or unset start state */
+    RUN_ZERO,			/* unknown or unset start state */
-    RUN_BEGIN = 0,		/* calc execution starts */
+    RUN_BEGIN,			/* calc execution starts */
-    RUN_RCFILES = 1,		/* rc files being evaluated */
+    RUN_RCFILES,		/* rc files being evaluated */
-    RUN_PRE_CMD_ARGS = 2,	/* prepare to evaluate cmd args */
+    RUN_PRE_CMD_ARGS,		/* prepare to evaluate cmd args */
-    RUN_CMD_ARGS = 3,		/* cmd args being evaluated */
+    RUN_CMD_ARGS,		/* cmd args being evaluated */
-    RUN_PRE_TOP_LEVEL = 4,	/* prepare to start top level activity */
+    RUN_PRE_TOP_LEVEL,		/* prepare to start top level activity */
-    RUN_TOP_LEVEL = 5,		/* running at top level */
+    RUN_TOP_LEVEL,		/* running at top level */
-    RUN_EXIT = 6,		/* normal exit from calc */
+    RUN_EXIT,			/* normal exit from calc */
-    RUN_EXIT_WITH_ERROR = 7	/* exit with error */
+    RUN_EXIT_WITH_ERROR		/* exit with error */
 } run;
-extern run run_state;
+extern DLL run run_state;
-extern char *run_state_name(run state);
+extern DLL char *run_state_name(run state);
 
 /*
  * calc version information
@@ -249,9 +262,9 @@ extern char *run_state_name(run state);
 extern int calc_major_ver;
 extern int calc_minor_ver;
 extern int calc_major_patch;
-extern char *calc_minor_patch;
+extern int calc_minor_patch;
 extern char *Copyright;
-extern char *version(void);
+extern DLL char *version(void);
 
 
 #endif /* !__CALC_H__ */

calc.man

@@ -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.5 $
+.\" @(#) $Revision: 29.12 $
-.\" @(#) $Id: calc.man,v 29.5 2000/06/07 14:02:13 chongo Exp $
+.\" @(#) $Id: calc.man,v 29.12 2004/02/23 05:21:24 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -36,24 +36,25 @@ calc \- arbitrary precision calculator
 .RB [ \-c ]
 .RB [ \-C ]
 .RB [ \-d ]
-.RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
 .br
 .in +5n
+.RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
+.br
 .RB [ \-e ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.RB [ \-n ]
+.RB [ \-O ]
+.br
 .RB [ \-p ]
 .RB [ \-q ]
 .RB [ \-s ]
 .RB [ \-u ]
 .RB [ \-v ]
-.br
 .RB [ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP\
 .SH DESCRIPTION
 \&
 .br
@@ -301,11 +302,22 @@ The reading of key bindings is also disabled
 when the mode disables opening of files for reading.
 
 .TP
-.B \-n
+.B \-O
-Use the new configuration defaults instead of the old
+Use the old classic defaults instead of the
-default classic defaults.
+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
@@ -513,8 +525,8 @@ searches in succession:
 ./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
-${CUSTOMLIBDIR}/myfile
+${CUSTOMCALDIR}/myfile
-${CUSTOMLIBDIR}/myfile.cal
+${CUSTOMCALDIR}/myfile.cal
 .fi
 .in -5n
 .sp 1
@@ -571,27 +583,25 @@ If first line of an executable file begins
 followed by the absolute pathname of the
 .B calc
 program and the flag
-.B \-S
+.B \-f
 as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ [other_flags\ \&...]
+\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" .
 Note that
-.B \-S
+.B \-f
-(UPPER CASE
-.BR \-S )
 must be the first \-flag on the ``#!'' line.
 Any other optional
 .B "other_flags"
 must come after
 the
-.BR \-S .
+.BR \-f .
 .sp 1
 In
 .B "shell script mode"
@@ -624,7 +634,7 @@ the file
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ \&\fB\-q\fP
+\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP\
 #
 # mersenne - an example of a calc \fBshell script file\fP
 
@@ -838,7 +848,7 @@ ${LIBDIR}/bindings
 non-GNU-readline command line editor bindings
 .sp 1
 .TP 5
-${INCDIRCALC}/*.h
+${CALC_INCDIR}/*.h
 include files for C interface use
 .sp 1
 .TP 5
@@ -850,7 +860,7 @@ ${LIBDIR}/libcustcalc.a
 custom binary link library
 .sp 1
 .TP 5
-${CUSTOMLIBDIR}/*.cal
+${CUSTOMCALDIR}/*.cal
 custom resource files
 .sp 1
 .TP 5
@@ -993,25 +1003,58 @@ Copyright (C) 1999  Landon Curt Noll
 and is covered under version 2.1 GNU Lesser General
 Public License.
 .sp
-.SH "BUG REPORTS / BUG FIXES / ENHANCEMENTS"
+.SH "CALC MAILING LIST / CALC UPDATES / ENHANCEMENTS"
 \&
 .br
 .sp
-Send comments, suggestions, bug fixes, enhancements
+To contribute comments, suggestions, enhancements
 and interesting
 .B calc
-resource files,
+resource files, and
-.B calc
+shell scripts please join the low volume calc mailing list.
-shell scripts that you would like you see included
+.sp
-in future distributions to:
+To join the low volume calc mailing list, send EMail to:
 .sp
 .in +0.5i
 .nf
-calc-contrib at asthe dot com
+calc-tester-request at asthe dot com
 .fi
 .in -0.5i
 .sp
-Bug reports are sent to:
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc mailing list subscription
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
+Your message body must contain:
+.sp
+.in +0.5i
+.nf
+subscribe calc-tester address
+end
+name your_full_name
+.fi
+.in -0.5i
+.sp
+where
+.B address
+s your EMail address and
+.B your_full_name
+is your full name.
+Feel free to follow the
+.B name
+line with additional EMail text as desired.
+.sp
+.SH "BUG REPORTS / BUG FIXES"
+\&
+.br
+.sp
+Send bug reports and bug fixes to:
 .sp
 .in +0.5i
 .nf
@@ -1022,6 +1065,16 @@ calc-bugs at asthe dot com
 .fi
 .in -0.5i
 .sp
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc bug report
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
 See the
 .I BUGS
 source file or use the
@@ -1036,7 +1089,7 @@ help bugs
 .sp
 for more information about bug reporting.
 .sp
-.SH "CALC WEB SITE / MAILING LIST"
+.SH "CALC WEB SITE"
 \&
 .br
 Landon Noll maintains the the
@@ -1044,33 +1097,7 @@ Landon Noll maintains the the
 web site is located at:
 .sp
 .in +0.5i
-http://www.isthe.com/chongo/tech/comp/calc/
+www.isthe.com/chongo/tech/comp/calc/
 .in -0.5i
 .sp
-One may join the
-.B calc
-testing group by sending a request to:
-.sp
-.in +0.5i
-.nf
-calc-tester-request at asthe dot com
-
-[[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-[[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-.fi
-.in -0.5i
-.sp
-Your message body (not the subject) should consist of:
-.sp
-.in +0.5i
-.nf
-subscribe calc-tester address
-end
-name your_full_name
-.fi
-.in -0.5i
-.sp
-where "address" is your EMail address and "your_full_name"
-is your full name.
-.sp
 Share and Enjoy! :\-)

calc.spec.in

@@ -0,0 +1,116 @@
+#****h* calc/calc.spec.in
+#
+# calc.spec.in - template specfile for calc
+#
+# Copyright (C) 2003  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.12 $
+# @(#) $Id: calc.spec.in,v 29.12 2003/04/15 03:37:59 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 subdird. 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
+Copyright: 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 prototyper and mathematical research
+tool. Calc comes with a rich set of builtin mathematical and
+programmatic functions.
+
+For the latest calc release, see the 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
+
+%files devel
+%defattr(-, root, root)
+%doc BUGS COPYING COPYING-LGPL LIBRARY
+%attr(644, root, root) %{_includedir}/calc/*
+%attr(644, root, root) %{_libdir}/*.a
+
+%changelog
+* 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

@@ -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 $
+# @(#) $Revision: 29.4 $
-# @(#) $Id: calcerr.tbl,v 29.2 2000/06/07 14:02:13 chongo Exp $
+# @(#) $Id: calcerr.tbl,v 29.4 2001/04/10 22:06:46 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr.tbl,v $
 #
 # Under source code control:	1996/05/23 17:38:44
@@ -108,8 +108,8 @@ E_FGETSTR1	Non-file first argument for fgetstr
 E_FGETSTR2	File not open for reading for fgetstr
 E_FGETLINE1	Non-file  argument for fgetline
 E_FGETLINE2	File not open for reading for fgetline
-E_FGETWORD1	Non-file argument for fgetword
+E_FGETFIELD1	Non-file argument for fgetfield
-E_FGETWORD2	File not open for reading for fgetword
+E_FGETFIELD2	File not open for reading for fgetfield
 E_REWIND1	Non-file argument for rewind
 E_FILES		Non-integer argument for files
 E_PRINTF1	Non-string fmt argument for fprint
@@ -375,3 +375,21 @@ E_GD3		Infinite or too-large result for gd
 E_AGD3		Infinite or too-large result for agd
 E_POWER4	Too-large value for power
 E_ROOT4		Too-large value for root
+E_DGT1		Non-real first arg for digit
+E_DGT2		Non-integral second arg for digit
+E_DGT3		Bad third arg for digit
+E_PLCS1		Bad first argument for places
+E_PLCS2		Bad second argument for places
+E_DGTS1		Bad first argument for digits
+E_DGTS2		Bad second argument for digits
+E_ILOG		Bad first argument for ilog
+E_ILOGB		Bad second argument for ilog
+E_ILOG10	Bad argument for ilog10
+E_ILOG2		Bad argument for ilog2
+E_COMB1		Non-integer second arg for comb
+E_COMB2		Too-large second arg for comb
+E_CTLN		Bad argument for catalan
+E_BERN		Bad argument for bern
+E_EULER		Bad argument for euler
+E_SLEEP		Bad argument for sleep
+E_TTY		calc_tty failure

cmath.h

@@ -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 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: cmath.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: cmath.h,v 29.6 2002/03/12 09:38:26 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:45
@@ -32,7 +32,11 @@
 #define __CMATH_H__
 
 
-#include "qmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "qmath.h"
+#else
+# include <calc/qmath.h>
+#endif
 
 
 /*
@@ -58,6 +62,7 @@ extern 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);
@@ -70,8 +75,8 @@ 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 *creal(COMPLEX *c);
+extern COMPLEX *c_real(COMPLEX *c);
-extern COMPLEX *cimag(COMPLEX *c);
+extern COMPLEX *c_imag(COMPLEX *c);
 extern COMPLEX *cneg(COMPLEX *c);
 extern COMPLEX *cinv(COMPLEX *c);
 extern COMPLEX *cint(COMPLEX *c);
@@ -83,6 +88,7 @@ extern BOOL ccmp(COMPLEX *c1, COMPLEX *c2);
  * More complicated functions.
  */
 extern COMPLEX *cpowi(COMPLEX *c, NUMBER *q);
+extern NUMBER *cilog(COMPLEX *c, ZVALUE base);
 
 
 /*

codegen.c

@@ -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 $
+ * @(#) $Revision: 29.8 $
- * @(#) $Id: codegen.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: codegen.c,v 29.8 2004/02/23 05:39:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/codegen.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
@@ -45,11 +45,15 @@
 #include "func.h"
 #include "conf.h"
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+# include <direct.h>
+#endif
+
 static BOOL rdonce;	/* TRUE => do not reread this file */
 
 FUNC *curfunc;
 
-static BOOL getfilename(char *name, BOOL msg_ok, BOOL *once);
+static int getfilename(char *name, BOOL *once);
 static BOOL getid(char *buf);
 static void getshowstatement(void);
 static void getfunction(void);
@@ -71,7 +75,7 @@ static void getsimplebody(void);
 static void getcondition(void);
 static void getmatargs(void);
 static void getelement(void);
-static void usesymbol(char *name, BOOL autodef);
+static void usesymbol(char *name, int autodef);
 static void definesymbol(char *name, int symtype);
 static void getcallargs(char *name);
 static void do_changedir(void);
@@ -90,9 +94,16 @@ static int getshiftexpr(void);
 static int getreference(void);
 static int getincdecexpr(void);
 static int getterm(void);
-static int getidexpr(BOOL okmat, BOOL autodef);
+static int getidexpr(BOOL okmat, int autodef);
 static long getinitlist(void);
 
+#define INDICALLOC 8
+
+static int quickindices[INDICALLOC];
+static int * newindices;
+static int * indices;
+static int maxindices;
+
 
 /*
  * Read all the commands from an input file.
@@ -116,6 +127,7 @@ getcommands(BOOL toplevel)
 	if (!toplevel)
 		enterfilescope();
 	for (;;) {
+		int i;
 		(void) tokenmode(TM_NEWLINES);
 		switch (gettoken()) {
 
@@ -133,49 +145,67 @@ getcommands(BOOL toplevel)
 			return;
 
 		case T_HELP:
-			if (!getfilename(name, FALSE, NULL)) {
+			for (i=1;;i++) {
-				strcpy(name, DEFAULTCALCHELP);
+				switch(getfilename(name, NULL)) {
+				case -1:
+					if(i == 1) {
+						strcpy(name, DEFAULTCALCHELP);
+						givehelp(name);
+					}
+					break;
+				case 0:
+					givehelp(name);
+					continue;
+				default:
+					break;
+				}
+				break;
 			}
-			givehelp(name);
 			break;
 
 		case T_READ:
-			if (!getfilename(name, TRUE, &rdonce))
-				break;
 			if (!allow_read) {
 				scanerror(T_NULL,
 				    "read command disallowed by -m mode\n");
 				break;
 			}
-			switch (opensearchfile(name,calcpath,CALCEXT,rdonce)) {
+			for (;;) {
-			case 0:
+				if (getfilename(name, &rdonce))
-				getcommands(FALSE);
+					break;
-				closeinput();
+				switch (opensearchfile(name,calcpath,
-				break;
+						       CALCEXT,rdonce)) {
-			case 1:
+				case 0:
-				/* previously read and -once was given */
+					getcommands(FALSE);
-				break;
+					closeinput();
-			case -2:
+					continue;
-				scanerror(T_NULL,
+				case 1:
-					  "Maximum input depth reached");
+					/* prev read and -once was given */
-				break;
+					continue;
-			default:
+				case -2:
-				scanerror(T_NULL, "Cannot open \"%s\"\n", name);
+					scanerror(T_NULL,
+						 "Maximum input depth reached");
+					break;
+				default:
+					scanerror(T_NULL,
+						  "Cannot open \"%s\"", name);
+					continue;
+				}
 				break;
 			}
 			break;
 
 		case T_WRITE:
-			if (!getfilename(name, TRUE, NULL))
-				break;
 			if (!allow_write) {
 				scanerror(T_NULL,
 				    "write command disallowed by -m mode\n");
 				break;
 			}
-			if (writeglobals(name))
+			if (getfilename(name, NULL))
+				break;
+			if (writeglobals(name)) {
 				scanerror(T_NULL,
 					  "Error writing \"%s\"\n", name);
+			}
 			break;
 
 		case T_CD:
@@ -497,9 +527,10 @@ getsimpledeclaration(int symtype)
 		switch (gettoken()) {
 			case T_SYMBOL:
 				rescantoken();
-				res = getonevariable(symtype);
+				if (getonevariable(symtype)) {
-				if (res)
+					res = 1;
 					addop(OP_POP);
+				}
 				continue;
 			case T_COMMA:
 				continue;
@@ -529,7 +560,7 @@ getonevariable(int symtype)
 			res = getonevariable(symtype);
 			definesymbol(name, symtype);
 			if (res) {
-				usesymbol(name, FALSE);
+				usesymbol(name, 0);
 				addop(OP_ASSIGNBACK);
 			}
 			return res;
@@ -892,7 +923,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		return;
 
 	case T_ELSE:
-		scanerror(T_SEMICOLON, "ELSE without preceeding IF");
+		scanerror(T_SEMICOLON, "ELSE without preceding IF");
 		return;
 
 	case T_SHOW:
@@ -1021,7 +1052,6 @@ getobjdeclaration(int symtype)
 	int count;			/* number of elements */
 	int index;			/* current index */
 	int i;				/* loop counter */
-	int indices[MAXINDICES];	/* indices for elements */
 	int oldmode;
 
 	if (gettoken() != T_SYMBOL) {
@@ -1038,58 +1068,89 @@ getobjdeclaration(int symtype)
 	 * Read in the definition of the elements of the object.
 	 */
 	count = 0;
+	indices = quickindices;
+	maxindices = INDICALLOC;
+
 	oldmode = tokenmode(TM_DEFAULT);
+
 	for (;;) {
 		switch (gettoken()) {
-			case T_SYMBOL:
+		case T_SYMBOL:
-				if (count == MAXINDICES) {
+			if (count == maxindices) {
-					scanerror(T_SEMICOLON,
+				if (maxindices == INDICALLOC) {
-						  "Too many elements in OBJ "
+					maxindices += INDICALLOC;
-						  "statement");
+					newindices = (int *) malloc(maxindices *
-					(void) tokenmode(oldmode);
+						sizeof(int));
-					return;
+					if (newindices == NULL) {
-				}
+						scanerror(T_SEMICOLON, "Out of memory for indices malloc");
-				index = addelement(tokensymbol());
-				for (i = 0; i < count; i++) {
-					if (indices[i] == index) {
-						scanerror(T_SEMICOLON,
-						  "Duplicate element name "
-						  "\"%s\"", tokensymbol());
 						(void) tokenmode(oldmode);
 						return;
 					}
+					memcpy(newindices, quickindices,
+						INDICALLOC * sizeof(int));
+					indices = newindices;
+				} else {
+					maxindices += INDICALLOC;
+					newindices = (int *) realloc(indices,
+						maxindices * sizeof(int));
+					if (newindices == NULL) {
+						free(indices);
+						scanerror(T_SEMICOLON, "Out of memory for indices realloc");
+						(void) tokenmode(oldmode);
+						return;
+					}
+					indices = newindices;
 				}
-				indices[count++] = index;
+			}
-				if (gettoken() == T_COMMA)
+			index = addelement(tokensymbol());
-					continue;
+			for (i = 0; i < count; i++) {
-				rescantoken();
+				if (indices[i] == index) {
-				if (gettoken() != T_RIGHTBRACE) {
+					if (indices != quickindices)
-					scanerror(T_SEMICOLON,
+						free(indices);
-						  "Bad object type definition");
+					scanerror(T_SEMICOLON, "Duplicate element name \"%s\"", tokensymbol());
 					(void) tokenmode(oldmode);
 					return;
 				}
-				/*FALLTHRU*/
+			}
-			case T_RIGHTBRACE:
+			indices[count++] = index;
-				(void) tokenmode(oldmode);
+			if (gettoken() == T_COMMA)
-				if (defineobject(name, indices, count)) {
-					scanerror(T_NULL,
-				"Object type \"%s\" is already defined", name);
-					return;
-				}
-				getobjvars(name, symtype);
-				return;
-			case T_NEWLINE:
 				continue;
-			default:
+			rescantoken();
-				scanerror(T_SEMICOLON,
+			if (gettoken() != T_RIGHTBRACE) {
-					  "Bad object type definition");
+				if (indices != quickindices)
+					free(indices);
+				scanerror(T_SEMICOLON, "Bad object type definition");
 				(void) tokenmode(oldmode);
 				return;
+			}
+			/*FALLTHRU*/
+		case T_RIGHTBRACE:
+			(void) tokenmode(oldmode);
+			if (defineobject(name, indices, count)) {
+				if (indices != quickindices)
+					free(indices);
+				scanerror(T_NULL,
+				"Object type \"%s\" is already defined", name);
+				return;
+			}
+			if (indices != quickindices)
+				free(indices);
+			getobjvars(name, symtype);
+			return;
+		case T_NEWLINE:
+			continue;
+		default:
+			if (indices != quickindices)
+				free(indices);
+			scanerror(T_SEMICOLON, "Bad object type definition");
+				(void) tokenmode(oldmode);
+			return;
+
 		}
 	}
 }
 
+
 static void
 getoneobj(long index, int symtype)
 {
@@ -1098,11 +1159,11 @@ getoneobj(long index, int symtype)
 	if (gettoken() == T_SYMBOL) {
 		if (symtype == SYM_UNDEFINED) {
 			rescantoken();
-			(void) getidexpr(TRUE, TRUE);
+			(void) getidexpr(TRUE, 1);
 		} else {
 			symname = tokensymbol();
 			definesymbol(symname, symtype);
-			usesymbol(symname, FALSE);
+			usesymbol(symname, 0);
 		}
 		getoneobj(index, symtype);
 		addop(OP_ASSIGN);
@@ -1181,11 +1242,11 @@ getonematrix(int symtype)
 	if (gettoken() == T_SYMBOL) {
 		if (symtype == SYM_UNDEFINED) {
 			rescantoken();
-			(void) getidexpr(FALSE, TRUE);
+			(void) getidexpr(FALSE, 1);
 		} else {
 			name = tokensymbol();
 			definesymbol(name, symtype);
-			usesymbol(name, FALSE);
+			usesymbol(name, 0);
 		}
 		while (gettoken() == T_COMMA);
 		rescantoken();
@@ -1688,6 +1749,8 @@ getrelation(void)
 			rescantoken();
 			return type;
 	}
+	if (islvalue(type))
+		addop(OP_GETVALUE);
 	(void) getsum();
 	addop(op);
 	return EXPR_RVALUE;
@@ -1727,6 +1790,8 @@ getsum(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getproduct();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1756,6 +1821,8 @@ getproduct(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getorexpr();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1775,6 +1842,8 @@ getorexpr(void)
 
 	type = getandexpr();
 	while (gettoken() == T_OR) {
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getandexpr();
 		addop(OP_OR);
 		type = EXPR_RVALUE;
@@ -1806,6 +1875,8 @@ getandexpr(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getshiftexpr();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1858,6 +1929,8 @@ getshiftexpr(void)
 			rescantoken();
 			return type;
 	}
+	if (islvalue(type))
+		addop(OP_GETVALUE);
 	(void) getshiftexpr();
 	addop(op);
 	return EXPR_RVALUE;
@@ -2028,7 +2101,25 @@ getterm(void)
 
 		case T_SYMBOL:
 			rescantoken();
-			type = getidexpr(TRUE, FALSE);
+			type = getidexpr(TRUE, 0);
+			break;
+
+		case T_GLOBAL:
+			if (gettoken() != T_SYMBOL) {
+				scanerror(T_NULL, "Global id expected");
+				break;
+			}
+			rescantoken();
+			type = getidexpr(TRUE, T_GLOBAL);
+			break;
+
+		case T_LOCAL:
+			if (gettoken() != T_SYMBOL) {
+				scanerror(T_NULL, "Local id expected");
+				break;
+			}
+			rescantoken();
+			type = getidexpr(TRUE, T_LOCAL);
 			break;
 
 		case T_LEFTBRACKET:
@@ -2077,11 +2168,11 @@ getterm(void)
 /*
  * Read in an identifier expressions.
  * This is a symbol name followed by parenthesis, or by square brackets or
- * element refernces.  The symbol can be a global or a local variable name.
+ * element references.  The symbol can be a global or a local variable name.
  * Returns the type of expression found.
  */
 static int
-getidexpr(BOOL okmat, BOOL autodef)
+getidexpr(BOOL okmat, int autodef)
 {
 	int type;
 	char name[SYMBOLSIZE+1];	/* symbol name */
@@ -2091,18 +2182,19 @@ getidexpr(BOOL okmat, BOOL autodef)
 	if (!getid(name))
 		return type;
 	switch (gettoken()) {
-		case T_LEFTPAREN:
+	case T_LEFTPAREN:
-			oldmode = tokenmode(TM_DEFAULT);
+		oldmode = tokenmode(TM_DEFAULT);
-			getcallargs(name);
+		getcallargs(name);
-			(void) tokenmode(oldmode);
+		(void) tokenmode(oldmode);
-			type = 0;
+		type = 0;
-			break;
+		break;
-		case T_ASSIGN:
+	case T_ASSIGN:
-			autodef = TRUE;
+		if (autodef != T_GLOBAL && autodef != T_LOCAL)
-			/* fall into default case */
+			autodef = 1;
-		default:
+		/* fall into default case */
-			rescantoken();
+	default:
-			usesymbol(name, autodef);
+		rescantoken();
+		usesymbol(name, autodef);
 	}
 	/*
 	 * Now collect as many element references and matrix index operations
@@ -2110,27 +2202,27 @@ getidexpr(BOOL okmat, BOOL autodef)
 	 */
 	for (;;) {
 		switch (gettoken()) {
-			case T_LEFTBRACKET:
+		case T_LEFTBRACKET:
-				rescantoken();
+			rescantoken();
-				if (!okmat)
+			if (!okmat)
-					return type;
-				getmatargs();
-				type = 0;
-				break;
-			case T_ARROW:
-				addop(OP_DEREF);
-				/*FALLTHRU*/
-			case T_PERIOD:
-				getelement();
-				type = 0;
-				break;
-			case T_LEFTPAREN:
-				scanerror(T_NULL,
-					  "Function calls not allowed "
-					  "as expressions");
-			default:
-				rescantoken();
 				return type;
+			getmatargs();
+			type = 0;
+			break;
+		case T_ARROW:
+			addop(OP_DEREF);
+			/*FALLTHRU*/
+		case T_PERIOD:
+			getelement();
+			type = 0;
+			break;
+		case T_LEFTPAREN:
+			scanerror(T_NULL,
+				  "Function calls not allowed "
+				  "as expressions");
+		default:
+			rescantoken();
+			return type;
 		}
 	}
 }
@@ -2144,71 +2236,37 @@ getidexpr(BOOL okmat, BOOL autodef)
  *
  * given:
  *	name		filename to read
- *	msg_ok		TRUE => ok to print error messages
  *	once		non-NULL => set to TRUE of -once read
  */
-static BOOL
+static int
-getfilename(char *name, BOOL msg_ok, BOOL *once)
+getfilename(char *name, BOOL *once)
 {
 	STRING *s;
+	int i;
 
-	/* look at the next token */
 	(void) tokenmode(TM_NEWLINES | TM_ALLSYMS);
-	switch (gettoken()) {
+	for (i = 2; i > 0; i--) {
-		case T_STRING:
+		switch (gettoken()) {
-			s = findstring(tokenstring());
+			case T_STRING:
-			strcpy(name, s->s_str);
+				s = findstring(tokenstring());
-			sfree(s);
+				strcpy(name, s->s_str);
-			break;
+				sfree(s);
-		case T_SYMBOL:
+				break;
-			strcpy(name, tokensymbol());
+			case T_SYMBOL:
-			break;
+				strcpy(name, tokensymbol());
-		default:
+				break;
-			if (msg_ok)
+			default:
-				scanerror(T_SEMICOLON, "Filename expected");
+				rescantoken();
-			return FALSE;
+				return -1;
-	}
-
-	/* determine if we care about a possible -once option */
-	if (once != NULL) {
-		/* we care about a possible -once option */
-		if (strcmp(name, "-once") == 0) {
-			/* -once option found */
-			*once = TRUE;
-			/* look for the filename */
-			switch (gettoken()) {
-				case T_STRING:
-					s = findstring(tokenstring());
-					strcpy(name, s->s_str);
-					sfree(s);
-					break;
-				case T_SYMBOL:
-					strcpy(name, tokensymbol());
-					break;
-				default:
-					if (msg_ok)
-						scanerror(T_SEMICOLON,
-						    "Filename expected");
-					return FALSE;
-			}
-		} else {
-			*once = FALSE;
 		}
-	}
 
-	/* look at the next token */
+		if (i == 2 && once != NULL) {
-	switch (gettoken()) {
+			if ((*once = !strcmp(name, "-once")))
-		case T_SEMICOLON:
+				continue;
-		case T_NEWLINE:
+		}
-		case T_EOF:
+		break;
-			break;
-		default:
-			if (msg_ok)
-				scanerror(T_SEMICOLON,
-				    "Missing semicolon after filename");
-			return FALSE;
 	}
-	return TRUE;
+	return 0;
 }
 
 
@@ -2433,11 +2491,26 @@ definesymbol(char *name, int symtype)
  *
  * given:
  *	name		symbol name to be checked
- *	autodef		TRUE => define is symbol is not known
+ *	autodef		1 => define if symbol is not known
+ *			T_GLOBAL => get global, define if necessary
  */
 static void
-usesymbol(char *name, BOOL autodef)
+usesymbol(char *name, int autodef)
 {
+
+	if (autodef == T_GLOBAL) {
+			addopptr(OP_GLOBALADDR, (char *) addglobal(name, FALSE));
+			return;
+	}
+	if (autodef == T_LOCAL) {
+			if (symboltype(name) == SYM_PARAM) {
+				scanerror(T_COMMA,
+				  "Variable \"%s\" is already defined", name);
+				return;
+			}
+			addopone(OP_LOCALADDR, addlocal(name));
+			return;
+	}
 	switch (symboltype(name)) {
 		case SYM_LOCAL:
 			addopone(OP_LOCALADDR, (long) findlocal(name));
@@ -2544,24 +2617,25 @@ static void
 do_changedir(void)
 {
 	char *p;
+	STRING *s;
 
 	/* look at the next token */
 	(void) tokenmode(TM_NEWLINES | TM_ALLSYMS);
 
 	/* determine the new directory */
+	s = NULL;
 	switch (gettoken()) {
-	case T_NULL:
+		case T_STRING:
-	case T_NEWLINE:
+			s = findstring(tokenstring());
-	case T_SEMICOLON:
+			p = s->s_str;
-		p = home;
+			break;
-		break;
+		case T_SYMBOL:
-	default:
+			p = tokensymbol();
-		p = tokensymbol(); /* This is not enough XXX */
+			break;
-		if (p == NULL) {
+		default:
 			p = home;
-		}
-		break;
 	}
+
 	if (p == NULL) {
 		fprintf(stderr, "Cannot determine HOME directory\n");
 	}
@@ -2570,29 +2644,8 @@ do_changedir(void)
 	if (chdir(p)) {
 		perror(p);
 	}
-	return;
+	if (s != NULL)
+		sfree(s);
 }
 
 
-/*
- * getshellfile - process the contents of a shellfile
- */
-void
-getshellfile(char *shellfile)
-{
-	/*
-	 * treat the calc shell script as if we were reading it
-	 */
-	if (!allow_read) {
-		scanerror(T_NULL,
-		    "reading of calc shell script \"%s\" "
-		    "dislloaed by -m mode\n", shellfile);
-	} else if (opensearchfile(shellfile, NULL, NULL, FALSE) == 0) {
-		getcommands(FALSE);
-		closeinput();
-	} else {
-		scanerror(T_NULL,
-			  "Cannot open calc shell script \"%s\"\n", shellfile);
-	}
-	return;
-}

comfunc.c

@@ -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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: comfunc.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: comfunc.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/comfunc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
@@ -1007,7 +1007,7 @@ cpolar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
 	long m, n;
 
 	if (qiszero(epsilon)) {
-		math_error("Zero epsilson for cpolar");
+		math_error("Zero epsilon for cpolar");
 		/*NOTREACHED*/
 	}
 	if (qiszero(q1))
@@ -1162,3 +1162,27 @@ cprintfr(COMPLEX *c)
 		zprintval(i->den, 0L, 0L);
 	}
 }
+
+
+NUMBER *
+cilog(COMPLEX *c, ZVALUE base)
+{
+	NUMBER *qr, *qi;
+
+	qr = qilog(c->real, base);
+	qi = qilog(c->imag, base);
+
+	if (qr == NULL) {
+		if (qi == NULL)
+			return NULL;
+		return qi;
+	}
+	if (qi == NULL)
+		return qr;
+	if (qrel(qr, qi) >= 0) {
+		qfree(qi);
+		return qr;
+	}
+	qfree(qr);
+	return qi;
+}

commath.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: commath.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: commath.c,v 29.3 2002/03/12 09:38:26 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/commath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -381,7 +381,7 @@ cconj(COMPLEX *c)
  * Return the real part of a complex number.
  */
 COMPLEX *
-creal(COMPLEX *c)
+c_real(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -400,7 +400,7 @@ creal(COMPLEX *c)
  * Return the imaginary part of a complex number as a real.
  */
 COMPLEX *
-cimag(COMPLEX *c)
+c_imag(COMPLEX *c)
 {
 	COMPLEX *r;
 

config.c

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2002  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.3 $
+ * @(#) $Revision: 29.12 $
- * @(#) $Id: config.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: config.c,v 29.12 2004/02/23 05:59:50 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -51,6 +51,7 @@
 NAMETYPE configs[] = {
 	{"all",		CONFIG_ALL},
 	{"mode",	CONFIG_MODE},
+	{"mode2",	CONFIG_MODE2},
 	{"display",	CONFIG_DISPLAY},
 	{"epsilon",	CONFIG_EPSILON},
 	/*epsilonprec -- tied to epsilon not a configuration type*/
@@ -90,6 +91,8 @@ NAMETYPE configs[] = {
 	    {"ctrl-d",	CONFIG_CTRL_D},		/* alias for ctrl_d */
 	{"program",	CONFIG_PROGRAM},
 	{"basename",	CONFIG_BASENAME},
+	{"windows",	CONFIG_WINDOWS},
+	{"cygwin",	CONFIG_CYGWIN},
 	{"version",	CONFIG_VERSION},
 	{NULL,		0}
 };
@@ -100,6 +103,7 @@ NAMETYPE configs[] = {
  */
 CONFIG oldstd = {	/* backward compatible standard configuration */
 	MODE_INITIAL,		/* current output mode */
+	MODE2_INITIAL,		/* current secondary output mode */
 	20,			/* current output digits for float or exp */
 	NULL,	/* loaded in at startup - default error for real functions */
 	EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
@@ -109,10 +113,10 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	SQ_ALG2,		/* size of number to use square alg 2 */
 	POW_ALG2,		/* size of modulus to use REDC for powers */
 	REDC_ALG2,		/* size of modulus to use REDC algorithm 2 */
-	TRUE,			/* ok to print a tilde on aproximations */
+	TRUE,			/* ok to print a tilde on approximations */
 	TRUE,			/* ok to print tab before numeric values */
 	0,			/* quomod() default rounding mode */
-	2,			/* quotent // default rounding mode */
+	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
 	24,			/* sqrt() default rounding mode */
 	24,			/* appr() default rounding mode */
@@ -132,27 +136,38 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	TRUE,			/* print Quit or abort executed messages */
+	FALSE,			/* print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
+#if defined(_WIN32)
+	TRUE,			/* running under windows */
+#else
+	FALSE,			/* congrats, you are not using windows */
+#endif
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
+#endif
 	NULL			/* version */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
-	10,			/* current output digits for float or exp */
+	MODE2_INITIAL,		/* current output mode */
+	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 */
 	SQ_ALG2,		/* size of number to use square alg 2 */
 	POW_ALG2,		/* size of modulus to use REDC for powers */
 	REDC_ALG2,		/* size of modulus to use REDC algorithm 2 */
-	TRUE,			/* ok to print a tilde on aproximations */
+	TRUE,			/* ok to print a tilde on approximations */
 	TRUE,			/* ok to print tab before numeric values */
 	0,			/* quomod() default rounding mode */
-	0,			/* quotent // default rounding mode */
+	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
 	24,			/* sqrt() default rounding mode */
 	24,			/* appr() default rounding mode */
@@ -161,7 +176,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 */
@@ -172,10 +187,20 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	TRUE,			/* print Quit or abort executed messages */
+	FALSE,			/* print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
+#if defined(_WIN32)
+	TRUE,			/* running under windows */
+#else
+	FALSE,			/* congrats, you are not using windows */
+#endif
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
+#endif
 	NULL			/* version */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
@@ -201,6 +226,7 @@ static NAMETYPE modes[] = {
 	{"oct",		MODE_OCTAL},
 	{"binary",	MODE_BINARY},
 	{"bin",		MODE_BINARY},
+	{"off",		MODE2_OFF},
 	{NULL,		0}
 };
 
@@ -287,10 +313,11 @@ static NAMETYPE truth[] = {
 
 
 /*
- * declate static functions
+ * 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);
 
 
 /*
@@ -360,6 +387,26 @@ 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
+ */
+
+static int
+getlen(VALUE *vp, LEN *lp)
+{
+	if (vp->v_type != V_NUM || !qisint(vp->v_num))
+		return 1;
+	if (zge31b(vp->v_num->num))
+		return 2;
+	*lp = ztoi(vp->v_num->num);
+	if (*lp < 0)
+		return -1;
+	return 0;
+}
+
+
 /*
  * Set the specified configuration type to the specified value.
  * An error is generated if the type number or value is illegal.
@@ -370,6 +417,7 @@ setconfig(int type, VALUE *vp)
 	NUMBER *q;
 	CONFIG *newconf;	/* new configuration to set */
 	long temp;
+	LEN len;
 	char *p;
 
 	switch (type) {
@@ -414,15 +462,11 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_DISPLAY:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for display");
+			math_error("Bad value for display");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		math_setdigits(len);
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num))
-			temp = -1;
-		math_setdigits(temp);
 		break;
 
 	case CONFIG_MODE:
@@ -438,6 +482,19 @@ setconfig(int type, VALUE *vp)
 		math_setmode((int) temp);
 		break;
 
+	case CONFIG_MODE2:
+		if (vp->v_type != V_STR) {
+			math_error("Non-string for mode");
+			/*NOTREACHED*/
+		}
+		temp = lookup_long(modes, vp->v_str->s_str);
+		if (temp < 0) {
+			math_error("Unknown mode \"%s\"", vp->v_str);
+			/*NOTREACHED*/
+		}
+		math_setmode2((int) temp);
+		break;
+
 	case CONFIG_EPSILON:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for epsilon");
@@ -447,91 +504,51 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_MAXPRINT:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for maxprint");
+			math_error("Bad value for maxprint");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->maxprint = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num))
-			temp = -1;
-		if (temp < 0) {
-			math_error("Maxprint value is out of range");
-			/*NOTREACHED*/
-		}
-		conf->maxprint = temp;
 		break;
 
 	case CONFIG_MUL2:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for mul2");
+			math_error("Bad value for mul2");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		if (len == 0)
-		temp = qtoi(q);
+			len = MUL_ALG2;
-		if (qisfrac(q) || qisneg(q))
+		conf->mul2 = len;
-			temp = -1;
-		if (temp == 0)
-			temp = MUL_ALG2;
-		if (temp < 2) {
-			math_error("Illegal mul2 value");
-			/*NOTREACHED*/
-		}
-		conf->mul2 = (int)temp;
 		break;
 
 	case CONFIG_SQ2:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for sq2");
+			math_error("Bad value for sq2");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		if (len == 0)
-		temp = qtoi(q);
+			len = SQ_ALG2;
-		if (qisfrac(q) || qisneg(q))
+		conf->sq2 = len;
-			temp = -1;
-		if (temp == 0)
-			temp = SQ_ALG2;
-		if (temp < 2) {
-			math_error("Illegal sq2 value");
-			/*NOTREACHED*/
-		}
-		conf->sq2 = (int)temp;
 		break;
 
 	case CONFIG_POW2:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for pow2");
+			math_error("Bad value for pow2");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		if (len == 0)
-		temp = qtoi(q);
+			len = POW_ALG2;
-		if (qisfrac(q) || qisneg(q))
+		conf->pow2 = len;
-			temp = -1;
-		if (temp == 0)
-			temp = POW_ALG2;
-		if (temp < 1) {
-			math_error("Illegal pow2 value");
-			/*NOTREACHED*/
-		}
-		conf->pow2 = (int)temp;
 		break;
 
 	case CONFIG_REDC2:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non-numeric for redc2");
+			math_error("Bad value for redc2");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		if (len == 0)
-		temp = qtoi(q);
+			len = REDC_ALG2;
-		if (qisfrac(q) || qisneg(q))
+		conf->redc2 = len;
-			temp = -1;
-		if (temp == 0)
-			temp = REDC_ALG2;
-		if (temp < 1) {
-			math_error("Illegal redc2 value");
-			/*NOTREACHED*/
-		}
-		conf->redc2 = (int)temp;
 		break;
 
 	case CONFIG_TILDE:
@@ -563,129 +580,75 @@ setconfig(int type, VALUE *vp)
 		break;
 
 	case CONFIG_QUOMOD:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for quomod");
+			math_error("Illegal value for quomod");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->quomod = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal quomod parameter value");
-			/*NOTREACHED*/
-		}
-		conf->quomod = temp;
 		break;
 
 	case CONFIG_QUO:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for quo");
+			math_error("Illegal value for quo");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->quo = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal quo parameter value");
-			/*NOTREACHED*/
-		}
-		conf->quo = temp;
 		break;
 
 	case CONFIG_MOD:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for mod");
+			math_error("Illegal value for mod");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->mod = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal mod parameter value");
-			/*NOTREACHED*/
-		}
-		conf->mod = temp;
 		break;
 
 	case CONFIG_SQRT:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for sqrt");
+			math_error("Illegal value for sqrt");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->sqrt = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal sqrt parameter value");
-			/*NOTREACHED*/
-		}
-		conf->sqrt = temp;
 		break;
 
 	case CONFIG_APPR:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for appr");
+			math_error("Illegal value for appr");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->appr = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal appr parameter value");
-			/*NOTREACHED*/
-		}
-		conf->appr = temp;
 		break;
 
 	case CONFIG_CFAPPR:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for cfappr");
+			math_error("Illegal value for cfappr");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->cfappr = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal cfappr parameter value");
-			/*NOTREACHED*/
-		}
-		conf->cfappr = temp;
 		break;
 
 	case CONFIG_CFSIM:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for cfsim");
+			math_error("Illegal value for cfsim");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->cfsim = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal cfsim parameter value");
-			/*NOTREACHED*/
-		}
-		conf->cfsim = temp;
 		break;
 
 	case CONFIG_OUTROUND:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for outround");
+			math_error("Illegal value for outround");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->outround = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal output parameter value");
-			/*NOTREACHED*/
-		}
-		conf->outround = temp;
 		break;
 
 	case CONFIG_ROUND:
-		if (vp->v_type != V_NUM) {
+		if (getlen(vp, &len)) {
-			math_error("Non numeric for round");
+			math_error("Illegal value for round");
 			/*NOTREACHED*/
 		}
-		q = vp->v_num;
+		conf->round = len;
-		temp = qtoi(q);
-		if (qisfrac(q) || qisneg(q) || !zistiny(q->num)) {
-			math_error("Illegal output parameter value");
-			/*NOTREACHED*/
-		}
-		conf->round = temp;
 		break;
 
 	case CONFIG_LEADZERO:
@@ -898,11 +861,19 @@ setconfig(int type, VALUE *vp)
 		/*NOTREACHED*/
 
 	case CONFIG_BASENAME:
-		math_error("The program config parameter is read-only");
+		math_error("The basename config parameter is read-only");
+		/*NOTREACHED*/
+
+	case CONFIG_WINDOWS:
+		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_VERSION:
-		math_error("The program config parameter is read-only");
+		math_error("The version config parameter is read-only");
 		/*NOTREACHED*/
 
 	default:
@@ -1079,6 +1050,16 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		vp->v_str = makenewstring(p);
 		return;
 
+	case CONFIG_MODE2:
+		vp->v_type = V_STR;
+		p = lookup_name(modes, cfg->outmode2);
+		if (p == NULL) {
+			math_error("invalid secondary output mode: %d", cfg->outmode2);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
+		return;
+
 	case CONFIG_EPSILON:
 		vp->v_num = qlink(cfg->epsilon);
 		return;
@@ -1104,20 +1085,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_TILDE:
-		vp->v_type = V_STR;
 		if (cfg->tilde_ok) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
 	case CONFIG_TAB:
-		vp->v_type = V_STR;
 		if (cfg->tab_ok) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1158,20 +1137,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_LEADZERO:
-		vp->v_type = V_STR;
 		if (cfg->leadzero) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
 	case CONFIG_FULLZERO:
-		vp->v_type = V_STR;
 		if (cfg->fullzero) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1194,11 +1171,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_BLKVERBOSE:
-		vp->v_type = V_STR;
 		if (cfg->blkverbose) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1235,11 +1211,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_VERBOSE_QUIT:
-		vp->v_type = V_STR;
 		if (cfg->verbose_quit) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1271,6 +1246,22 @@ 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);
+		}
+		return;
+
+	case CONFIG_CYGWIN:
+		if (cfg->cygwin) {
+			vp->v_num = itoq(1);
+		} else {
+			vp->v_num = itoq(0);
+		}
+		return;
+
 	case CONFIG_VERSION:
 		vp->v_type = V_STR;
 		if (cfg->version == NULL) {
@@ -1311,12 +1302,12 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	 */
 	if (cfg1 == NULL || cfg1->epsilon == NULL || cfg1->prompt1 == NULL ||
 	    cfg1->prompt2 == NULL) {
-		math_error("CONFIG #1 value is invaid");
+		math_error("CONFIG #1 value is invalid");
 		/*NOTREACHED*/
 	}
 	if (cfg2 == NULL || cfg2->epsilon == NULL || cfg2->prompt1 == NULL ||
 	    cfg2->prompt2 == NULL) {
-		math_error("CONFIG #2 value is invaid");
+		math_error("CONFIG #2 value is invalid");
 		/*NOTREACHED*/
 	}
 
@@ -1326,6 +1317,7 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	return cfg1->traceflags != cfg2->traceflags ||
 	       cfg1->outdigits != cfg2->outdigits ||
 	       cfg1->outmode != cfg2->outmode ||
+	       cfg1->outmode2 != cfg2->outmode2 ||
 	       qcmp(cfg1->epsilon, cfg2->epsilon) ||
 	       cfg1->epsilonprec != cfg2->epsilonprec ||
 	       cfg1->maxprint != cfg2->maxprint ||
@@ -1371,6 +1363,7 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 
 	       (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);
 }

config.h

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999  Landon Curt Noll and David I. Bell
+ * Copyright (C) 1999-2002  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.3 $
+ * @(#) $Revision: 29.15 $
- * @(#) $Id: config.h,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: config.h,v 29.15 2004/02/23 06:08:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -35,8 +35,15 @@
 #define __CONFIG_H__
 
 
-#include "nametype.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "qmath.h"
+# include "win32dll.h"
+# include "nametype.h"
+# include "qmath.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/nametype.h>
+# include <calc/qmath.h>
+#endif
 
 
 /*
@@ -71,17 +78,20 @@
 #define CONFIG_MORE	25
 #define CONFIG_BLKMAXPRINT 26
 #define CONFIG_BLKVERBOSE 27
-#define CONFIG_BLKBASE 28
+#define CONFIG_BLKBASE	28
-#define CONFIG_BLKFMT 29
+#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_CTRL_D	34
-#define CONFIG_PROGRAM 35
+#define CONFIG_PROGRAM	35
-#define CONFIG_BASENAME 36
+#define CONFIG_BASENAME	36
-#define CONFIG_VERSION 37
+#define CONFIG_VERSION	37
+#define CONFIG_WINDOWS	38
+#define CONFIG_MODE2	39
+#define CONFIG_CYGWIN	40
 
 
 /*
@@ -90,8 +100,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 */
 
@@ -110,26 +118,27 @@
  */
 struct config {
 	int outmode;		/* current output mode */
-	long outdigits;		/* current output digits for float or exp */
+	int outmode2;		/* current secondary output mode */
+	LEN outdigits;		/* current output digits for float or exp */
 	NUMBER *epsilon;	/* default error for real functions */
 	    long epsilonprec;	/* epsilon binary precision (tied to epsilon) */
 	FLAG traceflags;	/* tracing flags */
-	long maxprint;		/* number of elements to print */
+	LEN maxprint;		/* number of elements to print */
 	LEN mul2;		/* size of number to use multiply algorithm 2 */
 	LEN sq2;		/* size of number to use square algorithm 2 */
 	LEN pow2;		/* size of modulus to use REDC for powers */
 	LEN redc2;		/* size of modulus to use REDC algorithm 2 */
 	BOOL tilde_ok;		/* ok to print a tilde on aproximations */
 	BOOL tab_ok;		/* ok to print tab before numeric values */
-	long quomod;		/* quomod() default rounding mode */
+	LEN quomod;		/* quomod() default rounding mode */
-	long quo;		/* quotent // default rounding mode */
+	LEN quo;		/* quotient // default rounding mode */
-	long mod;		/* mod % default rounding mode */
+	LEN mod;		/* mod % default rounding mode */
-	long sqrt;		/* sqrt() default rounding mode */
+	LEN sqrt;		/* sqrt() default rounding mode */
-	long appr;		/* appr() default rounding mode */
+	LEN appr;		/* appr() default rounding mode */
-	long cfappr;		/* cfappr() default rounding mode */
+	LEN cfappr;		/* cfappr() default rounding mode */
-	long cfsim;		/* cfsim() default rounding mode */
+	LEN cfsim;		/* cfsim() default rounding mode */
-	long outround;		/* output default rounding mode */
+	LEN outround;		/* output default rounding mode */
-	long round;		/* round()/bround() default rounding mode */
+	LEN round;		/* round()/bround() default rounding mode */
 	BOOL leadzero;		/* ok to print leading 0 before decimal pt */
 	BOOL fullzero;		/* ok to print trailing 0's */
 	long maxscancount;	/* max scan errors before abort */
@@ -146,6 +155,8 @@ struct config {
 	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 */
 	char *version;		/* calc version string */
 };
 typedef struct config CONFIG;
@@ -157,7 +168,8 @@ typedef struct config CONFIG;
 #define RSCDBG_STDIN_FUNC   (0x00000001)    /* interactive func define debug */
 #define RSCDBG_FILE_FUNC    (0x00000002)    /* file read func define debug */
 #define RSCDBG_FUNC_INFO    (0x00000004)    /* print extra info for show func */
-#define RSCDBG_MASK	    (0x00000007)
+#define RSCDBG_PRINT_DBG    (0x00000008)    /* print debug messages */
+#define RSCDBG_MASK	    (0x0000000f)
 
 
 /*
@@ -169,7 +181,8 @@ typedef struct config CONFIG;
 #define CALCDBG_BLOCK	    (0x00000008)    /* block debug */
 #define CALCDBG_TTY	    (0x00000010)    /* report TTY state changes */
 #define CALCDBG_RUNSTATE    (0x00000020)    /* report run_state changes */
-#define CALCDBG_MASK	    (0x0000003f)
+#define CALCDBG_RAND	    (0x00000040)    /* report rand() activity */
+#define CALCDBG_MASK	    (0x0000007f)
 
 /*
  * ctrl-d meanings
@@ -182,23 +195,23 @@ typedef struct config CONFIG;
 /*
  * global configuration states and aliases
  */
-extern CONFIG *conf;		/* current configuration */
+extern DLL CONFIG *conf;	/* current configuration */
-extern CONFIG oldstd;		/* backward compatible standard configuration */
+extern DLL CONFIG oldstd;	/* old classic standard configuration */
-extern CONFIG newstd;		/* new non-backward compatible configuration */
+extern DLL CONFIG newstd;	/* default compatible configuration */
-extern char *calc_debug;	/* !=NULL => value of config("calc_debug") */
+extern DLL char *calc_debug;	/* !=NULL => value of config("calc_debug") */
-extern char *resource_debug;	/* !=NULL => config("resource_debug") value */
+extern DLL char *resource_debug; /* !=NULL => config("resource_debug") value */
-extern char *user_debug;	/* !=NULL => value of config("user_debug") */
+extern DLL char *user_debug;	/* !=NULL => value of config("user_debug") */
 
 
 /*
  * configuration externals
  */
-extern CONFIG *config_copy(CONFIG *src);
+extern DLL CONFIG *config_copy(CONFIG *src);
-extern void config_free(CONFIG *cfg);
+extern DLL void config_free(CONFIG *cfg);
-extern void config_print(CONFIG *cfg);
+extern DLL void config_print(CONFIG *cfg);
-extern int configtype(char*);
+extern DLL int configtype(char*);
-extern void config_print(CONFIG*);
+extern DLL void config_print(CONFIG*);
-extern BOOL config_cmp(CONFIG*, CONFIG*);
+extern DLL BOOL config_cmp(CONFIG*, CONFIG*);
 
 
 #endif /* !__CONFIG_H__ */

const.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: const.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: const.c,v 29.3 2004/02/23 07:50:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/const.c,v $
  *
  * Under source code control:	1990/02/15 01:48:14
@@ -34,7 +34,7 @@
 
 #define CONSTALLOCSIZE 400	/* number of constants to allocate */
 
-static long constcount;		/* number of constants defined */
+static unsigned long constcount;/* number of constants defined */
 static long constavail;		/* number of constants available */
 static NUMBER **consttable;	/* table of constants */
 
@@ -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

@@ -0,0 +1,320 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
+ *
+ * usage:
+ *      4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
+ *
+ *      x0 y0 z0 w0	point 0 in R^4
+ *      x1 y1 z1 w1	point 1 in R^4
+ *	...		...
+ *      x5 y5 z5 w5	point 5 in R^4
+ *
+ * Copyright (C) 2001  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: 1.3 $
+ * @(#) $Id: 4dsphere.calc,v 1.3 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/4dsphere.calc,v $
+ *
+ * Under source code control:   2001/05/03 19:02:03
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * parse args
+ */
+argc = argv();
+if (argc != 25) {
+    fprintf(files(2), "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+	argv(0));
+    exit;
+}
+x0 = eval(argv(1));
+y0 = eval(argv(2));
+z0 = eval(argv(3));
+w0 = eval(argv(4));
+x1 = eval(argv(5));
+y1 = eval(argv(6));
+z1 = eval(argv(7));
+w1 = eval(argv(8));
+x2 = eval(argv(9));
+y2 = eval(argv(10));
+z2 = eval(argv(11));
+w2 = eval(argv(12));
+x3 = eval(argv(13));
+y3 = eval(argv(14));
+z3 = eval(argv(15));
+w3 = eval(argv(16));
+x4 = eval(argv(17));
+y4 = eval(argv(18));
+z4 = eval(argv(19));
+w4 = eval(argv(20));
+x5 = eval(argv(21));
+y5 = eval(argv(22));
+z5 = eval(argv(23));
+w5 = eval(argv(24));
+
+/*
+ * verbose output setup
+ */
+print "(":x0:",":y0:",":z0:",":w0:") ":;
+print "(":x1:",":y1:",":z1:",":w1:") ":;
+print "(":x2:",":y2:",":z2:",":w2:") ":;
+print "(":x3:",":y3:",":z3:",":w3:") ":;
+print "(":x4:",":y4:",":z4:",":w4:") ":;
+print "(":x5:",":y5:",":z5:",":w5:") ":;
+
+/*
+ *
+ * Given the 5 points:
+ *
+ * 	(x0,y1,z1,w1)
+ * 	(x1,y1,z1,w1)
+ * 	(x2,y2,z2,w2)
+ * 	(x3,y3,z3,w3)
+ * 	(x4,y4,z4,w4)
+ * 	(x5,y5,z5,w5)
+ *
+ * we can determine if they lie in the surface of 4D sphere in R^4 if the
+ * following matrix is 0:
+ *
+ * 	| x0^2+y0^2+z0^2+w0^2	x0	y0	z0	w0	1 |
+ * 	| x1^2+y1^2+z1^2+w1^2	x1	y1	z1	w1	1 |
+ * 	| x2^2+y2^2+z2^2+w2^2	x2	y2	z2	w2	1 |	= 0
+ * 	| x3^2+y3^2+z3^2+w3^2	x3	y3	z3	w3	1 |
+ * 	| x4^2+y4^2+z4^2+w4^2	x4	y4	z4	w4	1 |
+ * 	| x5^2+y5^2+z5^2+w5^2	x5	y5	z5	w5	1 |
+ */
+if ((w0*(-x1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) +y1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -z3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5)
+    -x5*z4- (x4-x5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(x2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4-
+    (x4-x5)*z3) +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+
+    (x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3)) -x0*(-w1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) -y1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(w2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3-
+    (-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3)) +y0*(-w1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -x1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) +
+    (z1^2+y1^2+x1^2+w1^2)*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3))
+    -w1*(-x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3))
+    +x1*(-w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3))
+    -y1*(-w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5)
+    - (w5*x4-w4*x5)*z3)) -z0*(-w1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -x1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    -y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2)) +y1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) - (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)
+    + (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5)
+    - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2) + (w2*(x4*y5+x3*(y4-y5)
+    -x5*y4- (x4-x5)*y3) -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5)
+    +w5*y4+ (w4-w5)*y3) -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3-
+    (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*y2)*(z1^2+y1^2+x1^2+w1^2))
+    +z1*(-w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    +y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2)) -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +
+    (z0^2+y0^2+x0^2+w0^2)*(-w1*(x2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+ (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*z2) +x1*(w2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3- (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*z2) -w2*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3) -y1*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) -y2*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5) -
+    (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5) -
+    (w5*x4-w4*x5)*y3)*z2+ (w2*(x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)
+    -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)
+    -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*y2)*z1) - (z1^2+y1^2+x1^2+w1^2)*(-w2*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3) -y2*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*z2)) == 0) {
+    print "are in the surface of a 4D sphere";
+} else {
+    print "are NOT on a 4D sphere surface";
+}

cscript/Makefile

@@ -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 $
+# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.5 2000/06/07 14:02:59 chongo Exp $
+# @(#) $Id: Makefile,v 29.23 2003/01/14 01:58:18 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -36,15 +36,121 @@
 SHELL= /bin/sh
 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.
+####
+
+# Where the system include (.h) files are kept
 #
-BINDIR= /usr/local/bin
+# For DJGPP, select:
-#BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
 #
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
 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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
+
 # Makefile debug
 #
 # Q=@	do not echo internal makefile actions (quiet mode)
@@ -59,13 +165,14 @@ CHMOD= chmod
 SED= sed
 SORT= sort
 FMT= fmt
+CMP= cmp
 
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
 #
 # The ${SCRIPT_SRC} is built from ${SCRIPT} and has the .calc extensions.
 #
-# This list is prodiced by the detaillist rule when no WARNINGS are detected.
+# This list is produced by the detaillist rule when no WARNINGS are detected.
 # To add a script:
 #
 #	1) Name the file with a .calc filename extension
@@ -76,26 +183,36 @@ FMT= fmt
 #
 #		make detaillist
 #
-SCRIPT= mersenne piforever plus simple
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
+	simple square
 
-SCRIPT_SRC= mersenne.calc piforever.calc plus.calc simple.calc
+SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
+	piforever.calc plus.calc powerterm.calc simple.calc square.calc
 
 # These files are found (but not built) in the distribution
 #
 DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README
 
-# These files are used to make (but not built) a calc .a library
+# These files are used to make (but not build) a calc .a library
 #
 CALCLIBLIST=
 
+# complete list of targets
+#
+# NOTE: This list MUST be co-ordinated with the ${CSCRIPT_TARGETS} variable
+#	in the upper level ../Makefile
+#
+CSCRIPT_TARGETS= ${SCRIPT}
+TARGETS= ${CSCRIPT_TARGETS}
+
 # The reason for this Makefile
 #
-all: ${SCRIPT} ${SCRIPT_SRC} .all
+all: ${TARGETS} .all
 
-# used by the upper level Makefile to determine of we have done all
+# 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
-#	an non-emoty else clause for every if condition.  *sigh*
+#	a non-empty else clause for every if condition.  *sigh*
 #
 .all:
 	rm -f .all
@@ -112,9 +229,11 @@ all: ${SCRIPT} ${SCRIPT_SRC} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cscript/$$i; \
-	done | ${SORT}
+	    fi; \
+	done | LANG=C ${SORT}
 
 distdir:
 	${Q}echo cscript
@@ -125,24 +244,28 @@ calcliblist:
 #
 detaillist:
 	${Q}-(echo "xxxxxxx"; \
-	   for i in ${SCRIPT}; do \
+	   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; \
 		else \
 		    echo $$i; \
 		fi; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    fi; \
+	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}; do \
+	   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; \
 		else \
 		    echo $$i.calc; \
 		fi; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    fi; \
+	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
 
@@ -170,11 +293,13 @@ depend:
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 		makedep.out
 	${Q}echo "" >> makedep.out
-	${Q}for i in ${SCRIPT}; do \
+	${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 '	@$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
-		echo '	$${CHMOD} +x $$@'; \
+		echo '	@$${CHMOD} +x $$@'; \
+	    fi; \
 	done >> makedep.out
 	${Q}echo sample dependency list formed
 	${Q}echo forming new cscript/Makefile
@@ -184,7 +309,7 @@ depend:
 	${Q}echo "" >> Makefile
 	${Q}${SED} -n '3,$$p' makedep.out >> Makefile
 	-${Q}rm -f makedep.out
-	-${Q}if cmp -s Makefile.bak Makefile; then \
+	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'sample Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -199,49 +324,102 @@ depend:
 		fi; \
 	fi
 
+##
+#
+# rpm rules
+#
+##
+
+echo_inst_files:
+	${Q}for i in ${SCRIPT} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${SCRIPTDIR}/$$i; \
+	    fi; \
+	done
+
+##
+#
+# Utility rules
+#
+##
+
 clean:
 	-rm -f makedep.out
 
 clobber:
-	-rm -f ${SCRIPT}
+	-rm -f ${TARGETS}
 
 install: all
-	-${Q}if [ ! -d ${BINDIR} ]; then \
+	-${Q}if [ ! -d $T${BINDIR} ]; then \
-		echo mkdir ${BINDIR}; \
+	    echo mkdir $T${BINDIR}; \
-		mkdir ${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${SCRIPTDIR} ]; then \
+	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
-		echo mkdir ${SCRIPTDIR}; \
+	    echo mkdir $T${SCRIPTDIR}; \
-		mkdir ${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}; \
 	else \
 	    true; \
 	fi
-	${Q}for i in ${SCRIPT}; do \
+	${Q}for i in ${SCRIPT} /dev/null; do \
-		echo rm -f ${SCRIPTDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		rm -f ${SCRIPTDIR}/$$i; \
+		continue; \
-		echo cp $$i ${SCRIPTDIR}; \
+	    fi; \
-		cp $$i ${SCRIPTDIR}; \
+	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
-		echo ${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
+		true; \
-		${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
+	    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"; \
+	    fi; \
 	done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
+4dsphere: 4dsphere.calc
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
+fproduct: fproduct.calc
+	@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:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
 piforever: piforever.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
 plus: plus.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
+powerterm: powerterm.calc
+	@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:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
+square: square.calc
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@

cscript/README

@@ -19,6 +19,23 @@ For more info, see:
 
 =-=
 
+4dsphere
+
+    Determine if 6 points lie on the surface of a 4-dimensional sphere in R^4.
+
+    4dsphere x0 y0 z0 w0   x1 y1 z1 w1   ...   x5 y5 z5 w5
+
+	x0 y0 z0 w0     point 0 in R^4
+	x1 y1 z1 w1     point 1 in R^4
+	...             ...
+	x5 y5 z5 w5     point 5 in R^4
+
+
+fproduct filename term ...
+
+    Write the big Endian product of terms to a file.  Use - for stdout.
+
+
 mersenne exp
 
     Print the value of 2^exp-1.
@@ -34,6 +51,12 @@ plus arg ...
     Print the sum of 1 or more arguments.
 
 
+powerterm [base_limit] value
+
+    Print the value as a sum (or difference) of powers of integers up
+    to and including powers <= base_limit.  By default, base_limit is 10000.
+
+
 simple
 
     A trivial example of a calc shell script.
@@ -54,8 +77,8 @@ 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.4 $
+## @(#) $Revision: 29.10 $
-## @(#) $Id: README,v 29.4 2000/06/07 14:02:59 chongo Exp $
+## @(#) $Id: README,v 29.10 2001/06/10 19:34:40 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40

cscript/fproduct.calc

@@ -0,0 +1,88 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * fproduct - write the big Endian product of terms to a file
+ *
+ * usage:
+ *	fproduct filename term [term ...]
+ *
+ *	filename	where to write the product, use - for stdout
+ *	term ...	terms to multiply
+ *
+ * Copyright (C) 2001  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: fproduct.calc,v 29.2 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/fproduct.calc,v $
+ *
+ * Under source code control:   2001/04/07 20:13:11
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * parse args
+ */
+argc = argv();
+if (argc < 2) {
+    fprintf(files(2), "usage: %s term [term ...]\n", argv(0));
+    exit;
+}
+filename = argv(1);
+
+
+/*
+ * build the product
+ */
+product = 1;
+for (i=2; i < argc; ++i) {
+    product *= eval(argv(i));
+}
+product = abs(product);
+
+
+/*
+ * open the file for writing, "-" is stdout
+ */
+if (filename == "-") {
+    fd = files(1);
+} else {
+    fd = fopen(filename, "w");
+    if (!isfile(fd)) quit "be2file: cannot open file for writing";
+}
+
+
+/*
+ * write the octets to the file
+ *
+ * The most significant bits of the integer become the first file octets.
+ */
+if (product > 0) {
+    octlen = int((highbit(product)+8) / 8);
+    for (i=octlen-1; i >= 0; --i) {
+	fputc(fd, char(product >> (i*8)));
+    }
+}
+
+
+/*
+ * cleanup
+ */
+if (filename != "-") {
+    fclose(fd);
+}

cscript/mersenne.calc

@@ -1,4 +1,4 @@
-#!/usr/local/src/cmd/calc/calc -S
+#!/usr/local/src/cmd/calc/calc -q -s -f
 #
 # mersenne - print the value of a mersenne number
 #
@@ -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 $
+# @(#) $Revision: 29.3 $
-# @(#) $Id: mersenne.calc,v 29.2 2000/06/07 14:02:59 chongo Exp $
+# @(#) $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;
@@ -35,13 +35,19 @@
 /*
  * parse args
  */
-if (argv() != 1) {
+if (argv() != 2) {
 	/* we include the name of this script in the error message */
 	fprintf(files(2), "usage: %s exp\n", config("program"));
 	abort "wrong number of args";
 }
 
+global n = eval(argv(1));
+
+if (!isint(n) || n <= 0) {
+	quit "Argument to be a positive integer";
+}
+
 /*
  * print the decimal value of 2^n-1
  */
-print "2^": argv(0) : "-1 =", 2^eval(argv(0))-1;
+print "2^": n : "-1 =", 2^n-1;

cscript/piforever.calc

@@ -1,4 +1,4 @@
-#!/usr/local/src/cmd/calc/calc -S
+#!/usr/local/src/cmd/calc/calc -q -f
 #
 # piforever - print digits of pi forever (or as long as your mem/cpu allow)
 #
@@ -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 $
+# @(#) $Revision: 29.3 $
-# @(#) $Id: piforever.calc,v 29.2 2000/06/07 14:02:59 chongo Exp $
+# @(#) $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

cscript/plus.calc

@@ -1,4 +1,4 @@
-#!/usr/local/src/cmd/calc/calc -S
+#!/usr/local/src/cmd/calc/calc -q -s -f
 #
 # plus - add two or more arguments together
 #
@@ -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 $
+# @(#) $Revision: 29.3 $
-# @(#) $Id: plus.calc,v 29.2 2000/06/07 14:02:59 chongo Exp $
+# @(#) $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
@@ -35,19 +35,19 @@
 /*
  * parse args
  */
-if (argv() < 1) {
+if (argv() < 2) {
 	/* we include the name of this script in the error message */
 	fprintf(files(2), "usage: %s value ...\n", config("program"));
 	abort "not enough args";
 }
 
 /*
- * print the sum of the 2 args
+ * print the sum of the args
  *
  * Since args are strings, we must eval them before using them numerically.
  */
 sum = 0;
-for (i=0; i < argv(); ++i) {
+for (i=1; i < argv(); ++i) {
 	sum += eval(argv(i));
 }
 print sum;

cscript/powerterm.calc

@@ -0,0 +1,185 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * powerterm - print the argument as a sum of powers of integers
+ *
+ * usage:
+ *      powerterm [base_limit] value
+ *
+ *	base_limit	largest base we will consider (def: 10000)
+ *      value		value to convert into sums of powers of integers
+ *
+ * Copyright (C) 2001  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the powerterm 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: powerterm.calc,v 29.6 2001/06/06 09:06:29 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/powerterm.calc,v $
+ *
+ * Under source code control:   2001/04/24 23:49:11
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * parse args
+ */
+config("verbose_quit", 0),;
+base_lim = 10000;		/* default: highest base we will consider */
+if (argv() < 2 || argv() > 3) {
+    fprintf(files(2), "usage: %s [base_limit] value\n", argv(0));
+    exit;
+}
+if (argv() == 3) {
+    x = eval(argv(2));
+    base_lim = eval(argv(1));
+} else {
+    x = eval(argv(1));
+}
+if (! isint(x)) {
+    fprintf(files(2), "%s: value must be an integer\n");
+    exit;
+}
+if (! isint(base_lim)) {
+    fprintf(files(2), "%s: base limit must be an integer\n");
+    exit;
+}
+if (base_lim <= 1) {
+    fprintf(files(2), "%s: base limit is too small\n");
+    exit;
+}
+++base_lim;
+
+/*
+ * setup loop variables
+ */
+term = 0;			/* number of powerterm found */
+
+/*
+ * log constants
+ */
+if (base_lim <= 2^20+1) {		/* 2^20 requires ~96 Megs of memory */
+    mat lni[base_lim];			/* log of integers */
+    for (i=2; i < base_lim; ++i) {
+	lni[i] = ln(i);
+    }
+    have_lni = 1;			/* have lni[x] array */
+} else {
+    mat lni[1];				/* not used */
+    have_lni = 0;			/* base_lim too large for array */
+}
+
+/*
+ * remove nestest powers
+ */
+while (abs(x) >= base_lim) {
+
+    /*
+     * look for the nearest power
+     */
+    lnx = ln(abs(x));			/* log of the remaining co-factor */
+    closest = 0.5;
+    base = 1;
+    exponent = 0;
+    if (have_lni) {
+
+	/*
+	 * use pre-calculated log array when looking for the nearest power
+	 */
+	for (i = 2; i < base_lim; ++i) {
+
+	    /*
+	     * determine exponent closeness to an integer
+	     */
+	    ex = lnx / lni[i];
+	    power = int(ex + 0.5);
+	    diff = ex - power;
+
+	    /*
+	     * look for a closer power
+	     */
+	    if (abs(diff) < closest) {
+		closest = abs(diff);
+		base = i;
+		exponent = power;
+	    }
+	}
+
+    } else {
+
+	/*
+	 * re-calculate logs when looking for the nearest power
+	 */
+	for (i = 2; i < base_lim; ++i) {
+
+	    /*
+	     * determine exponent closeness to an integer
+	     */
+	    ex = lnx / ln(i);
+	    power = int(ex + 0.5);
+	    diff = ex - power;
+
+	    /*
+	     * look for a closer power
+	     */
+	    if (abs(diff) < closest) {
+		closest = abs(diff);
+		base = i;
+		exponent = power;
+	    }
+	}
+    }
+
+    /*
+     * output current term and then subtract it
+     */
+    if (x != 0) {
+	if (x < 0) {
+	    print "-",;
+	} else if (term > 0) {
+	    print "+",;
+	}
+	if (exponent > 1) {
+	    print base: "^": exponent,;
+	} else {
+	    print base,;
+	}
+    }
+
+    /*
+     * subtract (or add) this near power
+     */
+    if (x < 0) {
+	x = x + base^exponent;
+    } else {
+	x = x - base^exponent;
+    }
+    ++term;
+}
+
+/*
+ * print the final term
+ */
+if (x < 0) {
+    print "-", -x;
+} else if (x > 0) {
+    print "+", x;
+} else {
+    print "";
+}
+exit;

cscript/simple.calc

@@ -1,4 +1,4 @@
-#!/usr/local/src/cmd/calc/calc -S
+#!/usr/local/src/cmd/calc/calc -q -f
 #
 # simple - an example of a simple calc shell script
 #
@@ -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 $
+# @(#) $Revision: 29.3 $
-# @(#) $Id: simple.calc,v 29.2 2000/06/07 14:02:59 chongo Exp $
+# @(#) $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
@@ -32,4 +32,4 @@
 /*
  * This is an example of a simple calc shell script.
  */
-print "The simple calc shell script works!"
+print "This simple calc shell script works!"

cscript/square.calc

@@ -0,0 +1,65 @@
+#!/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/
+
+# 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("")))
+	print "\t":eval(s)^2;

custom.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: custom.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: custom.c,v 29.3 2001/03/17 21:31:47 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/custom.c,v $
  *
  * Under source code control:	1997/03/03 04:53:08
@@ -34,11 +34,10 @@
 #include "value.h"
 #include "custom.h"
 
+#include <stdio.h>
 
 #if defined(CUSTOM)
 
-#include <stdio.h>
-
 #include "calc.h"
 
 #include "have_string.h"

custom/Makefile

@@ -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 $
+# @(#) $Revision: 29.21 $
-# @(#) $Id: Makefile,v 29.2 2000/06/07 14:03:03 chongo Exp $
+# @(#) $Id: Makefile,v 29.21 2004/02/23 09:23:08 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -88,26 +88,120 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o
 #Q=
 Q=@
 
+####
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
+####
+
+# Where the system include (.h) files are kept
 #
-# where to install things
+# For DJGPP, select:
 #
-# ${TOPDIR} is the directory under which the calc directory will be placed.
+#	INCDIR= /dev/env/DJDIR/include
-# ${LIBDIR} is where the *.cal, *.h, *.a, bindings and help dir are installed.
-# ${HELPDIR} is where the help directory is installed.
-# ${CUSTOMLIBDIR} is where custom lib files are installed.
-# ${CUSTOMHELPDIR} is where custom help files are installed.
 #
-TOPDIR= /usr/local/lib
+# If in doubt, set:
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
-#TOPDIR= /usr/contrib/lib
 #
-LIBDIR= ${TOPDIR}/calc
+#	INCDIR= /usr/include
-HELPDIR= ${LIBDIR}/help
+#
-CUSTOMLIBDIR= ${LIBDIR}/custom
+
-CUSTOMHELPDIR= ${HELPDIR}/custhelp
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -256,7 +350,7 @@ REQUIRED_SRC= custtbl.c
 #
 REQUIRED_OBJ= custtbl.o
 
-# These .h files are installed under ${CUSTOMLIBDIR} by the install rule.
+# These .h files are installed under ${CUSTOMCALDIR} by the install rule.
 #
 INSTALL_H_SRC= ${CUSTOM_H_SRC}
 
@@ -288,9 +382,13 @@ DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
 #
 CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
 
+# This is the custom .a link library that is build
+#
+CALC_LIBCUSTOM= libcustcalc.a
+
 # complete list of targets
 #
-TARGETS= libcustcalc.a ${CUSTCALC_OBJ}
+TARGETS= ${CALC_LIBCUSTOM} ${CUSTCALC_OBJ}
 
 # required vars
 #
@@ -303,6 +401,7 @@ SED= sed
 MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
+CMP= cmp
 
 ##
 #
@@ -313,7 +412,7 @@ SORT= sort
 all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 	${CUSTOM_HELP} ${MAKE_FILE} .all
 
-libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
+libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../${MAKE_FILE}
 	-rm -f libcustcalc.a
 	ar qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
@@ -353,8 +452,10 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
+	    fi; \
 	done
 
 distdir:
@@ -390,11 +491,13 @@ depend:
 	-${Q}rm -rf skel
 	${Q}mkdir skel
 	${Q}mkdir skel/custom
-	-${Q}for i in ${C_SRC}; do \
+	-${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 /dev/null ${H_SRC}; do \
+	-${Q}for i in ${H_SRC} /dev/null; do \
 		if [ "$$i" = "/dev/null" ]; then \
 		    continue; \
 		fi; \
@@ -406,7 +509,13 @@ depend:
 		echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q}(cd ..; ${MAKE} hsrc)
-	${Q}for i in `cd ..; ${MAKE} h_list`; do \
+	${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"; \
@@ -419,9 +528,11 @@ depend:
 	${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 -m -f makedep.out ${C_SRC}
+	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
-	-${Q}for i in ${C_SRC}; do \
+	-${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
@@ -429,9 +540,10 @@ depend:
 	${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 | ${SORT} -u >> 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 \
+	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'custom Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -446,6 +558,34 @@ depend:
 		fi; \
 	fi
 
+##
+#
+# rpm rules
+#
+##
+
+echo_inst_files:
+	${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 \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMHELPDIR}/$$i; \
+	    fi; \
+	done
+	${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 \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
+	    fi; \
+	done
+
 ##
 #
 # Utility rules
@@ -457,73 +597,148 @@ clean:
 
 clobber:
 	-rm -f ${TARGETS}
-	rm -f .all Makefile.tmp
+	rm -f .all Makefile.tmp Makefile.bak
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${INCDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${INCDIR}; \
-		mkdir ${TOPDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${LIBDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${LIBDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${LIBDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
+	    echo mkdir $T${CALC_INCDIR}; \
-		mkdir ${HELPDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMLIBDIR} ]; then \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-		echo mkdir ${CUSTOMLIBDIR}; \
+	    echo mkdir $T${HELPDIR}; \
-		mkdir ${CUSTOMLIBDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMHELPDIR} ]; then \
+	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-		echo mkdir ${CUSTOMHELPDIR}; \
+	    echo mkdir $T${CUSTOMCALDIR}; \
-		mkdir ${CUSTOMHELPDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
-		if [ X$$i = X/dev/null ]; then continue; fi; \
+	    echo mkdir $T${CUSTOMHELPDIR}; \
-		echo rm -f ${CUSTOMLIBDIR}/$$i; \
+	    mkdir $T${CUSTOMHELPDIR}; \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
+	    if [ ! -d "$T${CUSTOMHELPDIR}" ]; then \
-		echo cp $$i ${CUSTOMLIBDIR}; \
+		echo mkdir -p "$T${CUSTOMHELPDIR}"; \
-		cp $$i ${CUSTOMLIBDIR}; \
+		mkdir -p "$T${CUSTOMHELPDIR}"; \
-		echo ${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    fi; \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    echo ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	else \
+	    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}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	else \
+	    true; \
+	fi
+	-${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; \
+	    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"; \
+	    fi; \
 	done
-	${Q}for i in ${CUSTOM_CALC_FILES}; do \
+	-${Q}rm -f tmp
-		echo rm -f ${CUSTOMLIBDIR}/$$i; \
+	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		echo cp $$i ${CUSTOMLIBDIR}; \
+		continue; \
-		cp $$i ${CUSTOMLIBDIR}; \
+	    fi; \
-		echo ${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    if ${CMP} -s $$i $T${CUSTOMCALDIR}/$$i; then \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+		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"; \
+	    fi; \
 	done
-	${Q}for i in ${CUSTOM_HELP}; do \
+	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
-		echo rm -f ${CUSTOMHELPDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		rm -f ${CUSTOMHELPDIR}/$$i; \
+		continue; \
-		echo cp $$i ${CUSTOMHELPDIR}; \
+	    fi; \
-		cp $$i ${CUSTOMHELPDIR}; \
+	    if ${CMP} -s $$i $T${CUSTOMHELPDIR}/$$i; then \
-		echo ${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i; \
+		true; \
-		${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i; \
+	    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"; \
+	    fi; \
 	done
 	-${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \
-		echo "rm -f ${CUSTOMLIBDIR}/libcustcalc.a"; \
+	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
-		rm -f ${CUSTOMLIBDIR}/libcustcalc.a; \
+		true; \
-		echo "cp libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a"; \
+	    else \
-		cp libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a; \
+		rm -f $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		echo "${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a"; \
+		cp -f libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a; \
+		${CHMOD} 0644 $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		echo "${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a"; \
+		mv -f $T${CUSTOMCALDIR}/libcustcalc.a.new \
-		${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a; \
+		      $T${CUSTOMCALDIR}/libcustcalc.a; \
+		${RANLIB} $T${CUSTOMCALDIR}/libcustcalc.a; \
+		echo "installed $T${CUSTOMCALDIR}/libcustcalc.a"; \
+	    fi; \
 	fi
 
 ##
@@ -550,6 +765,7 @@ 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
@@ -558,6 +774,7 @@ 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
@@ -575,6 +792,7 @@ 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
@@ -583,6 +801,7 @@ 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
@@ -600,6 +819,7 @@ 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
@@ -608,6 +828,7 @@ 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_pzasusb8.o: ../alloc.h
@@ -625,6 +846,7 @@ 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
@@ -633,6 +855,7 @@ 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
@@ -653,6 +876,7 @@ 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
@@ -664,6 +888,7 @@ 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
@@ -691,5 +916,6 @@ 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/c_argv.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: c_argv.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Id: c_argv.c,v 29.3 2004/02/23 09:19:18 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 */

custom/c_devnull.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: c_devnull.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Id: c_devnull.c,v 29.3 2004/02/23 09:19:18 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

@@ -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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: c_help.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Id: c_help.c,v 29.3 2004/02/23 09:19:18 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_pzasusb8.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: c_pzasusb8.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Id: c_pzasusb8.c,v 29.3 2004/02/23 09:19:18 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

@@ -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 $
+ * @(#) $Revision: 29.7 $
- * @(#) $Id: c_sysinfo.c,v 29.3 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Id: c_sysinfo.c,v 29.7 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -53,6 +53,8 @@
 #include "../zrand.h"
 #include "../zrandom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * sys_info - names and values of selected #defines
@@ -64,7 +66,7 @@ struct infoname {
 	FULL nmbr;	/* if str==NULL ==> value fo #define as a FULL */
 };
 static struct infoname sys_info[] = {
-    {"A55", "slots in an additive 55 table", NULL, (FULL)A55},
+    {"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},
     {"BASEB", "bits in the calculation base", NULL, (FULL)BASEB},
@@ -112,7 +114,6 @@ static struct infoname sys_info[] = {
     {"MAXFILES", "max number of opened files", NULL, (FULL)MAXFILES},
     {"MAXFULL", "largest SFULL value", NULL, (FULL)MAXFULL},
     {"MAXHALF", "largest SHALF value", NULL, (FULL)MAXHALF},
-    {"MAXINDICES", "max number of indices for objects", NULL, (FULL)MAXINDICES},
     {"MAXLABELS", "max number of user labels in function", NULL, (FULL)MAXLABELS},
     {"MAXLEN", "longest storage size allowed", NULL, (FULL)MAXLEN},
     {"MAXLONG", "largest long val", NULL, (FULL)MAXLONG},
@@ -129,8 +130,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},
@@ -182,7 +181,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 */

endian.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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: endian.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: endian.c,v 29.4 2003/01/14 01:50:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/endian.c,v $
  *
  * Under source code control:	1993/11/15 04:32:58
@@ -36,6 +36,11 @@
 
 #include <stdio.h>
 
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
@@ -48,8 +53,10 @@ char byte[8] = { (char)0x12, (char)0x36, (char)0x48, (char)0x59,
 int
 main(void)
 {
+#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
 	/* pointers into the byte order array */
 	int *intp = (int *)byte;
+#endif
 #if defined(DEBUG)
 	short *shortp = (short *)byte;
 	long *longp = (long *)byte;
@@ -69,6 +76,11 @@ main(void)
 	printf("#define BIG_ENDIAN\t4321\n");
 	printf("#define LITTLE_ENDIAN\t1234\n");
 
+#if defined(LITTLE_ENDIAN)
+	printf("#define CALC_BYTE_ORDER\tLITTLE_ENDIAN\n");
+#elif defined(BIG_ENDIAN)
+	printf("#define CALC_BYTE_ORDER\tBIG_ENDIAN\n");
+#else
 	/* Determine byte order */
 	if (intp[0] == 0x12364859) {
 	    /* Most Significant Byte first */
@@ -81,6 +93,7 @@ main(void)
 		"Unknown int Byte Order, set CALC_BYTE_ORDER in Makefile\n");
 	    exit(1);
 	}
+#endif
 	/* exit(0); */
 	return 0;
 }

file.c

@@ -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 $
+ * @(#) $Revision: 29.8 $
- * @(#) $Id: file.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: file.c,v 29.8 2004/02/23 07:53:12 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -35,15 +35,23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <ctype.h>
 #include "calc.h"
 #include "longbits.h"
 #include "have_fpos.h"
+#include "have_fpos_pos.h"
 #include "fposval.h"
 #include "file.h"
 #include "calcerr.h"
 
+#if defined(_WIN32)
+# include <io.h>
+#endif
+
 #define READSIZE	1024	/* buffer size for reading */
 
 /*
@@ -150,7 +158,7 @@ file_init(void)
 				} else {
 					fp = (FILE *) fdopen(i, "w");
 					if (fp) {
-						strcpy(files[idnum].mode, "w?");
+						strcpy(files[idnum].mode, "w");
 						files[idnum].reading = FALSE;
 					}
 					else
@@ -199,7 +207,7 @@ openid(char *name, char *mode)
 	int i;
 
 	if (idnum >= MAXFILES)
-		return -77;
+		return -E_FOPEN3;
 
 	fiop = &files[3];
 	for (i = 3; i < MAXFILES; fiop++,i++) {
@@ -235,11 +243,32 @@ openid(char *name, char *mode)
 	fiop->reading = TRUE;
 	fiop->writing = TRUE;
 	fiop->action = 0;
-	if (mode[1] == '\0') {
+
-		if (*mode == 'r')
+	/*
+	 * determine file open mode
+	 *
+	 * While a leading 'r' is for reading and a leading 'w' is
+	 * for writing, the presense of a '+' in the string means
+	 * both reading and writing.  A leading 'a' means append
+	 * which is writing.
+	 */
+	if (mode[0] == 'r') {
+		fiop->reading = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->writing = FALSE;
-		else
+		} else {
+			fiop->writing = TRUE;
+		}
+	} else if (mode[0] == 'w' || mode[0] == 'a') {
+		fiop->writing = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->reading = FALSE;
+		} else {
+			fiop->reading = TRUE;
+		}
+	} else {
+		fiop->reading = FALSE;
+		fiop->writing = FALSE;
 	}
 	strcpy(fiop->mode, mode);
 	return id;
@@ -338,11 +367,32 @@ reopenid(FILEID id, char *mode, char *name)
 	fiop->reading = TRUE;
 	fiop->writing = TRUE;
 	fiop->action = 0;
-	if (mode[1] == '\0') {
+
-		if (*mode == 'r')
+	/*
+	 * determine file open mode
+	 *
+	 * While a leading 'r' is for reading and a leading 'w' is
+	 * for writing, the presense of a '+' in the string means
+	 * both reading and writing.  A leading 'a' means append
+	 * which is writing.
+	 */
+	if (mode[0] == 'r') {
+		fiop->reading = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->writing = FALSE;
-		else
+		} else {
+			fiop->writing = TRUE;
+		}
+	} else if (mode[0] == 'w' || mode[0] == 'a') {
+		fiop->writing = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->reading = FALSE;
+		} else {
+			fiop->reading = TRUE;
+		}
+	} else {
+		fiop->reading = FALSE;
+		fiop->writing = FALSE;
 	}
 	strcpy(fiop->mode, mode);
 	return id;
@@ -350,13 +400,13 @@ reopenid(FILEID id, char *mode, char *name)
 
 
 /*
- * Find the file I/O structure for the specified file id, and verify that
+ * Find the file I/O structure for the specified file id, and verifies that
- * it is opened in the required manner ('r' for reading or 'w' for writing).
+ * it is opened in the required manner (0 for reading or 1 for writing).
- * If mode is 0, then no open checks are made at all, and NULL is then
+ * If writable is -1, then no open checks are made at all and NULL is then
  * returned if the id represents a closed file.
  */
 FILEIO *
-findid(FILEID id, int mode)
+findid(FILEID id, int writable)
 {
 	FILEIO *fiop;		/* file structure */
 	int i;
@@ -375,21 +425,11 @@ findid(FILEID id, int mode)
 	if (i == idnum)
 		return NULL;
 
-	switch (mode) {
+	if (writable >= 0) {
-		case 'r':
+		if ((writable && !fiop->writing) ||
-			if (!fiop->reading)
+		    (!writable && !fiop->reading)) {
-				return NULL;
+			return NULL;
-			break;
+		}
-		case 'w':
-			if (!fiop->writing)
-				return NULL;
-			break;
-		case 0:
-			break;
-		default:
-			/* This should not happen */
-			math_error("Unknown findid mode");
-			/*NOTREACHED*/
 	}
 	return fiop;
 }
@@ -401,7 +441,7 @@ findid(FILEID id, int mode)
 BOOL
 validid(FILEID id)
 {
-	return (findid(id, 0) != NULL);
+	return (findid(id, -1) != NULL);
 }
 
 
@@ -497,7 +537,7 @@ errorid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return EOF;
 	return (ferror(fiop->fp) != 0);
@@ -512,7 +552,7 @@ eofid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return EOF;
 	return (feof(fiop->fp) != 0);
@@ -527,7 +567,7 @@ flushid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return 0;
 	if (!fiop->writing || fiop->action == 'r')
@@ -536,6 +576,7 @@ flushid(FILEID id)
 }
 
 
+#if !defined(_WIN32)
 int
 flushall(void)
 {
@@ -551,6 +592,7 @@ flushall(void)
 	}
 	return err;
 }
+#endif /* Windoz free systems */
 
 
 /*
@@ -588,7 +630,7 @@ readid(FILEID id, int flags, char **retptr)
 	totlen = 0;
 	str = NULL;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return 1;
 	nlstop = (flags & 1);
@@ -669,7 +711,7 @@ getcharid(FILEID id)
 	FILEIO *fiop;
 	FILEPOS fpos;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 	if (fiop->action == 'w') {
@@ -700,7 +742,7 @@ printid(FILEID id, int flags)
 	/*
 	 * filewall - file is closed
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		if (flags & PRINT_UNAMBIG)
 			math_fmt("FILE %d closed", id);
@@ -768,7 +810,7 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 	VALUE *vp;
 	char *str;
 	int ch;
-	unsigned long len;
+	long len;
 	int oldmode, newmode;
 	long olddigits, newdigits;
 	long width, precision;
@@ -777,7 +819,7 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 	BOOL printstring;
 	BOOL printchar;
 
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 	if (fiop->action == 'r') {
@@ -1004,7 +1046,7 @@ idfputc(FILEID id, int ch)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 	if (fiop->action == 'r') {
@@ -1039,7 +1081,7 @@ idungetc(FILEID id, int ch)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 	if (fiop->action != 'r')
@@ -1062,7 +1104,7 @@ idfputs(FILEID id, char *str)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 
@@ -1100,7 +1142,7 @@ idfputstr(FILEID id, char *str)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 
@@ -1130,7 +1172,7 @@ int
 rewindid(FILEID id)
 {
 	FILEIO *fiop;
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return 1;
 	rewind(fiop->fp);
@@ -1178,7 +1220,7 @@ filepos2z(FILEPOS pos)
 	ret.len = FILEPOS_BITS/BASEB;
 	ret.v = alloc(ret.len);
 	zclearval(ret);
-	SWAP_HALF_IN_FILEPOS(ret.v, &pos);
+	SWAP_HALF_IN_FILEPOS(ret.v, (HALF *)&pos);
 	ret.sign = 0;
 	ztrim(&ret);
 
@@ -1239,7 +1281,8 @@ z2filepos(ZVALUE zpos)
 	if (!zgtmaxfull(zpos)) {
 		/* ztofull puts the value into native byte order */
 		pos = ztofull(zpos);
-		ret = pos;
+		memset(&ret, 0, sizeof(FILEPOS));
+		memcpy((void *)&ret, (void *)&pos, sizeof(pos));
 		return ret;
 	}
 
@@ -1251,7 +1294,7 @@ z2filepos(ZVALUE zpos)
 		memcpy(&tmp, zpos.v, sizeof(FILEPOS));
 	} else {
 		/* copy what bits we can into the temp value */
-		tmp = 0;
+		memset(&tmp, 0, sizeof(FILEPOS));
 		memcpy(&tmp, zpos.v, zpos.len*BASEB/8);
 	}
 	/* swap into native byte order */
@@ -1317,7 +1360,7 @@ getloc(FILEID id, ZVALUE *res)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1342,7 +1385,7 @@ ftellid(FILEID id, ZVALUE *res)
 	FILEPOS fpos;		/* current file position */
 
 	/* get FILEIO */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 
@@ -1365,7 +1408,7 @@ fseekid(FILEID id, ZVALUE offset, int whence)
 	int ret = 0;		/* return code */
 
 	/* setup */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 
@@ -1490,7 +1533,7 @@ setloc(FILEID id, ZVALUE zpos)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1658,7 +1701,7 @@ getsize(FILEID id, ZVALUE *res)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return 1;
@@ -1694,7 +1737,7 @@ get_device(FILEID id, ZVALUE *dev)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1727,7 +1770,7 @@ get_inode(FILEID id, ZVALUE *inode)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1763,7 +1806,7 @@ zfilesize(FILEID id)
 	ZVALUE ret;		/* file size as a ZVALUE return value */
 
 	/* file FILEIO */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* return neg value for non-file error */
 		itoz(-1, &ret);
@@ -2133,7 +2176,7 @@ fscanfid(FILEID id, char *fmt, int count, VALUE **vals)
 	FILE *fp;
 	FILEPOS fpos;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2397,7 +2440,7 @@ isattyid(FILEID id)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 	return isatty(fileno(fiop->fp));
@@ -2434,7 +2477,7 @@ fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res)
 	long k = 0;
 
 	/* get FILEIO */
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2553,7 +2596,7 @@ frsearch(FILEID id, char *str, ZVALUE first, ZVALUE last, ZVALUE *res)
 	char *s;		/* str comparison pointer */
 
 	/* get FILEIO */
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2630,7 +2673,7 @@ findfname(FILEID id)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 
 	if (fiop == NULL)
 		return NULL;

file.h

@@ -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 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: file.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: file.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.h,v $
  *
  * Under source code control:	1996/05/24 05:55:58
@@ -35,7 +35,11 @@
 #define __FILE_H__
 
 
-#include "have_fpos.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "have_fpos.h"
+#else
+# include <calc/have_fpos.h>
+#endif
 
 
 /*
@@ -50,7 +54,7 @@ typedef struct {
 	BOOL reading;		/* TRUE if opened for reading */
 	BOOL writing;		/* TRUE if opened for writing */
 	char action;		/* most recent use for 'r', 'w' or 0 */
-	char mode[3];		/* open mode */
+	char mode[sizeof("rb+")];/* open mode */
 } FILEIO;
 
 
@@ -85,7 +89,7 @@ typedef struct {
 /*
  * external functions
  */
-extern FILEIO * findid(FILEID id, int mode);
+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);

fposval.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 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: fposval.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: fposval.c,v 29.6 2001/03/18 03:01:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/fposval.c,v $
  *
  * Under source code control:	1994/11/05 03:19:52
@@ -63,6 +63,7 @@
 #include "endian_calc.h"
 #include "have_offscl.h"
 #include "have_posscl.h"
+#include "have_fpos_pos.h"
 
 char *program;			/* our name */
 
@@ -83,7 +84,15 @@ main(int argc, char **argv)
 	/*
 	 * print the file position information
 	 */
+#if defined(HAVE_FPOS_POS)
+	fileposlen = FPOS_POS_BITS;
+#else /* ! HAVE_FPOS_POS */
+# if defined(FPOS_BITS)
+	fileposlen = FPOS_BITS;
+# else
 	fileposlen = sizeof(FILEPOS)*8;
+# endif
+#endif /* ! HAVE_FPOS_POS */
 	printf("#undef FILEPOS_BITS\n");
 	printf("#define FILEPOS_BITS %d\n", fileposlen);
 #if CALC_BYTE_ORDER == BIG_ENDIAN
@@ -113,8 +122,8 @@ main(int argc, char **argv)
 	 * Normally a "(*(dest) = *(src))" would do, but on some
 	 * systems a FILEPOS is not a scalar hince we must memcpy.
 	 */
-	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s%d%s\n",
+	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s\n",
-	    "memcpy((void *)(dest), (void *)(src), sizeof(",fileposlen,"))");
+	    "memcpy((void *)(dest), (void *)(src), sizeof(FPOS_POS_BITS))");
 #endif /* HAVE_FILEPOS_SCALAR */
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	putchar('\n');
@@ -122,7 +131,11 @@ main(int argc, char **argv)
 	/*
 	 * print the stat file size information
 	 */
+#if defined(OFF_T_BITS)
+	stsizelen = OFF_T_BITS;
+#else
 	stsizelen = sizeof(buf.st_size)*8;
+#endif
 	printf("#undef OFF_T_BITS\n");
 	printf("#define OFF_T_BITS %d\n", stsizelen);
 #if CALC_BYTE_ORDER == BIG_ENDIAN
@@ -156,7 +169,7 @@ main(int argc, char **argv)
 	 * systems, a off_t is not a scalar hince we must memcpy.
 	 */
 	printf("#define SWAP_HALF_IN_OFF_T(dest, src)\t%s%d%s\n",
-	    "memcpy((void *)(dest), (void *)(src), sizeof(",stsizelen,"))");
+	    "memcpy((void *)(dest), (void *)(src), ", stsizelen/8, ")");
 #endif /* HAVE_OFF_T_SCALAR */
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	putchar('\n');
@@ -164,7 +177,11 @@ main(int argc, char **argv)
 	/*
 	 * print the dev_t size
 	 */
+#if defined(DEV_BITS)
+	devlen = DEV_BITS;
+#else
 	devlen = sizeof(buf.st_dev)*8;
+#endif
 	printf("#undef DEV_BITS\n");
 	printf("#define DEV_BITS %d\n", devlen);
 #if CALC_BYTE_ORDER == BIG_ENDIAN
@@ -193,14 +210,18 @@ main(int argc, char **argv)
 	 * systems, a DEV is not a scalar hince we must memcpy.
 	 */
 	printf("#define SWAP_HALF_IN_DEV(dest, src)\t%s%d%s\n",
-	    "memcpy((void *)(dest), (void *)(src), sizeof(",devlen,"))");
+	    "memcpy((void *)(dest), (void *)(src), ", devlen/8, ")");
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	putchar('\n');
 
 	/*
 	 * print the ino_t size
 	 */
+#if defined(INODE_BITS)
+	inodelen = INODE_BITS;
+#else
 	inodelen = sizeof(buf.st_ino)*8;
+#endif
 	printf("#undef INODE_BITS\n");
 	printf("#define INODE_BITS %d\n", inodelen);
 #if CALC_BYTE_ORDER == BIG_ENDIAN
@@ -229,7 +250,7 @@ main(int argc, char **argv)
 	 * systems, a INODE is not a scalar hince we must memcpy.
 	 */
 	printf("#define SWAP_HALF_IN_INODE(dest, src)\t%s%d%s\n",
-	    "memcpy((void *)(dest), (void *)(src), sizeof(",inodelen,"))");
+	    "memcpy((void *)(dest), (void *)(src), ", inodelen/8, ")");
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	/* exit(0); */
 	return 0;

func.c

@@ -1,7 +1,7 @@
 /*
  * func - built-in functions implemented here
  *
- * Copyright (C) 1999  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2002  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.3 $
+ * @(#) $Revision: 29.13 $
- * @(#) $Id: func.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: func.c,v 29.13 2004/02/23 07:25:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $
  *
  * Under source code control:	1990/02/15 01:48:15
@@ -35,6 +35,11 @@
 #include <sys/types.h>
 #include <errno.h>
 
+#if defined(_WIN32)
+# include <io.h>
+# define _access access
+#endif
+
 #if defined(FUNCLIST)
 
 #define CONST /* disabled for FUNCLIST in case NATIVE_CC doesn't have it */
@@ -79,6 +84,7 @@
 #endif
 
 #include "have_const.h"
+#include "have_unused.h"
 #include "calc.h"
 #include "calcerr.h"
 #include "opcodes.h"
@@ -102,7 +108,7 @@
 /*
  * forward declarations
  */
-static NUMBER *base_value(long mode);
+static NUMBER *base_value(long mode, int defval);
 static int strscan(char *s, int count, VALUE **vals);
 static int filescan(FILEID id, int count, VALUE **vals);
 static VALUE f_eval(VALUE *vp);
@@ -160,9 +166,9 @@ static STRINGHEAD newerrorstr;
 
 
 /*
- * arg count definitons
+ * arg count definitions
  */
-#define IN 100		/* maximum number of arguments */
+#define IN 1024		/* maximum number of arguments */
 #define FE 0x01		/* flag to indicate default epsilon argument */
 #define FA 0x02		/* preserve addresses of variables */
 
@@ -256,8 +262,8 @@ f_prompt(VALUE *vp)
 	cp = nextline();
 	closeinput();
 	if (cp == NULL) {
-		math_error("End of file while prompting");
+		result.v_type = V_NULL;
-		/*NOTREACHED*/
+		return result;
 	}
 	if (*cp == '\0') {
 		result.v_str = slink(&_nullstring_);
@@ -278,7 +284,7 @@ f_prompt(VALUE *vp)
 static VALUE
 f_display(int count, VALUE **vals)
 {
-	long oldvalue;
+	LEN oldvalue;
 	VALUE res;
 
 	/* initialize VALUE */
@@ -293,16 +299,16 @@ f_display(int count, VALUE **vals)
 			fprintf(stderr,
 			       "Out-of-range arg for display ignored\n");
 		else
-			conf->outdigits = qtoi(vals[0]->v_num);
+			conf->outdigits = (LEN) qtoi(vals[0]->v_num);
 	}
-	res.v_num = itoq(oldvalue);
+	res.v_num = itoq((long) oldvalue);
 	return res;
 }
 
 
 /*ARGSUSED*/
 static VALUE
-f_null(int count, VALUE **vals)
+f_null(int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE res;
 
@@ -1012,7 +1018,7 @@ f_srand(int count, VALUE **vals)
 			break;
 
 		default:
-			math_error("illegal type of arg passsed to srand()");
+			math_error("illegal type of arg passed to srand()");
 			/*NOTREACHED*/
 			break;
 		}
@@ -1158,7 +1164,7 @@ f_srandom(int count, VALUE **vals)
 			break;
 
 		default:
-			math_error("illegal type of arg passsed to srandom()");
+			math_error("illegal type of arg passed to srandom()");
 			/*NOTREACHED*/
 			break;
 		}
@@ -1220,8 +1226,10 @@ f_primetest(int count, NUMBER **vals)
 {
 	/* parse args */
 	switch (count) {
-	case 1: return itoq((long) qprimetest(vals[0], &_qone_, &_qone_));
+	case 1: return itoq((long) qprimetest(vals[0],
-	case 2: return itoq((long) qprimetest(vals[0], vals[1], &_qone_));
+			    qlink(&_qone_), qlink(&_qone_)));
+	case 2: return itoq((long) qprimetest(vals[0],
+			    vals[1], qlink(&_qone_)));
 	default: return itoq((long) qprimetest(vals[0], vals[1], vals[2]));
 	}
 }
@@ -1253,37 +1261,76 @@ f_setbit(int count, VALUE **vals)
 }
 
 
-static NUMBER *
+static VALUE
-f_digit(NUMBER *val1, NUMBER *val2)
+f_digit(int count, VALUE **vals)
 {
-	if (qisfrac(val2)) {
+	VALUE res;
-		math_error("Non-integral digit position");
+	ZVALUE base;
-		/*NOTREACHED*/
+
+	if (vals[0]->v_type != V_NUM)
+		return error_value(E_DGT1);
+
+	if (vals[1]->v_type != V_NUM || qisfrac(vals[1]->v_num))
+		return error_value(E_DGT2);
+
+	if (count == 3) {
+		if (vals[2]->v_type != V_NUM || qisfrac(vals[2]->v_num))
+			return error_value(E_DGT3);
+		base = vals[2]->v_num->num;
+	} else {
+		base = _ten_;
 	}
-	if (qiszero(val1) || (qisint(val1) && qisneg(val2)))
+	res.v_type = V_NUM;
-		return qlink(&_qzero_);
+	res.v_num = qdigit(vals[0]->v_num, vals[1]->v_num->num, base);
-	if (zge31b(val2->num)) {
+	if (res.v_num == NULL)
-		if (qisneg(val2)) {
+		return error_value(E_DGT3);
-			math_error("Very large digit position");
+
-			/*NOTREACHED*/
+	return res;
-		}
-		return qlink(&_qzero_);
-	}
-	return itoq((long) qdigit(val1, qtoi(val2)));
 }
 
 
-static NUMBER *
+static VALUE
-f_digits(NUMBER *val)
+f_digits(int count, VALUE **vals)
 {
-	return itoq((long) qdigits(val));
+	ZVALUE base;
+	VALUE res;
+
+	if (vals[0]->v_type != V_NUM)
+		return error_value(E_DGTS1);
+	if (count > 1) {
+		if (vals[1]->v_type != V_NUM || qisfrac(vals[1]->v_num)
+			|| qiszero(vals[1]->v_num) || qisunit(vals[1]->v_num))
+			return error_value(E_DGTS2);
+		base = vals[1]->v_num->num;
+	} else {
+		base = _ten_;
+	}
+	res.v_type = V_NUM;
+	res.v_num = itoq(qdigits(vals[0]->v_num, base));
+	return res;
 }
 
 
-static NUMBER *
+static VALUE
-f_places(NUMBER *val)
+f_places(int count, VALUE **vals)
 {
-	return itoq((long) qplaces(val));
+	long places;
+	VALUE res;
+
+	if (vals[0]->v_type != V_NUM)
+		return error_value(E_PLCS1);
+	if (count > 1) {
+		if (vals[1]->v_type != V_NUM || qisfrac(vals[1]->v_num))
+			return error_value(E_PLCS2);
+		places = qplaces(vals[0]->v_num, vals[1]->v_num->num);
+		if (places == -2)
+			return error_value(E_PLCS2);
+	} else
+		places = qdecplaces(vals[0]->v_num);
+
+	res.v_type = V_NUM;
+	res.v_num = itoq(places);
+	return res;
 }
 
 
@@ -1969,7 +2016,7 @@ f_ln(int count, VALUE **vals)
 				return result;
 			}
 			ctmp.real = vals[0]->v_num;
-			ctmp.imag = &_qzero_;
+			ctmp.imag = qlink(&_qzero_);
 			ctmp.links = 1;
 			c = cln(&ctmp, err);
 			break;
@@ -3128,6 +3175,135 @@ f_agd(int count, VALUE **vals)
 }
 
 
+static VALUE
+f_comb(VALUE *v1, VALUE *v2)
+{
+	long n;
+	VALUE result;
+	VALUE tmp1, tmp2, div;
+
+	if (v2->v_type != V_NUM || qisfrac(v2->v_num))
+		return error_value(E_COMB1);
+	result.v_subtype = V_NOSUBTYPE;
+	result.v_type = V_NUM;
+	if (qisneg(v2->v_num)) {
+		result.v_num = qlink(&_qzero_);
+		return result;
+	}
+	if (qiszero(v2->v_num)) {
+		result.v_num = qlink(&_qone_);
+		return result;
+	}
+	if (qisone(v2->v_num)) {
+		copyvalue(v1, &result);
+		return result;
+	}
+	if (v1->v_type == V_NUM) {
+		result.v_num = qcomb(v1->v_num, v2->v_num);
+		if (result.v_num == NULL)
+			return error_value(E_COMB2);
+		return result;
+	}
+	if (zge24b(v2->v_num->num))
+		return error_value(E_COMB2);
+	n = qtoi(v2->v_num);
+	copyvalue(v1, &result);
+	decvalue(v1, &tmp1);
+	div.v_type = V_NUM;
+	div.v_num = qlink(&_qtwo_);
+	n--;
+	for (;;) {
+		mulvalue(&result, &tmp1, &tmp2);
+		freevalue(&result);
+		divvalue(&tmp2, &div, &result);
+		freevalue(&tmp2);
+		if (--n == 0 || !testvalue(&result) || result.v_type < 0) {
+			freevalue(&tmp1);
+			freevalue(&div);
+			return result;
+		}
+		decvalue(&tmp1, &tmp2);
+		freevalue(&tmp1);
+		tmp1 = tmp2;
+		incvalue(&div, &tmp2);
+		freevalue(&div);
+		div = tmp2;
+	}
+}
+
+
+static VALUE
+f_bern(VALUE *vp)
+{
+	VALUE res;
+
+	if (vp->v_type != V_NUM || qisfrac(vp->v_num))
+		return error_value(E_BERN);
+
+	res.v_subtype = V_NOSUBTYPE;
+	res.v_type = V_NUM;
+	res.v_num = qbern(vp->v_num->num);
+	if (res.v_num == NULL)
+		return error_value(E_BERN);
+	return res;
+}
+
+
+static VALUE
+f_freebern(void)
+{
+	VALUE res;
+
+	qfreebern();
+	res.v_type = V_NULL;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
+}
+
+
+static VALUE
+f_euler(VALUE *vp)
+{
+	VALUE res;
+
+	if (vp->v_type!=V_NUM || qisfrac(vp->v_num))
+		return error_value(E_EULER);
+	res.v_subtype = V_NOSUBTYPE;
+	res.v_type = V_NUM;
+	res.v_num = qeuler(vp->v_num->num);
+	if (res.v_num == NULL)
+		return error_value(E_EULER);
+	return res;
+}
+
+
+static VALUE
+f_freeeuler(void)
+{
+	VALUE res;
+
+	qfreeeuler();
+	res.v_type = V_NULL;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
+}
+
+
+static VALUE
+f_catalan(VALUE *vp)
+{
+	VALUE res;
+
+	if (vp->v_type!=V_NUM || qisfrac(vp->v_num) || zge31b(vp->v_num->num))
+		return error_value(E_CTLN);
+	res.v_type = V_NUM;
+	res.v_subtype = V_NOSUBTYPE;
+	res.v_num = qcatalan(vp->v_num);
+	if (res.v_num == NULL)
+		return error_value(E_CTLN);
+	return res;
+}
+
 static VALUE
 f_arg(int count, VALUE **vals)
 {
@@ -3178,7 +3354,7 @@ f_trunc(int count, NUMBER **vals)
 {
 	NUMBER *val;
 
-	val = &_qzero_;
+	val = qlink(&_qzero_);
 	if (count == 2)
 		val = vals[1];
 	return qtrunc(*vals, val);
@@ -3260,7 +3436,7 @@ f_btrunc(int count, NUMBER **vals)
 {
 	NUMBER *val;
 
-	val = &_qzero_;
+	val = qlink(&_qzero_);
 	if (count == 2)
 		val = vals[1];
 	return qbtrunc(*vals, val);
@@ -3365,7 +3541,7 @@ f_ceil(VALUE *val)
 	tmp.v_subtype = V_NOSUBTYPE;
 
 	tmp.v_type = V_NUM;
-	tmp.v_num = &_qone_;
+	tmp.v_num = qlink(&_qone_);
 	apprvalue(val, &tmp, &tmp, &res);
 	return res;
 }
@@ -3382,9 +3558,9 @@ f_floor(VALUE *val)
 	tmp2.v_subtype = V_NOSUBTYPE;
 
 	tmp1.v_type = V_NUM;
-	tmp1.v_num = &_qone_;
+	tmp1.v_num = qlink(&_qone_);
 	tmp2.v_type = V_NUM;
-	tmp2.v_num = &_qzero_;
+	tmp2.v_num = qlink(&_qzero_);
 	apprvalue(val, &tmp1, &tmp2, &res);
 	return res;
 }
@@ -3488,24 +3664,82 @@ f_polar(int count, VALUE **vals)
 }
 
 
-static NUMBER *
+static VALUE
-f_ilog(NUMBER *val1, NUMBER *val2)
+f_ilog(VALUE *v1, VALUE *v2)
 {
-	return itoq(qilog(val1, val2));
+	VALUE res;
+
+	if (v2->v_type != V_NUM || qisfrac(v2->v_num) || qiszero(v2->v_num) ||
+			qisunit(v2->v_num))
+		return error_value(E_ILOGB);
+
+	switch(v1->v_type) {
+	case V_NUM:
+		res.v_num = qilog(v1->v_num, v2->v_num->num);
+		break;
+	case V_COM:
+		res.v_num = cilog(v1->v_com, v2->v_num->num);
+		break;
+	default:
+		return error_value(E_ILOG);
+	}
+
+	if (res.v_num == NULL)
+		return error_value(E_LOGINF);
+
+	res.v_type = V_NUM;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
 }
 
 
-static NUMBER *
+static VALUE
-f_ilog2(NUMBER *val)
+f_ilog2(VALUE *vp)
 {
-	return itoq(qilog2(val));
+	VALUE res;
+
+	switch(vp->v_type) {
+	case V_NUM:
+		res.v_num = qilog(vp->v_num, _two_);
+		break;
+	case V_COM:
+		res.v_num = cilog(vp->v_com, _two_);
+		break;
+	default:
+		return error_value(E_ILOG2);
+	}
+
+	if (res.v_num == NULL)
+		return error_value(E_LOGINF);
+
+	res.v_type = V_NUM;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
 }
 
 
-static NUMBER *
+static VALUE
-f_ilog10(NUMBER *val)
+f_ilog10(VALUE *vp)
 {
-	return itoq(qilog10(val));
+	VALUE res;
+
+	switch(vp->v_type) {
+		case V_NUM:
+			res.v_num = qilog(vp->v_num, _ten_);
+			break;
+		case V_COM:
+			res.v_num = cilog(vp->v_com, _ten_);
+			break;
+		default:
+			return error_value(E_ILOG10);
+	}
+
+	if (res.v_num == NULL)
+		return error_value(E_LOGINF);
+
+	res.v_type = V_NUM;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
 }
 
 
@@ -4496,7 +4730,7 @@ f_list(int count, VALUE **vals)
 
 /*ARGSUSED*/
 static VALUE
-f_assoc(int count, VALUE **vals)
+f_assoc(int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE result;
 
@@ -4696,10 +4930,14 @@ f_listremove(VALUE *vp)
 static NUMBER *
 f_runtime(void)
 {
+#if defined(_WIN32)
+	return qlink(&_qzero_);
+#else /* Windoz free systems */
 	struct tms buf;
 
 	times(&buf);
 	return iitoq((long) buf.tms_utime, (long) CLK_TCK);
+#endif /* Windoz free systems */
 }
 
 
@@ -4750,24 +4988,31 @@ f_fopen(VALUE *v1, VALUE *v2)
 	/* initialize VALUE */
 	result.v_subtype = V_NOSUBTYPE;
 
+	/* check for a valid mode [rwa][b+\0][b+\0] */
 	if (v1->v_type != V_STR || v2->v_type != V_STR)
 		return error_value(E_FOPEN1);
 	mode = v2->v_str->s_str;
-
 	if ((*mode != 'r') && (*mode != 'w') && (*mode != 'a'))
 		return error_value(E_FOPEN2);
 	if (mode[1] != '\0') {
-		if (mode[1] != '+')
+		if (mode[1] != '+' && mode[1] != 'b')
-			return error_value(E_FOPEN2);
-		if (mode[2] != '\0')
 			return error_value(E_FOPEN2);
+		if (mode[2] != '\0') {
+			if ((mode[2] != '+' && mode[2] != 'b') ||
+			    mode[1] == mode[2])
+				return error_value(E_FOPEN2);
+			if (mode[3] != '\0')
+				return error_value(E_FOPEN2);
+		}
 	}
+
+	/* try to open */
 	errno = 0;
 	id = openid(v1->v_str->s_str, v2->v_str->s_str);
 	if (id == FILEID_NONE)
 		return error_value(errno);
 	if (id < 0)
-		return error_value(E_FOPEN3);
+		return error_value(-id);
 	result.v_type = V_FILE;
 	result.v_file = id;
 	return result;
@@ -4784,21 +5029,27 @@ f_freopen(int count, VALUE **vals)
 	/* initialize VALUE */
 	result.v_subtype = V_NOSUBTYPE;
 
+	/* check for a valid mode [rwa][b+\0][b+\0] */
 	if (vals[0]->v_type != V_FILE)
 		return error_value(E_FREOPEN1);
 	if (vals[1]->v_type != V_STR)
 		return error_value(E_FREOPEN2);
-
 	mode = vals[1]->v_str->s_str;
-
 	if ((*mode != 'r') && (*mode != 'w') && (*mode != 'a'))
 		return error_value(E_FREOPEN2);
 	if (mode[1] != '\0') {
-		if (mode[1] != '+')
+		if (mode[1] != '+' && mode[1] != 'b')
-			return error_value(E_FREOPEN2);
-		if (mode[2] != '\0')
 			return error_value(E_FREOPEN2);
+		if (mode[2] != '\0') {
+			if ((mode[2] != '+' && mode[2] != 'b') ||
+			    mode[1] == mode[2])
+				return error_value(E_FOPEN2);
+			if (mode[3] != '\0')
+				return error_value(E_FREOPEN2);
+		}
 	}
+
+	/* try to reopen */
 	errno = 0;
 	if (count == 2) {
 		id = reopenid(vals[0]->v_file, mode, NULL);
@@ -5904,10 +6155,10 @@ f_fgetfield(VALUE *vp)
 	result.v_subtype = V_NOSUBTYPE;
 
 	if (vp->v_type != V_FILE)
-		return error_value(E_FGETWORD1);
+		return error_value(E_FGETFIELD1);
 	i = readid(vp->v_file, 14, &str);
 	if (i > 0)
-		return error_value(E_FGETWORD2);
+		return error_value(E_FGETFIELD2);
 	result.v_type = V_NULL;
 	if (i == 0) {
 		result.v_type = V_STR;
@@ -6459,6 +6710,19 @@ f_isatty(VALUE *vp)
 }
 
 
+static VALUE
+f_calc_tty(void)
+{
+	VALUE res;
+
+	if (!calc_tty(FILEID_STDIN))
+		return error_value(E_TTY);
+	res.v_type = V_NULL;
+	res.v_subtype = V_NOSUBTYPE;
+	return res;
+}
+
+
 static VALUE
 f_inputlevel (void)
 {
@@ -6646,11 +6910,64 @@ f_system(VALUE *vp)
 	if (conf->calc_debug & CALCDBG_SYSTEM) {
 		printf("%s\n", vp->v_str->s_str);
 	}
-	result.v_num = itoq((long) system(vp->v_str->s_str));
+#if defined(_WIN32)
+	/* if the execute length is 0 then just return 0 */
+	if (strlen(vp->v_str->s_str) == 0) {
+		result.v_num = itoq((long)0);
+	} else {
+		result.v_num = itoq((long)system(vp->v_str->s_str));
+	}
+#else /* Windoz free systems */
+	result.v_num = itoq((long)system(vp->v_str->s_str));
+#endif /* Windoz free systems */
 	return result;
 }
 
 
+static VALUE
+f_sleep(int count, VALUE **vals)
+{
+	long time;
+	VALUE res;
+	NUMBER *q1, *q2;
+
+	res.v_type = V_NULL;
+#if !defined(_WIN32)
+	if (count > 0) {
+		if (vals[0]->v_type != V_NUM || qisneg(vals[0]->v_num))
+				return error_value(E_SLEEP);
+		if (qisint(vals[0]->v_num)) {
+			if (zge31b(vals[0]->v_num->num))
+				return error_value(E_SLEEP);
+			time = ztoi(vals[0]->v_num->num);
+			time = sleep(time);
+		}
+		else {
+			q1 = qscale(vals[0]->v_num, 20);
+			q2 = qint(q1);
+			qfree(q1);
+			if (zge31b(q2->num)) {
+				qfree(q2);
+				return error_value(E_SLEEP);
+			}
+			time = ztoi(q2->num);
+			qfree(q2);
+				/* BSD 4.3 usleep has void return */
+			usleep(time);
+			return res;
+		}
+	} else {
+		time = sleep(1);
+	}
+	if (time) {
+		res.v_type = V_NUM;
+		res.v_num = itoq(time);
+	}
+#endif /* Windoz free systems */
+	return res;
+}
+
+
 /*
  * set the default output base/mode
  */
@@ -6662,15 +6979,15 @@ f_base(int count, NUMBER **vals)
 
 	/* deal with just a query */
 	if (count != 1) {
-		return base_value(conf->outmode);
+		return base_value(conf->outmode, conf->outmode);
 	}
 
 	/* deal with the specal modes first */
 	if (qisfrac(vals[0])) {
-		return base_value(math_setmode(MODE_FRAC));
+		return base_value(math_setmode(MODE_FRAC), conf->outmode);
 	}
 	if (vals[0]->num.len > 64/BASEB) {
-		return base_value(math_setmode(MODE_EXP));
+		return base_value(math_setmode(MODE_EXP), conf->outmode);
 	}
 
 	/* set the base, if possible */
@@ -6698,7 +7015,61 @@ f_base(int count, NUMBER **vals)
 	}
 
 	/* return the old base */
-	return base_value(oldbase);
+	return base_value(oldbase, conf->outmode);
+}
+
+
+/*
+ * set the default secondary output base/mode
+ */
+static NUMBER *
+f_base2(int count, NUMBER **vals)
+{
+	long base;	/* output base/mode */
+	long oldbase=0; /* output base/mode */
+
+	/* deal with just a query */
+	if (count != 1) {
+		return base_value(conf->outmode2, conf->outmode2);
+	}
+
+	/* deal with the specal modes first */
+	if (qisfrac(vals[0])) {
+		return base_value(math_setmode2(MODE_FRAC), conf->outmode2);
+	}
+	if (vals[0]->num.len > 64/BASEB) {
+		return base_value(math_setmode2(MODE_EXP), conf->outmode2);
+	}
+
+	/* set the base, if possible */
+	base = qtoi(vals[0]);
+	switch (base) {
+	case 0:
+		oldbase = math_setmode2(MODE2_OFF);
+		break;
+	case -10:
+		oldbase = math_setmode2(MODE_INT);
+		break;
+	case 2:
+		oldbase = math_setmode2(MODE_BINARY);
+		break;
+	case 8:
+		oldbase = math_setmode2(MODE_OCTAL);
+		break;
+	case 10:
+		oldbase = math_setmode2(MODE_REAL);
+		break;
+	case 16:
+		oldbase = math_setmode2(MODE_HEX);
+		break;
+	default:
+		math_error("Unsupported base");
+		/*NOTREACHED*/
+		break;
+	}
+
+	/* return the old base */
+	return base_value(oldbase, conf->outmode2);
 }
 
 
@@ -6706,14 +7077,14 @@ f_base(int count, NUMBER **vals)
  * return a numerical 'value' of the mode/base
  */
 static NUMBER *
-base_value(long mode)
+base_value(long mode, int defval)
 {
 	NUMBER *result;
 
 	/* return the old base */
 	switch (mode) {
 	case MODE_DEFAULT:
-		switch (conf->outmode) {
+		switch (defval) {
 		case MODE_DEFAULT:
 			result = itoq(10);
 			break;
@@ -6740,6 +7111,9 @@ base_value(long mode)
 		case MODE_BINARY:
 			result = itoq(2);
 			break;
+		case MODE2_OFF:
+			result = itoq(0);
+			break;
 		default:
 			result = itoq(0);
 			break;
@@ -6768,6 +7142,9 @@ base_value(long mode)
 	case MODE_BINARY:
 		result = itoq(2);
 		break;
+	case MODE2_OFF:
+		result = itoq(0);
+		break;
 	default:
 		result = itoq(0);
 		break;
@@ -6987,6 +7364,7 @@ f_free(int count, VALUE **vals)
 	return result;
 }
 
+
 static VALUE
 f_freeglobals(void)
 {
@@ -7000,6 +7378,7 @@ f_freeglobals(void)
 	return result;
 }
 
+
 static VALUE
 f_freeredc(void)
 {
@@ -7407,6 +7786,20 @@ f_argv(int count, VALUE **vals)
 }
 
 
+static VALUE
+f_version(void)
+{
+	VALUE result;
+
+	/* return the calc verstion string */
+	result.v_type = V_STR;
+	result.v_subtype = V_NOSUBTYPE;
+	result.v_str = makestring(strdup(version()));
+
+	return result;
+}
+
+
 #endif /* !FUNCLIST */
 
 
@@ -7493,6 +7886,10 @@ static CONST struct builtin builtins[] = {
 	 "arithmetic mean of values"},
 	{"base", 0, 1, 0, OP_NOP, f_base, 0,
 	 "set default output base"},
+	{"base2", 0, 1, 0, OP_NOP, f_base2, 0,
+	 "set default secondary output base"},
+	{"bernoulli", 1, 1, 0, OP_NOP, 0, f_bern,
+	 "Bernoulli number for index a"},
 	{"bit", 2, 2, 0, OP_BIT, 0, 0,
 	 "whether bit b in value a is set"},
 	{"blk", 0, 3, 0, OP_NOP, 0, f_blk,
@@ -7509,6 +7906,10 @@ static CONST struct builtin builtins[] = {
 	 "truncate a to b number of binary places"},
 	{"calclevel", 0, 0, 0, OP_NOP, 0, f_calclevel,
 	 "current calculation level"},
+	{"calc_tty", 0, 0, 0, OP_NOP, 0, f_calc_tty,
+	 "set tty for interactivity"},
+	{"catalan", 1, 1, 0, OP_NOP, 0, f_catalan,
+	 "catalan number for index a"},
 	{"ceil", 1, 1, 0, OP_NOP, 0, f_ceil,
 	 "smallest integer greater than or equal to number"},
 	{"cfappr", 1, 3, 0, OP_NOP, f_cfappr, 0,
@@ -7521,7 +7922,7 @@ static CONST struct builtin builtins[] = {
 	 "command buffer"},
 	{"cmp", 2, 2, 0, OP_CMP, 0, 0,
 	 "compare values returning -1, 0, or 1"},
-	{"comb", 2, 2, 0, OP_NOP, qcomb, 0,
+	{"comb", 2, 2, 0, OP_NOP, 0, f_comb,
 	 "combinatorial number a!/b!(a-b)!"},
 	{"config", 1, 2, 0, OP_SETCONFIG, 0, 0,
 	 "set or read configuration value"},
@@ -7555,10 +7956,10 @@ static CONST struct builtin builtins[] = {
 	 "denominator of fraction"},
 	{"det", 1, 1, 0, OP_NOP, 0, f_det,
 	 "determinant of matrix"},
-	{"digit", 2, 2, 0, OP_NOP, f_digit, 0,
+	{"digit", 2, 3, 0, OP_NOP, 0, f_digit,
 	 "digit at specified decimal place of number"},
-	{"digits", 1, 1, 0, OP_NOP, f_digits, 0,
+	{"digits", 1, 2, 0, OP_NOP, 0, f_digits,
-	 "number of digits in number"},
+	 "number of digits in base b representation of a"},
 	{"display", 0, 1, 0, OP_NOP, 0, f_display,
 	 "number of decimal digits for displaying numbers"},
 	{"dp", 2, 2, 0, OP_NOP, 0, f_dp,
@@ -7573,6 +7974,8 @@ static CONST struct builtin builtins[] = {
 	 "set or read calc_errno"},
 	{"error", 0, 1, 0, OP_NOP, 0, f_error,
 	 "generate error value"},
+	{"euler", 1, 1, 0, OP_NOP, 0, f_euler,
+	 "Euler number"},
 	{"eval", 1, 1, 0, OP_NOP, 0, f_eval,
 	 "evaluate expression from string to value"},
 	{"exp", 1, 2, 0, OP_NOP, 0, f_exp,
@@ -7623,6 +8026,10 @@ static CONST struct builtin builtins[] = {
 	 "write one or more null-terminated strings to a file"},
 	{"free", 0, IN, FA, OP_NOP, 0, f_free,
 	 "free listed or all global variables"},
+	{"freebernoulli", 0, 0, 0, OP_NOP, 0, f_freebern,
+	 "free stored Benoulli numbers"},
+	{"freeeuler", 0, 0, 0, OP_NOP, 0, f_freeeuler,
+	 "free stored Euler numbers"},
 	{"freeglobals", 0, 0, 0, OP_NOP, 0, f_freeglobals,
 	 "free all global and visible static variables"},
 	{"freeredc", 0, 0, 0, OP_NOP, 0, f_freeredc,
@@ -7663,11 +8070,11 @@ static CONST struct builtin builtins[] = {
 	 "v mod h*2^n+r, h>0, n>0, r = -1, 0 or 1"},
 	{"hypot", 2, 3, FE, OP_NOP, qhypot, 0,
 	 "hypotenuse of right triangle within accuracy c"},
-	{"ilog", 2, 2, 0, OP_NOP, f_ilog, 0,
+	{"ilog", 2, 2, 0, OP_NOP, 0, f_ilog,
-	 "integral log of one number with another"},
+	 "integral log of a to integral base b"},
-	{"ilog10", 1, 1, 0, OP_NOP, f_ilog10, 0,
+	{"ilog10", 1, 1, 0, OP_NOP, 0, f_ilog10,
 	 "integral log of a number base 10"},
-	{"ilog2", 1, 1, 0, OP_NOP, f_ilog2, 0,
+	{"ilog2", 1, 1, 0, OP_NOP, 0, f_ilog2,
 	 "integral log of a number base 2"},
 	{"im", 1, 1, 0, OP_IM, 0, 0,
 	 "imaginary part of complex number"},
@@ -7833,8 +8240,8 @@ static CONST struct builtin builtins[] = {
 	 "value of pi accurate to within epsilon"},
 	{"pix", 1, 2, 0, OP_NOP, f_pix, 0,
 	 "number of primes <= a < 2^32, return b if error"},
-	{"places", 1, 1, 0, OP_NOP, f_places, 0,
+	{"places", 1, 2, 0, OP_NOP, 0, f_places,
-	 "places after decimal point (-1 if infinite)"},
+	 "places after \"decimal\" point (-1 if infinite)"},
 	{"pmod", 3, 3, 0, OP_NOP, qpowermod,0,
 	 "mod of a power (a ^ b (mod c))"},
 	{"polar", 2, 3, 0, OP_NOP, 0, f_polar,
@@ -7937,6 +8344,8 @@ static CONST struct builtin builtins[] = {
 	 "total number of elements in value"},
 	{"sizeof", 1, 1, 0, OP_NOP, 0, f_sizeof,
 	 "number of octets used to hold the value"},
+	{"sleep", 0, 1, 0, OP_NOP, 0, f_sleep,
+	 "suspend operatioo for a seconds"},
 	{"sort", 1, 1, 0, OP_NOP, 0, f_sort,
 	 "sort a copy of a matrix or list"},
 	{"sqrt", 1, 3, 0, OP_NOP, 0, f_sqrt,
@@ -7995,6 +8404,8 @@ static CONST struct builtin builtins[] = {
 	 "truncate a to b number of decimal places"},
 	{"ungetc", 2, 2, 0, OP_NOP, 0, f_ungetc,
 	 "unget char read from file"},
+	{"version", 0, 0, 0, OP_NOP, 0, f_version,
+	 "calc version string"},
 	{"xor", 1, IN, 0, OP_NOP, 0, f_xor,
 	 "logical xor"},
 

func.h

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: func.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: func.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -32,8 +32,13 @@
 #define __FUNC_H__
 
 
-#include "calc.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "label.h"
+# include "calc.h"
+# include "label.h"
+#else
+# include <calc/calc.h>
+# include <calc/label.h>
+#endif
 
 
 /*

hash.c

@@ -1,7 +1,7 @@
 /*
  * hash - one-way hash routines
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2002  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 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: hash.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: hash.c,v 29.5 2002/12/29 09:20:25 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.c,v $
  *
  * Under source code control:	1995/11/23 05:13:11
@@ -911,6 +911,7 @@ hash_value(int type, void *v, HASH *state)
 			(USB8 *)value->v_rand->buffer, SLEN*FULL_BITS/8);
 		state = hash_int(type, value->v_rand->j, state);
 		state = hash_int(type, value->v_rand->k, state);
+		state = hash_int(type, value->v_rand->need_to_skip, state);
 		(state->update)(state,
 			(USB8 *)value->v_rand->slot, SCNT*FULL_BITS/8);
 		(state->update)(state,
@@ -940,6 +941,7 @@ hash_value(int type, void *v, HASH *state)
 
 		/* hash the CONFIG state */
 		state = hash_int(type, value->v_config->outmode, state);
+		state = hash_int(type, value->v_config->outmode2, state);
 		state = hash_long(type,(long)value->v_config->outdigits, state);
 		state = hash_number(type, value->v_config->epsilon, state);
 		state = hash_long(type,

hash.h

@@ -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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: hash.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: hash.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.h,v $
  *
  * Under source code control:	1995/11/14 23:57:45
@@ -33,10 +33,17 @@
 #define __HASH_H__
 
 
-#include "shs.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "shs1.h"
+# include "shs.h"
-#include "md5.h"
+# include "shs1.h"
-#include "zmath.h"
+# include "md5.h"
+# include "zmath.h"
+#else
+# include <calc/shs.h>
+# include <calc/shs1.h>
+# include <calc/md5.h>
+# include <calc/zmath.h>
+#endif
 
 
 /* MAX_CHUNKSIZE is the largest chunksize of any hash */

have_fpos_pos.c

@@ -0,0 +1,68 @@
+/*
+ * have_fpos_pos - Determine if a __pos element in FILEPOS
+ *
+ * Copyright (C) 2000  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_fpos_pos.c,v 29.2 2001/03/18 03:00:11 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/have_fpos_pos.c,v $
+ *
+ * Under source code control:	2000/12/17 01:23
+ * File existed as early as:	2000
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * If the symbol HAVE_NO_FPOS is defined, we will output nothing.
+ * If the HAVE_FILEPOS_SCALAR is defuned, we will output nothing.
+ * If we are able to compile this program, then we must have the
+ * __pos element in a non-scalar FILEPOS.
+ */
+
+
+#include <stdio.h>
+#include "have_fpos.h"
+#include "have_posscl.h"
+
+int
+main(void)
+{
+#if !defined(HAVE_NO_FPOS) && !defined(HAVE_FILEPOS_SCALAR)
+	fpos_t pos;		/* file position */
+
+	/* print a __pos element in fpos_t */
+	printf("#undef HAVE_FPOS_POS\n");
+	printf("#define HAVE_FPOS_POS 1  /* yes */\n\n");
+
+	/* determine __pos element size */
+	printf("#undef FPOS_POS_BITS\t/* no */\n");
+# if defined(FPOS_POS_BITS)
+	printf("#define FPOS_POS_BITS %d\n\n", FPOS_POS_BITS);
+# else
+	printf("#define FPOS_POS_BITS %d\n\n", sizeof(pos.__pos)*8);
+# endif
+
+#else
+	/* we have no __pos element */
+	printf("#undef HAVE_FPOS_POS\t/* no */\n");
+	printf("#undef FPOS_POS_BITS\n");
+#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;
+}

help.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.4 $
+ * @(#) $Revision: 29.8 $
- * @(#) $Id: help.c,v 29.4 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: help.c,v 29.8 2001/04/08 08:29:28 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/help.c,v $
  *
  * Under source code control:	1997/09/14 10:58:30
@@ -42,6 +42,11 @@
 #include <unistd.h>
 #endif
 
+#if defined(_WIN32)
+# define popen _popen
+# define pclose _pclose
+#endif
+
 
 /*
  * some help topics are symbols, so we alias them to nice filenames
@@ -57,6 +62,7 @@ static struct help_alias {
 	{".", "oldvalue"},
 	{"%", "mod"},
 	{"//", "quo"},
+	{"copy", "blkcpy"},
 	{"copying", "COPYING"},
 	{"copying-lgpl", "COPYING-LGPL"},
 	{"copying_lgpl", "COPYING-LGPL"},
@@ -65,6 +71,13 @@ static struct help_alias {
 	{"COPYRIGHT", "copyright"},
 	{"Copyleft", "copyright"},
 	{"COPYLEFT", "copyright"},
+	{"read", "command"},
+	{"write", "command"},
+	{"quit", "command"},
+	{"exit", "command"},
+	{"abort", "command"},
+	{"cd", "command"},
+	{"show", "command"},
 	{"stdlib", "resource"},
 	{NULL, NULL}
 };
@@ -105,7 +118,11 @@ page_file(FILE *stream)
 	/*
 	 * form a write pipe to a pager
 	 */
-	cmd = popen(pager, "w");
+	if (pager == NULL || pager[0] == '\0') {
+	    cmd = stdout;
+	} else {
+	    cmd = popen(pager, "w");
+	}
 	if (cmd == NULL) {
 		fprintf(stderr, "unable form pipe to pager: %s", pager);
 		return;

help/Makefile

@@ -2,7 +2,7 @@
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2002  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.3 $
+# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.3 2000/06/07 14:02:33 chongo Exp $
+# @(#) $Id: Makefile,v 29.23 2003/01/14 02:24:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -36,15 +36,120 @@
 SHELL= /bin/sh
 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.
-#
+####
-TOPDIR= /usr/local/lib
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
 
-LIBDIR= ${TOPDIR}/calc
+# Where the system include (.h) files are kept
-HELPDIR= ${LIBDIR}/help
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Makefile debug
 #
@@ -63,6 +168,7 @@ CHMOD= chmod
 SED= sed
 SORT= sort
 FMT= fmt
+CMP= cmp
 
 # Standard and Builtin help files
 #
@@ -141,29 +247,30 @@ BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \
 #
 DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	appr arg argv arrow asec asech asin asinh assign atan atan2 atanh \
-	avg base bit blk blkcpy blkfree blocks bround btrunc calclevel ceil \
+	avg base base2 bernoulli bit blk blkcpy blkfree blocks bround btrunc \
-	cfappr cfsim char cmdbuf cmp comb conj cos cosh cot coth count cp \
+	calc_tty calclevel catalan ceil cfappr cfsim char cmdbuf cmp comb \
-	csc csch ctime delete den dereference det digit digits dp epsilon \
+	conj cos cosh cot coth count cp csc csch ctime delete den dereference \
-	errcount errmax errno error eval exp fact factor fclose fcnt feof \
+	det digit digits dp epsilon errcount errmax errno error euler eval \
-	ferror fflush fgetc fgetfield fgetline fgets fgetstr fib files floor \
+	exp fact factor fclose fcnt feof ferror fflush fgetc fgetfield \
-	fopen forall fprintf fputc fputs fputstr frac free freeglobals \
+	fgetline fgets fgetstr fib files floor fopen forall fprintf fputc \
-	freeredc freestatics frem freopen fscan fscanf fseek fsize ftell \
+	fputs fputstr frac free freebernoulli freeeuler freeglobals freeredc \
-	gcd gcdrem gd getenv hash head highbit hmean hnrmod hypot ilog \
+	freestatics frem freopen fscan fscanf fseek fsize ftell gcd gcdrem \
-	ilog10 ilog2 im indices inputlevel insert int inverse iroot isassoc \
+	gd getenv hash head highbit hmean hnrmod hypot ilog ilog10 ilog2 \
-	isatty isblk isconfig isdefined iserror iseven isfile ishash isident \
+	im indices inputlevel insert int inverse iroot isassoc isatty isblk \
-	isint islist ismat ismult isnull isnum isobj isobjtype isodd isprime \
+	isconfig isdefined iserror iseven isfile ishash isident isint islist \
-	isptr isqrt isrand israndom isreal isrel issimple issq isstr istype \
+	ismat ismult isnull isnum isobj isobjtype isodd isprime isptr isqrt \
-	jacobi join lcm lcmfact lfactor ln lowbit ltol makelist matdim \
+	isrand israndom isreal isrel issimple issq isstr istype jacobi join \
-	matfill matmax matmin matsum mattrace mattrans max md5 memsize meq \
+	lcm lcmfact lfactor ln lowbit ltol makelist matdim matfill matmax \
-	min minv mmin mne mod modify name near newerror nextcand nextprime \
+	matmin matsum mattrace mattrans max md5 memsize meq min minv mmin \
-	norm null num oldvalue ord param perm pfact pi pix places pmod polar \
+	mne mod modify name near newerror nextcand nextprime norm null \
-	poly pop popcnt power prevcand prevprime printf prompt protect ptest \
+	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 sort sqrt srand srandom ssq str \
+	sgn sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom \
-	strcat strerror strlen strpos strprintf strscan strscanf substr \
+	ssq str strcat strerror strlen strpos strprintf strscan strscanf \
-	sum swap system tail tan tanh test time trunc xor
+	substr sum swap system tail tan tanh test time trunc version xor
 
 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
@@ -237,7 +344,8 @@ changes: ../CHANGES
 
 libcalc: ../LIBRARY
 	rm -f $@
-	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' < ../LIBRARY > $@
+	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
+	       -e 's:$${CALC_INCDIR}:${CALC_INCDIR}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -388,11 +496,13 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE}
 # Singular files are the same files as their plural form.
 #
 ${SINGULAR_FILES}: ${PLURAL_FILES}
-	${Q}for i in ${SINGULAR_FILES}; do \
+	${Q}for i in ${SINGULAR_FILES} /dev/null; do \
-	    echo "rm -f $${i}"; \
+	    if [ X"$$i" != X"/dev/null" ]; then \
-	    rm -f $${i}; \
+		echo "rm -f $${i}"; \
-	    echo "cp $${i}s $${i}"; \
+		rm -f $${i}; \
-	    cp $${i}s $${i}; \
+		echo "cp $${i}s $${i}"; \
+		cp $${i}s $${i}; \
+	    fi; \
 	done
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -425,7 +535,8 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 	-${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 -I.. funclist.c -c
+	${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
@@ -452,9 +563,11 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo help/$$i; \
-	done | ${SORT}
+	    fi; \
+	done | LANG=C ${SORT}
 
 distdir:
 	${Q}echo help
@@ -478,16 +591,39 @@ bsdi: all
 #
 detaillist:
 	${Q}-(echo "xxxxx"; \
-	   for i in ${DETAIL_HELP}; do \
+	   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; \
 		fi; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    fi; \
+	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxx/DETAIL_HELP=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
 
+##
+#
+# rpm rules
+#
+##
+
+echo_inst_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
+
+##
+#
+# Utility rules
+#
+##
+
 clean:
 	rm -f obj mkbuiltin funclist.c funclist.o funclist
 	rm -f COPYING COPYING-LGPL
@@ -499,36 +635,51 @@ clobber:
 	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${TOPDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${LIBDIR} ]; then \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-		echo mkdir ${LIBDIR}; \
+	    echo mkdir $T${HELPDIR}; \
-		mkdir ${LIBDIR}; \
+	    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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
+	-${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
-		echo mkdir ${HELPDIR}; \
+		  full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
-		mkdir ${HELPDIR}; \
+	    if [ "$$i" = "/dev/null" ]; then \
-	else \
+		continue; \
-	    true; \
+	    fi; \
-	fi
+	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
-	${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
+		true; \
-		  full ${DETAIL_HELP} ${SINGULAR_FILES}; do \
+	    else \
-		echo rm -f ${HELPDIR}/$$i; \
+		rm -f $T${HELPDIR}/$$i.new; \
-		rm -f ${HELPDIR}/$$i; \
+		cp -f $$i $T${HELPDIR}/$$i.new; \
-		echo cp $$i ${HELPDIR}; \
+		${CHMOD} 0444 $T${HELPDIR}/$$i.new; \
-		cp $$i ${HELPDIR}; \
+		mv -f $T${HELPDIR}/$$i.new $T${HELPDIR}/$$i; \
-		echo ${CHMOD} 0444 ${HELPDIR}/$$i; \
+		echo "installed $T${HELPDIR}/$$i"; \
-		${CHMOD} 0444 ${HELPDIR}/$$i; \
+	    fi; \
 	done
-	rm -f ${HELPDIR}/obj
+	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
-	cp obj.file ${HELPDIR}/obj
+	    true; \
-	${CHMOD} 0444 ${HELPDIR}/obj
+	else \
-	${Q}echo remove files that are obsolete
+	    rm -f $T${HELPDIR}/obj.new; \
-	-rm -f rmblk block stdlib
+	    cp -f obj.file $T${HELPDIR}/obj.new; \
-	-rm -f ${HELPDIR}/rmblk ${HELPDIR}/block ${HELPDIR}/stdlib
+	    ${CHMOD} 0444 $T${HELPDIR}/obj.new; \
+	    mv -f $T${HELPDIR}/obj.new $T${HELPDIR}/obj; \
+	    echo "installed $T${HELPDIR}/obj"; \
+	fi

help/address

@@ -23,7 +23,7 @@ DESCRIPTION
     0 <= i < sizeof(B).	 &B[i] then returns the address at which this
     octet is located until the block is freed or relocated.  Freeing
     of an unnamed block B occurs when a new value is assigned to B or
-    when B ceases to exist; a named block B is freed by blkfree(B().
+    when B ceases to exist; a named block B is freed by blkfree(B).
     A block is relocated when an operation like copying to B requires
     a change of sizeof(B).
 
@@ -70,18 +70,18 @@ DESCRIPTION
 			> p = &"abc"
 			> A = "abc"
 
-    The address &*A of the value of A will be equal to p.
+    the address &*A of the value of A will be equal to p.
 
     Except in cases like strcat(A, "") when *A identified with a literal
     string as above, definitions of string values using strcat() or substr()
     will copy the relevant strings to newly allocated addresses which will
     be useable only while the variables retain these defined values.
-    For example,
+    For example, after
 
 			> B = C = strcat("a", "bc");
 
     &*B and &*C will be different.  If p is defined by p = &*B, p should
-    not be used after a mew value is assigned to B, or B ceases to exist,
+    not be used after a new value is assigned to B, or B ceases to exist,
     etc.
 
     When compilation of a function encounters for the first time a particular
@@ -117,7 +117,7 @@ DESCRIPTION
 
 		> A = B = C = f(2);
 
-    which, not only performs the addition n f() only once, but stores the
+    which, not only performs the addition in f() only once, but stores the
     number values for A, B and C at the same address.
 
     Whether a value V is a pointer and if so, its type, is indicated by the
@@ -176,8 +176,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: address,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: address,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/address,v $
 ##
 ## Under source code control:	1997/09/06 20:03:34

help/arrow

@@ -13,7 +13,7 @@ TYPES
 DESCRIPTION
     p->X returns the same as (*p).X.  Thus the current value of *p is
     to be an object of a type for which X identifies one element.
-    p->X then returns the lvalue corresponding to that element of of the
+    p->X then returns the lvalue corresponding to that element of the
     value of *p.
 
     The expression *p.X will cause a runtime error since this is
@@ -66,8 +66,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: arrow,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: arrow,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/arrow,v $
 ##
 ## Under source code control:	1997/09/06 20:03:34

help/asin

@@ -14,7 +14,7 @@ DESCRIPTION
     Returns the asin of x to a multiple of eps with error less in
     absolute value than .75 * eps.
 
-    v = asin(x) is the number in [-p1/2, pi/2] for which sin(v) = x.
+    v = asin(x) is the number in [-pi/2, pi/2] for which sin(v) = x.
 
 EXAMPLE
     > print asin(.5, 1e-5), asin(.5, 1e-10), asin(.5, 1e-15), asin(.5, 1e-20)
@@ -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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: asin,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: asin,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/asin,v $
 ##
 ## Under source code control:	1994/03/19 01:40:24

help/assoc

@@ -32,10 +32,9 @@ DESCRIPTION
     may have different numbers (between 1 and 4 inclusive) of indices,
     and these indices need not be integers in specified ranges.
 
-    Assignments of a null value
+    Assignment of a null value to an element of an association does not
-    to an element of an association does not delete the element, but
+    delete the element, but a later reference to that element will return
-    a later reference to that element will return the null value as if
+    the null value as if the element is undefined.
-    the element is undefined.
 
     The elements of an association are stored in a hash table for
     quick access.  The index values are hashed to select the correct
@@ -99,8 +98,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: assoc,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: assoc,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/assoc,v $
 ##
 ## Under source code control:	1994/09/25 20:22:31

help/atan

@@ -14,7 +14,7 @@ DESCRIPTION
     Returns the atan of x to a multiple of eps with error less in
     absolute value than .75 * eps.
 
-    v = atan(x) is the number in (-p1/2, pi/2) for which tan(v) = x.
+    v = atan(x) is the number in (-pi/2, pi/2) for which tan(v) = x.
 
 EXAMPLE
     > print atan(2, 1e-5), atan(2, 1e-10), atan(2, 1e-15), atan(2, 1e-20)
@@ -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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: atan,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: atan,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/atan,v $
 ##
 ## Under source code control:	1994/03/19 01:40:25

help/base

@@ -57,7 +57,7 @@ DESCRIPTION
 	base(1e20)	base(2^64)	base(2^8191-1)
 
     However the base() function will only return one of the base values
-    lised in the table above.
+    listed in the table above.
 
 EXAMPLE
     > base()
@@ -79,7 +79,7 @@ LINK LIBRARY
 	  MODE_REAL, MODE_EXP, MODE_HEX, MODE_OCTAL, MODE_BINARY
 
 SEE ALSO
-    config
+    base2, config, str
 
 ## Copyright (C) 1999  Landon Curt Noll
 ##
@@ -97,8 +97,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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: base,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: base,v 29.5 2002/12/29 09:17:54 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/base,v $
 ##
 ## Under source code control:	1994/09/30 00:09:39

help/base2

@@ -0,0 +1,120 @@
+NAME
+    base2 - set 2nd output base
+
+SYNOPSIS
+    base2([mode])
+
+TYPES
+    mode	real
+
+    return	real
+
+DESCRIPTION
+    By default, calc will output values according to the default base
+    as controlled by the base() builtin function.
+
+    The base2() builtin function, if given a non-zero argument, enables
+    double base output mode.  In double base output mode, calc values
+    are displayed twice, once according to base() and again according
+    to base2().  In double base output mode, the second time a value is
+    displayed, it is displayed within comments:
+
+	21701 /* 0x54c5 */
+
+    The arguments for base2() are identical to base() with the addition
+    of the 0 value:
+
+	     base2	equivalent
+		      config("mode2")'s
+
+	       2	"binary"	base 2 fractions
+			"bin"
+
+	       8	"octal"		base 8 fractions
+			"oct"
+
+	      10	"real"		base 10 floating point
+			"float"
+			"default"
+
+	     -10	"integer"	base 10 integers
+			"int"
+
+	      16	"hexadecimal"	base 16 fractions
+			"hex"
+
+	     1/3	"fraction"	base 10 fractions
+			"frac"
+
+	    1e20	"scientific"	base 10 scientific notation
+			"sci"
+			"exp"
+
+	       0	"off"		disable double base output
+
+    For convenience, any non-integer non-zero value is assumed to mean
+    base 10 fractions and any integer >= 2^64 is assumed to mean base 10
+    scientific notation.
+
+    These base2() calls have the same meaning as config("mode2", "fraction"):
+
+	base2(1/3)	base2(0.1415)	base2(16/37)
+
+    These base2() calls have the same meaning as config("mode2", "scientific"):
+
+	base2(1e20)	base2(2^64)	base2(2^8191-1)
+
+    However the base2() function will only return one of the base values
+    listed in the table above.
+
+EXAMPLE
+    > base2()
+	    0
+    > base2(8)
+	    0 /* 0 */
+    > print 10
+    10 /* 012 */
+    > base2(16),
+    > 131072
+    	131072 /* 0x20000 */
+    > 2345
+	2345 /* 0x929 */
+
+LIMITS
+    none
+
+LINK LIBRARY
+    int math_setmode2(int newmode)
+
+    NOTE: newmode must be one of MODE_DEFAULT, MODE_FRAC, MODE_INT,
+	  MODE_REAL, MODE_EXP, MODE_HEX, MODE_OCTAL, MODE_BINARY,
+	  MODE2_OFF
+
+SEE ALSO
+    base, config, str
+
+## Copyright (C) 2002  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: 1.3 $
+## @(#) $Id: base2,v 1.3 2002/12/29 09:17:54 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/base2,v $
+##
+## Under source code control:	2002/12/29 00:21:07
+## File existed as early as:	2002
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/bernoulli

@@ -0,0 +1,67 @@
+NAME
+    bernoulli - Bernoulli number
+
+SYNOPSIS
+    bernoulli(n)
+
+TYPES
+    n		integer, n < 2^31 if even
+
+    return	rational
+
+DESCRIPTION
+    Returns the Bernoulli number with index n, i.e. the coefficient B_n in
+    the expansion
+
+		t/(exp(t) - 1) = Sum B_n * t^n/n!
+
+    bernoulli(n) is zero both for n < 0 and for n odd and > 2.
+    When bernoulli(n) is computed for positive even n, the values for
+    n and smaller positive even indices are stored in a table so that
+    a later call to bernoulli(k) with 0 <= k < n will be executed quickly.
+
+    Considerable runtime and memory are required for calculating
+    bernoulli(n) for large even n.  For n = 1000, the numerator has
+    1779 digits, the denominator 9 digits.
+
+    The memory used to store calculated bernoulli numbers is freed by
+    freebernoulli().
+
+EXAMPLE
+    > config("mode", "frac"),;
+    > for (n = 0; n <= 6; n++) print bernoulli(n),; print;
+    1 -1/2 1/6 0 -1/30 0 1/42
+
+LIMITS
+    n < 2^31-1
+
+LIBRARY
+    NUMBER *qbernoulli(long n)
+
+SEE ALSO
+    euler, catalan, comb, fact, perm
+
+## 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.5 $
+## @(#) $Id: bernoulli,v 29.5 2002/07/10 11:47:04 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/bernoulli,v $
+##
+## Under source code control:	2000/07/13 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/blk

@@ -122,7 +122,7 @@ DESCRIPTION
     Named blocks are assigned index numbers 0, 1, 2, ..., in the order
     of their creation.	The block with index id is returned by blocks(id).
     With no argument, blocks() returns the number of current unfreed
-    named blocks.  A named block may be used
+    named blocks.
 
     The memory allocated to a named block is freed by the blkfree()
     function with argument the named block, its name, or its id number.
@@ -234,8 +234,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: blk,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: blk,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/blk,v $
 ##
 ## Under source code control:	1997/04/05 13:07:13

help/blocks

@@ -1,5 +1,5 @@
 NAME
-    blocks - return a named file or number of unfreed named blocks
+    blocks - return a named block or number of unfreed named blocks
 
 SYNOPSIS
     blocks([id])
@@ -58,8 +58,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: blocks,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: blocks,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/blocks,v $
 ##
 ## Under source code control:	1997/04/05 13:07:13

help/calc_tty

@@ -0,0 +1,52 @@
+NAME
+    calc_tty - restore normal input conditions for interactive use
+
+SYNOPSIS
+    calc_tty()
+
+TYPES
+    return	none if appears to be successful, error-value otherwise
+
+DESCRIPTION
+    This may enable a return to normal operation if abnormal activity
+    results from a change of one or more terminal characteristics, as
+    may occur when activity is resumed by an fg command after a ctrl-Z
+    interrupt, or by any of the three commands:
+
+		> !stty echo
+		> !stty -cbreak
+		> !stty echo -cbreak
+
+EXAMPLE
+    > calc_tty();
+
+LIBRARY
+    none
+
+SEE ALSO
+    none
+
+## 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.1 $
+## @(#) $Id: calc_tty,v 29.1 2000/12/14 10:31:45 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/calc_tty,v $
+##
+## Under source code control:	2000/12/14 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/catalan

@@ -0,0 +1,63 @@
+NAME
+    catalan - Catalan number
+
+SYNOPSIS
+    catalan(n)
+
+TYPES
+    n		integer
+
+    return	integer
+
+DESCRIPTION
+    If n >= 0, this returns the Catalan number for index n:
+
+	catalan(n) = comb(2*n,n)/(n + 1)
+
+    Zero is returned for negative n.
+
+    The Catalan numbers occur in solutions of several elementary
+    combinatorial problems, e.g. for n >= 1, catalan(n) is the number of
+    ways of using parentheses to express a product of n + 1 letters in
+    terms of binary products; it is the number of ways of dissecting a
+    convex polygon with n + 2 sides into triangles by nonintersecting
+    diagonals; it is the number of integer-component-incrementing paths
+    from (x,y) = (0,0) to (x,y) = (n,n) for which always y <= x.
+
+EXAMPLE
+    > print catalan(2), catalan(3), catalan(4), catalan(20)
+    2 5 14 6564120420
+
+LIMITS
+    none
+
+LINK LIBRARY
+    NUMBER *qcatalan(NUMBER *n)
+
+SEE ALSO
+    comb, fact, perm
+
+## 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.2 $
+## @(#) $Id: catalan,v 29.2 2000/12/17 12:27:58 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/catalan,v $
+##
+## Under source code control:	2000/12/14 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/config

@@ -16,6 +16,7 @@ Configuration parameters
 	    "epsilon"		sets error value for transcendentals.
 	    "maxprint"		sets maximum number of elements printed.
 	    "mode"		sets printout mode.
+	    "mode2"		sets 2nd base printout mode.
 	    "mul2"		sets size for alternative multiply.
 	    "sq2"		sets size for alternative squaring.
 	    "pow2"		sets size for alternate powering.
@@ -47,6 +48,8 @@ Configuration parameters
 	    "ctrl_d"		The interactive meaning of ^D (Control D)
 	    "program"		Read-only calc program or shell script path
 	    "basename"		Read-only basename of the program value
+	    "windows"		Read-only indicator of MS windows
+	    "cygwin"		TRUE=>calc compiled with cygwin, Read-only
 	    "version"		Read-only calc version
 
     The "all" config value allows one to save/restore the configuration
@@ -183,6 +186,7 @@ Detailed config descriptions
     =-=
 
     config("mode", "mode_string")
+    config("mode2", "mode_string")
 
     The "mode" parameter is a string specifying the mode for printing of
     numbers by the unformatted print functions, and the default
@@ -218,7 +222,17 @@ Detailed config descriptions
     Where multiple strings are given, the first string listed is what
     config("mode") will return.
 
-    The default "mode" is "real".
+    The "mode2" controls the double base output.  When set to a value
+    other than "off", calc outputs files in both the "base" mode as
+    well as the "base2" mode.  The "mode2" value may be any of the
+    "mode" values with the addition of:
+
+	    "off"		disable 2nd base output mode	base2(0)
+
+    The base() builtin function sets and returns the "mode" value.
+    The base2() builtin function sets and returns the "mode2" value.
+
+    The default "mode" is "real".  The default "mode2" is "off".
 
     =-=
 
@@ -509,7 +523,9 @@ Detailed config descriptions
 
 	5	Report on changes to the run state of calc.
 
-    Bits >= 6 are reserved for future use and should not be used at this time.
+	6	Report on rand() subtractive 100 shuffle generator issues.
+
+    Bits >= 7 are reserved for future use and should not be used at this time.
 
     By default, "calc_debug" is 0.  The initial value may be overridden
     by the -D command line option.
@@ -539,6 +555,9 @@ Detailed config descriptions
 	2	Show func will display more information about a functions
 		arguments as well as more argument sdummary information.
 
+	3	During execution, allow calc standard resource files
+		to output additional debugging information.
+
     The value for config("resource_debug") in both oldstd and newstd is 3,
     but if calc is invoked with the -d flag, its initial value is zero.
     Thus, if calc is started without the -d flag, until config("resource_debug")
@@ -574,12 +593,14 @@ Detailed config descriptions
 
     The "verbose_quit" controls the print of the message:
 
-	Quit or abort executed
+	quit or abort executed
 
     when a non-interactive quit or abort without an argument is encountered.
     A quit of abort without an argument does not display a message when
     invoked at the interactive level.
 
+    By deafult, "verbose_quit" is false.
+
     =-=
 
     config("ctrl_d", "ctrl_d_string")
@@ -674,6 +695,23 @@ Detailed config descriptions
 
     =-=
 
+    config("windows")		<== NOTE: This is a read-only config value
+
+    Returns TRUE if you are running on a MS windows system, false if you
+    are running on an operating system that does not hate you.
+
+    This config parameter is read-only and cannot be set.
+
+    =-=
+
+    config("cygwin")		<== NOTE: This is a read-only config value
+
+    Returns TRUE if you calc was compiled with cygwin, false otherwise.
+
+    This config parameter is read-only and cannot be set.
+
+    =-=
+
     config("version")		<== NOTE: This is a read-only config value
 
     The version string of the calc program can be obtained by:
@@ -698,8 +736,8 @@ Detailed config descriptions
 ## 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 $
+## @(#) $Revision: 29.8 $
-## @(#) $Id: config,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: config,v 29.8 2004/02/23 05:59:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/config,v $
 ##
 ## Under source code control:	1991/07/21 04:37:17

help/contrib

@@ -35,24 +35,41 @@ If your change is large, you should send entire files (either
 as a diff -c /dev/null your-file patch, or as a uuencoded and
 gziped (or compressed) tar file).
 
-You should send submissions to:
+To contribute code, scripts, resource files and/or to help please
+join the low volume calc mailing list by sending EMail to:
 
     calc-contrib at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
+Feel free to follow the name line with additional EMail text as desired.
+
 Thanks for considering submitting code to calc.	 Calc is a collective
 work by a number of people.  It would not be what it is today without
 your efforts and submissions!
 
-Calc bug reports, however, should be sent to:
+=-=
+
+Calc bug reports and calc bug fixes should be sent to:
 
     calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 See the BUGS file or try the help command:
 
     help bugs
@@ -61,26 +78,10 @@ for details on bug reporting.
 
 =-=
 
-One may join the calc testing group by sending a request to:
-
-	calc-tester-request at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-
-    Your message body (not the subject) should consist of:
-
-	subscribe calc-tester address
-	end
-	name your_full_name
-
-    where "address" is your EMail address and "your_full_name"
-    is your full name.
-
 Landon Curt Noll
 http://www.isthe.com/chongo/
 
-chongo <was here> /\../\
+chongo (share and enjoy) /\../\
 
 ## Copyright (C) 1999  Landon Curt Noll
 ##
@@ -98,8 +99,8 @@ chongo <was here> /\../\
 ## 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 $
+## @(#) $Revision: 29.4 $
-## @(#) $Id: contrib,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: contrib,v 29.4 2001/06/01 11:37:14 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/contrib,v $
 ##
 ## Under source code control:	1997/03/09 16:33:22

help/define

@@ -1,121 +1,197 @@
-Function definitions
+NAME
+    define - command keyword to start a function definition
 
-    Function definitions are introduced by the 'define' keyword.
+SYNTAX
-    Other than this, the basic structure of an ordinary definition
+    define fname([param_1 [= default_1], ...]) = [expr]
-    is like in that in C: parameters are specified for the function
+    define fname([param_1 [= default_1], ...]) { [statement_1 ... ] }
-    within parenthesis, the function body is introduced by a left brace,
-    variables may declared for the function, statements implementing the
-    function may follow, any value to be returned by the function is specified
-    by a return statement, and the function definition is ended with a
-    right brace.
 
-    There are some subtle differences, however.	 The types of parameters
+TYPES
-    and variables are not defined at compile time, and may vary during
+    fname		identifier, not a builtin function name
-    execution and be different in different calls to the function.  For
+    param_1, ...	identifiers, no two the same
-    example, a two-argument function add may be defined by
+    default_1, ...	expressions
+    expr		expression
+    statement_1, ...	statements
 
-		define add(a,b) {
+DESCRIPTION
-			return a + b;
+    The intention of a function definition is that the identifier fname
-		}
+    becomes the name of a function which may be called by an expression
+    of the form  fname(arg_1, arg_2, ...), where arg_1, arg_2, ... are
+    expressions (including possibly blanks, which are treated as
+    null values).  Evaluation of the function begins with evaluation
+    of arg_1, arg_2, ...; then, in increasing order of i, if arg_i is
+    null-valued and  "= default_i" has been included in the definition,
+    default_i is evaluated and its value becomes the value of arg_i.
+    The instructions in expr or the listed statements are then executed
+    with each occurrence of param_i replaced by the value obtained
+    for arg_i.
 
-    and be called with integer, fractional, or complex number values for a
+    In a call, arg_i may be preceded by a backquote (`)  to indicate that
-    and b, or, under some compatibility conditions, matrices or objects.
+    evaluation of arg_i is not to include a final evaluation of an lvalue.
-    Any variable, not already defined as global, used in a definition has
+    For example, suppose a function f and a global variable A have been
-    to be declared as local, global or static, and retains this character
+    defined by:
-    until its scope is terminated by the end of the definition, the end of
-    the file being read or some other condition (see help variable for
-    details).
 
-    For example, the following function computes the factorial of n, where
+		define f(x) = (x = 3);
-    we may suppose it is to be called only with positive integral values
+		global mat A[3];
-    for n:
 
-	    define factorial(n)
+    If g() is  a function that evaluates to 2:
-	    {
-		    local	ans;
 
-		    ans = 1;
+		f(A[g()]);
-		    while (n > 1)
-			    ans *= n--;
-		    return ans;
-	    }
 
-    (In calc, this definition is unncessary since there is a built-in
+    assigns the value of A[2] to the parameter x and then assigns the
-    function fact(n), also expressible as n!, which returns the factorial
+    value 3 to x:
-    of n.)
 
-    Any functions used in the body of the definition need not have already
+		f(`A[g()]);
-    been defined; it is sufficient that they have been defined when they are
-    encountered during evaluation when the function is called.
 
-    If a function definition is sufficiently simple and does not require
+    has essentially the effect of assigning A[2] as an lvalue to x and
-    local or static variables, it may be defined in shortened manner by
+    then assigning the value 3 to A[2].  (Very old versions of calc
-    using an equals sign following by an expression involving some or all
+    achieved the same result by using '&' as in  f(&A[g()]).)
-    of the parameters and already existing global variables.
 
-    In this case, the definition is terminated by a newline character
+    The number of arguments arg_1, arg_2, ... in a call need not equal the
-    (which may be preceded by a semicolon), and the value the function
+    number of parameters.  If there are fewer arguments than parameters,
-    returns when called will be determined by the specified expression.
+    the "missing" values are assigned the null value.
-    Loops and "if" statements are not allowed (but ? : expressions and the
-    logical operators ||, && and !  are permitted).  As an example, the
-    average of two numbers could be defined as:
 
-	    define average(a, b) = (a + b) / 2;
+    In the definition of a function, the builtin function param(n)
+    provides a way of referring to the parameters.  If n (which may
+    result from evaluating an expreession) is zero, it returns the number
+    of arguments in a call to the function, and if 1 <= n <= param(0),
+    param(n) refers to the parameter with index n.
 
-    (Again, this function is not necessary, as the same result is
+    If no error occurs and no quit statement or abort statement is
-    returned by the builtin function avg() when called with the
+    encountered during evaluation of the expression or the statements,
-    two arguments a, b.)
+    the function call returns a value.  In the expression form, this is
+    simply the value of the expression.
 
-    Function definitions can be very complicated.  Functions may be
+    In the statement form, if a return statement is encountered,
-    defined on the command line if desired, but editing of partial
+    the "return" keyword is to be either immediately followed by an
-    functions is not possible past a single line.  If an error is made
+    expression or by a statement terminator (semicolon or rightbrace);
-    on a previous line, then the function must be finished (with probable
+    in the former case, the expression is evaluated, evaluation of
-    errors) and reentered from the beginning.  Thus for complicated
+    the function ceases, and the value obtained for the expression is
-    functions, it is best to use an editor to create the definition in a
+    returned as the "value of the function";  in the no-expression case,
-    file, and then enter the calculator and read in the file containing
+    evaluation ceases immediately and the null-value is returned.
-    the definition.
 
-    The parameters of a function can be referenced by name, as in
+    In the expression form of definition, the end of the expression expr
-    normal C usage, or by using the 'param' function.  This function
+    is to be indicated by either a semicolon or a newline not within
-    returns the specified parameter of the function it is in, where
+    a part enclosed by parentheses; the definition may extend over
-    the parameters are numbered starting from 1.  The total number
+    several physical lines by ending each line with a '\' character or by
-    of parameters to the function is returned by using 'param(0)'.
+    enclosing the expression in parentheses.  In interactive mode, that
-    Using this function allows you to implement varargs-like routines
+    a definition has not been completed is indicated by the continuation
-    which can handle up to 100 calling parameters.  For example:
+    prompt.   A ctrl-C interrupt at this stage will abort the definition.
 
-	    define sc()
+    If the expr is omitted from an expression definition, as in:
-	    {
-		    local s, i;
 
-		    s = 0;
+		define h() = ;
-		    for (i = 1; i <= param(0); i++)
-			    s += param(i)^3;
-		    return s;
-	    }
 
-    defines a function which returns the sum of the cubes of all its
+    any call to the function will evaluate the arguments and return the
-    parameters.
+    null value.
 
-    Any identifier other than a reserved word (if, for, etc.) and the
+    In the statement form, the definition ends when a matching right
-    name of a builtin function (abs, fact, sin, etc.) can be used when
+    brace completes the "block" started by the initial left brace.
-    defining a new function or redefining an existing function.
+    Newlines within the block are treated as white space; statements
+    within the block end with a ';' or a '}' matching an earlier '{'.
 
-    An indication of how a user-defined function is stored may be obtained
+    If a function with name fname had been defined earlier, the old
-    by using the "show opcodes" command.  For example:
+    definition has no effect on the new definition, but if the definition
+    is completed successfully, the new definition replaces the old one;
+    otherwise the old definition is retained.  The number of parameters
+    and their names in the new definiton may be quite different from
+    those in the old definition.
 
-		> global alpha
+    An attempt at a definition may fail because of scanerrors as the
-		> define f(x) = 5 + alpha * x
+    definition is compiled.  Common causes of these are: bad syntax,
-		"f" defined
+    using identifiers as names of variables not yet defined.  It is
-		> show opcodes f
+    not a fault to have in the definition a call to a function that has
-		0: NUMBER 5
+    not yet been defined; it is sufficient that the function has been
-		2: GLOBALADDR alpha
+    defined when a call is made to the function.
-		4: PARAMADDR 0
-		6: MUL
-		7: ADD
-		8: RETURN
 
+    After fname has been defined, the definition may be removed by the command:
 
-## Copyright (C) 1999  Landon Curt Noll
+		undefine fname
+
+    The definitions of all user-defined functions may be removed by:
+
+		undefine *
+
+    If bit 0 of config("resource_debug") is set and the define command is
+    at interactive level, a message saying that fname has been defined
+    or redefined is displayed.  The same message is displayed if bit 1
+    of config("resource_debug") is set and the define command is read
+    from a file.
+
+    The identifiers used for the parameters in a function definition do
+    not form part of the completed definition.  For example,
+
+	define f(a,b) = a + b;
+	define g(alpha, beta) = alpha + beta;
+
+    result in identical code for the functions f, g.
+
+    If config("trace") & 8 is nonzero, the opcodes of a newly defined
+    function are displayed on completion of its definition, parameters
+    being specified by names used in the definition.  For example:
+
+	> config("trace", 8),
+	> define f(a,b) = a + b
+	0: PARAMADDR a
+	2: PARAMADDR b
+	4: ADD
+	5: RETURN
+	f(a,b) defined
+
+    The opcodes may also be displayed later using the show opcodes command;
+    parameters will be specified by indices instead of by names.  For example:
+
+	> show opco f
+	0: PARAMADDR 0
+	2: PARAMADDR 1
+	4: ADD
+	5: RETURN
+
+    When a function is defined by the statement mode, the opcodes normally
+    include DEBUG opcodes which specify statement boundaries at which
+    SIGINT interruptions are likely to be least risky.  Inclusion of
+    the DEBUG opcodes is disabled if config("trace") & 2 is nonzero.
+    For details, see help interrupt.
+
+    While config("trace") & 1 is nonzero, the opcodes are displayed as
+    they are being evaluated.  The current function is identified by its
+    name, or "*" in the case of a command-line and "**" in the case of
+    an eval(str) evaluation.
+
+    When a function is called, argument values may be of any type for
+    which the operations and any functions used within the body of the
+    definition can be executed.  For example, whatever the intention at
+    the time they were defined, the functions f1(), f2() defined above
+    may be called with integer, fractional, or complex-number values, or
+    with both arguments strings, or under some compatibility conditions,
+    matrices or objects.
+
+EXAMPLE
+    > define f(a,b) = 2*a + b;
+    > define g(alpha, beta)
+    >> {
+    >>	   local a, pi2;
+    >>
+    >>	   pi2 = 2 * pi();
+    >>	   a = sin(alpha % pi2);
+    >>	   if (a > 0.0) {
+    >>	       return a*beta;
+    >>	   }
+    >>	   if (beta > 0.0) {
+    >>	       a *= cos(-beta % pi2);
+    >>	   }
+    >>	   return a;
+    >> }
+
+LIMITS
+    The number of arguments in a function-call cannot exceed 100.
+
+LIBRARY
+    none
+
+SEE ALSO
+    param, variable, undefine, show
+
+## Copyright (C) 2000  David I. Bell, Landon Curt Noll and 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
@@ -131,10 +207,11 @@ Function definitions
 ## 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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: define,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: define,v 29.3 2000/07/17 15:36:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/define,v $
 ##
+##
 ## Under source code control:	1991/07/21 04:37:18
 ## File existed as early as:	1991
 ##

help/digit

@@ -1,38 +1,93 @@
 NAME
-    digit - digit at specified position in a decimal representation
+    digit - digit at specified position in a "decimal" representation
 
 SYNOPSIS
-    digit(x, y)
+    digit(x, n [, b])
 
 TYPES
     x		real
-    y		integer
+    n		integer
+    b		integer >= 2, default = 10
 
     return	integer
 
 DESCRIPTION
-    By extending the digits on the left, and if necessary, the digits
-    on the right, by infinite strings of zeros, abs(x) may be considered
-    to have the decimal representation:
 
-		... d_2 d_1 d_0.d_-1 d_-2 ...
+    d(x,n,b) returns the digit with index n in a standard base-b "decimal"
+    representation of x, which may be described as follows:
+
+    For an arbitrary base b >= 2, following the pattern of decimal (base 10)
+    notation in elementary arithmetic, a base-b "decimal" representation of
+    a positive real number may be considered to be specified by a finite or
+    infinite sequence of "digits" with possibly a "decimal" point
+    to indicate where the fractional part of the representation begins.
+    Just as the digits for base 10 are the integers 0, 1, 2, ..., 9, the
+    digits for a base-b representation are the integers d for which
+    0 <= d < b.   The index for a digit position is the count, positively to
+    the left, of the number from the "units" position immediately to the
+    left of the "decimal" point; the digit  d_n  at position n contributes
+    additively  d_n * b^n  to the value of x.  For example,
+
+		d_2 d_1 d_0 . d_-1 d_-2
+
+    represents the number
+
+		d_2 * b^2 + d_1 * b + d0 + d_-1 * b^-1 + d_-2 * b^-2
+
+    The sequence of digits has to be infinite if den(x) has a prime factor
+    which is not a factor of the base b.  In cases where the representation
+    may terminate, the digits are considered to continue with an infinite
+    string of zeros rather than the other possibility of an infinite
+    sequence of (b - 1)s.  Thus, for the above example, d_n = 0 for
+    n = -3, -4, ...  Similarly, a representation may be considered to
+    continue with an infinite string of zeros on the left, so that in the
+    above example d_n = 0 also for n >= 3.
+
+    For negative x, digit(x,n,b) is given by digit(abs(x),n,b); the
+    standard "decimal" representation of this x is a - sign followed by
+    the representation of abs(x).
+
+    In calc, the "real" numbers are all rational and for these the
+    digits following the decimal point eventually form a recurring sequence.
+
+    With base-b digits for x as explained above, the integer whose base-b
+    representation is
+
+		b_n+k-1 b_n_k-2 ... b_n,
+
+    i.e. the k digits with last digit b_n, is given by
+
+		digit(b^-r * x, q, b^k)
+
+    if r and q satisfy  n = q * b + r.
 
-    digit(x,y) then returns the digit d_y.
 
 EXAMPLE
-    > x = 12.34
+	> a = 123456.789
-    > print digit(x,2), digit(x,1), digit(x,0), digit(x,-1), digit(x,-2)
+	> for (n = 6; n >= -6; n++) print digit(a, n),; print
-    0 1 2 3 4
+	0 1 2 3 4 5 6 7 8 9 0 0 0
 
-    > x = 10/7
+	> for (n = 6; n >= -6; n--) print digit(a, n, 100),; print
-    > print digit(x,1), digit(x,0), digit(x,-1), digit(x,-2), digit(x,-3)
+	0 0 0 0 12 34 56 78 90 0 0 0 0
-    0 1 4 2 8
+
+	> for (n = 6; n >= -6; n--) print digit(a, n, 256),; print
+	0 0 0 0 1 226 64 201 251 231 108 139 67
+
+  	> for (n = 1; n >= -12; n++) print digit(10/7, n),; print
+    	> 0 1 4 2 8 5 7 1 4 2 8 5 7 1
+
+	> print digit(10/7, -7e1000, 1e6)
+	428571
 
 LIMITS
-    If x is not an integer, y > -2^31
+
+    The absolute value of the integral part of x is assumed to be less
+    than 2^2^31, ensuring that digit(x, n, b) will be zero if n >= 2^31.
+    The size of negative n is limited only by the capacity of the computer
+    being used.
 
 LINK LIBRARY
-    long qdigit(NUMBER *x, long y)
+    NUMBER * qdigit(NUMBER *q, ZVALUE dpos, ZVALUE base)
 
 SEE ALSO
     bit
@@ -53,8 +108,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 $
+## @(#) $Revision: 29.4 $
-## @(#) $Id: digit,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: digit,v 29.4 2000/12/17 12:27:58 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/digit,v $
 ##
 ## Under source code control:	1995/10/03 10:40:01

help/digits

@@ -1,32 +1,56 @@
 NAME
-    digits - return number of digits in an integer or integer part
+    digits - return number of "decimal" digits in an integral part
 
 SYNOPSIS
-    digits(x)
+    digits(x [,b])
 
 TYPES
     x		real
+    b		integer >= 2, defaults to 10
 
     return	integer
 
 DESCRIPTION
-    For real x, digits(x) returns the number of digits in the decimal
+    Returns number of digits in the standard base-b representation
-    representation of int(abs(x)).  If x >= 1, digits(x) = 1 + ilog10(x).
+    when x is truncated to an integer and the sign is ignored.
+
+    To be more precise: when abs(int(x)) > 0, this function returns
+    the value 1 + ilog(x, b).  When abs(int(x)) == 0, then this
+    function returns the value 1.
+
+    If omitted, b is assumed to be 10.  If given, b must be an
+    integer > 1.
+
+    One should remember these special cases:
+
+	digits(12.3456) == 2    computes with the integer part only
+	digits(-1234) == 4      computes with the absolute value only
+	digits(0) == 1          specical case
+	digits(-0.123) == 1     combination of all of the above
 
 EXAMPLE
-    > print digits(0), digits(0.0123), digits(3.7), digits(-27), digits(-99.7)
+    > print digits(100), digits(23209), digits(2^72)
-    1 1 1 2 2
+    3 5 22
+
+    > print digits(0), digits(1), digits(-1)
+    1 1 1
+
+    > print digits(-1234), digits(12.3456), digits(107.207)
+    4 2 3
+
+    > print digits(17^463-1, 17), digits(10000, 100), digits(21701, 2)
+    3, 15 14
 
 LIMITS
-    none
+    b > 1
 
 LINK LIBRARY
-    long qdigits(NUMBER *x)
+    long qdigits(NUMBER *q, ZVALUE base)
 
 SEE ALSO
-    places
+    digit, places
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -42,8 +66,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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: digits,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: digits,v 29.5 2003/01/26 19:41:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/digits,v $
 ##
 ## Under source code control:	1995/10/03 10:40:01

help/euler

@@ -0,0 +1,63 @@
+NAME
+    euler - Euler number
+
+SYNOPSIS
+    euler(n)
+
+TYPES
+    n		integer, n <= 1000000 if even
+
+    return	integer
+
+DESCRIPTION
+    Returns the Euler number with index n, i.e. the coefficient E_n in
+    the expansion
+
+		sech(t) = Sigma E_n * t^n/n!
+
+    When euler(n) is computed for positive even n, the values for
+    n and smaller positive even indices are stored in a table so that
+    a later call to euler(k) with 0 <= k <= n will be executed quickly.
+    If euler(k) is called with negative k, zero is returned and the
+    memory used by the table iu freed.
+
+    Considerable runtime and memery are required for calculating
+    euler(n) for large even n.
+
+EXAMPLE
+    > for (n = 0; n <= 6; n++) print euler(n),; print;
+    1 0 -1 0 5 0 -61
+
+LIMITS
+    none
+
+LINK LIBRARY
+    NUMBER *qeuler(long n)
+
+SEE ALSO
+    bernoulli, bell, catalan, comb, fact, perm
+
+## 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.2 $
+## @(#) $Id: euler,v 29.2 2000/12/17 12:27:58 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/euler,v $
+##
+## Under source code control:	2000/12/14 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/fopen

@@ -15,9 +15,39 @@ DESCRIPTION
     opened for either reading, writing, or appending.  The mode
     is controlled by the mode flag as follows:
 
-	"r"	reading
+		 allow	  allow    file is   positioned	  file(*)
-	"w"	writing
+       mode	reading	 writing  truncated      at	  mode
-	"a"	appending
+       ----	-------  -------  ---------  ---------	  ----
+	r	   Y	    N	      N      beginning	  text
+	rb	   Y	    N	      N      beginning	  binary
+	r+	   Y	    N	      N      beginning	  text
+	r+b	   Y	    N	      N      beginning	  binary
+	rb+	   Y	    N	      N      beginning	  binary
+
+	w	   N	    Y	      Y      beginning	  text
+	wb	   N	    Y	      Y      beginning	  binary
+	w+	   Y	    Y	      Y      beginning	  text
+	w+b	   Y	    Y	      Y      beginning	  binary
+	wb+	   Y	    Y	      Y      beginning	  binary
+
+	a	   N	    Y	      Y         end	  text
+	ab	   N	    Y	      Y         end	  binary
+	a+	   Y	    Y	      Y         end	  text
+	a+b	   Y	    Y	      Y         end	  binary
+	ab+	   Y	    Y	      Y         end	  binary
+
+    (*) NOTE on 'b' / binary/text mode:
+
+    	The 'b' or fopen binary mode has no effect on POSIX / Linux
+	/ Un*x-like systems.  On those systems a text file is the
+	same as a binary file (as it should be for any modern-day
+	operating system).  Adding 'b' to an fopen has no effect
+	and is ignored.
+
+	Some non-POSIX systems sucn as MS Windoz treat text files
+	and binary files differently.  In text mode MS Windoz consider
+	"\r\n" and end-of-line character.  On an Apple MAC, the
+	text mode end-of-line character is "\r".
 
     Names of files are subject to ~ expansion just like the C or
     Korn shell.	 For example, the file name:
@@ -90,8 +120,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: fopen,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: fopen,v 29.3 2001/04/10 21:46:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/fopen,v $
 ##
 ## Under source code control:	1994/10/27 03:04:17

help/freebernoulli

@@ -0,0 +1,49 @@
+NAME
+    freebernoulli - free stored Benoulli numbers
+
+SYNOPSIS
+    freebernoulli()
+
+TYPES
+    return	none
+
+DESCRIPTION
+    The memory used to store calculated bernoulli numbers is freed by
+    freebernoulli().
+
+EXAMPLE
+    > freebernoulli();
+
+LIMITS
+    none
+
+LINK LIBRARY
+    void qfreebern(void);
+
+SEE ALSO
+    bernoulli
+
+## 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.2 $
+## @(#) $Id: freebernoulli,v 29.2 2000/07/17 15:36:26 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/freebernoulli,v $
+##
+## Under source code control:	2000/07/13
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/freeeuler

@@ -0,0 +1,49 @@
+NAME
+    freeeuler - free stored Euler numbers
+
+SYNOPSIS
+    freeeuler()
+
+TYPES
+    return	none
+
+DESCRIPTION
+    The memory used to store calculated Euler numbers is freed by
+    freeeuler().
+
+EXAMPLE
+    > freeeuler();
+
+LIMITS
+    none
+
+LINK LIBRARY
+    void qfreeeuler(void);
+
+SEE ALSO
+    euler, bernoulli, freebernoulli
+
+## 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.1 $
+## @(#) $Id: freeeuler,v 29.1 2000/12/14 10:31:45 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/freeeuler,v $
+##
+## Under source code control:	2000/12/14 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/hash

@@ -1,5 +1,5 @@
 NAME
-    hash - FNV-1 hash value
+    hash - return the calc hash value
 
 SYNOPSIS
     hash(x_1 [, x_2, x_3, ...])
@@ -12,27 +12,16 @@ TYPES
 DESCRIPTION
     Returns a hash value for one or more values of arbitrary types.
 
-    The basis of this hash algorithm was taken from an idea sent
+    The calc hash value is based on the core Fowler/Noll/Vo hash
-    as reviewer comments to the IEEE POSIX P1003.2 committee by:
+    known as FNV-1.  The return value, however, cannot be used
+    as an FNV hash value because calc's internal function also
+    takes into account more abstract concepts such as data types.
 
-	 Phong Vo (http://www.research.att.com/info/kpv/)
+    See:
-	 Glenn Fowler (http://www.research.att.com/~gsf/)
-
-    In a subsequent ballot round:
-
-	 Landon Curt Noll (http://www.isthe.com/chongo/)
-
-    improved on their algorithm.  Some people tried this hash
-    and found that it worked rather well.  In an EMail message
-    to Landon, they named it ``Fowler/Noll/Vo'' or the FNV hash.
-
-    FNV hashes are architected to be fast while maintaining a low
-    collision rate. The FNV speed allows one to quickly hash lots
-    of data while maintaining a reasonable collision rate.  See:
 
 	 http://www.isthe.com/chongo/tech/comp/fnv/
 
-    for more details as well as other forms of the FNV hash.
+    information about the Fowler/Noll/Vo (FNV) hash.
 
 EXAMPLE
     > a = isqrt(2e1000); s = "xyz";
@@ -48,7 +37,7 @@ LINK LIBRARY
 SEE ALSO
     sha, sha1, md5
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -64,8 +53,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: hash,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: hash,v 29.3 2003/03/01 01:16:02 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/hash,v $
 ##
 ## Under source code control:	1996/03/12 23:10:01

help/im

@@ -20,7 +20,7 @@ LIMITS
     none
 
 LINK LIBRARY
-    COMPLEX *cimag(COMPLEX *x)
+    COMPLEX *c_imag(COMPLEX *x)
 
 SEE ALSO
     re
@@ -41,8 +41,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: im,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: im,v 29.3 2002/03/12 09:38:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/im,v $
 ##
 ## Under source code control:	1995/10/05 04:52:26

help/interrupt

@@ -15,10 +15,13 @@ Interrupts
 	    [Abort level n]
 
     where n ranges from 1 to 3.	 For n equal to 1, the calculator will
-    abort calculations at the next statement boundary.	For n equal to 2,
+    abort calculations at the next statement boundary specified by an
-    the calculator will abort calculations at the next opcode boundary.
+    ABORT opcode as described below.  For n equal to 2, the calculator
-    For n equal to 3, the calculator will abort calculations at the next
+    will abort calculations at the next opcode boundary.  For n equal to 3,
-    lowest level arithmetic operation boundary.
+    the calculator will abort calculations at the next attempt to allocate
+    memory for the result of an integer arithmetic operation; this
+    level may be appropriate for stopping a builtin operation like
+    inversion of a large matrix.
 
     If a final interrupt is given when n is 3, the calculator will
     immediately abort the current calculation and longjmp back to the
@@ -27,8 +30,77 @@ Interrupts
     be done as a last resort.  You are advised to quit the calculator
     after this has been done.
 
-## Copyright (C) 1999  Landon Curt Noll
+ABORT opcodes
-##
+
+    If config("trace") & 2 is zero, ABORT opcodes are introduced at
+    various places in the opcodes for evaluation of command lines
+    and functions defined by "define ... { ... }" commands.  In the
+    following, config("trace") has been set equal to 8 so that opcodes
+    are displayed when a function is defined.   The function f(x)
+    evaluates x + (x - 1) + (x - 2) + ... until a zero term is
+    encountered.  If f() is called with a negative or fractional x,
+    the calculation is never completed and to stop it, an interruption
+    (on many systems, by ctrl-C) will be necessary.
+
+	> config("trace", 8),
+	> define f(x) {local s; while (x) {s += x--} return s}
+	0: DEBUG line 2
+	2: PARAMADDR x
+	4: JUMPZ 19
+	6: DEBUG line 2
+	8: LOCALADDR s
+	10: DUPLICATE
+	11: PARAMADDR x
+	13: POSTDEC
+	14: POP
+	15: ADD
+	16: ASSIGNPOP
+	17: JUMP 2
+	19: DEBUG line 2
+	21: LOCALADDR s
+	23: RETURN
+	f(x) defined
+
+    (The line number following DEBUG refers to the line in the file
+    from which the definition is read.)   If an attempt is made to
+    evaluate f(-1), the effect of the DEBUG at opcode 6 ensures that
+    a single SIGINT will stop the calculation at a start of
+    {s += x--} loop.  In interactive mode, with ^C indicating
+    input of ctrl-C, the displayed output is as in:
+
+	> f(-1)
+	^C
+	[Abort level 1]
+	"f": line 2: Calculation aborted at statement boundary
+
+    The DEBUG opcodes are disabled by nonzero config("trace") & 2.
+    Changing config("trace") to achieve this, and defining g(x) with
+    the same definition as for f(x) gives:
+
+	> define g(x) {local s; while (x) {s += x--} return s}
+	0: PARAMADDR x
+	2: JUMPZ 15
+	4: LOCALADDR s
+	6: DUPLICATE
+	7: PARAMADDR x
+	9: POSTDEC
+	10: POP
+	11: ADD
+	12: ASSIGNPOP
+	13: JUMP 0
+	15: LOCALADDR s
+	17: RETURN
+	g(x) defined
+
+    If g(-1) is called, two interrupts are necessary, as in:
+
+	> g(-1)
+	^C
+	[Abort level 1]
+	^C
+	[Abort level 2]
+	"g": Calculation aborted in opcode
+
 ## 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.
@@ -43,8 +115,8 @@ Interrupts
 ## 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 $
+## @(#) $Revision: 29.4 $
-## @(#) $Id: interrupt,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: interrupt,v 29.4 2000/07/17 15:38:52 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/interrupt,v $
 ##
 ## Under source code control:	1991/07/21 04:37:21

help/places

@@ -1,36 +1,46 @@
 NAME
-    places - return number of decimal places
+    places - return number of "decimal" places in a fractional part
 
 SYNOPSIS
-    places(x)
+    places(x [,b])
 
 TYPES
     x		real
+    b		integer >= 2, defaults to 10
 
     return	integer
 
 DESCRIPTION
-    If x has a finite decimal representation (with nonzero last digit),
+    Returns the least non-negative integer n for which  b^n * x  is an
-    places(x) returns the number of digits after the decimal point in this
+    integer, or -1 if there is no such integer.
-    representation; this is the least non-negative integer n for which
-    10^n * x is an integer.
 
-    If x does not have a finite decimal representation, places(x) returns -1.
+    places(x,b) = 0 if and only if x is an integer.
+
+    If omitted, b is assumed to be 10.  If given, b must be an
+    integer > 1.
+
+    places(x,b) = n > 0 if and only if the fractional part of abs(x)
+    has a finite base-b "decimal" representation with n digits of which
+    the last digit is nonzero.  This occurs if and only if every prime
+    factor of den(x) is a factor of b.
 
 EXAMPLE
     > print places(3), places(0.0123), places(3.70), places(1e-10), places(3/7)
     0 4 1 10 -1
 
+    > print places(0.0123, 2), places(.625, 2), places(.625, 8)
+    -1 3 1
+
 LIMITS
-    none
+    b > 1
 
 LINK LIBRARY
-    long qplaces(NUMBER *x)
+    long qplaces(NUMBER *q, ZVALUE base)
 
 SEE ALSO
-    digits
+    digit, digits
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -46,8 +56,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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: places,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: places,v 29.5 2003/01/26 19:43:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/places,v $
 ##
 ## Under source code control:	1995/10/03 10:40:02

help/rand

@@ -1,5 +1,5 @@
 NAME
-    rand - additive 55 shuffle pseudo-random number generator
+    rand - subtractive 100 shuffle pseudo-random number generator
 
 SYNOPSIS
     rand([[min, ] max])
@@ -11,7 +11,7 @@ TYPES
     return	integer
 
 DESCRIPTION
-    Generate a pseudo-random number using an additive 55 shuffle generator.
+    Generate a pseudo-random number using an subtractive 100 shuffle generator.
     We return a pseudo-random number over the half closed interval [min,max).
     By default, min is 0 and max is 2^64.
 
@@ -38,36 +38,40 @@ DESCRIPTION
 
     when seeded with the same seed.
 
-    The rand generator has two distinct parts, the additive 55 method
+    The rand generator has two distinct parts, the subtractive 100 method
-    and the shuffle method.  The additive 55 method is described in:
+    and the shuffle method.  The subtractive 100 method is described in:
 
-	"The Art of Computer Programming - Seminumerical Algorithms"
+	"The Art of Computer Programming - Seminumerical Algorithms",
-	by Knuth, Vol 2, 2nd edition (1981), Section 3.2.2, page 27,
+	Vol 2, 3rd edition (1998), Section 3.6, page 186, formula (2).
-	Algorithm A.
 
-    The period and other properties of the additive 55 method
+    The "use only the first 100 our of every 1009" is described in
+    Knuth's "The Art of Computer Programming - Seminumerical Algorithms",
+    Vol 2, 3rd edition (1998), Section 3.6, page 188".
+
+    The period and other properties of the subtractive 100 method
     make it very useful to 'seed' other generators.
 
-    The shuffle method is feed values by the additive 55 method.
+    The shuffle method is feed values by the subtractive 100 method.
     The shuffle method is described in:
 
-	"The Art of Computer Programming - Seminumerical Algorithms"
+	"The Art of Computer Programming - Seminumerical Algorithms",
-	by Knuth, Vol 2, 2nd edition (1981), Section 3.2.2, page 32,
+	Vol 2, 3rd edition (1998), Section 3.2.2, page 34, Algorithm B.
-	Algorithm B.
 
     The rand generator has a good period, and is fast.	It is reasonable as
     generators go, though there are better ones available.  The shuffle
     method has a very good period, and is fast.	 It is fairly good as
     generators go, particularly when it is feed reasonably random
-    numbers.  Because of this, we use feed values from the additive 55
+    numbers.  Because of this, we use feed values from the subtractive 100
     method into the shuffle method.
 
     The rand generator uses two internal tables:
 
-	additive table - 55 entries of 64 bits used by the additive 55 method
+	additive table - 100 entries of 64 bits used by the subtractive
+			 100 method
 
 	shuffle table - 256 entries of 64 bits used by the shuffle method
-			feed by the additive 55 method from the additive table
+			feed by the subtractive 100 method from the
+			subtractive table
 
     The goals of this generator are:
 
@@ -95,21 +99,21 @@ DESCRIPTION
     a standard against which other generators may be measured.
 
     The Rand book of numbers was groups into groups of 20 digits.  The
-    first 55 groups < 2^64 were used to initialize the default additive
+    first 100 groups < 2^64 were used to initialize the default additive
     table.  The size of 20 digits was used because 2^64 is 20 digits
     long.  The restriction of < 2^64 was used to prevent modulus biasing.
 
     The shuffle table size is longer than the 100 entries recommended
     by Knuth.  We use a power of 2 shuffle table length so that the
-    shuffle process can select a table entry from a new additive 55
+    shuffle process can select a table entry from a new subtractive 100
     value by extracting its low order bits.  The value 256 is convenient
     in that it is the size of a byte which allows for easy extraction.
 
-    We use the upper byte of the additive 55 value to select the
+    We use the upper byte of the subtractive 100 value to select the
     shuffle table entry because it allows all of 64 bits to play a part
     in the entry selection.  If we were to select a lower 8 bits in the
     64 bit value, carries that propagate above our 8 bits would not
-    impact the additive 55 generator output.
+    impact the subtractive 100 generator output.
 
     It is 'nice' when a seed of "n" produces a 'significantly different'
     sequence than a seed of "n+1".  Generators, by convention, assign
@@ -161,7 +165,7 @@ DESCRIPTION
     The values 'a' and 'c for randreseed64 are taken from the Rand book
     of numbers.	 Because m=2^64 is 20 decimal digits long, we will
     search the Rand book of numbers 20 at a time.  We will skip any of
-    the 55 values that were used to initialize the additive 55
+    the 100 values that were used to initialize the subtractive 100
     generators.	 The values obtained from the Rand book are:
 
 	a = 6316878969928993981
@@ -190,36 +194,40 @@ DESCRIPTION
 
     The truly paranoid might suggest that my claims in the MAGIC NUMBERS
     section are a lie intended to entrap people.  Well they are not, but
-    you need not take my (Landon Curt Noll) word for it.
+    if you that paranoid why would you use a non-cryprographically strong
+    pseudo-random number generator in the first place?  You would be
+    better off using the random() builtin function.
 
-    The random numbers from the Rand book of random numbers can be
+    The two constants that were picked from the Rand Book of Random Numbers
+    The random numbers from the Rand Book of Random Numbers can be
     verified by anyone who obtains the book.  As these numbers were
-    created before I (Landon Curt Noll) was born (you can look up my
+    created before I (Landon Curt Noll) was born (you can look up
-    birth record if you want), I claim to have no possible influence on
+    my birth record if you want), I claim to have no possible influence
-    their generation.
+    on their generation.
 
     There is a very slight chance that the electronic copy of the
-    Rand book that I was given access to differs from the printed text.
+    Rand Book of Random Numbers that I was given access to differs
-    I am willing to provide access to this electronic copy should
+    from the printed text.  I am willing to provide access to this
-    anyone wants to compare it to the printed text.
+    electronic copy should anyone wants to compare it to the printed text.
 
-    When using the a55 generator, one may select your own 55 additive
+    When using the s100 generator, one may select your own 100 subtractive
     values by calling:
 
-	srand(mat55)
+         srand(mat100)
 
-    and avoid using my magic numbers.  Of course, you must pick good
+    and avoid using my magic numbers.  The randreseed64 process is NOT
-    additive 55 values yourself!
+    applied to the matrix values. Of course, you must pick good subtractive
+    100 values yourself!
 
 EXAMPLE
     > print srand(0), rand(), rand(), rand()
-    RAND state 14384206130809570460 10173010522823332484 5713611208311484212
+    RAND state 2298441576805697181 3498508396312845423 5031615567549397476
 
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123)
-    17 104 74 47 48 46
+    106 59 99 99 25 88
 
     > print rand(2,12), rand(2^50,3^50), rand(0,2), rand(-400000, 120000)
-    11 170570393286648531699560 1 -96605
+    2 658186291252503497642116 1 -324097
 
 LIMITS
     min < max
@@ -248,8 +256,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: rand,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: rand,v 29.3 2001/04/14 22:46:33 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/rand,v $
 ##
 ## Under source code control:	1996/01/01 02:16:09

help/re

@@ -20,7 +20,7 @@ LIMITS
     none
 
 LINK LIBRARY
-    COMPLEX *cimag(COMPLEX *x)
+    COMPLEX *c_imag(COMPLEX *x)
 
 SEE ALSO
     im
@@ -41,8 +41,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: re,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: re,v 29.3 2002/03/12 09:38:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/re,v $
 ##
 ## Under source code control:	1995/10/05 04:52:27

help/script

@@ -1,62 +1,264 @@
 Calc shell scripts
 ------------------
 
-    If an executable file begins with:
+    There are several ways calc may be used in shell scripts.  The
+    syntax for these varies widely for different shells and systems,
+    but common to most are commands like echo, if, for, goto, shift,
+    and exit, as well as the accessing of environment parameters, shell
+    variables, and command-line arguments.
 
-	 #!/usr/local/bin/calc -S [-other_flags ...]
+    As a simple example, assuming a C or Bourne shell, let add be a
+    file containing just one line:
 
-    the rest of the file will be processed in shell script mode.
+	    calc -q -- $1 + $2
-    Note that -S (UPPER CASE -S) must be the first -flag on the
-    ``#!'' line.  Any other optional ``-other_flags'' must come
-    after the -S.
 
-    In shell script mode the contents of the file are evaluated
+    Then:
-    and executed as if they were processed by the read command.
-    Any optional ``-other_flags'' will by parsed first followed
-    by any arguments given shell script itself.
 
-    In shell script mode, -s (lower case -s) is always assumed.
+	    ./add 1.23 4.56
-    In addition, -d and -p are automatically set if -i is not
-    given.
 
-    For example, if the file /tmp/mersenne:
+    should respond with the display of:
 
-	 #!/usr/local/bin/calc -S -q
+	    5.9
-	 #
-	 # mersenne - an example of a calc shell script file
 
-	 /* parse args */
+    The "-q" was included in the command to avoid reading of any
-	 if (argv() != 1) {
+    start-up calc files which could contain commands not wanted
-	   fprintf(files(2), "usage: %s exp\n", config("program"));
+    here.  The "--" indicates that there are no more options;
-	   abort "must give one exponent arg";
+    without it, if $1 began with '-', calc would interpret it as
-	 }
+    the first character of another option.  To execute the file,
+    the strings "1.23" and "4.56" were assigned to $1 and $2, so
+    calc was in effect asked to evaluate the string "1.23 + 4.56".
 
-	 /* print the mersenne number */
+    By making add executable by a command like:
-	 print "2^": argv(0) : "-1 =", 2^eval(argv(0))-1;
 
-    is made an executable file by:
+	    chmod u+x add
 
-	 chmod +x /tmp/mersenne
+    the command used here may be simplified to:
 
-    then the command line:
+	    ./add 1.23 4.56
 
-	 /tmp/mersenne 127
+    Here we shall assume that any script we refer to has been made
+    executable in this way.
 
-    will print:
+    Because $1 and $2, and instructions in the script, are to read
+    by calc as expressions or commands, they may be much more
+    complicated than in the above example, but if they involve
+    characters with special interpretations by the shell (spaces
+    for word separation, * or ? or [ ...] for file-name expansion,
+    ! (without immediately following space) for history expansion,
+    ( ... ) for shell-function arguments, { ... } for brace
+    expansion, $ for parameter or variable expansion, <, <<, >, >>
+    for redirection of input or output, etc.) it will usually be
+    necessary to quote or escape tho characters, or usually more
+    conveniently, quote whole expressions with single or double
+    quotes.
 
-	 2^127-1 = 170141183460469231731687303715884105727
+    For example, the add script should have no problem with
+    commands like:
 
-    Note that because -s is assumed in shell script mode and
+	    ./add "sqrt(2)" "3 * 4"
-    non-dashed args are made available as strings via the argv()
-    builtin function.  Therefore:
 
-	 2^eval(argv(0))-1
+	    ./add "mat A[2,2] = {1,2,3,4}" "A^2"
 
-    will print the decimal value of 2^n-1 but
+	    ./add "2 + 3i" "(3 + 4i)^2"
 
-	 2^argv(0)-1
+    If the shell arguments are to be integers, one could use
+    scripts like the following with arithmetic expansion
+    for the bash and ksh:
 
-    will not.
+	    declare -i a=$1
+	    declare -i b=$2
+	    calc -q -- $a + $b
+
+    and for csh:
+
+	    @ a = $1
+	    @ b = $2
+	    calc -q -- $a + $b
+
+    Specifying the shell for a script may be done by including
+    in the script a first line with the "magic number" "#!" and
+    the full file path for the shell as in:
+
+	    #!/bin/bash
+	    declare -i a=$1
+	    declare -i b=$2
+	    calc -q -- $a + $b
+
+    For a script to multiply rather than add two expressions, one
+    could have a file mul with the one line:
+
+	    calc -q -- $1 \* $2
+    or:
+	    calc -q -- "$1 * $2"
+
+    which will work so long as $1 and $2 are literal numbers, but
+    will not work for:
+
+	    ./mul 2+3 4
+    or:
+	    ./mul "2 + 3" 4
+
+    both of which calc interprets as evaluating 2 + 3 * 4.  What should
+    work for most shells is:
+
+	    calc -q -- "($1) * ($2)"
+
+    For adding an arbitrary number of expressions that evaluate to
+    rational numbers expressible with at most 20 decimal places,
+    simple shell script could be used:
+
+	    s=0
+	    for i do
+		    s=`calc -q -- $s + $i`
+	    done
+	    echo sum = $s
+
+    This is not particularly efficient since it calls calc once for
+    each argument.  Also, a more serious script would permit more
+    general numbers.
+
+    Another way of handling a sum of several expressions is with
+    the script addall2 with a here document:
+
+	    calc "-q -s" $* << +
+	    global i, n, s;
+	    n = argv();
+	    for (i = 0; i < n; i++)
+		    s += eval(argv(i));
+	    print "sum =", s;
+	    +
+
+    In executing the command:
+
+	    ./addall2 2 3 4
+
+    the $* in ths script expands to  2 3 4, and because of the "-s"
+    in the options, calc starts with argv(0) = "2", argv(1) = "3",
+    argv(2)= "4".  As there is only one calc process involved and
+    the eval() function accepts as argument any string that
+    represents the body of a calc function, the strings argv(0),
+    argv(1), ... could evaluate to any value types for which the
+    additions to be performed are defined, and variables defined in
+    one argv() can be used in later arguments.
+
+    For systems that support interpreter files, essentially the
+    same thing may be done more efficiently by using calc as an
+    interpreter.  Assuming the full path for calc is
+    /usr/local/bin/calc, one could use the file addall3 with contents
+
+	    #!/usr/local/bin/calc -q -s -f
+	    global i, n, s;
+	    n = argv();
+	    for (i = 1; i <= n; i++)
+		    s += eval(argv(i));
+	    print "sum =", s;
+
+    After the command:
+
+	    addall3 2 3 4
+
+    the arguments calc receives are argv(0) = "addall3", argv(1) =
+    "2", argv(3) = "3", argv(4) = "4".
+
+    Another kind of script that can be useful is sqrts1:
+
+	    calc -q 'global s; while (scanf("%s", s) == 1) print sqrt(eval(s));'
+
+    or what is essentially an interpreter equivalent sqrts2:
+
+	    #!/usr/local/bin/calc -q -f
+	    global s;
+	    while (scanf('%s', s) == 1)
+		    print sqrt(eval(s));
+
+    If sqrts is either of these scripts, the command:
+
+	    echo 27 2+3i | sqrts
+
+    or, if datafile contains the one line:
+
+	    27 2+3i
+
+    or the two lines:
+
+	    27
+	    2+3i
+
+    either:
+
+	    cat datafile | ./sqrts
+    or:
+	    ./sqrts < datafile
+
+    should display the square-roots of 27 and 2+3i.  The output could
+    be piped to another command by | or directed to a file by use of
+    > or >>.
+
+    With no specified input, either sqrts1 or sqrts2 will wait
+    without any prompt for input from the keyboard and as each line
+    is completed display the square-roots of the expressions
+    entered.  Exit can be achieved by entering exit or entering
+    ctrl-D (interpreted as EOF) rather than a line of input.
+
+    One advantage of an interpreter file like sqrts2 (which has only
+    options, but neither "-s" nor "--" in its first line) is that it
+    can be invoked with further options as in
+
+	    echo 2 3 4 | ./sqrts2 -i -D 32
+
+    An advantage of non-interpreter files is that they can use shell
+    features.  For example, for unquoted arguments or arguments in
+    double quotes parameter expansion (indicated by unquoted '$') and
+    command substitution (using backquotes) occur before lines are
+    compiled by calc.  For example, if doit is an executable
+    script with contents
+
+	    calc -q -- "$1($2)"
+
+    it may be used as in:
+
+	    ./doit sqrt 7
+    and:
+	    ./doit exp 7
+
+    to display the values of sqrt(7) and exp(7).  The "--" prevents a
+    leading '-' in the $1 argument as indicating one or more additional
+    options. E.g., without the "--" in doit,
+
+	    ./doit -sqrt 7
+
+    would be interpreted as:
+
+	    calc -q "-sqrt(7)"
+
+    in which the dash in the quoted part would be taken as indicating a
+    list of options -s, -q, -r, etc.; this would give an "illegal option"
+    error as calc has no -r option.
+
+    In invoking the doit script it is not necessary that $1 expand to a
+    calc function name and $2 to an expression; all that is required is
+    that:
+
+	    $1($2)
+
+    expands to a string that calc will recognize as a command.  E.g.:
+
+	    ./doit "define f(x) = x^2; 2 + mod" "f(7), 6"
+
+    does the same as:
+
+	    calc -q -- "define f(x) = x^2; 2 + mod(f(7), 6)"
+
+    Essentially the same is achieved by the contents of doit is changed to:
+
+	    calc -q -p -- << +
+	    $1($2)
+	    +
+
+    The "-p" stops calc going interactive; without it the effect would be
+    be the same as that of a script with the one line:
+
+	    calc -q -i -- "$1($2)"
 
 For more information use the following calc commands:
 
@@ -65,7 +267,7 @@ For more information use the following calc commands:
     help config
     help cscript
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 2000  Landon Curt Noll and 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
@@ -81,8 +283,8 @@ For more information use the following calc commands:
 ## 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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: script,v 29.3 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: script,v 29.5 2001/04/08 07:56:32 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/script,v $
 ##
 ## Under source code control:	1999/11/30 05:29:48
@@ -90,3 +292,4 @@ For more information use the following calc commands:
 ##
 ## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
 ## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+

help/seed

@@ -19,9 +19,9 @@ DESCRIPTION
 	is almost certainly non-chaotic.  This function is likely not
 	suitable for applications (such as cryptographic applications)
 	where the unpredictability of seeds is critical.  For such critical
-	applications, lavarand should be used.	See the URL:
+	applications, LavaRnd should be used.	See the URL:
 
-		http://lavarand.sgi.com/index.html
+		http://www.LavaRnd.org/
 
 	for information about seeding a pseudo-random number generator
 	(such as rand() or random()) with the cryptographic hash of the
@@ -67,8 +67,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: seed,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: seed,v 29.3 2001/05/13 13:26:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/seed,v $
 ##
 ## Under source code control:	1999/10/03 10:04:29

help/sleep

@@ -0,0 +1,68 @@
+NAME
+    sleep - suspend operation for a specified time
+
+SYNOPSIS
+    sleep([n])
+
+TYPES
+    n		non-negative real, defaults to 1
+
+    return	integer or null value
+
+DESCRIPTION
+    This uses the C-library sleep (if n is integral) or usleep (for
+    non-integral n) to suspend operation for n seconds.  If n is an
+    integer and the sleep is stopped by an interruption, the number
+    of seconds remaining is returned.
+
+    One kind of use is to slow down output to permit easier reading of
+    results, as in:
+
+	> for (i = 0; i < 100; i++) {
+		print sqrt(i);
+		sleep(1/2);
+	}
+
+    The following illustrates what happens if ctrl-C is hit 5 seconds
+    after the first command:
+
+	> print sleep(20)
+
+	[Abort level 1]
+	15
+	>
+
+EXAMPLE
+    > sleep(1/3);
+    > sleep(20);
+
+LIBRARY
+    none
+
+SEE ALSO
+    none
+
+## 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.2 $
+## @(#) $Id: sleep,v 29.2 2000/12/17 12:27:58 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/sleep,v $
+##
+## Under source code control:	2000/12/14 01:33:00
+## File existed as early as:	2000
+##
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/srand

@@ -1,5 +1,5 @@
 NAME
-    srand - seed the additive 55 shuffle pseudo-random number generator
+    srand - seed the subtractive 100 shuffle pseudo-random number generator
 
 SYNOPSIS
     srand([seed])
@@ -10,43 +10,43 @@ TYPES
     return	rand state
 
 DESCRIPTION
-    Seed the pseudo-random number using an additive 55 shuffle generator.
+    Seed the pseudo-random number using an subtractive 100 shuffle generator.
 
     For integer seed != 0:
 
-	Any buffered rand generator bits are flushed.  The additive table
+	Any buffered rand generator bits are flushed.  The subtractive table
-	for the rand generator is loaded with the default additive table.
+	for the rand generator is loaded with the default subtractive table.
 	The low order 64 bits of seed is xor-ed against each table value.
-	The additive table is shuffled according to seed/2^64.
+	The subtractive table is shuffled according to seed/2^64.
 
 	The following calc code produces the same effect on the internal
-	additive table:
+	subtractive table:
 
-	    /* reload default additive table xor-ed with low 64 seed bits */
+	    /* reload default subtractive table xor-ed with low 64 seed bits */
 	    seed_xor = seed & ((1<<64)-1);
-	    for (i=0; i < 55; ++i) {
+	    for (i=0; i < 100; ++i) {
-		additive[i] = xor(default_additive[i], seed_xor);
+		subtractive[i] = xor(default_subtractive[i], seed_xor);
 	    }
 
-	    /* shuffle the additive table */
+	    /* shuffle the subtractive table */
 	    seed >>= 64;
-	    for (i=55; seed > 0 && i > 0; --i) {
+	    for (i=100; seed > 0 && i > 0; --i) {
 		quomod(seed, i+1, seed, j);
-		swap(additive[i], additive[j]);
+		swap(subtractive[i], subtractive[j]);
 	    }
 
 	Seed must be >= 0.  All seed values < 0 are reserved for future use.
 
-	The additive table pointers are reset to additive[23] and additive[54].
+	The subtractive table pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
 	There is no limit on the size of a seed.  On the other hand,
 	extremely large seeds require large tables and long seed times.
-	Using a seed in the range of [2^64, 2^64 * 55!) should be
+	Using a seed in the range of [2^64, 2^64 * 100!) should be
 	sufficient for most purposes.  An easy way to stay within this
-	range to to use seeds that are between 21 and 93 digits, or
+	range to to use seeds that are between 21 and 178 digits, or
-	64 to 308 bits long.
+	64 to 588 bits long.
 
 	To help make the generator produced by seed S, significantly
 	different from S+1, seeds are scrambled prior to use.  The
@@ -68,9 +68,9 @@ DESCRIPTION
 	After this call, the rand generator is restored to its initial
 	state after calc started.
 
-	The additive 55 pointers are reset to additive[23] and additive[54].
+	The subtractive 100 pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
 	The call:
 
@@ -80,14 +80,14 @@ DESCRIPTION
 
     For matrix arg:
 
-	Any buffered random bits are flushed.  The additive table with the
+	Any buffered random bits are flushed.  The subtractive table with the
-	first 55 entries of the matrix mod 2^64.
+	first 100 entries of the matrix mod 2^64.
 
-	The additive 55 pointers are reset to additive[23] and additive[54].
+	The subtractive 100 pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
-	This form allows one to load the internal additive 55 generator
+	This form allows one to load the internal subtractive 100 generator
 	with user supplied values.
 
 	The randreseed64 process is NOT applied to the matrix values.
@@ -114,7 +114,7 @@ DESCRIPTION
 
     For no arg given:
 
-	Return current a55 generator state.  This call does not alter
+	Return current s100 generator state.  This call does not alter
 	the generator state.
 
 	This call allows one to take a snapshot of the current generator state.
@@ -126,25 +126,25 @@ EXAMPLE
 	    RAND state
     > state = srand();
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    32 60 67 71 1 77
+    80 95 41 78 100 27
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    52 72 110 15 69 58
+    122 109 12 95 80 32
     > state2 = srand(state);
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    32 60 67 71 1 77
+    80 95 41 78 100 27
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    52 72 110 15 69 58
+    122 109 12 95 80 32
     > state3 = srand();
     > print state3 == state2;
     1
     > print rand();
-    641407694185874626
+    10710588361472584495
 
 LIMITS
-    for matrix arg, the matrix must have at least 55 integers
+    for matrix arg, the matrix must have at least 100 integers
 
 LINK LIBRARY
-    RAND *zsrand(ZVALUE *pseed, MATRIX *pmat55)
+    RAND *zsrand(ZVALUE *pseed, MATRIX *pmat100)
     RAND *zsetrand(RAND *state)
 
 SEE ALSO
@@ -166,8 +166,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: srand,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: srand,v 29.3 2001/04/14 22:46:33 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/srand,v $
 ##
 ## Under source code control:	1996/01/01 04:19:07

help/srandom

@@ -220,11 +220,11 @@ DESCRIPTION
 	Blum moduli.
 
 	The pre-defined Blum moduli and quadratic residues were selected
-	by lavarand, a hardware random number generator.  See the URL:
+	by LavaRnd, a hardware random number generator.  See the URL:
 
-	    http://lavarand.sgi.com/index.html
+	    http://www.LavaRnd.org/
 
-	for an explanation of how the lavarand random number generator works.
+	for an explanation of how the LavaRnd random number generator works.
 	For more information, see the comments at the top of the calc
 	source file, zrandom.c.
 
@@ -354,8 +354,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: srandom,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: srandom,v 29.3 2001/05/13 13:26:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/srandom,v $
 ##
 ## Under source code control:	1997/02/17 01:18:22