Release v2.14.2.2

The following are the changes in this release:

    Removed references to obsolete Email addresses.

    macOS Darwin defaults LCC to "cc".

.github/ISSUE_TEMPLATE/calc-bug-report.md

@@ -0,0 +1,70 @@
+---
+name: Calc bug report
+about: Create a report to help us improve
+title: 'Bug: XXX-change-this-part-XXX'
+labels: bug
+assignees: ''
+
+---
+
+Calc bug report template version: 1.3 2022-11-27
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+0. How you started calc
+    I.e., provide the command line you used to launch calc
+
+1. Calc commands and their output
+    Please provide any calc commands you entered on the terminal.
+    Please provide the calc command line output inline as well.
+    If the above is long, please attach a file.
+
+    Or if you cannot compile calc: The make command you used try and compile calc
+    and all error and warning messages produced during that action.  If long, consider
+    attaching a file.
+
+2. Indicate where the problem is
+    Referring to the information for step 1 above,  indicate where the problem is to be found
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Attach debug.out**
+IMPORTANT: Please run `make debug` and then attach the `debug.out` file.
+
+**Screen shots**
+If applicable, attach screen shots to help explain your problem.
+
+**Execution environment (please complete the following information):**
+ - OS:
+        E.g., macOS, FreeBSD, Linux, Windows 11, etc.
+
+ - OS version:
+        E.g., Preferred: give the output of `uname -a`
+                 or if no uname command, a description of the OS version/release you are using
+
+ - OS distribution:
+        E.g., macOS 13.0.1, contents of /etc/redhat-release, or /etc/os-release, etc.
+
+ - Calc Version
+        E.g., output of calc -v
+                 or if you cannot compile calc, the version you downloaded and from where it came from
+
+ - Shell and shell version
+        E.g., bash, zsh, power shell, etc.
+                 and the version of the shell you are using, if known
+
+**Calc mods**
+If you have modified the calc source for some reason, please description what you modified.
+Please consider attaching a patch (diff -u) between an official calc release and the source
+you are using.
+
+**Patch**
+If you have a recommended code patch to address the problem, please attach your file
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot.yml

@@ -0,0 +1,12 @@
+# Set update schedule for GitHub Actions
+#
+# See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.gitignore

@@ -6,7 +6,7 @@
 #
 .dynamic
 .hsrc
-Makefile.simple
+Makefile.our
 NOTES
 align32.h
 args.h
@@ -16,6 +16,7 @@ calc.1
 calc.usage
 calcerr.c
 calcerr.h
+charbit.h
 conf.h
 cscript/.all
 cscript/4dsphere
@@ -28,30 +29,37 @@ cscript/powerterm
 cscript/simple
 cscript/square
 custom/.all
-custom/Makefile.simple
 custom/libcustcalc*
+debug.out
 endian
 endian_calc.h
 fposval.h
+have_arc4random.h
 have_ban_pragma.h
 have_const.h
-have_fpos.h
+have_environ.h
+have_fgetsetpos.h
 have_fpos_pos.h
 have_getpgid.h
 have_getprid.h
 have_getsid.h
 have_gettime.h
+have_limits.h
 have_memmv.h
 have_newstr.h
 have_offscl.h
 have_posscl.h
 have_rusage.h
+have_statfs.h
 have_stdlib.h
 have_stdvs
 have_strdup.h
 have_string.h
 have_strlcat.h
 have_strlcpy.h
+have_sys_mount.h
+have_sys_param.h
+have_sys_vfs.h
 have_times.h
 have_uid_t.h
 have_unistd.h
@@ -82,6 +90,7 @@ help/man
 help/new_custom
 help/question
 help/questions
+help/releases
 help/resource
 help/type
 help/usage

BUGS

@@ -15,19 +15,37 @@ Look at the end of the output, it should say something like:
 
 If it does not, then something is really broken!
 
-To be sure that your version of calc is up to date, check out:
+To be sure that your version of calc is up to date.
+Look for the latest release on GitHub:
 
-    http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+    https://github.com/lcn2/calc/releases
+
+Just below latest GitHub release sectiop is something called:
+
+    > Assets
+
+Click in the triangle to open up the Assets then click on
+the approptiate package to download.
 
 If you made and modifications to calc beyond the simple Makefile
-configuration, try backing them out and see if things get better.
+configuration, try backing those changes out and see if things get
+better.
 
 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.
 
 =-=
 
-The BEST WAY TO SEND IN A BUG REPORT is via calc GitHub issue URL:
+If you encounter a warning or error in compiling, or if you
+find a calc bug and you wish to send is a fix, we recommend
+that you submit your change using the GitHub pull request:
+
+    https://github.com/lcn2/calc/pulls
+
+=-=
+
+If you just want to send us a bug report, we recommend
+doing so via the GitHub issue process:
 
     https://github.com/lcn2/calc/issues
 
@@ -42,44 +60,7 @@ GitHub web page, click on this button:
 
     ((New Issue))
 
-=-=
-
-If you prefer to not use GitHub, then you
-may send bug and bug fixes reports to:
-
-    calc-bugrept-mail at asthe dot com
-
-    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    NOTE: This replaces the old calc-bugs at asthe dot com address.
-
-PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
-
-    calc bug report
-
-You may add additional words to your subject line.
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
-
-IMPORTANT:
-
-    PLEASE use the above SPECIAL PHRASE somewhere in the Subject line or
-    the mail system won't deliver your Email message.
-
-Keep in mind that the best way to report on a calc bug is
-via the above mentioned calc GitHub issue URL.
-
-Please be patient as we cannot always respond to Email messages quickly.
-
-=-=
-
-When you send your report, via the calc GitHub issue URL or Email,
-please include the following information:
+Please include the following information in the new issue:
 
     * A description of the problem
 
@@ -105,12 +86,13 @@ please include the following information:
     * If calc dumped core, try to send us a core dump stack trace
 
     * cd to the calc source directory, and send the contents
-      of debug.out produced by this command:
+      of debug.out.txt produced by this command:
 
-	make debug > debug.out 2>&1
+	make debug > debug.out.txt 2>&1
 
-Fell free to use the above address to send in bug fixes (in the form
-of a context diff patch).
+PLEASE attach the debug.out.txt file to your GitHub issue (bug report)!!
+
+Please be patient as we cannot always respond to pull requests quickly.
 
 =-=
 
@@ -119,6 +101,8 @@ Known bugs in calc:
     The output of the alg_config.cal resource file is bogus.
     We would welcome a replacement for this code.
 
+    Calc may not compile natively under Windows 11. See README.WINDOWS.
+
     We are sure some more bugs exist.  When you find them, please let
     us know!  See the above for details on how to report and were to
     Email your bug reports and hopefully patches to fix them.
@@ -172,9 +156,18 @@ mis-features in calc:
 
       will not.
 
+    * The numerator is assumed
+
+	The numerator value of 1 appears to be assumed.  In calc:
+
+	     / 2
+
+	will produce a value of 0.5 as if the numerator 1 was given.
+
+
 =-=
 
-## Copyright (C) 1999-2014,2021  Landon Curt Noll
+## Copyright (C) 1999-2014,2021,2023  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

CHANGES

@@ -1,4 +1,631 @@
-The following are the changes from calc version 2.14.0.9 to date:
+The following are the changes from calc version 2.14.2.1 to date:
+
+    Added cal/fnv_tool.cal, a calc resource file defining:
+
+	find_fnv_prime(bits)
+	deprecated_fnv0(bits,fnv_prime,string)
+	fnv_offset_basis(bits,fnv_prime)
+	fnv1a_style_hash(bits,fnv_prime,prev_hash,string)
+
+    Fixed sorted order of cal/README.
+
+    Removed references to obsolete Email addresses.
+
+    macOS Darwin defaults LCC to "cc".
+
+
+The following are the changes from calc version 2.14.2.0 to 2.14.2.0:
+
+    Ported calc to the s390x IBM Mainframe running RHEL9.1.
+
+    Added cal/splitbits.cal:
+
+	splitbits(x, b)
+
+	Given an integer x, split the value into a list of integers,
+	each of which is at most b bits long.
+
+	The value b must be an integer > 0.
+
+	The number of elements in the returned list is:
+
+	    ceil((highbit(x) + 1) / b)
+
+	If x == 0, then a list of 1 element containing 0 is returned.
+
+	If x < 0, then the two's compliment of abs(x) is returned.
+	Even though calc represents negative integers as positive values
+	with sign bit, the bits returned by this function are as if
+	the integer converted as if the integer was a two's compliment value.
+
+	See also the help command:
+
+	    ; help resource
+
+
+The following are the changes from calc version 2.14.1.5 to 2.14.1.6:
+
+    Fixed version numbers in two cases in CHANGES that referred
+    to the 2.14.2.x instead of 2.14.1.x.
+
+    Rename MINGW Makefile variable (a holdover from MINGW32_NT-5.0)
+    to OSNAME.
+
+    Fixed FUNCPTR typedef in hist.c to fix deprecated compiler warnings.
+
+    Fixed when USE_READLINE, READLINE_LIB, READLINE_EXTRAS, and
+    READLINE_INCLUDE are set to empty (disable use of the GNU-readline
+    facility).
+
+    Fix cases of spaces before tabs in Makefile and Makefile.simple.
+
+    Fixed obsolete references to the atoz() in LIBRARY to use the
+    correct internal function name of str2z().
+
+    Fixed obsolete references to the atoq() in LIBRARY to use the
+    correct internal function name of str2q().
+
+    Document in help/unexpected that * operator has has a higher
+    precedence than << in calc, which differs from C.  Thanks
+    goes to GitHub user @inguin for pointing put this difference.
+
+
+The following are the changes from calc version 2.14.1.3 to 2.14.1.4:
+
+    Fixed missing <string.h include in have_fpos_pos.c.
+
+    Change calc version from 2.14.1.2 to 2.14.2.3 as part of a test to
+    build calc RPMs on a reference RHEL8.7 platform (formerly a RHEL7.9
+    platform).
+
+    Changes #! lines in Makefiles to "#!/usr/bin/env make".
+
+    Set SHELL in Makefiles to the basename of the shell.
+
+    Updated COPYING file to indicate that these files are now
+    covered under "The Unlicense" (see https://unlicense.org):
+
+	    sha1.c
+	    sha1.h
+	    cal/dotest.cal
+	    cal/screen.cal
+
+    Updated help/credit to match the above changes to COPYING.
+
+    Updated CONTRIB-CODE and calc.man to refer to using GitHub pull requests
+    for contributing to calc (instead of using Email).
+
+    Updated BUGS and calc.man to refer to using GitHub issues
+    for reporting calc bugs (instead of using Email).
+
+    Updated QUESTIONS and calc.man to refer to using GitHub issues
+    for asking calc questions (instead of using Email).
+
+    Fixed Makefile.local command example to refer to overriding the
+    Makefile variable DEBUG (instead of CDEBUG).
+
+    Fixed all make chk ASAN warnings under macOS 13.2.1 when calc is compiled
+    with the following uncommented lines in Makefile.local:
+
+	DEBUG:= -O0 -g
+	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1
+
+    Improved how pointers to functions are declared for the builtins
+    array in func.c to avoid function declarations without a prototype
+    that is now deprecated in C.
+
+    Improved how pointers to functions are declared for the opcodes
+    array in opcodes.c to avoid function declarations without a prototype
+
+    Replaced use of egrep with grep -E in Makefiles.
+
+    Fixed cases where variables were set but not used in symbol.c, calc.c,
+    and the main function in func.c as used by funclist.c.
+
+    Added rule name to "DO NOT EDIT -- generated by the Makefile" lines
+    in constructed files.
+
+    Test if <sys/vfs.h> exists and set HAVE_SYS_VFS_H accordingly
+    in have_sys_vfs.h.  Added HAVE_SYS_VFS_H to allow one to force
+    this value.
+
+    Test if <sys/param.h> exists and set HAVE_SYS_PARAM_H accordingly
+    in have_sys_param.h.  Added HAVE_SYS_PARAM_H to allow one to force
+    this value.
+
+    Test if <sys/mount.h> exists and set HAVE_SYS_MOUNT_H accordingly
+    in have_sys_mount.h.  Added HAVE_SYS_MOUNT_H to allow one to force
+    this value.
+
+    Test if the system as the statfs() system call and set HAVE_STATFS
+    accordingly in have_statfs.h.  Added HAVE_STATFS to allow one
+    to force this value.
+
+    The pseudo_seed() function will also try to call statfs() if
+    possible and permitted by the HAVE_STATFS value.
+
+    Test if makedepend command is available before trying to build
+    the Makefile dependency list via "make depend".
+
+
+The following are the changes from calc version 2.14.1.0 to 2.14.1.2:
+
+    Attempted to address a paranoid compiler warning -Wmaybe-uninitialized
+    in swap_HALF_in_ZVALUE() where the gcc compiler seems to ignore the
+    fact that calling not_reached() above the call to zcopyval()
+    should prevent dest from being NULL to the 1st zcopyval() call.
+    Thanks to <GitHub user mattdm> for raising this potential concern.
+
+    Fixed a -Wuse-after-free warning that identified a call to realloc()
+    in find_tty_state() could move the fd_setup array.  Thanks goes to
+    <GitHub user mattdm> for reporting this bug!
+
+    In find_tty_state(), we changed how we expand fd_orig as an original
+    pre-modified copy of fd_setup.  We realloc the fd_orig array and copy
+    the fd_setup into it first, before touching the fd_setup array.
+
+    In pseudo_seed(), we removed a call to setjmp() that was only
+    there to add more information to mix into the seed.  For compilers
+    such as gcc that used -Wclobbered, the call to setjmp() gave the
+    impression that the hash_val might be clobbered by a longjmp().
+    Where there is no longjmp() that would use the previous setjmp(),
+    the gcc compiler has nil ways to notice that. So to avoid confusion
+    we removed the setjmp() call.  Thanks to <GitHub user mattdm> for
+    raising this potential concern.
+
+    Added config("tilde_space", boolean).  The "tilde_space" controls
+    whether or not a space (' ') is printed after leading tilde ('~').
+    By default, config("tilde_space") is false.
+
+    For example, with the default, config("tilde_space", 0):
+
+	; 1/3
+		~0.33333333333333333333
+	; sqrt(7 + 5i,1e-100)
+		~2.79305614578749801863+~0.89507688693280053094i
+
+    With config("tilde_space", 1):
+
+	; 1/3
+		~ 0.33333333333333333333
+	; sqrt(7 + 5i,1e-100)
+		~ 2.79305614578749801863+~ 0.89507688693280053094i
+
+    NOTE: Use of config("tilde_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    To enable "tilde_space", use config("tilde_space", 1) on the
+    command line and/or use config("tilde_space", 1),; in your ~/.calcrc.
+    Thanks goes to <GitHub use ljramalho> for this suggestion.
+
+    Added config("tilde_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("tilde_space").
+
+    For example, with the default, config("tilde_space", 0):
+
+	; pi(1e-50)
+		~3.14159265358979323846
+
+    With config("tilde_space", 1):
+
+	; pi(1e-50)
+		~ 3.14159265358979323846
+
+    Added config("fraction_space", boolean).  The "fraction_space" controls
+    whether or not a space (' ') is printed before and after fractions.
+    By default, config("fraction_space") is false.
+
+    For example, with the default, config("fraction_space", 0):
+
+	; base(1/3),
+	; 1/7
+		1/7
+
+    With config("fraction_space", 1):
+
+	; base(1/3),
+	; 1/7
+		1 / 7
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of fractional values via "%r".
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    Added config("fraction_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("tilde_space").
+
+    Added config("complex_space", boolean).  The "complex_space" controls
+    whether or not a space (' ') is printed before and after the + or -
+    in complex values.
+
+    By default, config("complex_space") is false.
+
+    For example, with the default, config("complex_space", 0):
+
+	; asin(2)
+		1.57079632679489661923-1.31695789692481670863i
+
+    With config("complex_space", 1):
+
+	; asin(2)
+		1.57079632679489661923 - 1.31695789692481670863i
+
+    NOTE: Use of config("complex_space", 1) can break printing and scanning
+	  of fractional values via "%r".
+
+    NOTE: Use of config("complex_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    Added config("complex_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("complex_space").
+
+    Clarify in the calc man page, the relationship between -q and
+    calc start scripts such as the ~/.calcrc file.
+
+    Fixed in the calc man page, the issue of -f not implying -q.
+
+
+The following are the changes from calc version 2.14.1.2 to date:
+
+    Restored use of the #define FPOS_POS_LEN symbol.  This refers to
+    the length of the __pos element (if the __pos element exists),
+    the fpos_t type (if that type exists).
+
+    Changed SWAP_HALF_IN_FILEPOS(dest, src) mato to use FILEPOS_LEN Little
+    Endian when FILEPOS is a simple scalar type (i.e., HAVE_FILEPOS_SCALAR
+    is defined).
+
+    Changed #define HAVE_FPOS to HAVE_FGETSETPOS.
+
+    Corrected comment in have_fpos_pos.h.  The HAVE_FPOS_POS symbol was
+    NOT related to fgetpos & fsetpos but rather if we we have an __pos
+    element in FILEPOS.
+
+    Changed #define HAVE_NO_FPOS to HAVE_NO_FGETSETPOS.
+
+    Improved comments in have_fpos_pos.h to show why and how
+    HAVE_FPOS_POS, FPOS_POS_BITS, and FPOS_POS_LEN were defined or undefed.
+
+    Changed showfiles builtin to print sizes cast to (long int) with
+    the "%ld" printf format to avoid implementations that do not support
+    the "%lld" printf format specifier.
+
+    Renamed have_fpos.h to have_fgetsetpos.h.  Renamed CALC_HAVE_FPOS_H
+    to CALC_HAVE_FGETSETPOS_H.  The make install and the olduninstall
+    rules remove the any old have_fpos.h that was previously installed.
+
+    Added swap_HALFs(dest, src, len) function to byteswap.c.
+
+    Calc can now handle Big Engian file position sizes that are a
+    multiple of BASEB bits in length.  Before handle Big Engian file
+    positions could only be 32 and 64 bits in length.  This will allow,
+    for example, a Big Engian file position size of 128 (assuming that
+    128/BASEB is is an integer).
+
+    Temporary workaround for musl libc systems such as gentoo Linux that
+    allows them to compile calc and successfully run the regression test.
+
+
+The following are the changes from calc version 2.14.1.1 to 2.14.1.1:
+
+    Added a few remarks on calc version numbers to version.c.
+
+    Fixed how fposval.h is built.  On a number of systems, the fposval.c
+    file failed to compile incorrectly.  This caused problems for systems in
+    which fposval.h.def was not correct.
+
+    Fixed how have_memmv.h is built.  On a number of systems, the have_memmv.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_memmv.h file for such systems.
+
+    Fixed how align32.h is built.  On a number of systems, the align32.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    align32.h file for such systems.
+
+    Fixed how have_newstr.h is built.  On a number of systems, the have_newstr.c
+    failed to compile incorrectly, producing a potentially incorrect
+    have_newstr.h file for such systems.
+
+    Fixed how have_strdup.h is built.  On a number of systems, the have_strdup.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strdup.h file for such systems.
+
+    Fixed how have_strlcat.h is built.  On a number of systems, the have_strlcat.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strlcat.h file for such systems.
+
+    Fixed how have_strlcpy.h is built.  On a number of systems, the have_strlcpy.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strlcpy.h file for such systems.
+
+    Fixed how have_uid_t.h is built.  On a number of systems, the have_uid_t.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_uid_t.h file for such systems.
+
+    Fixed how have_uid_t.h is built.  On a number of systems, the have_uid_t.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_uid_t.h file for such systems.
+
+    Added full_debug rule to Makefile.  This does the work of the
+    old debug rule in a more verbose mode by using Q= H=@ S= E= V=@.
+
+    The debug rule in the Makefile now pre-removes debug.out and then
+    runs make full_debug sending stdout and stderr to debug.out.  It then
+    prints a few instructions about filing a GitHub issue bug report.
+
+    The full_debug rule will no longer stop when one of the sub-tasks
+    failed (exit non-zero).
+
+
+The following are the changes from calc version 2.14.1.0 to 2.14.1.0:
+
+    Fixed alignment of show item section of help command.
+
+    Bug fix: While 0^0 == 1, now for y > 0, 0^y == 0.
+    Adjusted cal/test8900.cal to reflect this bug fix.
+    Added tests to cal/regress.cal to help verify bug fix is fixed.
+
+    Fixed a \-escape bug in calc(1) man page.
+
+    Added cal/comma.cal:
+
+	Convert numbers into strings with 3-digit group and integer-fraction
+	separators.
+
+	If the value is an integer, the integer-fraction separator is not used.
+
+	str_comma(x, [group, [decimal]])
+
+	    Convert x into a string.
+
+	    If group is given and is a string, group will be used as
+	    the 3-digit group separator, otherwise the default 3-digit
+	    group separator will be used.
+
+	    If decimal is given and is a string, group will be used as
+	    the integer-fraction separator, otherwise the default
+	    integer-fraction separator will be used.
+
+	    The decimal and group arguments are optional.
+
+	set_default_group_separator(group)
+
+	    Change the default 3-digit group separator if group is a string,
+	    otherwise the default 3-digit group separator will not be
+	    changed.  Return the old 3-digit group separator.
+
+	set_default_decimal_separator(decimal)
+
+	    Change the default 3-digit group separator if decimal is a
+	    string, otherwise the default integer-fraction separator
+	    will not be changed.  Return the old integer-fraction separator.
+
+	print_comma(x, [group, [decimal]])
+
+	    Print the value produced by str_comma(x, [group, [decimal]])
+	    followed by a newline.
+
+	    If the str_comma() does not return a string, nothing is printed.
+
+	    The decimal and group arguments are optional.
+
+	    The value produced by str_comma() is returned.
+
+	fprint_comma(fd, x, [group, [decimal]])
+
+	    Print the value produced by str_comma(x, [group, [decimal]]),
+	    without a trailing newline, on file fd.
+
+	    If the str_comma() does not return a string, nothing is printed.
+
+	    If fd is not an open file, nothing is printed.
+
+	    The decimal and group arguments are optional.
+
+	    The value produced by str_comma() is returned.
+
+
+The following are the changes from calc version 2.14.0.15 to 2.14.0.15:
+
+    Changed Makefile to set shell before setting the SHELL Makefile
+    variable.
+
+    Added text to HOWTO.INSTALL to help people with systems that
+    lack the readline package.
+
+    Trimmed long line in the CONTRIBUTING.md file.
+
+    Expanded the globalsymbol string table size: from 1024 to 65536.
+
+    Expanded the how often to reallocate string table is performed:
+    from 100 to 1024.
+
+    Expanded the number env_pool elements to allocate at a time:
+    from 10 to 256.
+
+    Improve comments on Makefile.local and add a few more examples
+    of how it might be used.
+
+    Changed /*NOTREACHED*/ to not_reached(); and use "attribute.h".
+
+    Added .PHONY rule, just after all rule, to Makefiles.
+
+    Made minor format update on help/commands.
+
+    Added ${WINGM} Makefile variable for users under Windows 11 who
+    use Cygwin and the MinGW64 packages.
+
+    Updated README.WINDOWS for Windows 11 users based on advice
+    form a Microsoft 11 developer.
+
+    Fixed missing quotes in the PASSDOWN makefile variables.
+
+    Disable use of gettime() under _WIN32 or _WIN64.
+
+
+The following are the changes from calc version 2.14.0.14 to 2.14.0.14:
+
+    Fixed typo in Makefile.local comment.
+
+    Established a tagging procedure for a production release.
+    Production git tags will be of the form:
+
+	prod-2.x.y.z
+
+
+The following are the changes from calc version 2.14.0.13 to 2.14.0.13:
+
+    Made major changes to our release process in order to avoid
+    missing critical files that happened in calc v2.4.0.12.
+
+    Minor tweak to seed() builtin.  Updated help/srand and help/srandom.
+
+    Moved Makefile.ship into Makefile.
+
+    Removed custom/Makefile.head and custom/Makefile.tail.
+
+    The custom/Makefile is now part of source and includes Makefile.
+    In particular, custom/Makefile makes use of the 'middle' of
+    the new top level Makefile where calc's top level Makefile
+    variables are defined.
+
+    Makefile.simple and custom/Makefile.simple are now part of the source
+    and are constructed from Makefile and custom/Makefile respectively.
+    The Makefile.simple and custom/Makefile.simple avoid using GNU
+    conditionals. They may be used with older/classic make commands.
+
+    Makefile.local will include comments about how to better use
+    it. Between releases, Makefile.local at the top of the master branch
+    will contain how we typically build calc and test calc (FYI: we
+    normally enable things such as -Werror -Wextra -pedantic).  When we
+    push out a release, Makefile.local will be stripped of non-comment
+    lines.  Thus, releases of calc, and, released "calc*.src.rpm"
+    files and the source tarballs, will have a Makefile.local with
+    only comments.
+
+    The "README.*" files and "HOWTO.INSTALL" file have been updated.
+
+    By default, compiler warnings have been turned up.  The Makefile
+    variable ${CCWARN} now defaults to:
+
+	CCWARN= -Wall -Wextra -pedantic
+
+    The previous level of compiler warnings can be easily restored by
+    adding to Makefile.local:
+
+	CCWARN:= -Wall
+
+    The readline, history and ncurses libraries are now default.
+    The Makefile variables ${USE_READLINE}, ${READLINE_LIB}, and
+    ${READLINE_EXTRAS} now default to:
+
+	USE_READLINE= -DUSE_READLINE
+	READLINE_LIB= -lreadline
+	READLINE_EXTRAS= -lhistory -lncurses
+
+    The previous mode where readline, history and ncurses libraries
+    were not compiled in by default can be easily restored by
+    adding to Makefile.local:
+
+	USE_READLINE:=
+	READLINE_LIB:=
+	READLINE_EXTRAS:=
+
+    We have renamed "stable" as "production".
+    We have renamed "unstable" as "tested".
+
+    On the web site:
+
+	http://www.isthe.com/chongo/src/calc/
+
+    these files has been renamed:
+
+	2.x.y.z_IS_LATEST_STABLE   ==> 2.x.y.z_IS_LATEST_PRODUCTION
+	2.x.y.z_IS_LATEST_UNSTABLE ==> 2.x.y.z_IS_LATEST_TESTED
+
+    The terms 'stable' and 'unstable' were both misleading and
+    inaccurate.  For details see the new documention file:
+
+	README.RELEASE
+
+    See also the help command:
+
+	; help release
+
+    Fixed bug impacting how have_ustat.h was formed.
+
+    Updated help/archive, BUGS, HOWTO.INSTALL to reflect GitHub use.
+
+
+The following are the changes from calc version 2.14.0.11 to 2.14.0.12:
+
+    Fixed a number of typos.
+
+    Drop support for SunOS, IRIX and MINGW32_NT-5.0 targets.
+    Drop support for CLOCK_SGI_CYCLE.  Drop testing for __MSDOS__.
+
+    Minor improvement of various help files.  Made format of help
+    files more consistent.
+
+    Corrected a few comments in zrandom.c, including a case where
+    the comment referred to 1007 when it should have used 2^32.
+
+    Improved seed() generation.  Improved some comments in seed.c.
+    Added have_environ.c to build have_environ.h in order to
+    determine if:
+
+	extern char **environ;	/* user environment */
+
+    is an valid external symbol.
+
+    Fixed documentation that referred to the old additive 55
+    generator.  We have been using the subtractive 100 in place
+    of the additive 55 generator for a while now.
+
+    Fixed depend rule for custom/Makefile.
+
+    Fixed how Makefile variable SHELL is set on macOS vs. Linux.
+    Using /bin/sh on macOS due to how zsh treats globs by default.
+
+    Added charbit.h to define CALC_CHARBIT which is either CHAR_BIT
+    from <limits.h> or 8 or a value set by the Makefile variable
+    CALC_CHARBIT.  Added have_limits.h to determine if <limits.h>
+    is a system include file.
+
+    Compiling now tests for _WIN64 as well when testing for _WIN32.
+
+    Now assuming that <stdio.h> is available under _WIN32 and _WIN64.
+
+    Added some preliminary notes about attempts to compile calc
+    under Windows 11.
+
+	BTW: While we are unable to use Windows 11, we welcome
+	     Windows 11 developers to try compiling calc natively
+	     (instead of via a Linux virtual machine).  If you are
+	     able to compile Windows 11 natively, we would welcome
+	     GitHub pull requests showing any needed modifications:
+
+		https://github.com/lcn2/calc/pulls
+
+	     Please also add notes to the 'Compiling calc under Windows 11'
+	     section in README.WINDOWS file.
+
+    We added Makefile.simple as part of the master branch source
+    to help those who may be using a make tool that does not support
+    GNU Make-like features such as "ifeq" and ":=".
+
+    Fixed incorrect ustat_dev member ref in seed() builtin that
+    was part of the unreleased calc v2.12.0.11.
+
+
+The following are the changes from calc version 2.14.0.9 to 2.14.0.10:
 
     Due to issues with clang and Apple Silicon, ARCH_CFLAGS is now,
     by default, empty:
@@ -17,23 +644,23 @@ The following are the changes from calc version 2.14.0.9 to date:
 	arch: uname -p
 	hardware: uname -m
 
-    Fixed compiling calc on Apple Silicon with homebrew.  On Apple
+    Fixed compiling calc on Apple Silicon with HomeBrew.  On Apple
     Silicon, HomeBrew installs on into a different location.  The
     Makefile checks if ${hardware} is arm64 and adjusts the location
     of libraries such as readline and history accordingly.
 
-    Pluged a number of memory leaks.
+    Plugged a number of memory leaks.
 
-    Fixed a few cases where v_subtype was not properly initialuzed.
+    Fixed a few cases where v_subtype was not properly initialized.
 
     Improved the way that internal pre-defined constants are managed.
     Removed unused internal pre-defined constants.  Added code to
     prevent an internal pre-defined constant (that was never allocated)
     from being freed.
 
-    Remove unnecessary spaces inbetween or next to tabs.
+    Remove unnecessary spaces in-between or next to tabs.
 
-    Update copright dates to account for 2021 modifications.
+    Update Copyright dates to account for 2021 modifications.
 
 
 The following are the changes from calc version 2.14.0.7 to 2.14.0.8:
@@ -108,7 +735,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6:
     The optional 2nd argument is ignored by g2d(grad, ep) and d2g(deg, ep).
 
     The clean and clobber makefile rules no longer list custom/Makefile
-    as a dependecy.
+    as a dependency.
 
     Unfortunately due to the complex dependency issues between
     Makefile, Makefile.ship and custom/Makefile, parallel GNU make
@@ -246,7 +873,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6:
     Fixed typo in cal/statistics.cal thanks to a report by <GitHub user
     dennisaldea>.
 
-    Fixed an old Windoz pun in README.WINDOWS as requested by <GitHub
+    Fixed an old Windows pun in README.WINDOWS as requested by <GitHub
     user marcodegio>.
 
     Fixed a really obscure bug in the internal initconstants()
@@ -257,7 +884,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6:
 	multi-architecture testing found the bug.  Now, after all
 	those years, it is fixed.
 
-    Fixed issues identied by the default CodeUL GitHub security code scan:
+    Fixed issues identified by the default CodeUL GitHub security code scan:
 
 	Wrong type of arguments to printf in have_fpos_pos.c
 	Multiplication result converted to larger type in zfunc.c
@@ -981,9 +1608,9 @@ The following are the changes from calc version 2.12.5.0 to 2.12.5.1:
 
     There is a new calc bug report Email address:
 
-	    calc-bug-report at asthe dot com
+NOTE:	    calc-bug-report Email address no longer in use
 
-	This replaces the old calc-bugs at asthe dot com address.
+	This replaces the old calc-bugs Email address.
 
 	To be sure we see your Email reporting a calc bug, please use the
 	following phase in your Email Subject line:
@@ -1304,7 +1931,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:
     dot org) for this patch.
 
     Michael Penk (mpenk at wuska dot com) reported success in installs
-    under windoz via Cygwin by making a change to the Cygwin target.
+    under Windows via Cygwin by making a change to the Cygwin target.
     These changes have been folded into the main calc Makefile.
     The old recommendation of using 'make win32_hsrc' is no longer
     required for Cygwin.  See the README.WINDOWS file for details.
@@ -1478,7 +2105,7 @@ The following are the changes from calc version 2.12.1.10 to 2.12.2:
     All extern functions are now declared with the symbol E_FUNC.
     The include file decl.h defines these 4 symbols by default
     to static, extern, static, and extern respectively.  Under
-    Windoz, DLL is also defined according to the _EXPORTING symbol
+    Windows, DLL is also defined according to the _EXPORTING symbol
     and is prepended to the EXTERN and E_FUNC symbols.  The decl.h
     file has replaced the win32dll.h file.
 
@@ -1577,7 +2204,7 @@ The following are the changes from calc version 2.12.1.10 to 2.12.2:
 	NOTE: If your target is not supported below and the default target
 	      is not suitable for your needs, please send to the:
 
-		calc-contrib at asthe dot com
+NOTE:		calc-contrib Email address no longer in use
 
 	      Email address an "ifeq ($(target),YOUR_TARGET_NAME)"
 	      ... "endif" set of lines from the Makefile so that
@@ -2212,8 +2839,8 @@ The following are the changes from calc version 2.12.0 to 2.12.0.8:
 	doalltimes(1e6)
 
     Calc now ignores carriage returns (\r), vertical tabs (\v), and
-    form feeds (\f) when token parsing.  Thus users on Windoz systems
-    can write files using their \r\n format and users on non-Windoz
+    form feeds (\f) when token parsing.  Thus users on Windows systems
+    can write files using their \r\n format and users on non-Windows
     systems can read them without errors.
 
     The quomod() builtin function now takes an optional 5th argument
@@ -2555,7 +3182,7 @@ The following are the changes from calc version 2.11.6.0 to 2.11.6.2:
 
     Fixed help typos reported by Marc Mezzarobba <mm at mm dot ovh dot org>.
 
-    Forced system("") to return 0 under windoz.
+    Forced system("") to return 0 under Windows.
 
     The direct.h include file is not used when compiling under Cygwin.
 
@@ -2865,10 +3492,10 @@ The following are the changes from calc version 2.11.5t2 to 2.11.5t2.1:
     The calc builtin function, fopen(), now allows one to specify
     opening files in binary modes.  On POSIX / Linux / Un*x-like systems,
     text file is the same as a binary file and so 'b' to an fopen has
-    no effect and is ignored.  However on systems such as MS Windoz
+    no effect and is ignored.  However on systems such as MS Windows
     the 'b' / binary mode has meaning.  See 'help fopen' for details.
 
-    On systems (such as MS Windoz), calc will produce a different error
+    On systems (such as MS Windows), calc will produce a different error
     message when it attempts to open /dev/tty.  This will condition
     will occur in things like calc scripts when they switch from ``batch
     processing'' commands from and want to start interactive mode.
@@ -2903,14 +3530,14 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
     Thanks goes to Martin Buck <m at rtin-buck dot de> for reporting
     this bug and testing the fix.
 
-    An effort was made to make calc easier to build under Windoz
+    An effort was made to make calc easier to build under Windows
     using the Cygwin project (http://sources.redhat.com/cygwin/).
     Thanks to the work of Thomas Jones-Low (tjoneslo at softstart
     dot com), a number of #if defined(_WIN32)'s have been added
-    to calc source.  These changes should not effect Windoz
+    to calc source.  These changes should not effect Windows
     free system such as GNU/Linux, Solaris, POSIX-like, etc ...
 
-    Added windll.h to deal with Windoz related DLL issues.
+    Added windll.h to deal with Windows related DLL issues.
     Using the convention of 'extern DLL' instead of 'DLL extern'
     to deal with symbols that export to or import from a DLL.
 
@@ -2927,12 +3554,12 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
     If HAVE_URANDOM is NO, then the Makefile will assume /dev/urandom does
     not exist.
 
-    If TERMCONTROL is -DUSE_WIN32, then the Windoz terminal control
+    If TERMCONTROL is -DUSE_WIN32, then the Windows terminal control
     (no TERMIOS, no TERMIO, no SGTTY) will be assumed.
 
     Added a win32_hsrc Makefile rule to create hsrc files appropriate
-    for a Windoz system using Cygwin gcc environment.  Added win32.mkdef
-    which is used by the win32_hsrc rule to set the Windoz specific
+    for a Windows system using Cygwin gcc environment.  Added win32.mkdef
+    which is used by the win32_hsrc rule to set the Windows specific
     Makefile values to build hsrc files.  The hsrc files are built
     under the win32 directory.
 
@@ -3013,7 +3640,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
 	config("windows")
 
     Now shipping a win32 sub-directory that contains hsrc .h files
-    that have been attempted to be built for windoz.
+    that have been attempted to be built for Windows.
 
 
 The following are the changes from calc version 2.11.4t1 to 2.11.4t2:
@@ -3300,9 +3927,9 @@ The following are the changes from calc version 2.11.2t0 to 2.11.2t1.0:
     www.isthe.com.  NOTE: The Email address uses 'asthe' and the web
     site URL uses 'isthe'.
 
-    Using calc-bugs at asthe dot com for calc bug reports,
-    calc-contrib at asthe dot com for calc contributions,
-    calc-tester-request at asthe dot com for requests to join calc-tester and
+NOTE:	calc-bugs Email address no longer in use
+NOTE:	calc-contrib Email address no longer in use
+NOTE:	calc-tester-request Email address no longer in use
 
     Replaced explicit Email addresses found this file with the <user at
     site dot domain> notation to reduce the potential for those folks
@@ -8042,7 +8669,7 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 
     A small bug in the library file regress.cal was fixed.
 
-## Copyright (C) 2001-2017,2021  Landon Curt Noll
+## Copyright (C) 2001-2017,2021,2022  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

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+https://github.com/lcn2/calc/blob/master/QUESTIONS.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIB-CODE

@@ -1,73 +1,37 @@
 Calc is open source. Contributions of code are welcome.
 
-We welcome and encourage you to send us:
+In order to consider integrating your contributions, we need:
 
-    * calc resource files (cal/*.cal files)
-    * calc shell scripts (cscript/*.calc files)
-    * builtin functions that you have modified or written, i.e.:
-	assocfunc.c comfunc.c func.c func.h
-	listfunc.c matfunc.c qfunc.c zfunc.c
-    * custom functions that you have modified or written
-    * help files modified or written (help/*)
-    * Makefile improvements (Makefile, */Makefile)
-    * other source code modifications (*.c, *.h)
-    * etc. (* */* :) )
+    * your changes applied agsinst the top of the calc master branch:
 
-In order to consider integrating your code, we need:
+          https://github.com/lcn2/calc/
 
-    * calc version you are working with (please try use the latest version)
     * new help files or help file patches, if applicable (documentation)
-    * proposed text for the CHANGES file (brief description of what it does)
-    * regress.cal test patch as needed
-    * your source code and/or source code changes (:-))
 
-If you add functionality to calc, please be sure to modify/patch/add
+    * Update CHANGES file (brief description of what it does)
+
+    * regress.cal test patch as needed
+
+If you add functionality to calc, please be sure to modify
 Makefiles, help files, cal/regress.cal test code as well.
 Regression test cases are vital to maintaining calc's level
 of correctness and helps us avoid code bug regression.
 
-Please try to generate a patch against the most recent
-version of calc, and if you use GitHub, the top of the
-master branch:
-
-    https://github.com/lcn2/calc
-
 The best way contribute to calc bug is to generate calc
-GitHub pull request:
+GitHub pull request against the calc GitHub repo:
 
     https://github.com/lcn2/calc/pulls
 
+Please be patient as we cannot always respond pull requests quickly.
+
+=-=
+
+IMPORTANT:
+
 Your code needs to be contributed under either the 2.1 of the GNU
-Lesser General Public License (LGPL 2.1) or in the public domain.
+Lesser General Public License (LGPL 2.1) or under "The Unlicense":
 
-If you do not want to use calc GitHub, then send Email to:
-
-    calc-contrib-mail at asthe dot com
-
-    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-You MUST use following SPECIAL PHRASE in your Email Subject line:
-
-    calc contribution
-
-You may add additional words to your subject line.
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
-
-IMPORTANT: If your Email doesn't contain the above phrase,
-	   then we WILL NOT SEE your Email.
-
-PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
-
-Keep in mind that the best way to report on a calc bug is to use
-the above mentioned calc GitHub procedure.
-
-Please be patient as we cannot always respond to Email messages quickly.
+    https://unlicense.org
 
 =-=
 
@@ -77,7 +41,7 @@ See also the calc wishlist by running the calc command:
 
 =-=
 
-## Copyright (C) 1999,2014,2021  Landon Curt Noll
+## Copyright (C) 1999,2014,2021,2023  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

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# How to contribue code to calc
+
+## CONTRIB-CODE
+
+See the file
+<A HREF="https://github.com/lcn2/calc/blob/master/CONTRIB-CODE">CONTRIB-CODE</A>
+for how to contribue code to calc.

COPYING

@@ -4,9 +4,10 @@
 This file is Copyrighted
 ------------------------
 
+    This file is not covered under version 2.1 of the GNU LGPL.
     This file is covered under the following Copyright:
 
-	Copyright (C) 1999-2021  Landon Curt Noll
+	Copyright (C) 1999-2023  Landon Curt Noll
 	All rights reserved.
 
 	Everyone is permitted to copy and distribute verbatim copies
@@ -120,11 +121,13 @@ Calc copyrights and exception files
 	Copyright (C) year  Ernest Bowen
 	Copyright (C) year  Petteri Kettunen and Landon Curt Noll
 	Copyright (C) year  Christoph Zurnieden
+	Copyright (C) year  Landon Curt Noll and Thomas Jones-Low
+	Copyright (C) year  Klaus Alexander Seistrup and Landon Curt Noll
 
     These files are not covered under one of the Copyrights listed above:
 
 	    sha1.c		sha1.h		COPYING
-	    COPYING-LGPL	cal/qtime.cal	cal/screen.cal
+	    COPYING-LGPL	cal/screen.cal
 
     The file COPYING-LGPL, which contains a copy of the version 2.1
     GNU Lesser General Public License, is itself Copyrighted by the
@@ -136,8 +139,16 @@ 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 files
-    are under the LGPL but have different authors that those listed above.
+    These files are covered under "The Unlicense":
+
+	    sha1.c
+	    sha1.h
+	    cal/dotest.cal
+	    cal/screen.cal
+
+    For more information on this license, see:
+
+	    https://unlicense.org
 
     In all cases one may use and distribute these exception files freely.
     And because one may freely distribute the LGPL covered files, the

HOWTO.INSTALL

@@ -3,20 +3,21 @@ IMPORTANT: Please see the section at the bottom of this file for
 	   some important information on Makefiles used in calc.
 
 ###################################################################
-# IMPORTANT: DO NOT run GNU make in parallel mode!!!		  #
+# IMPORTANT: DO NOT use make in parallel mode!!!		  #
 ###################################################################
 # Unfortunately due to the complex dependency issues between	  #
-# Makefile, Makefile.ship and custom/Makefile, parallel GNU make  #
+# Makefile, Makefile.ship and custom/Makefile, parallel make      #
 # is NOT recommended.  Sorry (tm Canada) :)			  #
 ###################################################################
 
-Installing calc from the bzip2-ed tarball in 4 easy steps:
+Installing calc from the bzip2-ed tarball: 4 easy steps:
 
     (0) If your platform supports i686 RPMs, you may want to go to:
 
-	    http://www.isthe.com/chongo/src/calc/
+	    https://github.com/lcn2/calc/releases
 
-	and use these RPMs:
+	Open up the 'Assets' tag below a given release and
+	download these RPMs:
 
 	    * calc*.i686.rpm
 		- all that is needed if you just want to use calc
@@ -25,7 +26,14 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	        - calc *.h header and *.a lib files for use in other programs
 
 	    * calc.*.src.rpm
-	        - calc source in RPM package form
+	        - calc source via a SRPM package
+
+	Alternately to the above github link, you might try looking at
+	the RPMs under:
+
+	    http://www.isthe.com/chongo/src/calc/
+
+=-=
 
 The following 4 steps apply to calc source tree that comes from either:
 
@@ -37,6 +45,8 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	cd /var/tmp
 	bunzip2 -c /usr/src/redhat/SOURCES/calc-*.tar.bz2 | tar -xvf -
 
+4 steps:
+
 (1)	Look at the makefile, and adjust it to suit your needs.
 
 	The top level Makefile and the custom/Makefile require a modern
@@ -44,17 +54,109 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	targets, the default make is sufficient.  On FreeBSD for example,
 	probably want to use gmake instead of make.
 
-	Some report that under macOS, one has to declare the target
-	to be Darwin.  So for macOS, one might have to do:
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! By default, calc assumes you have the readline package installed !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! macOS does not have readline, so mac users need to make a choice !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-	    # for macOS users only, force the target to be Darwin
+	The readline package (-lreadline, -lhistory, -lncurses) used by and
+	linked into calc by default.  If your system does NOT have those
+	libaraies, then you have two options:
+
+	(1-with readline) Install the readline package 		<- Recommended
+
+	    Install the readline package first, then compile calc.
+
+	    For information on the readline package, see:
+
+		https://tiswww.case.edu/php/chet/readline/rltop.html
+
+	    MacOS users can use MacPorts or HomeBrew to install readline:
+
+		https://www.macports.org
+		https://brew.sh
+
+	    Or compile from the readline.git repo:
+
+		http://git.savannah.gnu.org/cgit/readline.git/
+
+	(1-w/o readline) Compile calc without readline 	(not recommended)
+
+	    Why do we not recommend (1b)?  Because using calc with readline
+	    provides a beter user experience.
+
+	    If you feel you must use calc without the readline package, then you
+	    will need to change your calc Makefile with this patch:
+
+--- Makefile.old	2021-12-29 14:57:56.000000000 -0800
++++ Makefile	2021-12-29 14:59:13.000000000 -0800
+@@ -1140,14 +1140,14 @@
  #
-	    make target=Darwin clobber
-	    make target=Darwin all
-	    make target=Darwin chk
-	    make target=Darwin install
+ # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
+-#USE_READLINE=
+-USE_READLINE= -DUSE_READLINE
++USE_READLINE=
++#USE_READLINE= -DUSE_READLINE
+ #
+-#READLINE_LIB=
+-#READLINE_EXTRAS=
++READLINE_LIB=
++READLINE_EXTRAS=
+ #
+-READLINE_LIB= -lreadline
+-READLINE_EXTRAS= -lhistory -lncurses
++#READLINE_LIB= -lreadline
++#READLINE_EXTRAS= -lhistory -lncurses
+ #
+ #READLINE_LIB= -L/usr/gnu/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+@@ -1181,8 +1181,8 @@
+ # # and using the readline, history, and ncurses libraries.
+ # #
+ ifneq ($(HOMEBREW_PREFIX),)
+-READLINE_LIB:= -L${HOMEBREW_PREFIX}/opt/readline/lib -lreadline
+-READLINE_INCLUDE:= -I${HOMEBREW_PREFIX}/opt/readline/include
++#READLINE_LIB:= -L${HOMEBREW_PREFIX}/opt/readline/lib -lreadline
++#READLINE_INCLUDE:= -I${HOMEBREW_PREFIX}/opt/readline/include
+ endif
+ #
+ #endif  /* end of skip for non-Gnu makefiles */
 
-	If your target system does not have a moderm Makefile (such as gmake),
+	    If your target system does not have a modern Makefile
+	    (such as gmake), then you will need to change your
+	    Makefile.simple with this patch:
+
+--- Makefile.simple.orig	2021-12-29 15:00:53.000000000 -0800
++++ Makefile.simple	2021-12-29 15:01:00.000000000 -0800
+@@ -1005,14 +1005,14 @@
+ #
+ # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
+-#USE_READLINE=
+-USE_READLINE= -DUSE_READLINE
++USE_READLINE=
++#USE_READLINE= -DUSE_READLINE
+ #
+-#READLINE_LIB=
+-#READLINE_EXTRAS=
++READLINE_LIB=
++READLINE_EXTRAS=
+ #
+-READLINE_LIB= -lreadline
+-READLINE_EXTRAS= -lhistory -lncurses
++#READLINE_LIB= -lreadline
++#READLINE_EXTRAS= -lhistory -lncurses
+ #
+ #READLINE_LIB= -L/usr/gnu/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! By default, calc assumes you are using a modern gnu-like make tool !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+	If your target system does not have a modern Makefile (such as gmake),
 	then you should try using the Makefile.simple and custom/Makefile.simple
 	files:
 
@@ -69,17 +171,17 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	suggestion.
 
 	If you are using a modern make (such as gmake), you may override
-	any values set in the Mkefile by adding them to Makefile.local
+	any values set in the Makefile by adding them to Makefile.local
 	using the := directive.  For example:
 
 	    HAVE_STRING_H:= YES
 	    HAVE_TIMES_H:= YES
 	    SED:= /usr/local/bin/nsed
 
-	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-	! If you are building under Windoz or a Windoz-like environment !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! If you are building under Windows or a Windows-like environment !
 	! (such as Cygwin or DJGPP), read the README.WINDOWS file.        !
-	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 	You should determine if these Makefile variables are reasonable:
 
@@ -204,9 +306,6 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
 	    make check
 
-	==> If you run into problems, read the BUGS file and follow
-	    the instructions found in there.
-
 	NOTE: For a quiet check which only prints if something goes wrong:
 
 	    make chk
@@ -218,6 +317,9 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 We suggest that you might want to read the README.FIRST file and look at
 the calc help subsystem.  See also the README.md file.
 
+In general, if you run into problems, read the BUGS file and follow
+the instructions.
+
 =-=
 
 On calc Makefiles:
@@ -241,50 +343,38 @@ SHELL= ...
 
     On some systems such as macOS, the bash shell is very
     far behind to the point where is cannot be depended on.
-    On such systems, the zsh may be a much better alternative
+    On such systems, the sh may be a much better alternative
     shell for this Makefile to use:
 
-	    SHELL= /bin/zsh
+	    SHELL= /bin/sh
 
-Makefile
+Makefile.local
 
-    # SRC: Makefile - Our calc build environment
+    # SRC: Makefile.local - tweaks to the top level Makefile
 
-    This is our internal Makefile that drives how we build calc.
-    For critical rules in Makefile.ship, there is a corresponding
-    rule in Makefile that calls ${MAKE} -f Makefile.ship with,
-    additional commands, args and Makefile variables.  The ${XVAR}
-    Makefile variable, for example, is passed on each call to
-    ${MAKE} -f Makefile.ship so that the environment and parameters of
-    Makefile.ship may be managed for our build environment.
+    Between releases, Makefile.local at the top of the master branch
+    will contain how we typically build calc and test calc (FYI: we
+    normally enable things such as -Werror -Wextra -pedantic).  When we
+    push out a release, Makefile.local will be stripped of non-comment
+    lines.  Thus, releases of calc, and, released "calc*.src.rpm"
+    files and the source tarballs, will have a Makefile.local with
+    only comments.
 
-    This Makefile is used to make the calc rpm.  In addition to these
-    comments, this Makefile differs from the non-rpm bzip2-ed tarball
-    source Makefile in at least the the following ways:
+    If the Makefile is not suitable for you (say because you fetch it
+    from the top of the master branch between releases), then you may
+    wish to remove all non-comment lines.  I.e., lines that do not start
+    with the # character.
 
-	CCWERR= -Werror
-	USE_READLINE= -DUSE_READLINE
-	READLINE_LIB= -lreadline -lhistory -lncurses
-
-    If the Makefile is not suitable for you, then
-    you may wish to replace it with Makefile.ship:
-
-	mv -f -v Makefile.ship Makefile
-
-    This Makefile assumes you have a modern make command such as
+    This Makefile.local assumes you have a modern make command such as
     the GNU make.  See Makefile.simple comment below if you do not
     have such a modern make command.
 
-    In packages such as RPMs, and the tar.bz2 source tarball,
-    Makefile contains the contents of Makefile.ship.  If Makefile.ship
-    is missing it has likely moved to replace Makefile.
-
     In the calc GitHub repo, Makefile is the calc build environment
     and Makefile.ship is the top level Makefile:
 
 	https://github.com/lcn2/calc
 
-Makefile.ship
+Makefile
 
     # SRC: Makefile.ship - top level Makefile
 
@@ -324,16 +414,9 @@ Makefile.ship
 	...
 	#endif /* DO NOT DO THIS */
 
-    The custom/Makefile rule of Makefile.ship is used to form
-    the custom/Makefile.  In particular the Makefile.ship lines:
-
-	# start of host target cut
-	... these go in between custom/Makefile.head and custom/Makefile.tail
-	# end of host target cut
-
 Makefile.simple
 
-    # SRC: non-GNU Makefile via make -f Makefile.ship Makefile.simple
+    # SRC: Makefile.simple - non-GNU version
 
     This is a non-GNU or simple Makefile designed for environments
     that do not have a modern make command.
@@ -360,36 +443,15 @@ Makefile.simple
 
 	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
 
-custom/Makefile.head
-
-    # SRC: custom/Makefile.head
-
-    This file forms the top part of the custom/Makefile.
-
-custom/Makefile.tail
-
-    # SRC: custom/Makefile.tail
-
-    This file forms the bottom part of the custom/Makefile.
-
 custom/Makefile
 
     # SRC: Makefile via make -f Makefile custom/Makefile
 
     This is the custom directory Makefile.
 
-    The custom/Makefile rule of Makefile.ship is used to form
-    the custom/Makefile.  In particular the Makefile.ship lines:
-
-	# start of host target cut
-	... these go in between custom/Makefile.head and custom/Makefile.tail
-	# end of host target cut
-
-    NOTE: The clobber rule does not remove this file. - XXX
-
 custom/Makefile.simple
 
-    # SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
+    # SRC: custom/Makefile.simple - non-GNU version
 
     This is a non-GNU or simple Makefile for the custom directory
     that is designed for environments that do not have a modern make

LIBRARY

@@ -320,10 +320,10 @@ The arbitrary precision integer routines define a structure called a ZVALUE.
 This is defined in zmath.h.  A ZVALUE contains a pointer to an array of
 integers, the length of the array, and a sign flag.  The array is allocated
 using malloc, so you need to free this array when you are done with a
-ZVALUE.	 To do this, you should call zfree with the ZVALUE as an argument
-(or call freeh with the pointer as an argument) and never try to free the
-array yourself using free.  The reason for this is that sometimes the pointer
-points to one of two statically allocated arrays which should NOT be freed.
+ZVALUE.	 To do this, you should call zfree() with the ZVALUE as an argument
+and never try to free the array yourself using free().  The reason for this
+is that sometimes the pointer points to a statically allocated arrays which
+should NOT be freed.
 
 The ZVALUE structures are passed to routines by value, and are returned
 through pointers.  For example, to multiply two small integers together,
@@ -344,7 +344,7 @@ values of 0 and 1 are so common that special checks are made for them.
 
 For initial values besides 0 or 1, you need to call itoz to convert a long
 value into a ZVALUE, as shown in the above example.  Or alternatively,
-for larger numbers you can use the atoz routine to convert a string which
+for larger numbers you can use the str2z routine to convert a string which
 represents a number into a ZVALUE.  The string can be in decimal, octal,
 hex, or binary according to the leading digits.
 
@@ -357,7 +357,7 @@ over a long sequence of operations.
 	ZVALUE z1, z2, z3;
 
 	z1 = _one_;
-	atoz("12345678987654321", &z2);
+	str2z("12345678987654321", &z2);
 	zadd(z1, z2, &z3);
 	zfree(z1);
 	zfree(z2);
@@ -446,10 +446,10 @@ to free them first.  The following illustrates this:
 	itoz(55L, &q->num);
 
 A better way to create NUMBERs with particular values is to use the itoq,
-iitoq, or atoq functions.  Using itoq makes a long value into a NUMBER,
+iitoq, or str2q functions.  Using itoq makes a long value into a NUMBER,
 using iitoq makes a pair of longs into the numerator and denominator of a
-NUMBER (reducing them first if needed), and atoq converts a string representing
-a number into the corresponding NUMBER.	 The atoq function accepts input in
+NUMBER (reducing them first if needed), and str2q converts a string representing
+a number into the corresponding NUMBER.	 The str2q function accepts input in
 integral, fractional, real, or exponential formats.  Examples of allocating
 numbers are:
 
@@ -457,7 +457,7 @@ numbers are:
 
 	q1 = itoq(66L);
 	q2 = iitoq(2L, 3L);
-	q3 = atoq("456.78");
+	q3 = str2q("456.78");
 
 Also unlike ZVALUEs, NUMBERs are quickly copied.  This is because they contain
 a link count, which is the number of pointers there are to the NUMBER.	The
@@ -504,8 +504,8 @@ For example, to calculate sin(0.5) to 100 decimal places, you could do:
 
 	NUMBER *q, *ans, *epsilon;
 
-	q = atoq("0.5");
-	epsilon = atoq("1e-100");
+	q = str2q("0.5");
+	epsilon = str2q("1e-100");
 	ans = qsin(q, epsilon);
 
 There are many convenience macros similar to the ones for ZVALUEs which can
@@ -615,7 +615,7 @@ These have the values 0, 1, and i.
 LAST THINGS LAST
 ----------------
 
-If you wish, when you are all doen you can call libcalc_call_me_last()
+If you wish, when you are all done you can call libcalc_call_me_last()
 to free a small amount of storage associated with the libcalc_call_me_first()
 call.  This is not required, but is does bring things to a closure.
 

Makefile.local

@@ -1 +1,40 @@
-# Add below to override Makefile values (using :=) as in: HAVE_STRING_H:= YES
+#!/usr/bin/env make
+#
+# Makefile.local - local Makefile variables
+#
+# This file is included by Makefile after the last Makefile is set and
+# before the first make rule.  This makes this file suitable to override
+# Makefile variables.
+#
+# To replace a Makefile variable, use := symbols.  For example:
+#
+#	CCWERR:= -Werror
+
+###################################################################
+# NOTE: For this and other commended out examples in this file,	  #
+# you need to remove the leading '#<whitespaces>' to take effect. #
+#								  #
+# Comments start with a #-character.				  #
+###################################################################
+
+# You can append to an existing Makefile variable using '+=' symbols.
+# For example:
+#
+#	CFLAGS+= -Ofast
+
+# For example, a AddressSanitizer.  You do NOT want to do this by
+# by default!  Do this only if you are debugging with libasan:
+#
+# For Linux gcc version 11.3.1 with libasan-11.3.1-2.1 you might try:
+#
+#	DEBUG:= -O0 -g
+#	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer
+#	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer
+#	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1
+#
+# For macOS 13.2.1 with clang version 14.0.0 (clang-1400.0.29.202) you might try:
+#
+#	DEBUG:= -O0 -g
+#	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+#	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+#	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1

QUESTIONS

@@ -1,37 +1,28 @@
-If you have a simple general question about calc, send Email to:
+If you have a general question about calc, consider opening
+a new Github discussion under:
 
-    calc-quest-mail at asthe dot com
+	https://github.com/lcn2/calc/discussions
 
-    NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
+Look over the existing discussions to see of your question fits
+under one of those exiting discussions.
 
-PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
+You may wish to add your question as a comment to an existing discussion.
+Otherwise click on:
 
-    calc question
+    ((New discussion))
 
-You may add additional words to your subject line.
-
-IMPORTANT: If your Email doesn't contain the above phrase,
-	   then we WILL NOT SEE your Email.
-
-PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+and ask your question in that new discussion.
 
 Please limit your questions to general questions about calc.  We
 cannot go into great detail in our answers, nor can we do your
-homework, nor can we do much more than answer short general questions
+homework, nor can we do much more than answer general questions
 about calc.
 
-Please be patient as we cannot always respond to Email messages quickly.
+Please be patient as we cannot always respond to discussion messages quickly.
 
 =-=
 
-## Copyright (C) 2021  Landon Curt Noll
+## Copyright (C) 2021,2023  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

README.RELEASE

@@ -0,0 +1,117 @@
+On calc versions and releases
+
+Calc version numbers have 4 levels.  For example:
+
+	 ++=== top 2 levels: calc builtin functions compatibility
+	 ||
+	vvvv
+
+	2.14.0.8
+	 \\\\\\
+	^  \\\\----> top 3 levels: calc important code base change
+	|
+	+--- top version level: internal representation compatibility
+
+The top version level (e.g., 2) refers to the internal representation
+of values.  Any library or hardware linked/built for calc 2 will be able
+to use values from other 2.x.y.z versions.
+
+The top 2 levels (e.g., 2.14) refers to a specific compatible set of
+builtin functions.  Calc interpreted code (such as calc resource files)
+written for, say calc 2.14, will be able to use the same set of builtin
+functions for any other 2.14.y.z version.  Any new builtin functions or
+significant changes to existing builtin functions would be introduced in
+a later release such as version 2.15.y.z.  While calc scripts written for
+2.14.y.z will highly likely be able to run under version 2.15.y.z, any
+new builtin functions added in calc 2.15 may collide with an identically
+named used defined function.
+
+The top 3 levels (e.g., 2.14.0) change to reflect an important change to
+the code base such as a bug fix or performance improvement.  There was
+neither a change to the internal representation format (a top level
+version change), nor were there new calc builtins introduced in such
+a top 3 level release.
+
+There are 3 classes of changes to the calc source tree:
+
+alpha		=> untagged GitHub commit
+
+	Any untagged commit to the GitHub master branch should be
+	considered as alpha code that may make calc unstable.
+
+	While we try to avoid breaking the calc code with commits,
+	there is a risk that picking up such a change could
+	negatively impact the code.
+
+tested		=> tagged GitHub pre-release commit
+
+	A new version of calc has been released and has recently passed
+	regression testing on at least to different platforms and chip
+	architectures.
+
+	The "tested" class was historically called "untested",
+	however this term was misleading as such releases ARE tested.
+	Since 2.14.0.13 we have used the term "tested".
+
+	All tested releases are tagged with a new version number.
+	Such releases have GitHub assets such as a source tarball,
+	zip file, source rpm, development rpm and binary rpm.  See the
+	orange "Pre-release" GitHub releases under:
+
+	    https://github.com/lcn2/calc/releases
+
+	 At the bottom of a given release is a "> Assets" that may
+	 be opened to reveal down-loadable files.
+
+production	=> tagged GitHub release commit
+
+	A new version of calc has been released and has undergone
+	extensive testing over time over a number of platforms.
+	Sometimes a "tested" release that is found work well over
+	a period of time will be re-released with a new version
+	number as a "production" release.
+
+	The latest production GitHub release is marked with green
+	"Latest" label under:
+
+	    https://github.com/lcn2/calc/releases
+
+	A release that has neither an orange "Pre-release" nor
+	a green "Latest" label is a prior production class release.
+
+	At the bottom of a given release is a "> Assets" that may
+	be opened to reveal down-loadable files.
+
+	Production class code where stability is critical should use a
+	"production" release.
+
+A historical note and apology:
+
+In the past, some version number changes were made that did not fully
+reflect the above version number or change class.  Moreover older terms
+such as "stable" and "unstable" were misleading and did not properly
+reflect the nature of the change.  Sorry!  The purpose of this document
+is to try and bring a better level of conformity to source code updates,
+tagged releases and version numbers.
+
+## Copyright (C) 2021  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.
+## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##
+## Under source code control:	2021/12/12 19:36:26
+## File existed as early as:	2021
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

README.WINDOWS

@@ -3,61 +3,109 @@ Dear calc user on a Windows 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.
+     Please also add notes to the 'Compiling calc under Windows 11'
+     and 'Compiling with Cygwin' section in README.WINDOWS file.
+
+NOTE: The main developers do not have access to a Windows based platform.
+      While we will make an effort to not break calc Windows based system,
+      our lack of a Windows test environment will mean we will make mistakes
+      from time to time.  Hopefully Windows users can overcome these mistakes.
       Of course you are welcome to send us any patches that fix your
-      Windoz build environment.
+      Windows build environment.
 
 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= compiling with Windows Subsystem for Linux (WSL) =-Cygwin =-=
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= Compiling calc under Windows 11 =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-It has been reported that calc version 2.12.6.4 has been successfully
-compiled, installed and running on Windows 10 on 2018 Jan 21.
+BTW: While we are unable to use Windows 11, we welcome Windows 11
+     developers to try compiling calc natively (instead of via a Linux
+     virtual machine).  If you are able to compile Windows 11 natively,
+     we would welcome GitHub pull requests showing any needed modifications:
 
-We were told:
+	https://github.com/lcn2/calc/pulls
 
-  "The Windows Subsystem for Linux (WSL) is a new Windows 10 feature that
-   enables you to run native Linux command-line tools directly on Windows"
+We were given this advice from a Windows 11 developer:
+
+    Windows 11 users could use Cygwin:
+
+        https://cygwin.com/install.html
+
+    IMPORTANT: While installing Cygwin, and during Cygwin Setup, be sure to
+	       select all the MinGW64 packages relating to gcc.
+
+	       See the "Compiling with Cygwin" section below.
+
+NOTE: Compiling calc under Windows 11 is work in progress.  If you run into
+      problems, consider the "Compiling with Cygwin" section below.
 
-   https://docs.microsoft.com/cs-cz/windows/wsl/about
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= compiling with Cygwin =-=
+=-= 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.
+and Unix tools for Windows.
 
 The major porting work for Cygwin was performed by Thomas Jones-Low
 (tjoneslo at softstart dot com).
 
-In March 2009, Michael Penk (mpenk at wuska dot com) reported success in
-installs under Cygwin:
+In December 2022, GitHub user @Leoongithub successfully compiled
+calc-2.14.1.2 under cygwin 2.924 (64 bit). The following are the
+compilation steps that GitHub user @Leoongithub recommends:
 
-    On my fairly complete Cygwin installs, everything compiles,
-    checks, and installs correctly.  My Cygwin is configured
-    in a very standard way (out of the box, using all of Cygwin's
-    defaults).  The install worked on 5 different machines with
-    Cygwin on them: one XP home, one XP professional, and three
-    Vista professionals.
+0. Install the latest version of cygwin (https://cygwin.com/install.html).
 
-Using the calc Makefile, he did the following:
+    NOTE: In addition to the default packages, you also need to check these
+	  three packages: gcc-core, make, and libreadline-devel. The version
+	  of these packages does not matter. Just choose the latest version.
 
-    make all target=Cygwin
-    make check
-    make install
+    NOTE: The addition of "target=Cygwin" to make commands below
+	  is done just in case the target is not set properly by make.
 
-He also reports:
+1. Change (cd) into the top of the source code directory of calc.
 
-    Of course, one should be logged in as an Administrator when
-    one builds and installs calc.
+   NOTE: The make command assume you are at the top of the calc source directory.
+
+2. make clobber target=Cygwin
+
+   NOTE: This helps ensure that you are starting from a so-called "clean slate",
+	 and that you have nothing hanging around from previous attempts to compile.
+
+3. make all target=Cygwin
+
+   NOTE: If successful, you should have a calc executable.  However that executable
+	 may not be working properly.  Advance to step (4) to test.
+
+4. make chk target=Cygwin
+
+   NOTE: If you want this command be be verbose, try:
+
+	    make check target=Cygwin
+
+   NOTE: This will run calc with the regress.cal regression suite.  This step could take
+	 for a while to run, depending on the speed/performance of your machine.
+	 If all is well (all regression tests pass), you will see at the end:
+
+	    chk OK
+
+         Otherwise you may see calc exit non-zero after it prints some lines with '****'
+	 error messages followed by a line including a final error count of the form:
+
+	   **** 2 error(s) found  \/++\/
+
+         If you see some errors that may relate to files and I/O, all may not be lost.
+	 It could simply mean that your Windows environment is not conforming to standard
+	 I/O and file operations.  The calc mathematical engine may be just fine.  On the
+	 other hand if you see mathematical related regression test failures, this is
+	 bad sign that your calc executable under Windows is not usable.
+
+5. make install target=Cygwin
+
+   NOTE: This step is optional.  While calc is usable at the top of the source code directory
+         of calc, installing calc may be of benefit so you can use calc elsewhere on your system.
 
-He was compiling calc 2.12.4.0 with Cygwin version 1.5.25-15.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= If all else fails, for Cygwin =-=
@@ -82,6 +130,10 @@ In particular:
     source directory, edit them (if needed) and build using the
     Cygwin GCC compiler and Cygwin build environment.
 
+NOTE: The use of win32_hsrc and this method has been deprecated.
+      It may go away once the Windows 11 methods are stable.
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= compiling under DJGPP =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -128,7 +180,9 @@ recommends the following settings:
 	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 	CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
 	CALCPAGER= less.exe -ci
-	DEBUG= -O2 -gstabs+ -DWINDOZ
+	DEBUG= -O2 -gstabs+ -D_WIN32
+	HAVE_ENVIRON=-DHAVE_NO_ENVIRON
+	HAVE_ARC4RANDOM=-DHAVE_NO_ARC4RANDOM
 
 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.
@@ -140,8 +194,43 @@ Look for Makefile comments of the form:
 Follow those recommendations.  In cases where they conflict with
 the above Makefile list, follow the recommendation in the Makefile.
 
+NOTE: The use of DJGPP and this method has been deprecated.
+      It may go away once the Windows 11 methods are stable.
 
-## Copyright (C) 2002-2009  Landon Curt Noll and Thomas Jones-Low
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= Compiling calc via virtual machine under Windows 11 =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+We would prefer a Windows 11 solution that does not require a Windows 11
+developer to install a Linux virtual machine.  Nevertheless, a Windows 11
+user might want to use the Microsoft Windows Subsystem (WSL) for Linux:
+
+	https://docs.microsoft.com/en-us/windows/wsl/
+
+    We have been told that you will need to turn on virtualization
+    to use this WSL subsystem.
+
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= Compiling calc under Windows 10 via Windows Subsystem for Linux (WSL) =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+It has been reported that calc version 2.12.6.4 has been successfully
+compiled, installed and running on Windows 10 on 2018 Jan 21.
+
+We were told:
+
+  "The Windows Subsystem for Linux (WSL) is a new Windows 10 feature that
+   enables you to run native Linux command-line tools directly on Windows"
+
+   https://docs.microsoft.com/cs-cz/windows/wsl/about
+
+NOTE: The use of calc under Windows 10 has been deprecated in favor of one
+      of the Windows 11 methods above.
+
+
+## Copyright (C) 2002-2009,2021,2022  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

README.md

@@ -1,3 +1,25 @@
+# TL;DR Try calc
+
+## TL;DR Install calc
+
+```
+misc linux: sudo yum install calc
+on Debian:  sudo apt install calc
+on RHEL:    sudo dnf install calc
+on Ubuntu:  sudo apt install calc
+via Termux: apt install calc
+via src:    sudo make clobber all chk instsll
+```
+
+## TL;DR Run calc
+
+```
+misc shell:   calc
+via bash:     calc
+via misc app: launch calc via Termux
+via zsh:      calc
+```
+
 # What is calc?
 
 Calc is an interactive calculator which provides for easy large

SECURITY.md

@@ -2,20 +2,18 @@
 
 ## Supported Versions
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
+The most recent version of calc is supported with security updates.
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
+If the most recent stable of calc is also supported with security updates.
+
+FYI: please review the BUGS file, or enter the calc command:
+
+    ; help BUGS
 
 ## Reporting a Vulnerability
 
-Use this section to tell people how to report a vulnerability.
+Please create a calc GitHub repo issue:
 
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.
+    https://github.com/lcn2/calc/issues
+
+Click on ((New issue)) and follow the issue template.

addop.c

@@ -1,7 +1,7 @@
 /*
  * addop - add opcodes to a function being compiled
  *
- * Copyright (C) 1999-2007,2021  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -37,6 +37,7 @@
 #include "symbol.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -68,12 +69,12 @@ initfunctions(void)
 	functemplate = (FUNC *) malloc(funcsize(maxopcodes));
 	if (functemplate == NULL) {
 		math_error("Cannot allocate function template");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	functions = (FUNC **) malloc(sizeof(FUNC *) * FUNCALLOCSIZE);
 	if (functions == NULL) {
 		math_error("Cannot allocate function table");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	funccount = 0;
 	funcavail = FUNCALLOCSIZE;
@@ -155,7 +156,7 @@ beginfunc(char *name, BOOL newflag)
 		fp = (FUNC *) malloc(funcsize(maxopcodes));
 		if (fp == NULL) {
 			math_error("Cannot allocate temporary function");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	}
 	fp->f_next = NULL;
@@ -203,7 +204,7 @@ endfunc(void)
 	fp = (FUNC *) malloc(size);
 	if (fp == NULL) {
 		math_error("Cannot commit function");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	memcpy((char *) fp, (char *) curfunc, size);
 	if (curfunc != functemplate)
@@ -257,13 +258,13 @@ adduserfunc(char *name)
 			sizeof(FUNC *) * (funcavail + FUNCALLOCSIZE));
 		if (functions == NULL) {
 			math_error("Failed to reallocate function table");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		funcavail += FUNCALLOCSIZE;
 	}
 	if (addstr(&funcnames, name) == NULL) {
 		math_error("Cannot save function name");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	index = funccount++;
 	functions[index] = NULL;
@@ -316,7 +317,7 @@ freefunc(FUNC *fp)
 		}
 		if (index == funccount) {
 			math_error("Bad call to freefunc!!!");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	}
 	if (newname[0] != '*' && (conf->traceflags & TRACE_FNCODES)) {
@@ -386,7 +387,7 @@ findfunc(long index)
 {
 	if (index >= funccount) {
 		math_error("Undefined function");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	return functions[index];
 }
@@ -438,7 +439,7 @@ addop(long op)
 		fp = (FUNC *) malloc(funcsize(maxopcodes));
 		if (fp == NULL) {
 			math_error("cannot malloc function");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		memcpy((char *) fp, (char *) curfunc,
 			funcsize(curfunc->f_opcodecount));

align32.c

@@ -27,6 +27,11 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+
 #include "longbits.h"
 
 #include "have_unistd.h"
@@ -34,11 +39,13 @@
 #include <unistd.h>
 #endif
 
+#include "have_unused.h"
+
 
 #include "banned.h"	/* include after system header <> includes */
 
 
-static void buserr(void);	/* catch alignment errors */
+static void buserr(int arg);	/* catch alignment errors */
 
 
 int
@@ -46,7 +53,7 @@ main(void)
 {
 	char byte[2*sizeof(USB32)];	/* mis-alignment buffer */
 	USB32 *p;			/* mis-alignment pointer */
-	int i;
+	unsigned long i;
 
 #if defined(MUST_ALIGN32)
 	/* force alignment */
@@ -82,7 +89,7 @@ main(void)
  */
 /*ARGSUSED*/
 static void
-buserr(int arg)
+buserr(int UNUSED(arg))
 {
 	/* alignment is required */
 	printf("#define MUST_ALIGN32\t%c* must align 32 bit values *%c\n",

alloc.h

@@ -42,9 +42,7 @@
 # include <string.h>
 
 #else
-#if defined(_WIN32) && defined(NOTCYGWIN)
 #include <stdio.h>
-#endif
 
 # if defined(HAVE_NEWSTR)
 E_FUNC void *memcpy();

assocfunc.c

@@ -1,7 +1,7 @@
 /*
  * assocfunc - association table routines
  *
- * Copyright (C) 1999-2007,2021  David I. Bell
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -36,6 +36,7 @@
 #include "value.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -74,7 +75,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 
 	if (dim < 0) {
 		math_error("Negative dimension for indexing association");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -112,7 +113,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 	ep = (ASSOCELEM *) malloc(ELEMSIZE(dim));
 	if (ep == NULL) {
 		math_error("Cannot allocate association element");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	ep->e_dim = dim;
 	ep->e_hash = hash;
@@ -142,13 +143,13 @@ assocsearch(ASSOC *ap, VALUE *vp, long i, long j, ZVALUE *index)
 
 	if (i < 0 || j > ap->a_count) {
 		math_error("This should not happen in assocsearch");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	while (i < j) {
 		ep = elemindex(ap, i);
 		if (ep == NULL) {
 			math_error("This should not happen in assocsearch");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (acceptvalue(&ep->e_value, vp)) {
 			utoz(i, index);
@@ -172,14 +173,14 @@ assocrsearch(ASSOC *ap, VALUE *vp, long i, long j, ZVALUE *index)
 
 	if (i < 0 || j > ap->a_count) {
 		math_error("This should not happen in assocsearch");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	j--;
 	while (j >= i) {
 		ep = elemindex(ap, j);
 		if (ep == NULL) {
 			math_error("This should not happen in assocsearch");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (acceptvalue(&ep->e_value, vp)) {
 			utoz(j, index);
@@ -333,7 +334,7 @@ assoccopy(ASSOC *oldap)
 			if (ep == NULL) {
 				math_error("Cannot allocate "
 					   "association element");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			ep->e_dim = oldep->e_dim;
 			ep->e_hash = oldep->e_hash;
@@ -374,7 +375,7 @@ resize(ASSOC *ap, long newsize)
 	newtable = (ASSOCELEM **) malloc(sizeof(ASSOCELEM *) * newsize);
 	if (newtable == NULL) {
 		math_error("No memory to grow association");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	for (i = 0; i < newsize; i++)
 		newtable[i] = NULL;
@@ -430,7 +431,7 @@ assocalloc(long initsize)
 	ap = (ASSOC *) malloc(sizeof(ASSOC));
 	if (ap == NULL) {
 		math_error("No memory for association");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	ap->a_count = 0;
 	ap->a_size = initsize;
@@ -438,7 +439,7 @@ assocalloc(long initsize)
 	if (ap->a_table == NULL) {
 		free((char *) ap);
 		math_error("No memory for association");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	for (i = 0; i < initsize; i++)
 		ap->a_table[i] = NULL;

attribute.h

@@ -0,0 +1,69 @@
+/*
+ * attribute - control use of attributes in a backward compatible way
+ *
+ * Copyright (C) 2022  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2022/01/21 22:51:25
+ * File existed as early as:	2022
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+#if !defined(INCLUDE_ATTRIBUTE_H)
+#define INCLUDE_ATTRIBUTE_H
+
+
+/*
+ * backward compatibility
+ *
+ * Not all compilers support __attribute__ nor do they suuport __has_builtin.
+ * For example, MSVC, TenDRAm and Little C Compiler doesn't support __attribute__.
+ * Early gcc does not support __attribute__.
+ *
+ * Not all compiles have __has_builtin
+ */
+#if !defined(__attribute__) && \
+    (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#    define __attribute__(A)
+#endif
+#if !defined __has_builtin
+#    define __has_builtin(x) 0
+#endif
+
+
+/*
+ * not_reached
+ *
+ * In the old days of lint, one could give lint and friends a hint by
+ * placing the token NOTREACHED immediately between opening and closing
+ * comments.  Modern compilers do not honor such commented tokens
+ * and instead rely on features such as __builtin_unreachable
+ * and __attribute__((noreturn)).
+ *
+ * The not_reached will either yield a __builtin_unreachable() feature call,
+ * or it will call abort from stdlib.
+ */
+#if __has_builtin(__builtin_unreachable)
+#    define not_reached() __builtin_unreachable()
+#else
+#    define not_reached() abort()
+#endif /* __has_builtin(__builtin_unreachable) */
+
+
+#endif /* !INCLUDE_ATTRIBUTE_H */

banned.h

@@ -1,14 +1,14 @@
 /*
- * banned - optionally ban dqngerious functions
+ * banned - optionally ban dangerous functions
  *
  * Unless UNBAN is defined, this file will turn the use
  * of certain dangerous functions into syntax errors.
  *
  * In the case of calc, we are motivated in part by the desire for
- * calc to correctly calculate: even durings extremely long calculations.
+ * calc to correctly calculate: even during extremely long calculations.
  *
  * If UNBAN is NOT defined, then calling certain functions
- * will result in a syntaxc error.
+ * will result in a syntax error.
  *
  * If we define UNBAN, then the effect of this file is disabled.
  *
@@ -17,7 +17,7 @@
  * if calculations.
  *
  * In the case of calc, we are motivated in part by the desire for calc
- * to correctly calculate: even durings extremely long calculations.
+ * to correctly calculate: even during extremely long calculations.
  *
  * If UNBAN is NOT defined, then calling certain functions
  * will result in a call to a non-existent function (link error).
@@ -88,11 +88,11 @@
  * then into function calls that do not exist.
  *
  * In the case of calc, we are motivated in part by the desire
- * for calc to correctly calculate: even durings extremely long
+ * for calc to correctly calculate: even during extremely long
  * calculations.
  *
  * If UNBAN is NOT defined, then calling certain functions
- * will result in a syntaxc error.
+ * will result in a syntax error.
  *
  * Unlike the above URL, we suggest an alternative function.
  * In many cases, additional logic is required to use the

blkcpy.c

@@ -1,7 +1,7 @@
 /*
  * blkcpy - general values and related routines used by the calculator
  *
- * Copyright (C) 1999-2007,2021  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2021,2022  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -36,6 +36,7 @@
 #include "str.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -298,7 +299,7 @@ copymat2mat(MATRIX *smat, long ssi, long num, MATRIX *dmat, long dsi)
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
 		math_error("Out of memory for mat-to-mat copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	vp = smat->m_table + ssi;
 	vq = vtemp;
@@ -347,7 +348,7 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
 		math_error("Out of memory for block-to-matrix copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	vp = vtemp;
 	i = num;
@@ -404,7 +405,7 @@ copymat2blk(MATRIX *smat, long ssi, long num, BLOCK *dblk, long dsi,
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for matrix-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -447,7 +448,7 @@ copymat2list(MATRIX *smat, long ssi, long num, LIST *lp, long dsi)
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
 		math_error("Out of memory for matrix-to-list copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	vp = smat->m_table + ssi;
 	vq = vtemp;
@@ -497,7 +498,7 @@ copylist2mat(LIST *lp, long ssi, long num, MATRIX *dmat, long dsi)
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
 		math_error("Out of memory for list-to-matrix copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	ep = listelement(lp, (long) ssi);
 	vp = vtemp;
@@ -547,7 +548,7 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
 		math_error("Out of memory for list-to-list copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	sep = listelement(slp, (long) ssi);
 	vp = vtemp;
@@ -662,7 +663,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for block-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -748,7 +749,7 @@ copyblk2blk(BLOCK *sblk, long ssi, long num, BLOCK *dblk, long dsi,
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for block-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -792,7 +793,7 @@ copystr2blk(STRING *str, long ssi, long num, BLOCK *dblk, long dsi,
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for string-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -913,7 +914,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for string-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -945,7 +946,7 @@ memmove(void *s1, CONST void *s2, MEMMOVE_SIZE_T n)
 	 */
 	if (s1 == NULL || s2 == NULL) {
 		math_error("bogus memmove NULL ptr");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (n <= 0) {
 		/* neg or 0 count does nothing */
@@ -1015,7 +1016,7 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi,
 		newdata = (USB8*) realloc(dblk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Out of memory for num-to-block copy");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		dblk->data = newdata;
 		dblk->maxsize = newsize;
@@ -1086,7 +1087,7 @@ copyblk2num(BLOCK *sblk, long ssi, long num, NUMBER *dnum, long dsi,
 	swapped = (HALF *)malloc(halflen * sizeof(HALF));
 	if (swapped == NULL) {
 		math_error("Out of memory for block-to-num copy");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	/* ensure that any trailing octets will be zero filled */
 	swapped[halflen-1] = 0;

block.c

@@ -1,7 +1,7 @@
 /*
  * block - fixed, dynamic, fifo and circular memory blocks
  *
- * Copyright (C) 1999-2007,2021  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2021,2022  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -42,6 +42,7 @@
 #include "calcerr.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -87,7 +88,7 @@ blkalloc(int len, int chunk)
 	nblk = (BLOCK *)malloc(sizeof(BLOCK));
 	if (nblk == NULL) {
 		math_error("cannot allocate block");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -98,7 +99,7 @@ blkalloc(int len, int chunk)
 	nblk->data = (USB8*)malloc(nblk->maxsize);
 	if (nblk->data == NULL) {
 		math_error("cannot allocate block data storage");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	memset(nblk->data, 0, nblk->maxsize);
 	nblk->datalen = len;
@@ -156,7 +157,7 @@ blk_free(BLOCK *blk)
  *	blk	- the BLOCK to check
  *
  * returns:
- *	if all is ok, otherwise math_error() is called and this
+ *	if all is OK, otherwise math_error() is called and this
  *	function does not return
  */
 S_FUNC void
@@ -172,7 +173,7 @@ blkchk(BLOCK *blk)
 	}
 	if (blk == NULL) {
 		math_error("internal: blk ptr is NULL");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -180,7 +181,7 @@ blkchk(BLOCK *blk)
 	 */
 	if (blk->data == NULL) {
 		math_error("internal: blk->data ptr is NULL");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -188,7 +189,7 @@ blkchk(BLOCK *blk)
 	 */
 	if (blk->datalen < 0) {
 		math_error("internal: blk->datalen < 0");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -196,7 +197,7 @@ blkchk(BLOCK *blk)
 	 */
 	if (blk->datalen < 0) {
 		math_error("internal: blk->datalen < 0");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	return;
 }
@@ -259,7 +260,7 @@ blkrealloc(BLOCK *blk, int newlen, int newchunk)
 		nblk = (USB8*)realloc(blk->data, newmax);
 		if (nblk == NULL) {
 			math_error("cannot reallocate block storage");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/* clear any new storage */
@@ -367,7 +368,7 @@ blktrunc(BLOCK *blk)
 	blk->data = (USB8*)malloc(1);
 	if (blk->data == NULL) {
 		math_error("cannot allocate truncated block storage");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	blk->data[0] = (USB8)0;
 	if (conf->calc_debug & CALCDBG_BLOCK) {
@@ -397,7 +398,7 @@ blk_copy(BLOCK *blk)
 	nblk = (BLOCK *)malloc(sizeof(BLOCK));
 	if (nblk == NULL) {
 		math_error("blk_copy: cannot malloc BLOCK");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -411,7 +412,7 @@ blk_copy(BLOCK *blk)
 	nblk->data = (USB8 *)malloc(blk->maxsize);
 	if (nblk->data == NULL) {
 		math_error("blk_copy: cannot duplicate block data");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	memcpy(nblk->data, blk->data, blk->maxsize);
 	return nblk;
@@ -539,7 +540,7 @@ reallocnblock(int id, int len, int chunk)
 	/* Fire wall */
 	if (id < 0 || id >= nblockcount) {
 		math_error("Bad id in call to reallocnblock");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	blk = nblocks[id]->blk;
@@ -556,13 +557,13 @@ reallocnblock(int id, int len, int chunk)
 		newdata = malloc(newsize);
 		if (newdata == NULL) {
 			math_error("Allocation failed");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	} else if (newsize != oldsize) {
 		newdata = realloc(blk->data, newsize);
 		if (newdata == NULL) {
 			math_error("Reallocation failed");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	}
 	memset(newdata + len, 0, newsize - len);
@@ -593,7 +594,7 @@ createnblock(char *name, int len, int chunk)
 			if (nblocks == NULL) {
 				maxnblockcount = 0;
 				math_error("unable to malloc new named blocks");
-				/*NOTREACHED*/
+				not_reached();
 			}
 		} else {
 			maxnblockcount += NBLOCKCHUNK;
@@ -602,7 +603,7 @@ createnblock(char *name, int len, int chunk)
 			if (nblocks == NULL) {
 				maxnblockcount = 0;
 				math_error("cannot malloc more named blocks");
-				/*NOTREACHED*/
+				not_reached();
 			}
 		}
 	}
@@ -610,18 +611,18 @@ createnblock(char *name, int len, int chunk)
 		initstr(&nblocknames);
 	if (findstr(&nblocknames, name) >= 0) {
 		math_error("Named block already exists!!!");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	newname = addstr(&nblocknames, name);
 	if (newname == NULL) {
 		math_error("Block name allocation failed");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	res = (NBLOCK *) malloc(sizeof(NBLOCK));
 	if (res == NULL) {
 		math_error("Named block allocation failed");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	nblocks[nblockcount] = res;

byteswap.c

@@ -1,7 +1,7 @@
 /*
  * byteswap - byte swapping routines
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2022  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
@@ -29,6 +29,7 @@
 #include "byteswap.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -36,10 +37,10 @@
  * swap_b8_in_HALFs - swap 8 and if needed, 16 bits in an array of HALFs
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a HALF array to swap
- *	len	- length of the src HALF array
+ *	len	- length of the src HALF array in HALFs
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -76,7 +77,7 @@ swap_b8_in_HALFs(HALF *dest, HALF *src, LEN len)
  * swap_b8_in_ZVALUE - swap 8 and if needed, 16 bits in a ZVALUE
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -103,7 +104,7 @@ swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 		if (dest == NULL) {
 			math_error("swap_b8_in_ZVALUE: swap_b8_in_ZVALUE: "
 				    "Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -144,7 +145,7 @@ swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  * swap_b8_in_NUMBER - swap 8 and if needed, 16 bits in a NUMBER
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -170,7 +171,7 @@ swap_b8_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 		dest = malloc(sizeof(NUMBER));
 		if (dest == NULL) {
 			math_error("swap_b8_in_NUMBER: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -208,7 +209,7 @@ swap_b8_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  * swap_b8_in_COMPLEX - swap 8 and if needed, 16 bits in a COMPLEX
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -234,7 +235,7 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 		dest = malloc(sizeof(COMPLEX));
 		if (dest == NULL) {
 			math_error("swap_b8_in_COMPLEX: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -272,10 +273,10 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
  * swap_b16_in_HALFs - swap 16 bits in an array of HALFs
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a HALF array to swap
- *	len	- length of the src HALF array
+ *	len	- length of the src HALF array in HALFs
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -308,11 +309,55 @@ swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len)
 }
 
 
+/*
+ * swap_HALFs - swap HALFs in an array of HALFs
+ *
+ * given:
+ *	dest	- pointer to where the swapped src will be put or
+ *		  NULL to allocate the storage
+ *	src	- pointer to a HALF array to swap
+ *	len	- length of the src HALF array in HALFs
+ *
+ * returns:
+ *	pointer to where the swapped src has been put
+ */
+HALF *
+swap_HALFs(HALF *dest, HALF *src, LEN len)
+{
+	HALF *s;	/* src swap pointer */
+	HALF *d;	/* dest swap pointer */
+	HALF *ret;
+	LEN i;
+
+	/*
+	 * allocate storage if needed
+	 */
+	if (dest == NULL) {
+		dest = alloc(len);
+	}
+	ret = dest;
+
+	/*
+	 * swap HALFs in the array
+	 */
+	s = src;
+	d = &dest[len-1];
+	for (i=0; i < len; ++i, --d, ++s) {
+		*d = *s;
+	}
+
+	/*
+	 * return the result
+	 */
+	return ret;
+}
+
+
 /*
  * swap_b16_in_ZVALUE - swap 16 bits in a ZVALUE
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -338,7 +383,7 @@ swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 		dest = malloc(sizeof(ZVALUE));
 		if (dest == NULL) {
 			math_error("swap_b16_in_ZVALUE: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -379,7 +424,7 @@ swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  * swap_b16_in_NUMBER - swap 16 bits in a NUMBER
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -405,7 +450,7 @@ swap_b16_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 		dest = malloc(sizeof(NUMBER));
 		if (dest == NULL) {
 			math_error("swap_b16_in_NUMBER: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -443,7 +488,7 @@ swap_b16_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  * swap_b16_in_COMPLEX - swap 16 bits in a COMPLEX
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -469,7 +514,7 @@ swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 		dest = malloc(sizeof(COMPLEX));
 		if (dest == NULL) {
 			math_error("swap_b16_in_COMPLEX: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -507,7 +552,7 @@ swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
  * swap_HALF_in_ZVALUE - swap HALFs in a ZVALUE
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -530,10 +575,10 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 		/*
 		 * allocate the storage
 		 */
-		dest = malloc(sizeof(ZVALUE));
+		dest = calloc(1, sizeof(ZVALUE));
 		if (dest == NULL) {
 			math_error("swap_HALF_in_ZVALUE: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -575,7 +620,7 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  * swap_HALF_in_NUMBER - swap HALFs in a NUMBER
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -601,7 +646,7 @@ swap_HALF_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 		dest = malloc(sizeof(NUMBER));
 		if (dest == NULL) {
 			math_error("swap_HALF_in_NUMBER: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -639,7 +684,7 @@ swap_HALF_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  * swap_HALF_in_COMPLEX - swap HALFs in a COMPLEX
  *
  * given:
- *	dest	- pointer to where the swapped src wil be put or
+ *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
@@ -665,7 +710,7 @@ swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 		dest = malloc(sizeof(COMPLEX));
 		if (dest == NULL) {
 			math_error("swap_HALF_in_COMPLEX: Not enough memory");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*

byteswap.h

@@ -1,7 +1,7 @@
 /*
  * byteswap - byte swapping macros
  *
- * Copyright (C) 1999,2014  Landon Curt Noll
+ * Copyright (C) 1999,2014,2021  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
@@ -39,7 +39,7 @@
 /*
  * SWAP_B8_IN_B16 - swap 8 bits in 16 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 16 bit value to swap
  *
  * This macro will either switch to the opposite byte sex (Big Endian vs.
@@ -53,7 +53,7 @@
 /*
  * SWAP_B16_IN_B32 - swap 16 bits in 32 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 32 bit value to swap
  */
 #define SWAP_B16_IN_B32(dest, src) (					\
@@ -64,7 +64,7 @@
 /*
  * SWAP_B8_IN_B32 - swap 8 & 16 bits in 32 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 32 bit value to swap
  *
  * This macro will either switch to the opposite byte sex (Big Endian vs.
@@ -82,7 +82,7 @@
 /*
  * SWAP_B32_IN_B64 - swap 32 bits in 64 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  */
 #define SWAP_B32_IN_B64(dest, src) (					\
@@ -93,7 +93,7 @@
 /*
  * SWAP_B16_IN_B64 - swap 16 & 32 bits in 64 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  */
 #define SWAP_B16_IN_B64(dest, src) (					\
@@ -106,7 +106,7 @@
 /*
  * SWAP_B8_IN_B64 - swap 16 & 32 bits in 64 bits
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  *
  * This macro will either switch to the opposite byte sex (Big Endian vs.
@@ -124,7 +124,7 @@
 /*
  * SWAP_B32_IN_B64 - swap 32 bits in 64 bits (simulated by 2 32 bit values)
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  */
 #define SWAP_B32_IN_B64(dest, src) (					\
@@ -135,7 +135,7 @@
 /*
  * SWAP_B16_IN_B64 - swap 16 & 32 bits in 64 bits (simulated by 2 32 bit vals)
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  */
 #define SWAP_B16_IN_B64(dest, src) (					\
@@ -146,7 +146,7 @@
 /*
  * SWAP_B8_IN_B64 - swap 16 & 32 bits in 64 bits (simulated by 2 32 bit vals)
  *
- *	dest	- pointer to where the swapped src wil be put
+ *	dest	- pointer to where the swapped src will be put
  *	src	- pointer to a 64 bit value to swap
  *
  * This macro will either switch to the opposite byte sex (Big Endian vs.

cal/Makefile

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999-2006,2017,2021  Landon Curt Noll
+# Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
 # SRC: cal/Makefile
 #
@@ -44,18 +44,23 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
+# On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/zsh
+#	SHELL= sh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= bash
+#SHELL= sh
+#if 0	/* start of skip for non-Gnu makefiles */
+#
+ifeq ($(target),Darwin)
+SHELL:= /bin/sh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 ####
@@ -102,15 +107,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:
@@ -220,10 +216,10 @@ T=
 # H=@:	do not report hsrc file formation progress
 # H=@	do echo hsrc file formation progress
 #
-# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S= >/dev/null 2>&1	silence ${CC} output during hsrc file formation
 # S=			full ${CC} output during hsrc file formation
 #
-# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E= 2>/dev/null	silence command stderr during hsrc file formation
 # E=			full command stderr during hsrc file formation
 #
 # V=@:	do not echo debug statements (quiet mode)
@@ -272,20 +268,21 @@ TRUE= true
 #
 CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
 	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \
-	constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \
-	factorial2.cal gvec.cal hello.cal hms.cal infinities.cal intfile.cal \
-	intnum.cal lambertw.cal linear.cal lnseries.cal lucas.cal \
-	lucas_chk.cal mersenne.cal mfactor.cal mod.cal natnumset.cal \
-	palindrome.cal pell.cal pi.cal pix.cal pollard.cal poly.cal prompt.cal \
-	psqrt.cal qtime.cal quat.cal randbitrun.cal randmprime.cal \
-	randombitrun.cal randomrun.cal randrun.cal regress.cal repeat.cal \
-	screen.cal seedrandom.cal set8700.cal set8700.line smallfactors.cal \
-	solve.cal specialfunctions.cal statistics.cal strings.cal sumsq.cal \
-	sumtimes.cal surd.cal test1700.cal test2300.cal test2600.cal \
-	test2700.cal test3100.cal test3300.cal test3400.cal test3500.cal \
-	test4000.cal test4100.cal test4600.cal test5100.cal test5200.cal \
-	test8400.cal test8500.cal test8600.cal test8900.cal toomcook.cal \
-	unitfrac.cal varargs.cal xx_print.cal zeta2.cal
+	comma.cal constants.cal deg.cal dms.cal dotest.cal ellip.cal \
+	factorial.cal factorial2.cal fnv_tool.cal gvec.cal hello.cal hms.cal \
+	infinities.cal intfile.cal intnum.cal lambertw.cal linear.cal \
+	lnseries.cal lucas.cal lucas_chk.cal mersenne.cal mfactor.cal mod.cal \
+	natnumset.cal palindrome.cal pell.cal pi.cal pix.cal pollard.cal \
+	poly.cal prompt.cal psqrt.cal qtime.cal quat.cal randbitrun.cal \
+	randmprime.cal randombitrun.cal randomrun.cal randrun.cal regress.cal \
+	repeat.cal screen.cal seedrandom.cal set8700.cal set8700.line \
+	smallfactors.cal solve.cal specialfunctions.cal splitbits.cal \
+	statistics.cal strings.cal sumsq.cal sumtimes.cal surd.cal \
+	test1700.cal test2300.cal test2600.cal test2700.cal test3100.cal \
+	test3300.cal test3400.cal test3500.cal test4000.cal test4100.cal \
+	test4600.cal test5100.cal test5200.cal test8400.cal test8500.cal \
+	test8600.cal test8900.cal toomcook.cal unitfrac.cal varargs.cal \
+	xx_print.cal zeta2.cal
 
 # These calc files are now obsolete and are removed by the install rule.
 #
@@ -298,6 +295,10 @@ DISTLIST= ${CALC_FILES} ${MAKE_FILE}
 # These files are used to make (but not built) a calc .a link library
 #
 CALCLIBLIST=
+#
+# rules that are not also names of files
+#
+PHONY= all clobber distlist install
 
 all: ${CALC_FILES} ${MAKE_FILE} .all
 
@@ -307,6 +308,8 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 	${RM} -f .all
 	${TOUCH} .all
 
+.PHONY: ${PHONY}
+
 ##
 #
 # File list generation.	 You can ignore this section.

cal/README

@@ -263,6 +263,64 @@ chrem.cal
     Chinese remainder theorem/problem solver.
 
 
+comma.cal
+
+    Convert numbers into strings with 3-digit group and integer-fraction
+    separators.
+
+    If the value is an integer, the integer-fraction separator is not used.
+
+    str_comma(x, [group, [decimal]])
+
+	Convert x into a string.
+
+	If group is given and is a string, group will be used as
+	the 3-digit group separator, otherwise the default 3-digit
+	group separator will be used.
+
+	If decimal is given and is a string, group will be used as
+	the integer-fraction separator, otherwise the default
+	integer-fraction separator will be used.
+
+	The decimal and group arguments are optional.
+
+    set_default_group_separator(group)
+
+	Change the default 3-digit group separator if group is a string,
+	otherwise the default 3-digit group separator will not be
+	changed.  Return the old 3-digit group separator.
+
+    set_default_decimal_separator(decimal)
+
+	Change the default 3-digit group separator if decimal is a
+	string, otherwise the default integer-fraction separator
+	will not be changed.  Return the old integer-fraction separator.
+
+    print_comma(x, [group, [decimal]])
+
+	Print the value produced by str_comma(x, [group, [decimal]])
+	followed by a newline.
+
+	If the str_comma() does not return a string, nothing is printed.
+
+	The decimal and group arguments are optional.
+
+	The value produced by str_comma() is returned.
+
+    fprint_comma(fd, x, [group, [decimal]])
+
+	Print the value produced by str_comma(x, [group, [decimal]]),
+	without a trailing newline, on file fd.
+
+	If the str_comma() does not return a string, nothing is printed.
+
+	If fd is not an open file, nothing is printed.
+
+	The decimal and group arguments are optional.
+
+	The value produced by str_comma() is returned.
+
+
 deg.cal
 
     deg(deg, min, sec)
@@ -330,6 +388,13 @@ dotest.cal
 	dotest("set8700.line");
 
 
+ellip.cal
+
+    efactor(iN, ia, B, force)
+
+    Attempt to factor using the elliptic functions: y^2 = x^3 + a*x + b.
+
+
 factorial.cal
 
     factorial(n)
@@ -490,12 +555,65 @@ factorial2.cal
     for information on falling factorials.
 
 
-ellip.cal
+fnv_util.cal
 
-    efactor(iN, ia, B, force)
+    Utility tools for FNV hash and "FNV-style" hash operations.
 
-    Attempt to factor using the elliptic functions: y^2 = x^3 + a*x + b.
+    These functions, if given non-standard values, will produce bogus results.
+    In some cases, such as specifying the number of bits in the hash,
+    using a non-power of 2 bit will produce a result that may work,
+    but the hash will be only an "FNV-style" hash and not a true FNV hash.
 
+    find_fnv_prime(bits)
+
+	If bits == null(), this function will attempt to prompt stdin
+	for a value and provide commends on the value of bits.
+
+	given:
+	    bits	number of bits in the hash, null() ==> prompt for value
+
+	returns:
+	    0 ==> no FNV prime found
+	    >0 ==> FNV prime
+
+    deprecated_fnv0(bits, fnv_prime, string)
+
+	If fnv_prime == null(), this function will try to compute the FNV prime
+	for a hash of size bits.
+
+	given:
+	    bits	number of bits in FNV hash
+	    fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+	    string	string to hash
+
+	returns:
+	    FNV-0 hash, for size bytes, of string
+
+	NOTE: This function does NOT attempt to determine that fnv_prime is prime.
+
+    fnv_offset_basis(bits, fnv_prime)
+
+	given:
+	    bits	number of bits in FNV hash
+	    fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+
+	returns:
+	    FNV offset basis for a hash size of bits and an FNV prime of fnv_prime
+
+	NOTE: This function does NOT attempt to determine that fnv_prime is prime.
+
+    fnv1a_style_hash(bits, fnv_prime, prev_hash, string)
+
+	given:
+	    bits	number of bits in FNV hash
+	    fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+	    prev_hash	previous hash value, null() ==> generate FNV offset basis
+	    string	string to hash
+
+	returns:
+	    "FNV-style" hash of bits
+
+	NOTE: This function does NOT attempt to determine that fnv_prime is prime.
 
 gvec.cal
 
@@ -892,7 +1010,7 @@ palindrome.cal
     nextprimepal(val)
     prevprimepal(val)
 
-    Functions to form and manipulate palendromes in base 10.
+    Functions to form and manipulate palindromes in base 10.
 
     Important functions are:
 
@@ -932,7 +1050,7 @@ pi.cal
     as your free memory space and system up time allows.
 
     The piforever() function (written by Klaus Alexander Seistrup
-    <klaus@seistrup.dk>) was inspired by an algorithm conceived by
+    <klaus at seistrup dot 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.
 
@@ -1375,6 +1493,60 @@ specialfunctions.cal
     on the script zeta2.cal.
 
 
+splitbits.cal
+
+    splitbits(x, b)
+
+    Given an integer x, split the value into a list of integers,
+    each of which is at most b bits long.
+
+    The value b must be an integer > 0.
+
+    The number of elements in the returned list is:
+
+	ceil((highbit(x) + 1) / b)
+
+    If x == 0, then a list of 1 element containing 0 is returned.
+
+    If x < 0, then the two's compliment of abs(x) is returned.
+    Even though calc represents negative integers as positive values
+    with sign bit, the bits returned by this function are as if
+    the integer converted as if the integer was a two's compliment
+    value.  For example:
+
+	; L = splitbits(-1, 8);
+	; print L[[0]]
+	255
+
+	; L = splitbits(-2, 8);
+	; print L[[0]]
+	254
+
+	; L = splitbits(-3, 8);
+	; print L[[0]]
+	253
+
+    The first element of the list contains the lowest order bits
+    of x.  The last element of the list contains the highest number
+    bits of x.
+
+    For example:
+
+	; x = 2^23209-1
+	; L = splitbits(x, 16);
+	; print size(L), L[[0]]
+
+	; print istype(2, 3i), istype(2, "2"), istype(2, null())
+	0 0 0
+
+	; mat a[2]
+	; b = list(1,2,3)
+	; c = assoc()
+	; obj chongo {was, here} d;
+	; print istype(a,b), istype(b,c), istype(c,d)
+	0 0 0
+
+
 statistics.cal
 
     gammaincoctave(z,a)

cal/comma.cal

@@ -0,0 +1,437 @@
+/*
+ * comma - convert numbers into strings with 3-digit group and integer-fraction separators
+ *
+ * Convert numbers into strings with 3-digit group and integer-fraction separators.
+ *
+ * If the value is an integer, the integer-fraction separator is not used.
+ *
+ * str_comma(x, [group, [decimal]])
+ *
+ *	Convert x into a string.
+ *
+ *	If group is given and is a string, group will be used as
+ *	the 3-digit group separator, otherwise the default 3-digit
+ *	group separator will be used.
+ *
+ *	If decimal is given and is a string, group will be used as
+ *	the integer-fraction separator, otherwise the default
+ *	integer-fraction separator will be used.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ * set_default_group_separator(group)
+ *
+ *	Change the default 3-digit group separator if group is a string,
+ *	otherwise the default 3-digit group separator will not be
+ *	changed.  Return the old 3-digit group separator.
+ *
+ * set_default_decimal_separator(decimal)
+ *
+ *	Change the default 3-digit group separator if decimal is a
+ *	string, otherwise the default integer-fraction separator
+ *	will not be changed.  Return the old integer-fraction separator.
+ *
+ * print_comma(x, [group, [decimal]])
+ *
+ *	Print the value produced by str_comma(x, [group, [decimal]])
+ *	followed by a newline.
+ *
+ *	If the str_comma() does not return a string, nothing is printed.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ *	The value produced by str_comma() is returned.
+ *
+ * fprint_comma(fd, x, [group, [decimal]])
+ *
+ *	Print the value produced by str_comma(x, [group, [decimal]]),
+ *	without a trailing newline, on file fd.
+ *
+ *	If the str_comma() does not return a string, nothing is printed.
+ *
+ *	If fd is not an open file, nothing is printed.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ *	The value produced by str_comma() is returned.
+ *
+ * Copyright (C) 2022  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:   2022/06/20 15:51:49
+ * File existed as early as:    2022
+ *
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+static default_group_separator = ",";	/* default 3-digit group separator */
+static default_decimal_separator = ".";	/* default integer-fraction separator */
+
+
+/*
+ * str_comma - convert number into base 10 string with 3-digit groups and integer-fraction separator
+ *
+ *
+ * This function converts a real number into a base 10 string, where
+ * groups of 3 digits are separated by a 3-digit group separator and
+ * a integer-fraction separator is printed between integer and decimal fraction.
+ *
+ * For example:
+ *
+ *	string = str_comma(x);
+ *	string = str_comma(x), " ", ".");
+ *	string = str_comma(x), ".", ",");
+ *
+ * Internally the function calls:
+ *
+ *     strprintf("%f", x);
+ *
+ * and thus the number of decimal fraction digits is subject to
+ * the display() or config("display") value.  See:
+ *
+ *     man display
+ *
+ * for details.
+ *
+ * given:
+ *
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and decimal separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define str_comma(x, group, decimal)
+{
+    local group_separator;	/* 3-digit group separator */
+    local decimal_separator;	/* separator between decimal integer and decimal fraction */
+    local sign_str;		/* leading - if x < 0 or empty if x >= 0 */
+    local integer;		/* integer part of absolute value of x */
+    local int_str;		/* integer as a string */
+    local int_len;		/* number of digits in int_str */
+    local first_group_len;	/* length of 1st group before the 1st 3-digit group separator */
+    local fraction;		/* factional part of absolute value of x */
+    local frac_str;		/* fraction as a string */
+    local frac_len;		/* number of digits in frac_str including leading 0. */
+    local ret;			/* string to return */
+    local config_leadzero;	/* config("leadzero") to restore */
+    local config_tilde;		/* config("tilde") to restore */
+    local i;
+
+    /*
+     * parse args - return null if args are bogus
+     *
+     * Return null() if args or conditions are bogus.
+     */
+    if (!isreal(x)) {
+	return null();
+    }
+    group_separator = isnull(group) ? default_group_separator : group;
+    decimal_separator = isnull(decimal) ? default_decimal_separator : decimal;
+    if (!isstr(group_separator)) {
+	return null();
+    }
+    if (!isstr(decimal_separator)) {
+	return null();
+    }
+
+    /*
+     * split number
+     */
+    if (x < 0) {
+	sign_str = "-";
+	integer = int(-x);
+	fraction = frac(-x);
+    } else {
+	sign_str = "";
+	integer = int(x);
+	fraction = frac(x);
+    }
+    ret = sign_str;
+
+    /*
+     * convert digits
+     *
+     * Avoid printing ~ and leading zeros for factional part.
+     */
+    int_str = strprintf("%d", integer);
+    config_leadzero = config("leadzero", 0);
+    config_tilde = config("tilde", 0);
+    frac_str = strprintf("%d", fraction);
+    config("leadzero", config_leadzero),;
+    config("tilde", config_tilde),;
+
+    /*
+     * determine number of digits in the integer part
+     */
+    int_len = strlen(int_str);
+    frac_len = strlen(frac_str);
+
+    /*
+     * form integer part with group separators as needed
+     */
+
+    /*
+     * case: integer is 3 or fewer digits
+     */
+    if (integer < 1000) {
+	ret += int_str;
+
+    /*
+     * case: integer is 4 or more digits
+     */
+    } else {
+
+	/*
+	 * form a decimal string using group separators
+	 */
+
+	/*
+	 * form the initial leading digits before 1st group separator
+	 */
+	first_group_len = int_len % 3;
+	if (first_group_len == 0) {
+	    first_group_len = 3;
+	}
+	ret += substr(int_str, 1, first_group_len);
+
+	/*
+	 * until end of digits, print group separator followed by 3 more digits
+	 */
+	for (i = first_group_len+1; i < int_len; i += 3) {
+	    ret += group_separator + substr(int_str, i, 3);
+	}
+    }
+
+    /*
+     * form fractional part using decimal separator as needed
+     */
+
+    /*
+     * case: x is an integer
+     */
+    if (fraction == 0) {
+
+	/* no fraction, nothing more to do */
+
+    /*
+     * case: x is not an integer
+     */
+    } else {
+
+	/*
+	 * add integer-fraction separator
+	 */
+	ret += decimal_separator;
+
+	/*
+	 * add remaining digits
+	 *
+	 * Skip over the leading 0. in frac_str
+	 */
+	ret += substr(frac_str, 2, frac_len-1);
+    }
+
+    /*
+     * All Done!!! -- Jessica Noll, Age 2
+     */
+    return ret;
+}
+
+
+/*
+ * set_default_group_separator - change the default 3-digit group separator
+ *
+ * If group is not a string, then the default 3-digit group separator
+ * is not changed.  Thus, this will only return the default 3-digit group separator:
+ *
+ *	set_default_group_separator(null());
+ *
+ * given:
+ *
+ *	group		3-digit group separator
+ *
+ * returns:
+ *
+ *	previous 3-digit group separator value
+ */
+define set_default_group_separator(group)
+{
+    local old_default_group_separator;		/* previous default 3-digit group separator to return */
+
+    /*
+     * save current 3-digit group separator
+     */
+    old_default_group_separator = default_group_separator;
+
+    /*
+     * change 3-digit group separator if group is a string
+     */
+    if (isstr(group)) {
+	default_group_separator = group;
+    }
+    return old_default_group_separator;
+}
+
+
+/*
+ * set_default_decimal_separator - change the default integer-fraction separator
+ *
+ * If decimal is not a string, then the default integer-fraction separator
+ * is not changed.  Thus, this will only return the integer-fraction separator:
+ *
+ *	set_default_decimal_separator(null());
+ *
+ * given:
+ *
+ *	decimal		separator between decimal integer and decimal fraction (def: ".")
+ *
+ * returns:
+ *
+ *	previous integer-fraction separator value
+ */
+define set_default_decimal_separator(decimal)
+{
+    local old_default_decimal_separator;	/* previous default integer-fraction separator */
+
+    /*
+     * save current integer-fraction separator
+     */
+    old_default_decimal_separator = default_decimal_separator;
+
+    /*
+     * change 3-digit decimal integer-fraction if decimal is a string
+     */
+    if (isstr(decimal)) {
+	default_decimal_separator = decimal;
+    }
+    return old_default_decimal_separator;
+}
+
+
+/*
+ * print_comma - print base 10 string with 3-digit group separators & integer-fraction separator + newline
+ *
+ * This function prints the result of str_comma(x, group, decimal) followed by a newline.
+ * For example:
+ *
+ *	print_comma(x);
+ *	print_comma(x), " ", ".");
+ *	print_comma(x), ".", ",");
+ *
+ * If str_comma() does not return a string, this function prints nothing.
+ *
+ * NOTE: To print without a newline, use fprint_comma(fd, x, group, decimal).
+ *
+ * given:
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and decimal separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define print_comma(x, group, decimal)
+{
+    local ret;		/* base 10 string with 3-digit group and integer-fraction separators */
+
+    /*
+     * convert to string
+     */
+    ret = str_comma(x, group, decimal);
+
+    /*
+     * print converted string
+     */
+    if (isstr(ret)) {
+	printf("%s\n", ret);
+    }
+    return ret;
+}
+
+
+/*
+ * fprint_comma - print base 10 string with 3-digit group separators & integer-fraction separator w/o newline
+ *
+ * This function prints the result of str_comma(x, group, decimal) on an open file, without a trailing newline.
+ * For example:
+ *
+ *	fprint_comma(files(1), x);
+ *	fprint_comma(fd, x), " ", ".");
+ *	fprint_comma(files(2), x), ".", ",");
+ *
+ * If str_comma() does not return a string, this function prints nothing.
+ *
+ * This function flushes output to the open file before returning.
+ *
+ * NOTE: To print with a newline, use print_comma(x, group, decimal).
+ *
+ * given:
+ *	fd		open file
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and integer-fraction separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define fprint_comma(fd, x, group, decimal)
+{
+    local ret;		/* base 10 string with 3-digit group and integer-fraction separators */
+
+    /*
+     * convert to string
+     */
+    ret = str_comma(x, group, decimal);
+
+    /*
+     * print converted string
+     */
+    if (isstr(ret) && isfile(fd)) {
+	fprintf(fd, "%s", ret);
+	fflush(fd);
+    }
+    return ret;
+}

cal/dotest.cal

@@ -4,19 +4,37 @@
  * This file was created by Ernest Bowen <ebowen at une dot edu dot au>
  * and modified by Landon Curt Noll.
  *
- * This dotest_code has been placed in the public domain.  Please do not
- * copyright this dotest_code.
- *
- * ERNEST BOWEN AND LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS         SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL         LANDON  CURT
- * NOLL	 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM  LOSS  OF
- * USE,	 DATA  OR  PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  *
  * Under source dotest_code control:	2006/03/08 05:54:09
  * File existed as early as:	2006

cal/fnv_tool.cal

@@ -0,0 +1,474 @@
+/*
+ * fnv_util - utility tools for FNV hash and "FNV-style" hash operations
+ *
+ * This file provides the following functions:
+ *
+ *	find_fnv_prime(bits)
+ *	deprecated_fnv0(bits, fnv_prime, string)
+ *	fnv_offset_basis(bits, fnv_prime)
+ *	fnv1a_style_hash(bits, fnv_prime, prev_hash, string)
+ *
+ * See the individual function for details on args and return value.
+ *
+ * If no args are given to find_fnv_prime() and stdin is associated
+ * with a tty (i.e., an interactive terminal), then bits will be
+ * prompted for and commentary will be printed to stdout as well.
+ *
+ * If fnv_prime == null(), then an attempt to compute the FNV prime
+ * for a hash if size bits is attempted..
+ *
+ * If prev_hash == null(), then the FNV offset basis for
+ * for a hash if size bits is computed.
+ *
+ * For more information on the FNV hash see:
+ *
+ *	https://en.wikipedia.org/wiki/Fowler-Noll-Vo_hash_function
+ *	http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * IMPORTANT NOTE:
+ *
+ * These functions, if given non-standard values, will produce bogus results.
+ * In some cases, such as specifying the number of bits in the hash,
+ * using a non-power of 2 bit will produce a result that may work,
+ * but the hash will be only an "FNV-style" hash and not a true FNV hash.
+ *
+ * We say "FNV-style" because the result hash is not a "true FNV-like" hash.
+ *
+ * Let integer n > 0 be the number if bits in the FNV hash.  Then:
+ *
+ *	t = floor((5+n)/12)
+ *
+ * The FNV prime, for the given n bits is the smallest prime of the form:
+ *
+ *	p = 256^t + 2^8 + b
+ *
+ * such that:
+ *
+ *	0 < b < 2^8
+ *	The number of one-bits in b must be 4 or 5
+ *	p mod (2^40 - 2^24 - 1) > (2^24 + 2^8 + 2^7)
+ *
+ * If you force n to not be a power of 2, for example:
+ *
+ *	n = 44
+ *
+ * you will find that the FNV prime for 44 bits is:
+ *
+ *	p44 = 4294967597
+ *	    = 0x10000012d
+ *	    = 0b100000000000000000000000100101101
+ *	    = 2^32 + 301 = 2^32 + 2^8 + 2^5 + 2^3 + 2^2 + 2^0
+ *
+ * However a hash size of 44 bits is not a true FNV hash, it is only a "FNV-style" hash.
+ *
+ * NOTE: We disallow n <= 31 because there are no FNV primes that small.
+ *
+ * NOTE: For n that is a power of 2 and n > 1024, you will find that
+ *	 that FNV primes become so rare that that one may not find a suitable
+ *	 FNV prime.  For n = 2048, 4096, 8192, 16384, 32768, 65536, 131072
+ *	 262144, and 524288, there is NO suitable FNV prime.
+ *
+ *	 As for as hashing goes, large values of n, even if an
+ *	 FNV hash may be found, are unlikely to be truly useful.  :-)
+ */
+/*
+ * Copyright (c) 2023 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *       supporting documentation
+ *       source copies
+ *       source works derived from this source
+ *       binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo (Landon Curt Noll, http://www.isthe.com/chongo/index.html) /\oo/\
+ *
+ * Share and enjoy! :-)
+ */
+
+
+/*
+ * find_fnv_prime - try to find a FNV prime given the number of bits
+ *
+ * If bits == null(), this function will attempt to prompt stdin
+ * for a value and provide commends on the value of bits.
+ *
+ * given:
+ *	bits	number of bits in the hash, null() ==> prompt for value
+ *
+ * returns:
+ *	0 ==> no FNV prime found
+ *	>0 ==> FNV prime
+ */
+define find_fnv_prime(bits)
+{
+    local b;		/* lower octet of the potential FNV prime: [1,255] */
+    local p;		/* value to test as an FNV prime */
+    local t;		/* power of 256 part of the FNV prime */
+    local one_bits;	/* number of 1 bits in b */
+    local p_minus_b;	/* potential FNV prime less b */
+    local interactive;	/* true ==> interactive mode and print commentary */
+
+    /*
+     * case: no arg, prompt for bits and print commentary
+     */
+    interactive = 0;	/* assume non-interactive mode */
+    if (isnull(bits)) {
+
+	/*
+	 * must be attached to an interactive terminal
+	 */
+	if (!isatty(files(0))) {
+	    print "# FATAL: stdin is not a tty: not attached to an interactive terminal";
+	    return 0;
+	}
+	interactive = 1;	/* set interactive mode */
+
+	/*
+	 * prompt for the number of bits
+	 */
+	do {
+	    local strscanf_ret;		/* return from strscanf_ret */
+	    local input;		/* value read after prompt */
+
+	    /*
+	     * prompt and obtain the input
+	     */
+	    input = prompt("Enter hash size in bits: ");
+	    strscanf_ret = strscanf(input, "%i", bits);
+	    print "input =", input;
+	    print "bits =", bits;
+	    if (!isint(bits) || bits <= 0) {
+		print;
+		print "# NOTE: must enter a integer > 0, try again";
+		print;
+	    }
+	} while (!isint(bits) || bits <= 0);
+    }
+
+    /*
+     * firewall - bits must be non-negative integer
+     */
+    if (!isint(bits) || bits < 0) {
+	if (interactive) {
+	    print "# FATAL: bits must be non-negative integer";
+	}
+	return 0;
+    }
+
+    /*
+     * provide commentary on the choice of bits if we are interactive
+     */
+    if (interactive) {
+	if (popcnt(bits) == 1) {
+	    if (bits > 1024) {
+		print "# WARNING: FNV primes for powers of 2  > 1024 are extremely rare.";
+		print "# WARNING: There are no FNV primes for 2048, 4096, 8192, 16384, 327678, 65536, 131072, 262144, nor 524288.";
+	    }
+	    print "# NOTE: bits a power of 2 and bits >= 32: bits is suitable for a true FNV hash";
+	    print "n =", bits;
+	} else {
+	    if (bits < 32) {
+		print "# WARNING: bits < 32 is not recommended because there isn't enough bits to be worth hashing";
+	    }
+	    print "# WARNING: because bits is not a power of 2, we can only form an \"FNV-style hash\": not a true FNV hash.";
+	    print "# WARNING: A \"FNV-style hash\" may not have the desired hash properties of a true FNV hash.";
+	    print "n =", bits;
+	}
+    }
+
+    /*
+     * search setup
+     */
+    t = floor((5+bits)/12);
+    p_minus_b = 256^t + 2^8;
+
+    /*
+     * search for a b that forms a suitable FNV prime
+     */
+    for (b=1; b < 256; ++b) {
+
+	/*
+	 * reject b unless the of one-bits in bottom octet of p is 4 or 5
+	 */
+	one_bits = popcnt(b);
+	if (one_bits != 4 && one_bits != 5) {
+	    continue;
+	}
+
+	/*
+	 * reject p if p mod (2^40 - 2^24 - 1) <= (2^24 + 2^8 + 2^7)
+	 */
+	p = p_minus_b + b;
+	if ((p % (2^40 - 2^24 - 1)) <= (2^24 + 2^8 + 2^7)) {
+	    continue;
+	}
+
+	/*
+	 * accept potential p value that is prime
+	 */
+	if (ptest(p) == 1) {
+	    return p;
+	}
+    }
+
+    /*
+     * case: did not find an FNV prime
+     */
+    if (b >= 256) {
+
+	/*
+	 * examine results if interactive
+	 */
+	if (interactive) {
+	    print "# FATAL: There is no a suitable FNV prime for bits =", bits;
+	    quit "find_fnv_prime: FATAL: FNV prime search failed";
+	}
+
+	/*
+	 * return 0 to indicate no FNV prime found
+	 */
+	return 0;
+    }
+
+    /*
+     * provide FNV commentary if interactive
+     */
+    if (interactive) {
+	print "t =", t;
+	print "b =", b;
+	print "# NOTE: p = 256^":t, "+ 2^8 +", b;
+	print;
+	print "p =", p;
+    }
+
+    /*
+     * return FNV prime
+     */
+    return p;
+}
+
+
+/*
+ * deprecated_fnv0 - FNV-0 hash that should only be used to generate an FNV offset basis
+ *
+ * If fnv_prime == null(), this function will try to compute the FNV prime
+ * for a hash of size bits.
+ *
+ * given:
+ *	bits		number of bits in FNV hash
+ *	fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+ *	string		string to hash
+ *
+ * returns:
+ *	FNV-0 hash, for size bytes, of string
+ *
+ * NOTE: This function does NOT attempt to determine that fnv_prime is prime.
+ */
+define deprecated_fnv0(bits, fnv_prime, string)
+{
+    local hash;		/* FNV hash value */
+    local len;		/* length of string */
+    local base;		/* base of FNV hash: 2^bits */
+    local i;
+
+    /*
+     * firewall
+     */
+    if (!isint(bits) || bits <= 0) {
+	quit "deprecated_fnv0: FATAL: bits arg must be an integer > 0";
+    }
+    if (!isstr(string)) {
+	quit "deprecated_fnv0: FATAL: string arg must be a string";
+    }
+
+    /*
+     * fnv_prime == null() means to try and generate the FNV prime
+     */
+    if (isnull(fnv_prime)) {
+	/* try to generate an FNV prime */
+	fnv_prime = find_fnv_prime(bits);
+	if (fnv_prime == 0) {
+	    quit "deprecated_fnv0: FATAL: no FNV prime exists for the given hash size in bits";
+	}
+    }
+    if (!isint(fnv_prime) || fnv_prime <= 0) {
+	quit "deprecated_fnv0: FATAL: fnv_prime arg must be an integer > 0 and should be prime";
+    }
+
+    /*
+     * FNV-0 hash each character
+     */
+    len = strlen(string);
+    base = 2^bits;
+    hash = 0;
+    for (i=0; i < len; ++i) {
+	hash = xor((hash * fnv_prime) % base, ord(string[i]));
+    }
+    return hash;
+}
+
+
+/*
+ * fnv_offset_basis - generate and FNV offset basis
+ *
+ * given:
+ *	bits		number of bits in FNV hash
+ *	fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+ *
+ * returns:
+ *	FNV offset basis for a hash size of bits and an FNV prime of fnv_prime
+ *
+ * NOTE: This function does NOT attempt to determine that fnv_prime is prime.
+ */
+define
+fnv_offset_basis(bits, fnv_prime)
+{
+    local fnv0_hash = 0;	/* FNV-0 hash value */
+
+    /* string to generate a FNV offset basis - do not change this value */
+    static chongo_was_here = "chongo <Landon Curt Noll> /\\../\\";
+
+    /*
+     * firewall
+     */
+    if (!isint(bits) || bits <= 0) {
+	quit "fnv_offset_basis: FATAL: bits arg must be an integer > 0";
+    }
+
+    /*
+     * fnv_prime == null() means to try and generate the FNV prime
+     */
+    if (isnull(fnv_prime)) {
+	/* try to generate an FNV prime */
+	fnv_prime = find_fnv_prime(bits);
+	if (fnv_prime == 0) {
+	    quit "fnv_offset_basis: FATAL: no FNV prime exists for the given hash size in bits";
+	}
+    }
+    if (!isint(fnv_prime) || fnv_prime <= 0) {
+	quit "fnv_offset_basis: FATAL: fnv_prime arg must be an integer > 0 and should be prime";
+    }
+
+    /*
+     * return the FNV-0 hash of fnv_offset_basis as the FNV offset basis
+     */
+    fnv0_hash = deprecated_fnv0(bits, fnv_prime, chongo_was_here);
+    return fnv0_hash;
+}
+
+
+/*
+ * fnv_style_hash - compute an "FNV-1a-style" hash
+ *
+ * These functions, if given non-standard values, will produce bogus results.
+ * To produce a true FNV-1a hash:
+ *
+ *	bits must be a power of 2
+ *	32 <= bits
+ *	fnv_prime == find_fnv_prime(bits) OR fnv_prime == null()
+ *	prev_hash == previous FNV hash OR prev_hash == null()
+ *
+ * If fnv_prime == null(), this function will try to compute the FNV prime
+ * for a hash of size bits.
+ *
+ * If prev_hash == null(), this function will try to compute the FNV offset basis
+ * for a hash of size bits.
+ *
+ * One may chain "FNV-style" hashes by replacing the offset_basis with
+ * the hash state of the previous hash.  For the first hash:
+ *
+ *	fnv_prime = find_fnv_prime(bits)
+ *	hash_val = fnv_style_hash(bits, fnv_prime, null(), string_a);
+ *
+ * then:
+ *
+ *	hash_val = fnv_style_hash(bits, fnv_prime, hash_val, string_b);
+ *
+ * This will produce the same as the string_a concatenated with string_b:
+ *
+ *	hash_val = fnv_style_hash(bits, null(), null(), string_a + string_b);
+ *
+ * NOTE: Because string_a and string_b are strings, the expression:
+ *
+ *	    string_a + string_b
+ *
+ *	is string_a concatenated with string_b.
+ *
+ * given:
+ *	bits		number of bits in FNV hash
+ *	fnv_prime	FNV prime, null() ==> generate suitable FNV prime if possible
+ *	prev_hash	previous hash value, null() ==> generate FNV offset basis
+ *	string		string to hash
+ *
+ * returns:
+ *	"FNV-style" hash of bits
+ *
+ * NOTE: This function does NOT attempt to determine that fnv_prime is prime.
+ */
+define
+fnv1a_style_hash(bits, fnv_prime, prev_hash, string)
+{
+    local hash = 0;	/* FNV hash value */
+    local len;		/* length of string */
+    local base;		/* base of FNV hash: 2^bits */
+    local i;
+
+    /*
+     * firewall
+     */
+    if (!isint(bits) || bits <= 0) {
+	quit "fnv1a_style_hash: FATAL: bits arg must be an integer > 0";
+    }
+    if (!isstr(string)) {
+	quit "fnv1a_style_hash: FATAL: string arg must be a string";
+    }
+
+    /*
+     * fnv_prime == null() means to try and generate the FNV prime
+     */
+    if (isnull(fnv_prime)) {
+	/* try to generate an FNV prime */
+	fnv_prime = find_fnv_prime(bits);
+	if (fnv_prime == 0) {
+	    quit "fnv1a_style_hash: FATAL: no FNV prime exists for the given hash size in bits";
+	}
+    }
+    if (!isint(fnv_prime) || fnv_prime <= 0) {
+	quit "fnv1a_style_hash: FATAL: fnv_prime arg must be an integer > 0 and should be prime";
+    }
+
+    /*
+     * prev_hash == null() means to generate the FNV offset basis
+     */
+    if (isnull(prev_hash)) {
+
+	/* generate the FNV offset basis for a hash of size bits */
+	prev_hash = fnv_offset_basis(bits, fnv_prime);
+    }
+    if (!isint(prev_hash) || prev_hash < 0) {
+	quit "fnv1a_style_hash: FATAL: prev_hash arg must be an integer => 0";
+    }
+
+    /*
+     * FNV-1a hash each character
+     */
+    len = strlen(string);
+    base = 2^bits;
+    hash = prev_hash;
+    for (i=0; i < len; ++i) {
+	hash = xor((hash * fnv_prime) % base, ord(string[i]));
+    }
+    return hash;
+}

cal/pi.cal

@@ -1,7 +1,7 @@
 /*
  * pi - various routines to calculate pi
  *
- * Copyright (C) 1999-2004  David I. Bell
+ * Copyright (C) 1999-2004,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -74,7 +74,7 @@ define qpi(epsilon)
 /*
  * Print digits of PI forever, neatly formatted, using calc.
  *
- * Written by Klaus Alexander Seistrup <klaus@seistrup.dk>
+ * Written by Klaus Alexander Seistrup <klaus at seistrup dot dk>
  * on a dull Friday evening in November 1999.
  *
  * Inspired by an algorithm conceived by Lambert Meertens.

cal/qtime.cal

@@ -1,9 +1,9 @@
 /*
  * qtime - Display time as English sentence
  *
- * Copyright (C) 1999  Klaus Alexander Seistrup and Landon Curt Noll
+ * Copyright (C) 1999,2021  Klaus Alexander Seistrup and Landon Curt Noll
  *
- * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
+ * Written by: Klaus Alexander Seistrup <kseis at magnetic-ink dot 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

cal/regress.cal

@@ -305,6 +305,8 @@ print '008: parsed test_variables()';
  */
 define test_arithmetic()
 {
+	local x;
+
 	print '400: Beginning test_arithmetic';
 
 	vrfy(3+4==7,		'401: 3 + 4 == 7');
@@ -366,8 +368,18 @@ define test_arithmetic()
 	vrfy((2^23209-1)^(2-2) == 1,	'457: (2^23209-1)^(2-2) == 1');
 	vrfy((2^23209-1)^((2^23209-1)-(2^23209-1)) == 1,
 			'458: (2^23209-1)^((2^23209-1)-(2^23209-1)) == 1');
+	vrfy(0^2 == 0,		'459: 0^2 == 0');
+	vrfy(0^3 == 0,		'460: 0^3 == 0');
+	vrfy(0^12 == 0,		'461: 0^12 == 0');
+	vrfy(0^13 == 0,		'462: 0^13 == 0');
+	x = 0;
+	vrfy(x == 0,		'463: x == 0');
+	vrfy(0^2 == 0,		'464: 0^2 == 0');
+	vrfy(0^3 == 0,		'465: 0^3 == 0');
+	vrfy(0^12 == 0,		'466: 0^12 == 0');
+	vrfy(x^13 == 0,		'467: x^13 == 0');
 
-	print '459: Ending test_arithmetic';
+	print '462: Ending test_arithmetic';
 }
 print '009: parsed test_arithmetic()';
 
@@ -529,7 +541,16 @@ define test_config()
 	vrfy(issimple(config("dupvar_warn")),
 		'562: issimple(config("rdupvar_warn"))');
 
-	print '563: Ending test_config';
+
+	/* test new space modes */
+	vrfy(config("tilde_space") == 0,
+		'563: config("tilde_space") == 0');
+	vrfy(config("fraction_space") == 0,
+		'564: config("fraction_space") == 0');
+	vrfy(config("complex_space") == 0,
+		'565: config("complex_space") == 0');
+
+	print '566: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -1720,7 +1741,7 @@ define test_rand()
 	print				  '1503: state0 = srand(0)';
 	vrfy(state0 == init,		  '1504: state0 == init');
 
-	/* test the additive 55 shuffle generator */
+	/* test the subtractive 100 shuffle generator */
 	tmp = srand(0);
 	print				  '1505: tmp = srand(0)';
 	vrfy(rand() == 0x1fe5b46fba7e069d, \
@@ -4284,84 +4305,119 @@ define test_strprintf()
 	print				    '4804: c = config("display", 2)';
 	c = config("tilde", 0);
 	print				    '4805: c = config("tilde", 0)';
+	c = config("tilde_space", 1);
+	print				    '4806: c = config("tilde_space", 1)';
 	c = config("leadzero", 0);
-	print				    '4806: c = config("leadzero", 0)';
+	print				    '4807: c = config("leadzero", 0)';
 	c = config("fullzero", 0);
-	print				    '4807: c = config("fullzero", 0)';
+	print				    '4808: c = config("fullzero", 0)';
 
 	/* tests with tilde == 0 */
 	vrfy(strprintf("%d%d", 27, 29) == "2729",
-			'4808: strprintf("%d%d", 27, 29) == "2729"');
+			'4809: strprintf("%d%d", 27, 29) == "2729"');
 	vrfy(strprintf("%5d%3d", 27, 29) == "   27 29",
-			'4809: strprintf("%5d%3d", 27, 29) == "   27 29"; ');
+			'4810: strprintf("%5d%3d", 27, 29) == "   27 29"; ');
 	vrfy(strprintf("%-5d%-3d", 27, 29) == "27   29 ",
-			'4810: strprintf("%-5d%-3d", 27, 29) == "27   29 "');
+			'4811: strprintf("%-5d%-3d", 27, 29) == "27   29 "');
 	vrfy(strprintf("%f", 1.375) == "1.38",
-			'4811: strprintf("%f", 1.375) == "1.38"');
+			'4812: strprintf("%f", 1.375) == "1.38"');
 	vrfy(strprintf("%f", 1.385) == "1.38",
-			'4812: strprintf("%f", 1.385) == "1.38"');
+			'4813: strprintf("%f", 1.385) == "1.38"');
 	vrfy(strprintf("%f", .375) == ".38",
-			'4813: strprintf("%f", .375) == ".38"');
+			'4814: strprintf("%f", .375) == ".38"');
 	vrfy(strprintf("%f", .385) == ".38",
-			'4814: strprintf("%f", .385) == ".38"');
+			'4815: strprintf("%f", .385) == ".38"');
 
 	/* tests with tilde == 1 */
 	c = config("tilde", 1);
-	print		'4815: c = config("tilde", 1)';
+	print		'4816: c = config("tilde", 1)';
 	vrfy(strprintf("%f", 1.375) == "~ 1.38",
-			'4816: strprintf("%f", 1.375) == "~1.38"');
+			'4817: strprintf("%f", 1.375) == "~ 1.38"');
 	vrfy(strprintf("%f", 27/29) == "~ .93",
-			'4817: strprintf("%f", 27/29) == "~.93"');
+			'4818: strprintf("%f", 27/29) == "~ .93"');
 	vrfy(strprintf("%r", 27/29) == "27/29",
-			'4818: strprintf("%r", 27/29) == "27/29"');
+			'4819: strprintf("%r", 27/29) == "27/29"');
 	vrfy(strprintf("%o", 27/29) == "033/035",
-			'4819: strprintf("%o", 27/29) == "033/035"');
+			'4820: strprintf("%o", 27/29) == "033/035"');
 	vrfy(strprintf("%x", 27/29) == "0x1b/0x1d",
-			'4820: strprintf("%x", 27/29) == "0x1b/0x1d"');
+			'4821: strprintf("%x", 27/29) == "0x1b/0x1d"');
 	vrfy(strprintf("%b", 27/29) == "0b11011/0b11101",
-			'4821: strprintf("%b", 27/29) == "0b11011/0b11101"');
+			'4822: strprintf("%b", 27/29) == "0b11011/0b11101"');
 	vrfy(strprintf("%e", 12345) == "~ 1.23e4",
-			'4822: strprintf("%e", 12345) == "~1.23e4"');
+			'4823: strprintf("%e", 12345) == "~ 1.23e4"');
 	vrfy(strprintf("%g", .385) == "~ .38",
-			'4823: strprintf("%g", .385) == "~.38"');
+			'4824: strprintf("%g", .385) == "~ .38"');
 	vrfy(strprintf("%g", 385) == "~ 3.8e2",
-			'4824: strprintf("%g", 385) == "~3.8e2"');
+			'4825: strprintf("%g", 385) == "~ 3.8e2"');
+
+	/* tests with tilde == 1 and tilde_space == 0 */
+	c = config("tilde_space", 0);
+	print		'4826: c = config("tilde_space", 0)';
+	vrfy(strprintf("%f", 1.375) == "~1.38",
+			'4827: strprintf("%f", 1.375) == "~1.38"');
+	vrfy(strprintf("%f", 27/29) == "~.93",
+			'4828: strprintf("%f", 27/29) == "~.93"');
+	vrfy(strprintf("%e", 12345) == "~1.23e4",
+			'4829: strprintf("%e", 12345) == "~1.23e4"');
+	vrfy(strprintf("%g", .385) == "~.38",
+			'4830: strprintf("%g", .385) == "~.38"');
+	vrfy(strprintf("%g", 385) == "~3.8e2",
+			'4831: strprintf("%g", 385) == "~3.8e2"');
+
+	/* tests with tilde_space == 0 */
+	c = config("tilde_space", 1);
+	print		'4832: c = config("tilde_space", 1)';
+	vrfy(strprintf("%f", 1.375) == "~ 1.38",
+			'4833: strprintf("%f", 1.375) == "~ 1.38"');
+	vrfy(strprintf("%f", 27/29) == "~ .93",
+			'4834: strprintf("%f", 27/29) == "~ .93"');
+	vrfy(strprintf("%e", 12345) == "~ 1.23e4",
+			'4835: strprintf("%e", 12345) == "~ 1.23e4"');
+	vrfy(strprintf("%g", .385) == "~ .38",
+			'4836: strprintf("%g", .385) == "~ .38"');
+	vrfy(strprintf("%g", 385) == "~ 3.8e2",
+			'4837: strprintf("%g", 385) == "~ 3.8e2"');
 
 	/* mode tests with tilde == 0 */
 	c = config("tilde", 0);
-	print		'4825: c = config("tilde", 0)';
+	print		'4838: c = config("tilde", 0)';
 	vrfy(strprintf("%e", 12345) == "1.23e4",
-			'4826: strprintf("%e", 12345) == "1.23e4"');
+			'4839: strprintf("%e", 12345) == "1.23e4"');
 	vrfy(strprintf("%.3e", 12345) == "1.234e4",
-			'4827: strprintf("%.3e", 12345) == "1.234e4"');
+			'4840: strprintf("%.3e", 12345) == "1.234e4"');
 	vrfy(strprintf("%e", .00012345) == "1.23e-4",
-			'4828: strprintf("%e", .00012345) == "1.23e-4"');
+			'4841: strprintf("%e", .00012345) == "1.23e-4"');
 	vrfy(strprintf("%d %d", 27) == "27 ",
-			'4829: strprintf("%d %d", 27) == "27 "');
+			'4842: strprintf("%d %d", 27) == "27 "');
 	vrfy(strprintf("%d", 27, 29) == "27",
-			'4830: strprintf("%d", 27, 29) == "27"');
+			'4843: strprintf("%d", 27, 29) == "27"');
 	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93",
-		'4831: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
+		'4844: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
 	vrfy(strprintf("%s", "abc") == "abc",
-		'4832: strprintf("%s", "abc") == "abc"');
+		'4845: strprintf("%s", "abc") == "abc"');
 	vrfy(strprintf("%f", "abc") == "abc",
-		'4833: strprintf("%f", "abc") == "abc"');
+		'4846: strprintf("%f", "abc") == "abc"');
 	vrfy(strprintf("%e", "abc") == "abc",
-		'4834: strprintf("%e", "abc") == "abc"');
+		'4847: strprintf("%e", "abc") == "abc"');
 	vrfy(strprintf("%5s", "abc") == "  abc",
-		'4835: strprintf("%5s", "abc") == "  abc"');
+		'4848: strprintf("%5s", "abc") == "  abc"');
 	vrfy(strprintf("%-5s", "abc") == "abc  ",
-		'4836: strprintf("%-5s", "abc") == "abc	 "');
+		'4849: strprintf("%-5s", "abc") == "abc	 "');
 	vrfy(strprintf("%g", .385) == ".38",
-			'4837: strprintf("%g", .385) == ".38"');
+			'4850: strprintf("%g", .385) == ".38"');
 	vrfy(strprintf("%g", 385) == "3.8e2",
-			'4838: strprintf("%g", 385) == "3.8e2"');
+			'4851: strprintf("%g", 385) == "3.8e2"');
+
+	c = config("fraction_space", 1);
+	print				    '4852: c = config("fraction_space", 1)';
+	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27 / 29 = .93",
+		'4853: strprintf("%r = %f", 27/29, 27/29) == "27 / 29 = .93"');
 
 	/* restore config */
 	c = config("all", callcfg);
-	print				    '4839: c = config("all", callcfg)';
+	print				    '4854: c = config("all", callcfg)';
 
-	print '4840: Ending test_strprintf';
+	print '4855: Ending test_strprintf';
 }
 print '088: parsed test_fileop()';
 
@@ -4750,7 +4806,7 @@ define test_random()
 	print				  '5303: state0 = srandom(0)';
 	vrfy(state0 == init,		  '5304: state0 == init');
 
-	/* test the additive 55 shuffle generator */
+	/* test the subtractive 100 shuffle generator */
 	tmp = srandom(0);
 	print				  '5305: tmp = srandom(0)';
 	vrfy(random() == 0x7fb838a8a0a95046, \
@@ -7101,9 +7157,10 @@ define test_sha1()
 	vrfy(sha1("x", "y", "z") == sha1("xyz"),
 	    '7208: sha1("x", "y", "z") == sha1("xyz")');
 
-	vrfy(sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) ==
-	    0xc3e1b562bf45b3bcfc055ac65b5b39cdeb6a6c55,
-	'7209: sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) == ...');
+	vrfy(sha1(sha1("this is",7^19-8,"a composite",3i+4.5,"hash")) ==
+	    0x68aa4fe0a9b6d1662f8d2dbdeee8879239185d09,
+	'7209: sha1(sha1("this is",7^19-8,"a composite",3i+4.5,"hash")) ' +
+	'== ...');
 
 
 	z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100));

cal/screen.cal

@@ -3,19 +3,37 @@
  *
  * This file was created by Ernest Bowen <ebowen at une dot edu dot au>.
  *
- * This code has been placed in the public domain.  Please do not
- * copyright this code.
- *
- * ERNEST BOWEN DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
- * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL	 LANDON	 CURT
- * NOLL	 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM  LOSS  OF
- * USE,	 DATA  OR  PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  *
  * Under source code control:	2006/03/08 05:54:09
  * File existed as early as:	2006

cal/set8700.line

@@ -1,7 +1,7 @@
 ##
 ## set8700 - dotest line tests for the 8700 set of regress.cal
 ##
-## Copyright (C) 2006  Ernest Bowen and Landon Curt Noll
+## Copyright (C) 2006,2021  Ernest Bowen and Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -159,7 +159,7 @@ set8700_A = 42, protect(set8700_A,1024), set8700_B = set8700_A, protect(set8700_
 set8700_A = 6 * 7, protect(set8700_A) == 1024
 set8700_A == set8700_B
 
-## Testing matrix protectioon
+## Testing matrix protection
 set8700_A = mat [3] = {1, 2, list(3,4)}; 1
 protect(set8700_A, 65, 1), protect(set8700_A) == 1089
 protect(set8700_A[0]) == 65
@@ -261,7 +261,7 @@ protect(set8700_L[0]) == 0
 protect(set8700_L[1]) == 512		## protect(set8700_A) copied
 protect(set8700_L[1][1]) == 1024	## protect(set8700_A[1]) copied
 
-## Testing list with "intialization"
+## Testing list with "initialization"
 set8700_L = list(1,2,3), protect(set8700_L) == 0
 protect(set8700_L[0]) | protect(set8700_L[1]) | protect(set8700_L[2]) == 0	## All zero
 set8700_L = {1,set8700_A}, set8700_L[1] == set8700_A

cal/splitbits.cal

@@ -0,0 +1,83 @@
+/*
+ * splitbits - split an integer into list on bit boundardies of a fixed size
+ *
+ * Copyright (C) 2018,2023  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2006/06/07 14:10:11
+ * File existed as early as:	2006
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * setup splitbits errors
+ */
+static E_SPLITBITS_1, E_SPLITBITS_2, E_SPLITBITS_3;
+if (! iserror(E_SPLITBITS_1)) E_SPLITBITS_1 = newerror("1st argument to splitbits must be an integer");
+if (! iserror(E_SPLITBITS_2)) E_SPLITBITS_2 = newerror("2nd argument to splitbits must be an integer");
+if (! iserror(E_SPLITBITS_3)) E_SPLITBITS_3 = newerror("2nd argument must be an integer > 0");
+
+
+/*
+ * define splitbits function
+ */
+define splitbits(x, b)
+{
+    local ret;		/* list to return */
+    local mask;		/* 2^b-1 */
+    local x_is_reg = 0;	/* true if x < 0 */
+
+    /* firewall */
+    if (! isint(x)) {
+	return error(E_SPLITBITS_1);
+    }
+    if (! isint(b)) {
+	return error(E_SPLITBITS_2);
+    }
+    if (b <= 0) {
+	return error(E_SPLITBITS_3);
+    }
+
+    /* special case: x == 0 */
+    if (x == 0) {
+	return list(0);
+    }
+
+    /* setup for splitting x */
+    ret = list();
+    mask = 2^b-1;
+    if (x < 0) {
+	x_is_reg = 1;
+	x = abs(x);
+    }
+
+    /* split x */
+    while (x > 0) {
+	printf("%d %x\n", size(ret), x);
+	if (x_is_reg) {
+	    append(ret, xor(x & mask, mask));
+	} else {
+	    append(ret, x & mask);
+	}
+	x >>= b;
+    }
+
+    /* return list */
+    return ret;
+}

cal/sumtimes.cal

@@ -1,7 +1,7 @@
 /*
- * sumtimes - runtimes evaluating sums & squares of large lists and mats
+ * sumtimes - runtime evaluating sums & squares of large lists and mats
  *
- * Copyright (C) 2006  Ernest Bowen
+ * Copyright (C) 2006,2021  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

cal/test8900.cal

@@ -2058,11 +2058,17 @@ define t010()
 	return 5;
     }
     /*
-     * Once, when an expression such as 0^(6-6) returned 0,
+     * When an expression such as 0^(6-6) returned 0,
      * then stirling2(10, 5) == 42525.  However when we made9
-     * 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120.
+     * 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120
+     * as in:
+     *
+     * if ((stirling2(10, 5) - (5102999/120)) != 0) {
+     *    epsilon(eps);
+     *    return 6;
+     * }
      */
-    if ((stirling2(10, 5) - (5102999/120)) != 0) {
+    if ((stirling2(10, 5) - 42525) != 0) {
 	epsilon(eps);
 	return 6;
     }
@@ -2867,7 +2873,7 @@ define t035()
 	epsilon(eps);
 	return 6;
     }
-/* Percentiles. Numbers shamlessly stolen from a question at stackoverflow*/
+/* Percentiles. Numbers shamelessly stolen from a question at stackoverflow */
     if (abs
 	(invbetainc(0.025, 10008, 151744) -
 	 0.060703546312525377697082321820950758320207425674954679415395) >
@@ -3081,7 +3087,7 @@ define test8900(verbose = 0, tnum, testnum = 8903)
 	return tnum;
     }
 
-    /* We will cause erors intentionally. A lot of them. */
+    /* We will cause errors intentionally. A lot of them. */
     old_errmax = errmax(-1);
 
     /*

calc.c

@@ -1,8 +1,7 @@
 /*
  * calc - arbitrary precision calculator
  *
- * Copyright (C) 1999-2013,2021  David I. Bell, Landon Curt Noll
- *				 and Ernest Bowen
+ * Copyright (C) 1999-2013,2021,2022  David I. Bell, Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -29,14 +28,14 @@
 #include <stdio.h>
 #include <signal.h>
 
-#if !defined (_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 # include <pwd.h>
 #endif
 
 #include <sys/types.h>
 #include <ctype.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(_WIN64)
 # include <io.h>
 # if !defined(NOTCYGWIN)
 /*
@@ -49,7 +48,7 @@
 # endif
 # define strdup _strdup
 # define isatty _isatty
-#endif /* Windoz */
+#endif /* Windows */
 
 #define CALC_C
 #include "calc.h"
@@ -85,6 +84,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -108,8 +108,6 @@ main(int argc, char **argv)
 	int c;			/* option */
 	int index;
 	int maxindex;
-	/* fix gcc warning bug */
-	int unusedint = 0;
 	char *cp;
 	char *endcp;
 	char *bp;
@@ -289,9 +287,7 @@ main(int argc, char **argv)
 						    exit(6);
 						}
 						calc_debug = cp;
-						/* fix gcc warning bug */
-						unusedint =
-						    strtol(cp, &endcp, 10);
+						(void) strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -323,9 +319,7 @@ main(int argc, char **argv)
 						    exit(9);
 						}
 						resource_debug = cp;
-						/* fix gcc warning bug */
-						unusedint =
-						    strtol(cp, &endcp, 10);
+						(void) strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -355,8 +349,7 @@ main(int argc, char **argv)
 					    exit(12);
 					}
 					user_debug = cp;
-					/* unusedint avoids gcc warning bug */
-					unusedint = strtol(cp, &endcp, 10);
+					(void) strtol(cp, &endcp, 10);
 					cp = endcp;
 					if (*cp != '\0' && *cp != ' ') {
 						fprintf(stderr, "Bad syntax in"
@@ -548,7 +541,6 @@ main(int argc, char **argv)
 		setbuf(stdout, NULL);
 	}
 
-
 	/*
 	 * initialize
 	 */
@@ -705,18 +697,18 @@ main(int argc, char **argv)
 			if (!p_flag && i_flag && !stdin_tty) {
 				closeinput();
 				if(!freopen("/dev/tty", "r", stdin)) {
-#if defined (_WIN32)
+#if defined(_WIN32) || defined(_WIN64)
 					fprintf(stderr,
 						"/dev/tty does not exist on "
 						"this operating system.  "
 						"Change operating systems\n"
 						"or don't use this calc mode "
 						"in the future, sorry!\n");
-#else /* Windoz free systems */
+#else /* Windows free systems */
 					fprintf(stderr,
 						"Unable to associate stdin"
 						" with /dev/tty");
-#endif /* Windoz free systems */
+#endif /* Windows free systems */
 					set_run_state(RUN_EXIT_WITH_ERROR);
 					break;
 				}
@@ -735,18 +727,18 @@ main(int argc, char **argv)
 					!p_flag && (!havecommands||i_flag)) {
 				closeinput();
 				if(!freopen("/dev/tty", "r", stdin)) {
-#if defined (_WIN32)
+#if defined(_WIN32) || defined(_WIN64)
 					fprintf(stderr,
 						"/dev/tty does not exist on "
 						"this operating system.  "
 						"Change operating systems\n"
 						"or don't use this calc mode "
 						"in the future, sorry!\n");
-#else /* Windoz free systems */
+#else /* Windows free systems */
 					fprintf(stderr,
 						"Unable to associate stdin"
 						" with /dev/tty");
-#endif /* Windoz free systems */
+#endif /* Windows free systems */
 					set_run_state(RUN_EXIT_WITH_ERROR);
 					break;
 				}
@@ -766,8 +758,6 @@ main(int argc, char **argv)
 	/*
 	 * All done! - Jessica Noll, Age 2
 	 */
-	/* fix gcc warning bug */
-	unusedint++;
 	libcalc_call_me_last();
 	return (run_state == RUN_EXIT_WITH_ERROR ||
 		run_state == RUN_ZERO) ? 1 : 0;
@@ -787,7 +777,7 @@ intint(int UNUSED(arg))
 	(void) signal(SIGINT, intint);
 	if (inputwait || (++abortlevel >= ABORT_NOW)) {
 		calc_interrupt("\nABORT");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (abortlevel >= ABORT_MATH)
 		_math_abort_ = TRUE;

calc.h

@@ -59,7 +59,7 @@
 #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)
+#if defined(_WIN32) || defined(_WIN64)
 #define LISTCHAR	';'	/* char which separates paths in a list */
 #else
 #define LISTCHAR	':'	/* char which separates paths in a list */
@@ -123,7 +123,7 @@ E_FUNC int get_inode(FILEID id, ZVALUE *ino);
 E_FUNC FILEID reopenid(FILEID id, char *mode, char *name);
 E_FUNC int closeall(void);
 
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 E_FUNC int flushall(void);
 #endif
 
@@ -186,7 +186,7 @@ E_FUNC char *calc_strdup(CONST char *);
  */
 E_FUNC void initialize(void);
 E_FUNC void reinitialize(void);
-#if !defined (_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 E_FUNC int isatty(int tty);	/* TRUE if fd is a tty */
 #endif
 E_FUNC char *version(void);	/* return version string */

calc.man

@@ -251,9 +251,6 @@ For example:
 \fI#!${BINDIR}/calc\fP \fB\-q\fP \fB\-f\fP
 .fi
 .in -5n
-.sp 1
-This allows the script to run independely of
-startup scripts.
 
 .sp 1
 See
@@ -294,6 +291,24 @@ This will cause calc to process lines in
 in
 .BR "shell script mode" .
 
+.sp 1
+.B NOTE:
+The use of
+.BR \-f
+does
+.B NOT
+imply
+.BR \-q
+and thus one would need to use
+.sp 1
+.in +5n
+.nf
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-q\fP \fB\-f\fP filename
+.fi
+.in -5n
+.sp 1
+to disable the use of calc startup files as well.
+
 .sp 1
 The use of
 .B \-f
@@ -458,6 +473,13 @@ flag overrides
 .TP
 .B \-q
 Disable the reading of the startup scripts.
+.sp 1
+This allows the script to run independently of
+startup scripts such those managed by the
+.B $CALCRC
+environment variable.
+For example, this will disable the use of the common calcrc file
+(usually ~/.calcrc).
 
 .TP
 .B \-s
@@ -596,7 +618,7 @@ may have to be replaced by:
 .sp 1
 .in +5n
 .nf
-print 27! ^2	or	print 27\!^2
+print 27! ^2	or	print 27\\!^2
 .fi
 .in -5n
 
@@ -813,6 +835,23 @@ are automatically set if
 .B \-i
 is not given.
 .sp 1
+.B NOTE:
+The use of
+.BR \-f
+does
+.B NOT
+imply
+.BR \-q
+and thus one would need to use
+.sp 1
+.in +5n
+.nf
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-q\fP \fB\-f\fP filename
+.fi
+.in -5n
+.sp 1
+to disable the use of calc startup files as well.
+.sp 1
 For example, if
 the file
 .BR /tmp/mersenne :
@@ -1186,6 +1225,7 @@ The calc commands:
 help copyright
 help copying
 help copying-lgpl
+help credit
 .fi
 .in -0.5i
 .sp
@@ -1220,6 +1260,10 @@ Copyright (C) year  David I. Bell, Landon Curt Noll and Ernest Bowen
 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
+Copyright (C) year  Christoph Zurnieden
+Copyright (C) year  Landon Curt Noll and Thomas Jones-Low
+Copyright (C) year  Klaus Alexander Seistrup and Landon Curt Noll
 .fi
 .in -0.5i
 .sp
@@ -1227,12 +1271,22 @@ This man page is:
 .sp
 .in +0.5i
 .nf
-Copyright (C) 1999-2021  Landon Curt Noll
+Copyright (C) 1999-2023  Landon Curt Noll
 .fi
 .in -0.5i
 .sp
 and is covered under version 2.1 GNU Lesser General
 Public License.
+.sp
+A few files in calc are covered under "The Unlicense".
+For more information on this license, see:
+.sp
+.in +0.5i
+.nf
+https://unlicense.org
+.fi
+.in -0.5i
+.sp
 
 .PP
 
@@ -1240,61 +1294,38 @@ Public License.
 
 .PP
 
-If you have a simple general question about calc, send Email to:
-.sp
-.in +0.5i
-calc-quest-mail at asthe dot com
-.sp
-NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
-.in -0.5i
-.sp
-.in +0.5i
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-.B PLEASE
-put following the
-.B SPECIAL PHRASE
-somewhere in your Email Subject line:
-.sp
-.in +0.5i
-.B calc question
-.in -0.5i
-.sp
-You may add additional words to your subject line.
-.sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+To ask the calc maintainers a general question about calc,
+see the output of the following calc command:
+
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+; help question
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-Please limit your questions to general questions about calc.
-We cannot go into great detail in our answers,
-nor can we do your homework, nor can
-we do much more than answer short general questions about calc.
+.PP
+
+or read the source file:
+
+.sp
+.in +0.5i
+.nf
+QUESTIONS
+.fi
+.in +0.5i
+.sp
+
+.PP
+
+or visit the following URL:
+.sp
+.in +0.5i
+.nf
+https://github.com/lcn2/calc/blob/master/QUESTIONS
+.fi
+.in +0.5i
 .sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1302,71 +1333,37 @@ Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
-Send bug reports and bug fixes to:
+To inform the calc maintainers about a bug, or to submit a bug fix,
+see the output of the following calc command:
+
 .sp
 .in +0.5i
 .nf
-calc-bugrept at asthe dot com
+; help bugs
 .fi
-.sp
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-.sp
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-You
-.B MUST
-use following
-.B SPECIAL PHRASE
-in your Email Subject line:
-.sp
 .in +0.5i
-.B calc bug report
-.in -0.5i
 .sp
-You may add additional words to your subject line.
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+.PP
+
+or read the source file:
+
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+BUGS
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-See the
-.I BUGS
-source file or use the
-.I calc
-command:
+.PP
+
+or visit the following URL:
 .sp
 .in +0.5i
 .nf
-help bugs
+https://github.com/lcn2/calc/blob/master/BUGS
 .fi
-.in -0.5i
+.in +0.5i
 .sp
-for more information about bug reporting.
-.sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1376,126 +1373,40 @@ Please be patient as we cannot always respond to Email messages quickly.
 
 .I Calc
 is open source.
-Contributions of code are welcome.
-.sp
-We welcome and encourage you to send us:
+You are welcome to contribute code to calc, or submit bug fixes to to calc.
 .sp
+To contribute code to calc, please see see the output of
+the following calc command:
+
 .sp
 .in +0.5i
 .nf
-* calc resource files (cal/*.cal)
-* calc shell scripts (cscript/*.calc)
-* builtin functions that you have modified or written, i.e.:
-  assocfunc.c comfunc.c func.c func.h
-  listfunc.c matfunc.c qfunc.c zfunc.c
-* custom functions that you have modified or written (custom/*)
-* help files modified or written (help/*)
-* brief description of you added, fixed, improved in CHANGES
-* regression test cases (cal/regress.cal)
-* Makefile improvements (Makefile, */Makefile)
-* other source code modifications (*.c, *.h)
-* etc. (* */* :) )
+; help contrib
 .fi
-.in -0.5i
-.sp
-If you add functionality to calc, please be sure to modify/patch/add
-Makefiles, help files, cal/regress.cal test code as well.
-Regression test cases are vital to maintaining calc's level
-of correctness and helps us avoid code bug regression.
-.sp
-In order to consider integrating your code, we need:
-.sp
-.nf
 .in +0.5i
-* calc version you are working with (please try use the latest version)
-* new help files or help file patches, if applicable (documentation)
-* proposed text for the CHANGES file (brief description of what it does)
-* regress.cal test patch as needed
-* your source code and/or source code changes (:-))
-.in -0.5i
-.fi
 .sp
-The best way to send us new code, if your changes are small, is
-via a patch (diff -c from the latest alpha code to your code).
-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).
-.sp
-Please try to generate a patch against the most recent
-version of calc, and if you use GitHub, the top of the
-master branch:
-.sp
-.nf
-.in +0.5i
-https://github.com/lcn2/calc
-.in -0.5i
-.fi
-.sp
-.sp
-The best way contribute to calc bug is to generate calc
-GitHub pull request:
-.sp
-.nf
-.in +0.5i
-https://github.com/lcn2/calc/pulls
-.in -0.5i
-.fi
-.sp
-Your code needs to be contributed under either the 2.1 of the
-.B GNU Lesser General Public License (LGPL 2.1)
-or be in the public domain.
-.sp
-If you do not want to use calc GitHub, then send EMail to:
+
+.PP
+
+or read the source file:
+
 .sp
 .in +0.5i
 .nf
-calc-contrib at asthe dot com
+CONTRIB-CODE
 .fi
-.sp
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-.sp
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-You
-.B MUST
-use following
-.B SPECIAL PHRASE
-in your Email Subject line:
-.sp
 .in +0.5i
-.B calc contribution
-.in -0.5i
-.sp
-You may add additional words to your subject line.
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+
+.PP
+
+or visit the following URL:
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
+https://github.com/lcn2/calc/blob/master/CONTRIB-CODE
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1510,5 +1421,30 @@ web site is located at:
 .in +0.5i
 www.isthe.com/chongo/tech/comp/calc/
 .in -0.5i
+
+.SH "CALC SOURCE CODE"
+
+The latest version of calc source code may be obtained at
+the following GitHub repo:
 .sp
-Share and Enjoy! :\-)
+.in +0.5i
+https://github.com/lcn2/calc
+.in -0.5i
+.sp
+The very latest calc souece is found at the top master branch.
+
+.PP
+
+You may download the calc releases from:
+.sp
+.in +0.5i
+https://github.com/lcn2/calc/releases
+.in -0.5i
+.sp
+The releases marked
+.B ((Pre-release))
+are beta releases.
+.sp
+The most recent release that is NOT  marked
+.B ((Pre-release))
+is the recommended stable release.

calc.spec.in

@@ -1,7 +1,7 @@
 #
 # calc.spec.in - template specfile for calc
 #
-# Copyright (C) 2003-2014  Petteri Kettunen and Landon Curt Noll
+# Copyright (C) 2003-2014,2021  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
@@ -49,7 +49,7 @@ BuildRoot: %{_tmppath}/build-root
 Calc is arbitrary precision C-like arithmetic system that is a
 calculator, an algorithm prototype and mathematical research
 tool. Calc comes with a rich set of builtin mathematical and
-programmatic functions.
+programming functions.
 
 For the latest calc release, see the calc project home page:
 
@@ -165,11 +165,11 @@ echo '-=- calc.spec beginning make clean -=-'
 %attr(644, root, root) %{_libdir}/libcustcalc.a
 
 %changelog
-* Sun Mar 24 2019 cLandon Curt Noll http://www.isthe.com/chongo
+* Sun Mar 24 2019 Landon Curt Noll http://www.isthe.com/chongo
 - Release: 13
 - Disable compiling with the default ARCH_CFLAGS= -march=native
-  by clearking the ARCH_CFLAGS value in order to maximize
-  the RPM binary protability.
+  by clearing the ARCH_CFLAGS value in order to maximize
+  the RPM binary portability.
 
 * Mon Sep 01 2014 Landon Curt Noll http://www.isthe.com/chongo
 - Release: 12
@@ -178,7 +178,7 @@ echo '-=- calc.spec beginning make clean -=-'
   use -j1 while building these RPMs to avoid this make bug.
   This only impacts the speed of building the rpms.
 - Stopped removing %{_buildroot} at the beginning of install
-  as this, acording to a number of sources, was asking for trouble.
+  as this, according to a number of sources, was asking for trouble.
 - Clean removes tmp, BUILD, SPEC, and BUILDROOT dirs under topdir.
 - Fixed the building of the calc-debuginfo rpm.
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,

calcerr.tbl

@@ -259,7 +259,7 @@ E_COPY6		Non-integer or negative destination index for copy
 E_COPY7		Destination index too large for copy
 E_COPY8		Freed block source for copy
 E_COPY9		Unsuitable source type for copy
-E_COPY10	Freed block destinction for copy
+E_COPY10	Freed block destination for copy
 E_COPY11	Unsuitable destination type for copy
 E_COPY12	Incompatible source and destination for copy
 E_COPY13	No-copy-from source variable
@@ -530,15 +530,15 @@ E_H2HM1		Non-lvalue arguments 2 or 3 for h2hm
 E_H2HM2		Non-real-number arg 1 for h2hm
 E_H2HM3		No-assign-to argument 2 or 3 for h2hm
 E_H2HM4		Invalid rounding arg 4 for h2hm
-E_DMS2D1	Non-real-number aarguments 1, 2 or 3 for dms2d
+E_DMS2D1	Non-real-number arguments 1, 2 or 3 for dms2d
 E_DMS2D2	Invalid rounding arg 4 for dms2d
-E_DM2D1		Non-real-number aarguments 1 or 2 for dm2d
+E_DM2D1		Non-real-number arguments 1 or 2 for dm2d
 E_DM2D2		Invalid rounding arg 4 for dm2d
-E_GMS2G1	Non-real-number aarguments 1, 2 or 3 for gms2g
+E_GMS2G1	Non-real-number arguments 1, 2 or 3 for gms2g
 E_GMS2G2	Invalid rounding arg 4 for gms2g
-E_GM2G1		Non-real-number aarguments 1 or 2 for gm2g
+E_GM2G1		Non-real-number arguments 1 or 2 for gm2g
 E_GM2G2		Invalid rounding arg 4 for gm2g
-E_HMS2H1	Non-real-number aarguments 1, 2 or 3 for hms2h
+E_HMS2H1	Non-real-number arguments 1, 2 or 3 for hms2h
 E_HMS2H2	Invalid rounding arg 4 for hms2h
-E_HM2H1		Non-real-number aarguments 1 or 2 for hm2h
+E_HM2H1		Non-real-number arguments 1 or 2 for hm2h
 E_HM2H2		Invalid rounding arg 4 for hm2h

charbit.c

@@ -0,0 +1,67 @@
+/*
+ * charbit - determine what CHAR_BIT is and define CALC_CHARBIT
+ *
+ * Copyright (C) 2021  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2021/12/07 20:57:50
+ * File existed as early as:	2021
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	charbit
+ *
+ * This prog outputs several defines:
+ *
+ *	CALC_CHARBIT
+ *		after including have_limits.h and perhaps <limits.h>,
+ *		output CALC_CHARBIT as CHAR_BIT (from <limits.h>, or as 8.
+ */
+
+#include <stdio.h>
+#include "have_limits.h"
+#if defined(HAVE_LIMITS_H)
+#include <limits.h>
+#endif
+
+
+#include "banned.h"	/* include after system header <> includes */
+
+
+int
+main(void)
+{
+	printf("#include \"have_limits.h\"\n");
+	printf("#if defined(HAVE_LIMITS_H)\n");
+	printf("#include <limits.h>\n");
+	printf("#endif\n\n");
+#if defined(CHAR_BIT)
+
+	printf("#define CALC_CHARBIT (CHAR_BIT) /* from <limits.h> */\n");
+
+#else /* CHAR_BIT */
+
+	printf("#define CALC_CHARBIT (8) /* no CHAR_BIT, assume 8 */\n");
+
+#endif /* CHAR_BIT */
+
+	/* exit(0); */
+	return 0;
+}

codegen.c

@@ -1,7 +1,7 @@
 /*
  * codegen - module to generate opcodes from the input tokens
  *
- * Copyright (C) 1999-2007,2017,2021  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2017,2021,2022  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -44,11 +44,14 @@
 #include "conf.h"
 #include "strl.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) || defined(_WIN64)
+#if !defined(__CYGWIN__)
 # include <direct.h>
 #endif
+#endif
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -451,7 +454,7 @@ getsimplebody(void)
 
 
 /*
- * Get the body of a function, or a subbody of a function.
+ * Get the body of a function, or a sub-body of a function.
  * body = '{' [ declarations ] ... [ statement ] ... '}'
  *	| [ declarations ] ... [statement ] ... '\n'
  */
@@ -1516,7 +1519,7 @@ getexprlist(void)
 
 
 /*
- * Get an opassignment or possibly just an assignment or expression.
+ * Get an op-assignment or possibly just an assignment or expression.
  * Returns flags describing the type of assignment or expression found.
  * assignment = lvalue '=' assignment
  *	| lvalue '+=' assignment
@@ -2381,16 +2384,16 @@ getfilename(char *name, size_t namelen, BOOL *once)
 						if (symstr == NULL) {
 							math_error(
 					"string value pointer is NULL!!");
-							/*NOTREACHED*/
+							not_reached();
 						}
 					} else {
 						math_error(
 				    "a filename variable must be a string");
-						/*NOTREACHED*/
+						not_reached();
 					}
 				} else {
 					math_error("no such global variable");
-					/*NOTREACHED*/
+					not_reached();
 				}
 			}
 

comfunc.c

@@ -1,7 +1,7 @@
 /*
  * comfunc - extended precision complex arithmetic non-primitive routines
  *
- * Copyright (C) 1999-2007,2021  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -30,6 +30,7 @@
 #include "cmath.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -60,16 +61,16 @@ c_powi(COMPLEX *c, NUMBER *q)
 
 	if (qisfrac(q)) {
 		math_error("Raising number to non-integral power");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (zge31b(q->num)) {
 		math_error("Raising number to very large power");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	power = ztolong(q->num);
 	if (ciszero(c) && (power == 0)) {
 		math_error("Raising zero to zeroth power");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	sign = 1;
 	if (qisneg(q))
@@ -381,7 +382,7 @@ c_root(COMPLEX *c, NUMBER *q, NUMBER *epsilon)
 
 	if (qisneg(q) || qiszero(q) || qisfrac(q)) {
 		math_error("Taking bad root of complex number");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (cisone(c) || qisone(q))
 		return clink(c);
@@ -446,7 +447,7 @@ c_exp(COMPLEX *c, NUMBER *epsilon)
 
 	if (qiszero(epsilon)) {
 		math_error("Zero epsilon for cexp");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (cisreal(c)) {
 		tmp1 = qexp(c->real, epsilon);
@@ -502,7 +503,7 @@ c_ln(COMPLEX *c, NUMBER *epsilon)
 
 	if (ciszero(c)) {
 		math_error("logarithm of zero");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (cisone(c))
 		return clink(&_czero_);
@@ -599,7 +600,7 @@ c_cos(COMPLEX *c, NUMBER *epsilon)
 
 	if (qiszero(epsilon)) {
 		math_error("Zero epsilon for ccos");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	n = qilog2(epsilon);
 	ctmp1 = comalloc();
@@ -649,7 +650,7 @@ c_sin(COMPLEX *c, NUMBER *epsilon)
 
 	if (qiszero(epsilon)) {
 		math_error("Zero epsilon for csin");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (ciszero(c))
 		return clink(&_czero_);
@@ -1072,7 +1073,7 @@ c_polar(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
 
 	if (qiszero(epsilon)) {
 		math_error("Zero epsilon for cpolar");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qiszero(q1))
 		return clink(&_czero_);
@@ -1114,12 +1115,12 @@ c_power(COMPLEX *c1, COMPLEX *c2, NUMBER *epsilon)
 
 	if (qiszero(epsilon)) {
 		math_error("Zero epsilon for cpower");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (ciszero(c1)) {
 		if (cisreal(c2) && qisneg(c2->real)) {
 			math_error ("Non-positive real exponent of zero");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		return clink(&_czero_);
 	}
@@ -1190,12 +1191,18 @@ comprint(COMPLEX *c)
 	qtmp = c->imag[0];
 	if (qiszero(&qtmp))
 		return;
+	if (conf->complex_space) {
+	    math_chr(' ');
+	}
 	if (!qiszero(c->real) && !qisneg(&qtmp))
 		math_chr('+');
 	if (qisneg(&qtmp)) {
 		math_chr('-');
 		qtmp.num.sign = 0;
 	}
+	if (conf->complex_space) {
+	    math_chr(' ');
+	}
 	qprintnum(&qtmp, MODE_DEFAULT, conf->outdigits);
 	math_chr('i');
 }
@@ -1222,7 +1229,13 @@ cprintfr(COMPLEX *c)
 	zprintval(i->num, 0L, 0L);
 	math_chr('i');
 	if (qisfrac(i)) {
+		if (conf->fraction_space) {
+		    math_chr(' ');
+		}
 		math_chr('/');
+		if (conf->fraction_space) {
+		    math_chr(' ');
+		}
 		zprintval(i->den, 0L, 0L);
 	}
 }

commath.c

@@ -1,7 +1,7 @@
 /*
  * commath - extended precision complex arithmetic primitive routines
  *
- * Copyright (C) 1999-2007,2021  David I. Bell
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,6 +27,7 @@
 #include "cmath.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -189,7 +190,7 @@ c_div(COMPLEX *c1, COMPLEX *c2)
 
 	if (ciszero(c2)) {
 		math_error("Division by zero");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if ((c1->real == c2->real) && (c1->imag == c2->imag))
 		return clink(&_cone_);
@@ -260,7 +261,7 @@ c_inv(COMPLEX *c)
 
 	if (ciszero(c)) {
 		math_error("Inverting zero");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	r = comalloc();
 	if (cisreal(c)) {
@@ -522,7 +523,7 @@ c_divq(COMPLEX *c, NUMBER *q)
 
 	if (qiszero(q)) {
 		math_error("Division by zero");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qisone(q))
 		return clink(c);
@@ -605,7 +606,7 @@ comalloc(void)
 	r = (COMPLEX *) malloc(sizeof(COMPLEX));
 	if (r == NULL) {
 		math_error("Cannot allocate complex number");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	r->links = 1;
 	r->real = qlink(&_qzero_);

config.c

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999-2007,2021  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -62,6 +62,7 @@
 #endif /* HAVE_STRDUP */
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -92,6 +93,9 @@ NAMETYPE configs[] = {
 	{"pow2",	CONFIG_POW2},
 	{"redc2",	CONFIG_REDC2},
 	{"tilde",	CONFIG_TILDE},
+	{"tilde_space",	CONFIG_TILDE_SPACE},
+	{"fraction_space",	CONFIG_FRACTION_SPACE},
+	{"complex_space",	CONFIG_COMPLEX_SPACE},
 	{"tab",		CONFIG_TAB},
 	{"quomod",	CONFIG_QUOMOD},
 	{"quo",		CONFIG_QUO},
@@ -149,8 +153,11 @@ 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 approximations */
-	TRUE,			/* ok to print tab before numeric values */
+	TRUE,			/* TRUE ==> print a tilde on approximations */
+	FALSE,			/* TRUE ==> print a space after tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around / in fractions */
+	FALSE,			/* TRUE ==> print spaces around + or - in complex values */
+	TRUE,			/* TRUE ==> print tab before numeric values */
 	0,			/* quomod() default rounding mode */
 	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
@@ -160,8 +167,8 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	8,			/* cfsim() default rounding mode */
 	2,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
-	FALSE,			/* ok to print leading 0 before decimal pt */
-	0,			/* ok to print trailing 0's */
+	FALSE,			/* TRUE ==> print leading 0 before decimal pt */
+	0,			/* TRUE ==> print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	PROMPT1,		/* normal prompt */
 	PROMPT2,		/* prompt when inside multi-line input */
@@ -172,30 +179,30 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	FALSE,			/* print Quit or abort executed messages */
+	FALSE,			/* TRUE ==> 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 */
+#if defined(_WIN32) || defined(_WIN64)
+	TRUE,			/* TRUE ==> running under windows */
 #else
-	FALSE,			/* congrats, you are not using windows */
+	FALSE,			/* FALSE ==> not using windows */
 #endif
 #if defined(__CYGWIN__)
-	TRUE,			/* compiled under cygwin */
+	TRUE,			/* TRUE ==> compiled under cygwin */
 #else
-	FALSE,			/* not compiled with cygwin */
+	FALSE,			/* FALSE ==> not compiled with cygwin */
 #endif
 #if defined(CUSTOM)
-	TRUE,			/* compiled with -DCUSTOM */
+	TRUE,			/* TRUE ==> compiled with -DCUSTOM */
 #else
-	FALSE,			/* compiled without -DCUSTOM */
+	FALSE,			/* FALSE ==> compiled without -DCUSTOM */
 #endif
 	&allow_custom,		/* *TRUE=> custom functions are enabled */
 	NULL,			/* version */
 	BASEB,			/* base for calculations */
-	TRUE,			/* warn when redeclaring */
-	TRUE,			/* warn when variable names collide */
+	TRUE,			/* TRUE ==> warn when redeclaring */
+	TRUE,			/* TRUE ==> warn when variable names collide */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
@@ -209,8 +216,11 @@ CONFIG newstd = {	/* new non-backward compatible 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 approximations */
-	TRUE,			/* ok to print tab before numeric values */
+	TRUE,			/* TRUE ==> print a tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around / in fractions */
+	FALSE,			/* TRUE ==> print a space after tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around + or - in complex values */
+	TRUE,			/* TRUE ==> print tab before numeric values */
 	0,			/* quomod() default rounding mode */
 	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
@@ -220,8 +230,8 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	8,			/* cfsim() default rounding mode */
 	24,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
-	TRUE,			/* ok to print leading 0 before decimal pt */
-	0,			/* ok to print trailing 0's */
+	TRUE,			/* TRUE ==> print leading 0 before decimal pt */
+	0,			/* TRUE ==> print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	"; ",			/* normal prompt */
 	";; ",			/* prompt when inside multi-line input */
@@ -232,30 +242,30 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	FALSE,			/* print Quit or abort executed messages */
+	FALSE,			/* TRUE ==> 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 */
+#if defined(_WIN32) || defined(_WIN64)
+	TRUE,			/* TRUE ==> running under windows */
 #else
-	FALSE,			/* congrats, you are not using windows */
+	FALSE,			/* FALSE ==> not using windows */
 #endif
 #if defined(__CYGWIN__)
-	TRUE,			/* compiled under cygwin */
+	TRUE,			/* TRUE ==> compiled under cygwin */
 #else
-	FALSE,			/* not compiled with cygwin */
+	FALSE,			/* FALSE ==> not compiled with cygwin */
 #endif
 #if defined(CUSTOM)
-	TRUE,			/* compiled with -DCUSTOM */
+	TRUE,			/* TRUE ==> compiled with -DCUSTOM */
 #else
-	FALSE,			/* compiled without -DCUSTOM */
+	FALSE,			/* FALSE ==> compiled without -DCUSTOM */
 #endif
-	&allow_custom,		/* *TRUE=> custom functions are enabled */
+	&allow_custom,		/* *TRUE ==> custom functions are enabled */
 	NULL,			/* version */
 	BASEB,			/* base for calculations */
-	TRUE,			/* warn when redeclaring */
-	TRUE,			/* warn when variable names collide */
+	TRUE,			/* TRUE ==> warn when redeclaring */
+	TRUE,			/* TRUE ==> warn when variable names collide */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
 
@@ -488,11 +498,11 @@ setconfig(int type, VALUE *vp)
 				newconf = &newstd;
 			} else {
 				math_error("CONFIG alias not oldstd or newstd");
-				/*NOTREACHED*/
+				not_reached();
 			}
 		} else if (vp->v_type != V_CONFIG) {
 			math_error("non-CONFIG for all");
-			/*NOTREACHED*/
+			not_reached();
 		} else {
 			newconf = vp->v_config;
 		}
@@ -507,14 +517,14 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_TRACE:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for trace");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
 		if (qisfrac(q) || !zistiny(q->num) ||
 			((unsigned long) temp > TRACE_MAX)) {
 				math_error("Bad trace value");
-				/*NOTREACHED*/
+				not_reached();
 		}
 		conf->traceflags = (FLAG)temp;
 		break;
@@ -522,7 +532,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_DISPLAY:
 		if (getlen(vp, &len)) {
 			math_error("Bad value for display");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		math_setdigits(len);
 		break;
@@ -530,12 +540,12 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MODE:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for mode");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		temp = lookup_long(modes, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\"", vp->v_str->s_str);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		math_setmode((int) temp);
 		break;
@@ -543,12 +553,12 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MODE2:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for mode");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		temp = lookup_long(modes, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\"", vp->v_str->s_str);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		math_setmode2((int) temp);
 		break;
@@ -556,7 +566,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_EPSILON:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for epsilon");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		setepsilon(vp->v_num);
 		break;
@@ -564,7 +574,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MAXPRINT:
 		if (getlen(vp, &len)) {
 			math_error("Bad value for maxprint");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->maxprint = len;
 		break;
@@ -572,7 +582,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MUL2:
 		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for mul2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (len == 0)
 			len = MUL_ALG2;
@@ -582,7 +592,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_SQ2:
 		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for sq2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (len == 0)
 			len = SQ_ALG2;
@@ -592,7 +602,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_POW2:
 		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for pow2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (len == 0)
 			len = POW_ALG2;
@@ -602,7 +612,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_REDC2:
 		if (getlen(vp, &len) || len < 0 || len == 1) {
 			math_error("Bad value for redc2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (len == 0)
 			len = REDC_ALG2;
@@ -617,12 +627,54 @@ setconfig(int type, VALUE *vp)
 			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 				math_error("Illegal truth value for tilde");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			conf->tilde_ok = (int)temp;
 		}
 		break;
 
+	case CONFIG_TILDE_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->tilde_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for tilde_space");
+				not_reached();
+			}
+			conf->tilde_space = (int)temp;
+		}
+		break;
+
+	case CONFIG_FRACTION_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->fraction_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for fraction_space");
+				not_reached();
+			}
+			conf->fraction_space = (int)temp;
+		}
+		break;
+
+	case CONFIG_COMPLEX_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->complex_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for complex_space");
+				not_reached();
+			}
+			conf->complex_space = (int)temp;
+		}
+		break;
+
 	case CONFIG_TAB:
 		if (vp->v_type == V_NUM) {
 			q = vp->v_num;
@@ -631,7 +683,7 @@ setconfig(int type, VALUE *vp)
 			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 				math_error("Illegal truth value for tab");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			conf->tab_ok = (int)temp;
 		}
@@ -640,7 +692,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_QUOMOD:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for quomod");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->quomod = len;
 		break;
@@ -648,7 +700,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_QUO:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for quo");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->quo = len;
 		break;
@@ -656,7 +708,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MOD:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for mod");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->mod = len;
 		break;
@@ -664,7 +716,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_SQRT:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for sqrt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->sqrt = len;
 		break;
@@ -672,7 +724,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_APPR:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for appr");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->appr = len;
 		break;
@@ -680,7 +732,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_CFAPPR:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for cfappr");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->cfappr = len;
 		break;
@@ -688,7 +740,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_CFSIM:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for cfsim");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->cfsim = len;
 		break;
@@ -696,7 +748,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_OUTROUND:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for outround");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->outround = len;
 		break;
@@ -704,7 +756,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_ROUND:
 		if (getlen(vp, &len)) {
 			math_error("Illegal value for round");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->round = len;
 		break;
@@ -715,10 +767,9 @@ setconfig(int type, VALUE *vp)
 			conf->leadzero = !qiszero(q);
 		} else if (vp->v_type == V_STR) {
 			temp = lookup_long(truth, vp->v_str->s_str);
-			if (temp < 0) { {
+			if (temp < 0) {
 				math_error("Illegal truth value for leadzero");
-				/*NOTREACHED*/
-			}
+				not_reached();
 			}
 			conf->leadzero = (int)temp;
 		}
@@ -732,7 +783,7 @@ setconfig(int type, VALUE *vp)
 			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) { {
 				math_error("Illegal truth value for fullzero");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			}
 			conf->fullzero = (int)temp;
@@ -742,7 +793,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MAXSCAN:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for maxscancount");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
@@ -750,7 +801,7 @@ setconfig(int type, VALUE *vp)
 			temp = -1;
 		if (temp < 0) {
 			math_error("Maxscan value is out of range");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->maxscancount = temp;
 		break;
@@ -758,12 +809,12 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_PROMPT:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for prompt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		p = (char *)malloc(vp->v_str->s_len + 1);
 		if (p == NULL) {
 			math_error("Cannot duplicate new prompt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		strlcpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt1);
@@ -773,12 +824,12 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_MORE:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for more prompt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		p = (char *)malloc(vp->v_str->s_len + 1);
 		if (p == NULL) {
 			math_error("Cannot duplicate new more prompt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		strlcpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt2);
@@ -788,7 +839,7 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_BLKMAXPRINT:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for blkmaxprint");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
@@ -796,7 +847,7 @@ setconfig(int type, VALUE *vp)
 			temp = -1;
 		if (temp < 0) {
 			math_error("Blkmaxprint value is out of range");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->blkmaxprint = temp;
 		break;
@@ -809,7 +860,7 @@ setconfig(int type, VALUE *vp)
 			temp = lookup_long(truth, vp->v_str->s_str);
 			if (temp < 0) {
 			    math_error("Illegal truth value for blkverbose");
-			    /*NOTREACHED*/
+			    not_reached();
 			}
 			conf->blkverbose = (int)temp;
 		}
@@ -818,13 +869,13 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_BLKBASE:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for blkbase");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		temp = lookup_long(blk_base, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\" for blkbase",
 			    vp->v_str->s_str);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->blkbase = temp;
 		break;
@@ -832,13 +883,13 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_BLKFMT:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for blkfmt");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		temp = lookup_long(blk_fmt, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\" for blkfmt",
 			    vp->v_str->s_str);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->blkfmt = temp;
 		break;
@@ -846,13 +897,13 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_CALC_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for calc_debug");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
 		if (qisfrac(q) || !zistiny(q->num)) {
 			math_error("Illegal calc_debug parameter value");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->calc_debug = temp;
 		break;
@@ -860,13 +911,13 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_RESOURCE_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for resource_debug");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
 		if (qisfrac(q) || !zistiny(q->num)) {
 			math_error("Illegal resource_debug parameter value");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->resource_debug = temp;
 		break;
@@ -874,13 +925,13 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_USER_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for user_debug");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		q = vp->v_num;
 		temp = qtoi(q);
 		if (qisfrac(q) || !zistiny(q->num)) {
 			math_error("Illegal user_debug parameter value");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->user_debug = temp;
 		break;
@@ -894,7 +945,7 @@ setconfig(int type, VALUE *vp)
 			if (temp < 0) {
 				math_error("Illegal truth value "
 					   "for verbose_quit");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			conf->verbose_quit = (int)temp;
 		}
@@ -903,56 +954,56 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_CTRL_D:
 		if (vp->v_type != V_STR) {
 			math_error("Non-string for ctrl_d");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		temp = lookup_long(ctrl_d, vp->v_str->s_str);
 		if (temp < 0) {
 			math_error("Unknown mode \"%s\" for ctrl_d",
 			    vp->v_str->s_str);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		conf->ctrl_d = temp;
 		break;
 
 	case CONFIG_PROGRAM:
 		math_error("The program config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_BASENAME:
 		math_error("The basename config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_WINDOWS:
 		math_error("The windows config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_CYGWIN:
 		math_error("The cygwin config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_COMPILE_CUSTOM:
 		math_error("The custom config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_ALLOW_CUSTOM:
 		math_error("The allow_custom config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_VERSION:
 		math_error("The version config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_BASEB:
 		math_error("The baseb config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	case CONFIG_REDECL_WARN:
 		if (vp->v_type == V_NUM) {
@@ -963,7 +1014,7 @@ setconfig(int type, VALUE *vp)
 			if (temp < 0) {
 				math_error("Illegal truth value for "
 					   "redecl_warn");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			conf->redecl_warn = (int)temp;
 		}
@@ -978,7 +1029,7 @@ setconfig(int type, VALUE *vp)
 			if (temp < 0) {
 				math_error("Illegal truth value for "
 					   "dupvar_warn");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			conf->dupvar_warn = (int)temp;
 		}
@@ -986,13 +1037,13 @@ setconfig(int type, VALUE *vp)
 
 	case CONFIG_HZ:
 		math_error("The clock tick rate config parameter is read-only");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 
 	default:
 		math_error("Setting illegal config parameter");
-		/*NOTREACHED*/
-		abort();
+		not_reached();
+		break;
 	}
 }
 
@@ -1017,7 +1068,7 @@ config_copy(CONFIG *src)
 	if (src == NULL || src->epsilon == NULL || src->prompt1 == NULL ||
 	    src->prompt2 == NULL) {
 		math_error("bad CONFIG value");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1026,7 +1077,7 @@ config_copy(CONFIG *src)
 	dest = (CONFIG *)malloc(sizeof(CONFIG));
 	if (dest == NULL) {
 		math_error("malloc of CONFIG failed");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1134,7 +1185,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 	if (cfg == NULL || cfg->epsilon == NULL || cfg->prompt1 == NULL ||
 	    cfg->prompt2 == NULL) {
 		math_error("bad CONFIG value");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1161,7 +1212,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		p = lookup_name(modes, cfg->outmode);
 		if (p == NULL) {
 			math_error("invalid output mode: %d", cfg->outmode);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		vp->v_str = makenewstring(p);
 		return;
@@ -1172,7 +1223,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		if (p == NULL) {
 			math_error("invalid secondary output mode: %d",
 				   cfg->outmode2);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		vp->v_str = makenewstring(p);
 		return;
@@ -1205,6 +1256,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		i = (cfg->tilde_ok ? 1 : 0);
 		break;
 
+	case CONFIG_TILDE_SPACE:
+		i = (cfg->tilde_space ? 1 : 0);
+		break;
+
+	case CONFIG_FRACTION_SPACE:
+		i = (cfg->fraction_space ? 1 : 0);
+		break;
+
+	case CONFIG_COMPLEX_SPACE:
+		i = (cfg->complex_space ? 1 : 0);
+		break;
+
 	case CONFIG_TAB:
 		i = (cfg->tab_ok ? 1 : 0);
 		break;
@@ -1280,7 +1343,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		p = lookup_name(blk_base, cfg->blkbase);
 		if (p == NULL) {
 			math_error("invalid block base: %d", cfg->blkbase);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		vp->v_str = makenewstring(p);
 		return;
@@ -1290,7 +1353,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		p = lookup_name(blk_fmt, cfg->blkfmt);
 		if (p == NULL) {
 			math_error("invalid block format: %d", cfg->blkfmt);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		vp->v_str = makenewstring(p);
 		return;
@@ -1316,7 +1379,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		p = lookup_name(ctrl_d, cfg->ctrl_d);
 		if (p == NULL) {
 			math_error("invalid Control-D: %d", cfg->ctrl_d);
-			/*NOTREACHED*/
+			not_reached();
 		}
 		vp->v_str = makenewstring(p);
 		return;
@@ -1386,7 +1449,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 
 	default:
 		math_error("Getting illegal CONFIG element");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1416,12 +1479,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 invalid");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (cfg2 == NULL || cfg2->epsilon == NULL || cfg2->prompt1 == NULL ||
 	    cfg2->prompt2 == NULL) {
 		math_error("CONFIG #2 value is invalid");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*

config.h

@@ -94,6 +94,9 @@
 #define CONFIG_REDECL_WARN	44
 #define CONFIG_DUPVAR_WARN	45
 #define CONFIG_HZ	46
+#define CONFIG_TILDE_SPACE	47
+#define CONFIG_FRACTION_SPACE	48
+#define CONFIG_COMPLEX_SPACE	49
 
 
 /*
@@ -130,8 +133,11 @@ struct config {
 	LEN sq2;		/* size of number to use square algorithm 2 */
 	LEN pow2;		/* size of modulus to use REDC for powers */
 	LEN redc2;		/* size of modulus to use REDC algorithm 2 */
-	BOOL tilde_ok;		/* ok to print a tilde on approximations */
-	BOOL tab_ok;		/* ok to print tab before numeric values */
+	BOOL tilde_ok;		/* OK to print a tilde on approximations */
+	BOOL tilde_space;	/* print space after tilde on approximations */
+	BOOL fraction_space;	/* TRUE => print spaces around / in fractions */
+	BOOL complex_space;	/* TRUE => print spaces around + or - in complex values */
+	BOOL tab_ok;		/* OK to print tab before numeric values */
 	LEN quomod;		/* quomod() default rounding mode */
 	LEN quo;		/* quotient // default rounding mode */
 	LEN mod;		/* mod % default rounding mode */
@@ -141,8 +147,8 @@ struct config {
 	LEN cfsim;		/* cfsim() default rounding mode */
 	LEN outround;		/* output 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 */
+	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 */
 	char *prompt1;		/* normal prompt */
 	char *prompt2;		/* prompt when inside multi-line input */

const.c

@@ -1,7 +1,7 @@
 /*
  * const - constant number storage module
  *
- * Copyright (C) 1999-2007,2021  David I. Bell
+ * Copyright (C) 1999-2007,2021,2022  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -29,6 +29,7 @@
 #include "qmath.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -47,7 +48,7 @@ initconstants(void)
 	consttable = (NUMBER **) calloc(sizeof(NUMBER *), CONSTALLOCSIZE);
 	if (consttable == NULL) {
 		math_error("Unable to allocate constant table");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	for (i = 0; initnumbs[i] != NULL; i++) {
 		consttable[i] = initnumbs[i];
@@ -108,7 +109,7 @@ addqconstant(NUMBER *q)
 			sizeof(NUMBER *) * (constcount + CONSTALLOCSIZE));
 			if (tp == NULL) {
 				math_error("Unable to reallocate const table");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			consttable = tp;
 			constavail = CONSTALLOCSIZE;
@@ -179,11 +180,11 @@ constvalue(unsigned long index)
 {
 	if (index >= constcount) {
 		math_error("Bad index value for constvalue");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (consttable[index]->links == 0) {
 		math_error("Constvalue has been freed!!!");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	return consttable[index];
 }
@@ -196,12 +197,12 @@ freeconstant(unsigned long index)
 
 	if (index >= constcount) {
 		math_error("Bad index value for freeconst");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	q = consttable[index];
 	if (q->links == 0) {
 		math_error("Attempting to free freed const location");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	qfree(q);
 	if (index == constcount - 1) {

cscript/Makefile

@@ -1,7 +1,8 @@
+#!/usr/bin/env make
 #
 # cscript - makefile for calc shell script files
 #
-# Copyright (C) 1999-2006,2014,2017,2021  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017,2021-2023  Landon Curt Noll
 #
 # SRC: cscript/Makefile
 #
@@ -43,18 +44,23 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
+# On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/zsh
+#	SHELL= sh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= bash
+#SHELL= sh
+#if 0	/* start of skip for non-Gnu makefiles */
+#
+ifeq ($(target),Darwin)
+SHELL:= /bin/sh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 ####
@@ -101,15 +107,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:
@@ -219,10 +216,10 @@ T=
 # H=@:	do not report hsrc file formation progress
 # H=@	do echo hsrc file formation progress
 #
-# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S= >/dev/null 2>&1	silence ${CC} output during hsrc file formation
 # S=			full ${CC} output during hsrc file formation
 #
-# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E= 2>/dev/null	silence command stderr during hsrc file formation
 # E=			full command stderr during hsrc file formation
 #
 # V=@:	do not echo debug statements (quiet mode)
@@ -302,11 +299,17 @@ CALCLIBLIST=
 #
 CSCRIPT_TARGETS= ${SCRIPT}
 TARGETS= ${CSCRIPT_TARGETS} README
+#
+# rules that are not also names of files
+#
+PHONY= all clobber distlist install
 
 # The reason for this Makefile
 #
 all: ${TARGETS} .all
 
+.PHONY: ${PHONY}
+
 README: README.src
 	@${RM} -f $@
 	@${SED} -e "s:#!/usr/local/src/bin/calc/calc:#!${BINDIR}/calc:" $?>$@

cscript/powerterm.calc

@@ -92,7 +92,7 @@ if (base_lim <= 2^20+1) {		/* 2^20 requires ~96 Megs of memory */
 }
 
 /*
- * remove nestest powers
+ * remove nearest powers
  */
 while (abs(x) >= base_lim) {
 

cscript/square.calc

@@ -1,6 +1,6 @@
 #!/usr/local/src/bin/calc/calc -q -p -f
 /*
- * sqaure - print the squares of input values
+ * square - print the squares of input values
  *
  * Copyright (C) 2000-2007,2014,2019,2021  Ernest Bowen
  *

custom.c

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999-2006,2018,2021  Landon Curt Noll
+ * Copyright (C) 1999-2006,2018,2021,2022  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
@@ -48,6 +48,7 @@
 #endif /* CUSTOM */
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -77,12 +78,12 @@ custom(char *name, int count, VALUE **vals)
 			if (count < p->minargs) {
 				math_error("Too few arguments for custom "
 				    "function \"%s\"", p->name);
-				/*NOTREACHED*/
+				not_reached();
 			}
 			if (count > p->maxargs) {
 				math_error("Too many arguments for custom "
 				    "function \"%s\"", p->name);
-				/*NOTREACHED*/
+				not_reached();
 			}
 
 			/* call the custom function */
@@ -200,7 +201,7 @@ customhelp(char *name)
 	customname = (char *)malloc(snprintf_len+1);
 	if (customname == NULL) {
 		math_error("bad malloc of customname");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	snprintf(customname, snprintf_len, "custhelp/%s", name);
 	customname[snprintf_len] = '\0';	/* paranoia */

custom/CUSTOM_CAL

@@ -4,7 +4,7 @@ Custom calc resource files
 The following custom calc resource files are provided because they serve
 as examples of how use the custom interface.  The custom interface
 allows for machine dependent and/or non-portable code to be added as
-builtins to the calc program.  A few example custom functions and
+built-ins to the calc program.  A few example custom functions and
 resource files are shipped with calc to provide you with examples.
 
 By default, the custom builtin returns an error.  Calc have been
@@ -41,7 +41,7 @@ pzasusb8.cal
     Run custom("pzasusb8") on a standard set of data, print Endian
     related information and print value size information.
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

custom/Makefile.head

@@ -1,588 +0,0 @@
-#!/bin/make
-#
-# custom - makefile for calc custom routines
-#
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
-#
-# SRC: custom/Makefile.head
-#
-#	The "# SRC: ... - ..." comment line above indicates
-#	the origin of this file.
-#
-# IMPORTANT: Please see the section on Makefiles near the
-#	     bottom of the HOWTO.INSTALL file.
-#
-# 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.
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# Under source code control:	1997/03/09 02:28:54
-# File existed as early as:	1997
-#
-# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-#
-# calculator by David I. Bell with help/mods from others
-# Makefile by Landon Curt Noll
-
-####################################################
-# NOTE: Start of section from custom/Makefile.head #
-####################################################
-
-#.###############################################################.#
-#.#								#.#
-#.# WARNING: This Makefile is generated from a combination of	#.#
-#.#	   custom/Makefile.head, Makefile.ship, and		#.#
-#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
-#.#	   edit this file, but instead edit the proper source	#.#
-#.#	   file and then make custom/Makefile:			#.#
-#.#								#.#
-#.#		make custom/Makefile				#.#
-#.#								#.#
-#.#	   See the '# NOTE .. section from ..' lines for	#.#
-#.#	   where the source file for the lines are from.	#.#
-#.#								#.#
-#.###############################################################.#
-
-
-# The shell used by this Makefile
-#
-# On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavior.
-#
-# If your system has a up to date, bash shell, then
-# you may wish to use:
-#
-#	SHELL= /bin/bash
-#
-# On some systems such as macOS, the bash shell is very
-# far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= /bin/zsh
-#
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
-
-
-# PREFIX - Top level location for calc
-#
-# The PREFIX is often prepended to paths within calc and calc Makefiles.
-#
-# Starting with calc v2.13.0.1, nearly all Makefile places that used
-# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
-# and, of course, this section. :-)
-#
-# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
-#	a top level directory under which calc installs things.
-#	While usually ${T} is empty, it can be specific path
-#	as if calc where "chrooted" during an install.
-#	The ${PREFIX} value, during install, is a path between
-#	the top level ${T} install directory and the object
-#	such as an include file.
-#
-# NOTE: See also, ${T}, below.
-#
-# There are some paths that do NOT call under ${PREFIX}, such as
-# ${CALCPATH}, that include paths not under ${PREFIX}, but those
-# too are exceptions to this general rule.
-#
-# When in doubt, try:
-#
-#	PREFIX= /usr/local
-#
-PREFIX= /usr/local
-#PREFIX= /usr
-#PREFIX= /usr/global
-
-
-# CCBAN is given to ${CC} in order to control if banned.h is in effect.
-#
-# The banned.h attempts to ban the use of certain dangerous functions
-# that, if improperly used, could compromise the computational integrity
-# if calculations.
-#
-# In the case of calc, we are motivated in part by the desire for calc
-# to correctly calculate: even during extremely long calculations.
-#
-# If UNBAN is NOT defined, then calling certain functions
-# will result in a call to a non-existent function (link error).
-#
-# While we do NOT encourage defining UNBAN, there may be
-# a system / compiler environment where re-defining a
-# function may lead to a fatal compiler complication.
-# If that happens, consider compiling as:
-#
-#	make clobber all chk CCBAN=-DUNBAN
-#
-# as see if this is a work-a-round.
-#
-# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
-# Please send us a bug report.  See the file:
-#
-#	BUGS
-#
-# or the URL:
-#
-#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
-#
-# for how to send us such a bug report.
-#
-CCBAN= -UUNBAN
-#CCBAN= -DUNBAN
-
-
-#if 0	/* start of skip for non-Gnu makefiles */
-
-# Unfortunately due to the complex dependency issues between
-# Makefile, Makefile.ship and custom/Makefile, parallel GNU make
-# is NOT recommended.  Sorry.
-#
-.NOTPARALLEL:
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# NOTE: You can force a target value by defining target as in:
-#
-#	make ...__optional_arguments_... target=value
-
-# Try uname -s if the target was not already set on the make command line
-#
-ifeq ($(target),)
-target=$(shell uname -s 2>/dev/null)
-endif
-#endif	/* end of skip for non-Gnu makefiles */
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# The custom calc resource files to install
-#
-# Put your custom calc resource files here.
-#
-CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
-
-# The custom help files to install
-#
-# Put your custom help files here.
-#
-CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
-
-# Any .h files that are needed by programs that use
-# libcustcalc${LIB_EXT_VERSION}
-#
-# Put any .h files that you add which might be useful to other
-# programs here.
-#
-CUSTOM_H_SRC=
-
-# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
-#
-# Don't put ${REQUIRED_SRC} files in this list.
-#
-# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
-#
-# Put your custom .c files here.
-#
-CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
-	c_pmodm127.c c_register.c
-
-# Any .o files that are needed by program that use
-# libcustcalc${LIB_EXT_VERSION}.
-#
-# Don't put ${REQUIRED_OBJ} files in this list.
-#
-# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
-#
-# Put your custom .o files here.
-#
-CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
-	c_pmodm127.o c_register.o
-
-##############################################################################
-#-=-=-=-=-=-=- Defaults in case you want to build from this dir -=-=-=-=-=-=-#
-##############################################################################
-
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-
-# Makefile debug
-#
-# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal Makefile actions (debug / verbose mode)
-#
-# H=@:	do not report hsrc file formation progress
-# H=@	do echo hsrc file formation progress
-#
-# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
-# S=			full ${CC} output during hsrc file formation
-#
-# E= 2>/dev/null	slience command stderr during hsrc file formation
-# E=			full command stderr during hsrc file formation
-#
-# V=@:	do not echo debug statements (quiet mode)
-# V=@	do echo debug statements (debug / verbose mode)
-#
-#Q=
-Q=@
-#
-S= >/dev/null 2>&1
-#S=
-#
-E= 2>/dev/null
-#E=
-#
-#H=@:
-H=@
-#
-V=@:
-#V=@
-
-####
-# 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
-#
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
-# If in doubt, set:
-#
-#	INCDIR= /usr/include
-#
-
-#INCDIR= ${PREFIX}/include
-#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
-
-# where to install calc related 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= ${PREFIX}/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
-
-#LIBDIR= ${PREFIX}/lib
-#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
-
-#CALC_SHAREDIR= ${PREFIX}/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
-# ${CUSTOMINCDIR}	where custom .h files are installed
-# ${SCRIPTDIR}		where calc shell scripts are installed
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# 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=
-
-# Debug/Optimize options for ${CC} and ${LCC}
-#
-# Select DEBUG= -O2 -gstabs+ -DWINDOZ for DJGPP.
-#
-#DEBUG=
-#
-#DEBUG= -O
-#DEBUG= -O -g
-#DEBUG= -O -g3
-#
-#DEBUG= -O1
-#DEBUG= -O1 -g
-#DEBUG= -O1 -g3
-#
-#DEBUG= -O2
-#DEBUG= -O2 -g
-#DEBUG= -O2 -g3
-#DEBUG= -O2 -ipa
-#DEBUG= -O2 -g3 -ipa
-#
-#DEBUG= -O3
-#DEBUG= -O3 -g
-DEBUG= -O3 -g3
-#DEBUG= -O3 -ipa
-#DEBUG= -O3 -g3 -ipa
-#
-#DEBUG= -g
-#DEBUG= -g3
-#DEBUG= -gx
-#DEBUG= -WM,-g
-#
-#DEBUG= -O2 -gstabs+ -DWINDOZ
-
-# Some systems require one to use ranlib to add a symbol table to
-# a *.a link library.  Set RANLIB to the utility that performs this
-# action.  Set RANLIB to : if your system does not need such a utility.
-#
-RANLIB=ranlib
-#RANLIB=:
-
-# Normally certain files depend on the Makefile.  If the Makefile is
-# changed, then certain steps should be redone.	 If MAKE_FILE is
-# set to Makefile, then these files will depend on Makefile.  If
-# MAKE_FILE is empty, then they wont.
-#
-# If in doubt, set MAKE_FILE to Makefile
-#
-MAKE_FILE= Makefile
-#MAKE_FILE=
-
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
-# If you do not wish to use purify, set PURIFY to an empty string.
-#
-# If in doubt, use PURIFY=
-#
-#PURIFY= purify
-#PURIFY= purify -m71-engine
-#PURIFY= purify -logfile=pure.out
-#PURIFY= purify -m71-engine -logfile=pure.out
-PURIFY=
-
-# If you want to use a debugging link library such as a malloc debug link
-# library, or need to add special ld flags after the calc link libraries
-# are included, set ${LD_DEBUG} below.
-#
-# If in doubt, set LD_DEBUG to empty.
-#
-#LD_DEBUG= -lmalloc_cv
-LD_DEBUG=
-
-# When doing a:
-#
-#	make check
-#	make chk
-#	make debug
-#
-# the ${CALC_ENV} is used to supply the proper environment variables
-# to calc.  Most people will simply need 'CALCPATH=./cal' to ensure
-# that these debug rules will only use calc resource files under the
-# local source directory.  The longer lines (with MALLOC_VERBOSE=1 ...)
-# are useful for SGI IRIX people who have 'WorkShop Performance Tools'
-# and who also set 'LD_DEBUG= -lmalloc_cv' above.
-#
-# If in doubt, use CALC_ENV= CALCPATH=./cal.
-#
-CALC_ENV= CALCPATH=./cal
-#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
-#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1
-#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
-#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
-#	  MALLOC_CLEAR_MALLOC=1
-
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
-
-# Some out of date operating systems require / want an executable to
-# end with a certain file extension.  Some compile systems such as
-# Cygwin build calc as calc.exe.  The EXT variable is used to denote
-# the extension required by such.
-#
-# EXT=				# normal Un*x / Linux / GNU/Linux systems
-# EXT=.exe			# windoz / Cygwin
-#
-# If in doubt, use EXT=
-#
-EXT=
-#EXT=.exe
-
-# The default calc versions
-#
-VERSION= 2.14.0.10
-
-# Names of shared libraries with versions
-#
-LIB_EXT= .so
-LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
-
-# standard tools
-#
-AR= ar
-AWK= awk
-CHMOD= chmod
-CMP= cmp
-CO= co
-CP= cp
-FMT= fmt
-GREP= egrep
-LN= ln
-MAKE= make
-MAKEDEPEND= makedepend
-MKDIR= mkdir
-MV= mv
-RM= rm
-RMDIR= rmdir
-SED= sed
-SORT= sort
-TOUCH= touch
-TRUE= true
-
-# EXTRA_CFLAGS are flags given to ${CC} when compiling C files
-# EXTRA_LDFLAGS are flags given to ${CC} when linking progs
-#
-# Both CFLAGS and LDFLAGS are left blank in this Makefile by
-# default so that users may use them on the make command line
-# to always the way that C is compiled and files are linked
-# respectively.  For example:
-#
-#	make all EXTRA_CFLAGS="-DMAGIC" EXTRA_LDFLAGS="-lmagic"
-#
-# NOTE: These should be left blank in this Makefile to make it
-#       easier to add stuff on the command line.  If you want to
-#	to change the way calc is compiled by this Makefile, change
-#	the appropriate host target section below or a flag above.
-#
-EXTRA_CFLAGS=
-EXTRA_LDFLAGS=
-
-# COMMON_CFLAGS are the common ${CC} flags used for all progs, both
-#	    intermediate and final calc and calc related progs
-#
-COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
-
-# COMMON_LDFLAGS are the common flags used for linking all progs, both
-#	     intermediate and final calc and calc related progs
-#
-COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
-
-###########################################
-# Set the default compile flags for ${CC} #
-###########################################
-
-#if 0	/* start of skip for non-Gnu makefiles */
-
-# Required flags to compile C files for calc
-#
-# ICFLAGS are given to ${CC} for intermediate progs used to help compile calc
-# CFLAGS are given to ${CC} for calc progs other than intermediate progs
-#
-# NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
-#
-ifeq ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
-else
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
-endif
-CFLAGS= ${ICFLAGS} ${CCOPT}
-
-# Required flags to link files for calc
-#
-# ILDFLAGS for ${CC} in linking intermediate progs used to help compile calc
-# LDFLAGS for ${CC} in linking calc progs other than intermediate progs
-#
-ILDFLAGS= ${COMMON_LDFLAGS}
-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
-
-#endif	/* end of skip for non-Gnu makefiles */
-
-##################################################
-# NOTE: End of section from custom/Makefile.head #
-##################################################

custom/Makefile.simple

@@ -1,22 +1,646 @@
+#!/usr/bin/env make
 #
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+# custom - makefile for calc custom routines
 #
-# SRC: custom/Makefile.tail
+# Copyright (C) 1999-2006,2014,2017-2018,2021,2023  Landon Curt Noll
+#
+# SRC: custom/Makefile.simple - non-GNU version
 #
 #	The "# SRC: ... - ..." comment line above indicates
 #	the origin of this file.
 #
 # IMPORTANT: Please see the section on Makefiles near the
 #	     bottom of the HOWTO.INSTALL file.
+#
+# 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.
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# Under source code control:	1997/03/09 02:28:54
+# File existed as early as:	1997
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
+#
+# calculator by David I. Bell with help/mods from others
+# Makefile by Landon Curt Noll
 
-####################################################
-# NOTE: Start of section from custom/Makefile.tail #
-####################################################
+
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point where is cannot be depended on.
+# On such systems, the sh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= sh
+#
+SHELL= bash
+#SHELL= sh
+
+
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+#	a top level directory under which calc installs things.
+#	While usually ${T} is empty, it can be specific path
+#	as if calc where "chrooted" during an install.
+#	The ${PREFIX} value, during install, is a path between
+#	the top level ${T} install directory and the object
+#	such as an include file.
+#
+# NOTE: See also, ${T}, below.
+#
+# There are some paths that do NOT call under ${PREFIX}, such as
+# ${CALCPATH}, that include paths not under ${PREFIX}, but those
+# too are exceptions to this general rule.
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
+
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#
+# The banned.h attempts to ban the use of certain dangerous functions
+# that, if improperly used, could compromise the computational integrity
+# if calculations.
+#
+# In the case of calc, we are motivated in part by the desire for calc
+# to correctly calculate: even during extremely long calculations.
+#
+# If UNBAN is NOT defined, then calling certain functions
+# will result in a call to a non-existent function (link error).
+#
+# While we do NOT encourage defining UNBAN, there may be
+# a system / compiler environment where re-defining a
+# function may lead to a fatal compiler complication.
+# If that happens, consider compiling as:
+#
+#	make clobber all chk CCBAN=-DUNBAN
+#
+# as see if this is a work-a-round.
+#
+# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+# Please send us a bug report.  See the file:
+#
+#	BUGS
+#
+# or the URL:
+#
+#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+#
+# for how to send us such a bug report.
+#
+CCBAN= -UUNBAN
+#CCBAN= -DUNBAN
+
+
+
+# The custom calc resource files to install
+#
+# Put your custom calc resource files here.
+#
+CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
+
+# The custom help files to install
+#
+# Put your custom help files here.
+#
+CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
+
+# Any .h files that are needed by programs that use
+# libcustcalc${LIB_EXT_VERSION}
+#
+# Put any .h files that you add which might be useful to other
+# programs here.
+#
+CUSTOM_H_SRC=
+
+# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
+#
+# Don't put ${REQUIRED_SRC} files in this list.
+#
+# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
+#
+# Put your custom .c files here.
+#
+CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
+	c_pmodm127.c c_register.c
+
+# Any .o files that are needed by program that use
+# libcustcalc${LIB_EXT_VERSION}.
+#
+# Don't put ${REQUIRED_OBJ} files in this list.
+#
+# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
+#
+# Put your custom .o files here.
+#
+CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
+	c_pmodm127.o c_register.o
 
 ##############################################################################
-#-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
+#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
 
+##############################################################################
+#-=-=-=-=-=-=- Defaults in case you want to build from this dir -=-=-=-=-=-=-#
+##############################################################################
+
+# Normally, the upper level makefile will set these values.  We provide
+# a default here just in case you want to build from this directory.
+
+# Makefile debug
+#
+# Q=@	do not echo internal Makefile actions (quiet mode)
+# Q=	echo internal Makefile actions (debug / verbose mode)
+#
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	silence ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	silence command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
+# V=@:	do not echo debug statements (quiet mode)
+# V=@	do echo debug statements (debug / verbose mode)
+#
+#Q=
+Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
+V=@:
+#V=@
+
+####
+# 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
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= ${PREFIX}/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc related 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= ${PREFIX}/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= ${PREFIX}/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= ${PREFIX}/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
+# ${CUSTOMINCDIR}	where custom .h files are installed
+# ${SCRIPTDIR}		where calc shell scripts are installed
+#
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
+#
+# 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=
+
+# Debug/Optimize options for ${CC} and ${LCC}
+#
+# Select DEBUG= -O2 -gstabs+ -D_WIN32 for DJGPP.
+#
+#DEBUG=
+#
+#DEBUG= -O
+#DEBUG= -O -g
+#DEBUG= -O -g3
+#
+#DEBUG= -O1
+#DEBUG= -O1 -g
+#DEBUG= -O1 -g3
+#
+#DEBUG= -O2
+#DEBUG= -O2 -g
+#DEBUG= -O2 -g3
+#DEBUG= -O2 -ipa
+#DEBUG= -O2 -g3 -ipa
+#
+#DEBUG= -O3
+#DEBUG= -O3 -g
+DEBUG= -O3 -g3
+#DEBUG= -O3 -ipa
+#DEBUG= -O3 -g3 -ipa
+#
+#DEBUG= -g
+#DEBUG= -g3
+#DEBUG= -gx
+#DEBUG= -WM,-g
+#
+#DEBUG= -O2 -gstabs+ -D_WIN32
+
+# Some systems require one to use ranlib to add a symbol table to
+# a *.a link library.  Set RANLIB to the utility that performs this
+# action.  Set RANLIB to : if your system does not need such a utility.
+#
+RANLIB=ranlib
+#RANLIB=:
+
+# Normally certain files depend on the Makefile.  If the Makefile is
+# changed, then certain steps should be redone.	 If MAKE_FILE is
+# set to Makefile, then these files will depend on Makefile.  If
+# MAKE_FILE is empty, then they wont.
+#
+# If in doubt, set MAKE_FILE to Makefile
+#
+MAKE_FILE= Makefile
+#MAKE_FILE=
+
+# If you do not wish to use purify, set PURIFY to an empty string.
+#
+# If in doubt, use PURIFY=
+#
+#PURIFY= purify
+#PURIFY= purify -m71-engine
+#PURIFY= purify -logfile=pure.out
+#PURIFY= purify -m71-engine -logfile=pure.out
+PURIFY=
+
+# If you want to use a debugging link library such as a malloc debug link
+# library, or need to add special ld flags after the calc link libraries
+# are included, set ${LD_DEBUG} below.
+#
+# If in doubt, set LD_DEBUG to empty.
+#
+#LD_DEBUG= -lmalloc_cv
+LD_DEBUG=
+
+# When doing a:
+#
+#	make check
+#	make chk
+#	make debug
+#
+# the ${CALC_ENV} is used to supply the proper environment variables
+# to calc.  Most people will simply need 'CALCPATH=./cal' to ensure
+# that these debug rules will only use calc resource files under the
+# local source directory.  The longer lines (with MALLOC_VERBOSE=1 ...)
+# are useful for SGI IRIX people who have 'WorkShop Performance Tools'
+# and who also set 'LD_DEBUG= -lmalloc_cv' above.
+#
+# If in doubt, use CALC_ENV= CALCPATH=./cal.
+#
+CALC_ENV= CALCPATH=./cal
+#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
+#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1
+#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
+#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
+#	  MALLOC_CLEAR_MALLOC=1
+
+# By default, custom builtin functions may only be executed if calc
+# is given the -C option.  This is because custom builtin functions
+# may invoke non-standard or non-portable code.	 One may completely
+# disable custom builtin functions by not compiling any of code
+#
+# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
+# ALLOW_CUSTOM=			# disable custom even if -C is given
+#
+# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
+#
+ALLOW_CUSTOM= -DCUSTOM
+#ALLOW_CUSTOM=
+
+# Some out of date operating systems require / want an executable to
+# end with a certain file extension.  Some compile systems such as
+# Cygwin build calc as calc.exe.  The EXT variable is used to denote
+# the extension required by such.
+#
+# EXT=				# normal Un*x / Linux / GNU/Linux systems
+# EXT=.exe			# Windows / Cygwin
+#
+# If in doubt, use EXT=
+#
+EXT=
+#EXT=.exe
+
+# The default calc versions
+#
+VERSION= 2.14.2.2
+
+# Names of shared libraries with versions
+#
+LIB_EXT= .so
+LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
+
+# standard tools
+#
+AR= ar
+AWK= awk
+CHMOD= chmod
+CMP= cmp
+CO= co
+CP= cp
+DIFF= diff
+FMT= fmt
+GREP= grep
+LN= ln
+LS= ls
+MAKE= make
+MAKEDEPEND= makedepend
+MKDIR= mkdir
+MV= mv
+RM= rm
+RMDIR= rmdir
+SED= sed
+SORT= sort
+TAIL= tail
+TOUCH= touch
+TRUE= true
+
+# EXTRA_CFLAGS are flags given to ${CC} when compiling C files
+# EXTRA_LDFLAGS are flags given to ${CC} when linking progs
+#
+# Both CFLAGS and LDFLAGS are left blank in this Makefile by
+# default so that users may use them on the make command line
+# to always the way that C is compiled and files are linked
+# respectively.  For example:
+#
+#	make all EXTRA_CFLAGS="-DMAGIC" EXTRA_LDFLAGS="-lmagic"
+#
+# NOTE: These should be left blank in this Makefile to make it
+#       easier to add stuff on the command line.  If you want to
+#	to change the way calc is compiled by this Makefile, change
+#	the appropriate host target section below or a flag above.
+#
+EXTRA_CFLAGS=
+EXTRA_LDFLAGS=
+
+# COMMON_CFLAGS are the common ${CC} flags used for all progs, both
+#	    intermediate and final calc and calc related progs
+#
+COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+
+# COMMON_LDFLAGS are the common flags used for linking all progs, both
+#	     intermediate and final calc and calc related progs
+#
+COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
+
+###########################################
+# Set the default compile flags for ${CC} #
+###########################################
+
+
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################
+
+# include start from top Makefile - keep this line
+######################################################
+# NOTE: Start of section from the middle of Makefile #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, until the comment line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
+
+##############################################################################
+#-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
+##############################################################################
+
+# Common values set in targets
+#
+# BLD_TYPE determines if calc is built with static and/or dynamic libs.
+#	       Set this value to one of:
+#
+#	BLD_TYPE= calc-dynamic-only
+#	BLD_TYPE= calc-static-only
+#
+# CC_SHARE are flags given to ${CC} to build .o files suitable for shared libs
+# DEFAULT_LIB_INSTALL_PATH is where calc programs look for calc shared libs
+# LD_SHARE are common flags given to ${CC} to link with shared libraries
+# LIBCALC_SHLIB are flags given to ${CC} to build libcalc shared libraries
+# LIBCUSTCALC_SHLIB are flags given to ${CC} to build libcustcalc shared lib
+#
+#	NOTE: The above 5 values are unused if BLD_TYPE= calc-static-only
+#
+# CC_STATIC are flags given to ${CC} to build .o files suitable for static libs
+# LD_STATIC are common flags given to ${CC} to link with static libraries
+# LIBCALC_STATIC are flags given to ${CC} to build libcalc static libraries
+# LIBCUSTCALC_STATIC are flags given to ${CC} to build libcustcalc static lib
+#
+#	NOTE: The above 4 values are unused if BLD_TYPE= calc-dynamic-only
+#
+# CCOPT are flags given to ${CC} for optimization
+# CCWARN are flags given to ${CC} for warning message control
+#
+# The following are given to ${CC}:
+#
+#	WNO_IMPLICT
+#	WNO_ERROR_LONG_LONG
+#	WNO_LONG_LONG
+#
+# when compiling special .o files that may need special compile options:
+#
+#	NOTE: These flags simply turn off certain compiler warnings,
+#	      which is useful only when CCWERR is set to -Werror.
+#
+#	NOTE: If your compiler does not have these -Wno files, just
+#	      set these variables to nothing as in:
+#
+#		WNO_IMPLICT=
+#		WNO_ERROR_LONG_LONG=
+#		WNO_LONG_LONG=
+#
+# CCWERR are flags given to ${CC} to make warnings fatal errors
+#	NOTE: CCWERR is only set in development Makefiles and must only be
+#	      used with ${CC}, not ${LCC}.  If you do not want the compiler
+#	      to abort on warnings, then leave CCWERR blank.
+# CCMISC are misc flags given to ${CC}
+#
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#	NOTE: See where CCBAN is defined above for details.
+#
+# LCC is how the C compiler is invoked on locally executed intermediate programs
+# CC is how the C compiler is invoked (with an optional Purify)
+#
+# Specific target overrides or modifications to default values
+
+#
+BLD_TYPE= calc-static-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+#
+CC_STATIC=
+LD_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+#
+#CCWARN= -Wall
+CCWARN= -Wall -Wextra -pedantic
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= cc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+# The simple makefile forces the use of static ${CC} flags
+#
+# ICFLAGS are given to ${CC} for intermediate programs used to help compile calc
+# CFLAGS are given to ${CC} for calc programs other than intermediate programs
+# ILDFLAGS for ${CC} in linking intermediate programs used to help compile calc
+# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
+#
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
+CFLAGS= ${ICFLAGS} ${CCOPT}
+#
+ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+#
+
+#######################################################################
+#-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
+#######################################################################
+
+######################################################
+# NOTE: End of section from the middle of Makefile   #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, starting with the line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
+# include end from top Makefile - keep this line
+
 # These .c files are required for the main custom interface and
 # for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
 #
@@ -57,8 +681,7 @@ H_SRC= ${CUSTOM_H_SRC}
 # directory but are installed as help files from the help/Makefile.
 #
 DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
-	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE}.head \
-	${MAKE_FILE}.tail
+	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD Makefile Makefile.simple
 
 # These files are used to make (but not built) a calc .a link library
 #
@@ -78,7 +701,7 @@ TARGETS= ${BLD_TYPE} Makefile.simple
 
 ###
 #
-# The reason for this Makefile	:-)
+# The main reason for this Makefile	:-)
 #
 ###
 
@@ -158,21 +781,6 @@ calcliblist: ${CALCLIBLIST}
 	    fi; \
 	done
 
-#if 0	/* start of skip for non-Gnu makefiles */
-Makefile.simple: ${MAKE_FILE}
-	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${Q} ${RM} -f $@
-	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    ${MAKE_FILE} | \
-	    ${GREP} -v '#\.#' | \
-	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
-	${Q} echo >> $@
-	${Q} echo 'Makefile.simple:' >> $@
-	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
-	${Q} echo '		$${CP} -f $${MAKE_FILE} $$@; fi' >> $@
-	${V} echo '=-=-=-=-= custom/${MAKE_FILE} end of $@ rule =-=-=-=-='
-#endif	/* end of skip for non-Gnu makefiles */
 
 ##
 #
@@ -188,11 +796,17 @@ Makefile.simple: ${MAKE_FILE}
 
 depend:
 	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
+	    echo "custom/${MAKE_FILE}.bak exists, remove or move it" 1>&2; \
 	    exit 1; \
 	else \
 	    ${TRUE}; \
 	fi
+	${Q} if type -f ${MAKEDEPEND}; then \
+	    ${TRUE}; \
+	else \
+	    echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
+	    exit 1; \
+	fi
 	${Q} echo forming custom/skel
 	${Q} ${RM} -rf skel
 	${Q} ${MKDIR} -p skel
@@ -212,8 +826,8 @@ depend:
 		>> "skel/custom/$$i"; \
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
-	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
+	${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
+	(cd ..; ${MAKE} -f ${MAKE_FILE} h_list 2>/dev/null) | \
 	    while read i; do \
 		if [ ! -f "../$$i" ]; then continue; fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -223,15 +837,17 @@ depend:
 		    >> "skel/$$i"; \
 		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
 	    done
-	${Q} ${RM} -f skel/custom/makedep.out
+	${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} \
+	-${Q} cd skel/custom; ${MAKEDEPEND} \
 	    -I../../.. -w 1 -f makedep.out -- \
 	    ${CFLAGS} -- \
 	    ${C_SRC} 2>/dev/null
-	${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
+	${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
+	${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
+	    ${GREP} -E -v /usr/include > skel/custom/makedep.out
 	-${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/'; \
@@ -245,7 +861,7 @@ depend:
 	${Q} ${MV} ${MAKE_FILE} ${MAKE_FILE}.bak
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
-	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
+	${Q} ${GREP} -E -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
 	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
@@ -304,9 +920,6 @@ clobber: clean
 	${RM} -f libcustcalc*
 	${RM} -rf skel
 	${V} echo remove files that are obsolete
-#if 0	/* start of skip for non-Gnu makefiles */
-	${RM} -f Makefile.simple
-#endif	/* end of skip for non-Gnu makefiles */
 	-${Q} if [ -e .DS_Store ]; then \
 	    echo ${RM} -rf .DS_Store; \
 	    ${RM} -rf .DS_Store; \
@@ -549,6 +1162,7 @@ uninstall:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 c_argv.o: ../alloc.h
+c_argv.o: ../attribute.h
 c_argv.o: ../banned.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
@@ -576,6 +1190,7 @@ c_argv.o: ../value.h
 c_argv.o: ../zmath.h
 c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
+c_devnull.o: ../attribute.h
 c_devnull.o: ../banned.h
 c_devnull.o: ../block.h
 c_devnull.o: ../byteswap.h
@@ -603,6 +1218,7 @@ c_devnull.o: ../value.h
 c_devnull.o: ../zmath.h
 c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
+c_help.o: ../attribute.h
 c_help.o: ../banned.h
 c_help.o: ../block.h
 c_help.o: ../byteswap.h
@@ -630,6 +1246,7 @@ c_help.o: ../value.h
 c_help.o: ../zmath.h
 c_help.o: c_help.c
 c_pmodm127.o: ../alloc.h
+c_pmodm127.o: ../attribute.h
 c_pmodm127.o: ../banned.h
 c_pmodm127.o: ../block.h
 c_pmodm127.o: ../byteswap.h
@@ -656,6 +1273,7 @@ c_pmodm127.o: ../value.h
 c_pmodm127.o: ../zmath.h
 c_pmodm127.o: c_pmodm127.c
 c_pzasusb8.o: ../alloc.h
+c_pzasusb8.o: ../attribute.h
 c_pzasusb8.o: ../banned.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
@@ -682,6 +1300,7 @@ c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../zmath.h
 c_pzasusb8.o: c_pzasusb8.c
 c_register.o: ../alloc.h
+c_register.o: ../attribute.h
 c_register.o: ../banned.h
 c_register.o: ../block.h
 c_register.o: ../byteswap.h
@@ -709,6 +1328,7 @@ c_register.o: ../value.h
 c_register.o: ../zmath.h
 c_register.o: c_register.c
 c_sysinfo.o: ../alloc.h
+c_sysinfo.o: ../attribute.h
 c_sysinfo.o: ../banned.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h
@@ -743,6 +1363,7 @@ c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
 c_sysinfo.o: c_sysinfo.c
 custtbl.o: ../alloc.h
+custtbl.o: ../attribute.h
 custtbl.o: ../banned.h
 custtbl.o: ../block.h
 custtbl.o: ../byteswap.h
@@ -767,7 +1388,3 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
-
-##################################################
-# NOTE: End of section from custom/Makefile.tail #
-##################################################

custom/c_argv.c

@@ -57,7 +57,7 @@ c_argv(char *UNUSED(name), int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE zfilelen;	/* length of a file as a ZVALUE */
-	NUMBER *filelen;	/* pointer to length of a file as a NUMER */
+	NUMBER *filelen;	/* pointer to length of a file as a NUMBER */
 	char *type;		/* the name of the arg type */
 	int i;
 
@@ -103,12 +103,12 @@ c_argv(char *UNUSED(name), int count, VALUE **vals)
 			type = "assoc";
 			break;
 		case V_OBJ:	/* address of object structure */
-			type = "ocject";
+			type = "object";
 			break;
 		case V_FILE:	/* opened file id */
 			type = "file";
 			break;
-		case V_RAND:	/* address of additive 55 random state */
+		case V_RAND:	/* subtractive 100 random state */
 			type = "rand_state";
 			break;
 		case V_RANDOM:	/* address of Blum random state */

custom/c_help.c

@@ -1,7 +1,7 @@
 /*
  * c_help - custom help function
  *
- * Copyright (C) 1999-2004,2021  Landon Curt Noll
+ * Copyright (C) 1999-2004,2021,2022  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
@@ -39,6 +39,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -70,7 +71,7 @@ c_help(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 	 */
 	if (vals[0]->v_type != V_STR) {
 		math_error("custom help arg 1 must be a string");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*

custom/c_pmodm127.c

@@ -1,7 +1,7 @@
 /*
  * c_pmodm127 - calculate q mod 2^(2^127-1)
  *
- * Copyright (C) 2004-2007,2021  Landon Curt Noll
+ * Copyright (C) 2004-2007,2021,2022  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
@@ -36,6 +36,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -88,15 +89,15 @@ c_pmodm127(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 	result.v_type = V_NULL;
 	if (vals[0]->v_type != V_NUM) {
 		math_error("Non-numeric argument for pmodm127");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qisfrac(vals[0]->v_num)) {
 		math_error("Non-integer argument for pmodm127");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qisneg(vals[0]->v_num) || qiszero(vals[0]->v_num)) {
 		math_error("argument for pmodm127 <= 0");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -250,7 +251,7 @@ zmod5_or_zmod(ZVALUE *zp)
 		subcount++;
 		if (subcount > 2) {
 			math_error("Too many subtractions in zmod5_or_zmod");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		j = modlen;
 		a = zp->v;

custom/c_pzasusb8.c

@@ -1,7 +1,7 @@
 /*
  * c_pzasusb8 - print numerator as a string of USB8s
  *
- * Copyright (C) 1999-2004,2021  Ernest Bowen
+ * Copyright (C) 1999-2004,2021,2022  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
@@ -36,6 +36,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -67,7 +68,7 @@ c_pzasusb8(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 	result.v_type = V_NULL;
 	if (vals[0]->v_type != V_NUM) {
 		math_error("Non-real argument for pzasusb8");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*

custom/c_register.c

@@ -1,7 +1,7 @@
 /*
  * c_register - set or print a custom register value
  *
- * Copyright (C) 2007,2021  Landon Curt Noll
+ * Copyright (C) 2007,2021,2022  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
@@ -39,6 +39,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -90,24 +91,24 @@ c_register(char *UNUSED(name), int count, VALUE **vals)
 	result.v_type = V_NULL;
 	if (vals[0]->v_type != V_NUM) {
 		math_error("Non-numeric register number");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qisfrac(vals[0]->v_num)) {
 		math_error("Non-integer register number");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (qisneg(vals[0]->v_num)) {
 		math_error("register number < 0");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (! qistiny(vals[0]->v_num)) {
 		math_error("register is huge");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	reg = qtoi(vals[0]->v_num);
 	if (reg > CUSTOM_REG_MAX) {
 		math_error("register is larger than CUSTOM_REG_MAX");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*

custom/c_sysinfo.c

@@ -1,7 +1,7 @@
 /*
  * c_sysinfo - names and values of selected #defines
  *
- * Copyright (C) 1999-2007,2021  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021,2022  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
@@ -57,6 +57,7 @@
 #include "have_unused.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -208,7 +209,7 @@ STATIC struct infoname sys_info[] = {
      (FULL)SBITS},
     {"SBYTES", "size of additive or shuffle entry in bytes", NULL,
      (FULL)SBYTES},
-    {"SCNT", "length of additive 55 table in FULLs", NULL,
+    {"SCNT", "length of subtractive 100 table in FULLs", NULL,
      (FULL)SCNT},
     {"SEEDXORBITS", "low bits of a55 seed devoted to xor", NULL,
      (FULL)SEEDXORBITS},
@@ -301,7 +302,7 @@ c_sysinfo(char *UNUSED(name), int count, VALUE **vals)
 		    qisfrac(vals[0]->v_num) ||
 		    zge31b(vals[0]->v_num->num)) {
 			math_error("sysinfo: arg must be string, 0, 1 or 2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 		/*
@@ -319,7 +320,7 @@ c_sysinfo(char *UNUSED(name), int count, VALUE **vals)
 			break;
 		default:
 			math_error("sysinfo: arg must be string, 0, 1 or 2");
-			/*NOTREACHED*/
+			not_reached();
 		}
 
 	/*
@@ -368,7 +369,7 @@ c_sysinfo(char *UNUSED(name), int count, VALUE **vals)
 	 */
 	} else {
 		math_error("sysinfo: arg must be string, 0, 1 or 2");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*

decl.h

@@ -52,9 +52,9 @@
 
 
 /*
- * MS windoz macros
+ * MS Windows macros
  */
-#elif defined(_WIN32) || defined(WINDOZ)
+#elif defined(_WIN32) || defined(_WIN64)
 
 
   /* determine which type of DLL we must generate */
@@ -94,12 +94,5 @@
 
 #endif
 
-/* Perform printf-style argument type checking for known compilers */
-#ifdef __GNUC__
-# define PRINTF_FORMAT(fmt_idx, arg_idx) __attribute__ \
-         ((format (printf, fmt_idx, arg_idx)))
-#else
-# define PRINTF_FORMAT(fmt_idx, arg_idx)
-#endif
 
 #endif /* !INCLUDE_DECL_H */

file.c

@@ -1,7 +1,7 @@
 /*
  * file - file I/O routines callable by users
  *
- * Copyright (C) 1999-2007,2018,2021  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007,2018,2021,2022  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -39,18 +39,19 @@
 #include "calc.h"
 #include "alloc.h"
 #include "longbits.h"
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "have_fpos_pos.h"
 #include "fposval.h"
 #include "file.h"
 #include "calcerr.h"
 #include "strl.h"
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(_WIN64)
 # include <io.h>
 #endif
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -179,7 +180,7 @@ file_init(void)
 			tname = (char *)malloc(snprintf_len+1);
 			if (tname == NULL) {
 				math_error("Out of memory for init_file");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			snprintf(tname, snprintf_len, "descriptor[%d]", i);
 			tname[snprintf_len] = '\0';	/* paranoia */
@@ -231,7 +232,7 @@ init_fileio(FILEIO *fiop, char *name, char *mode,
 		fiop->name = (char *)malloc(namelen + 1);
 		if (fiop->name == NULL) {
 			math_error("No memory for filename");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	}
 
@@ -338,7 +339,7 @@ init_fileio(FILEIO *fiop, char *name, char *mode,
  * NOTE: This function will not return 0, 1 or 2 since they are
  *	 reserved for stdin, stdout, stderr.  In fact, it must not
  *	 return 0, 1, or 2 because it will confuse those who call
- *	 the opensearchfiile() function
+ *	 the opensearchfile() function
  */
 FILEID
 openid(char *name, char *mode)
@@ -367,7 +368,7 @@ openid(char *name, char *mode)
 	}
 	if (fstat(fileno(fp), &sbuf) < 0) {
 		math_error("bad fstat");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/* get a new FILEID */
@@ -383,7 +384,7 @@ openid(char *name, char *mode)
 
 
 /*
- * openpathid - open the specified abse filename, or
+ * openpathid - open the specified base filename, or
  *	        relative filename along a search path
  *
  * given:
@@ -398,7 +399,7 @@ openid(char *name, char *mode)
  * NOTE: This function will not return 0, 1 or 2 since they are
  *	 reserved for stdin, stdout, stderr.  In fact, it must not
  *	 return 0, 1, or 2 because it will confuse those who call
- *	 the opensearchfiile() function
+ *	 the opensearchfile() function
  */
 FILEID
 openpathid(char *name, char *mode, char *pathlist)
@@ -436,12 +437,12 @@ openpathid(char *name, char *mode, char *pathlist)
 			free(openpath);
 		}
 		math_error("bad fstat");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	if (openpath == NULL) {
 		fclose(fp);
 		math_error("bad openpath");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/* get a new FILEID */
@@ -482,7 +483,7 @@ reopenid(FILEID id, char *mode, char *name)
 	if ((id == FILEID_STDIN) || (id == FILEID_STDOUT) ||
 	    (id == FILEID_STDERR)) {
 		math_error("Cannot freopen stdin, stdout, or stderr");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/* reopen the file */
@@ -507,7 +508,7 @@ reopenid(FILEID id, char *mode, char *name)
 		}
 		if (i >= MAXFILES) {
 			math_error("This should not happen in reopenid");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		fp = f_open(name, mode);
 		if (fp == NULL) {
@@ -532,7 +533,7 @@ reopenid(FILEID id, char *mode, char *name)
 	}
 	if (fstat(fileno(fp), &sbuf) < 0) {
 		math_error("bad fstat");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/* initialize FILEIO structure */
@@ -632,7 +633,7 @@ closeid(FILEID id)
 	if ((id == FILEID_STDIN) || (id == FILEID_STDOUT) ||
 	    (id == FILEID_STDERR)) {
 		math_error("Cannot close stdin, stdout, or stderr");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/* get file structure */
@@ -728,7 +729,7 @@ flushid(FILEID id)
 }
 
 
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 int
 flushall(void)
 {
@@ -744,7 +745,7 @@ flushall(void)
 	}
 	return err;
 }
-#endif /* Windoz free systems */
+#endif /* Windows free systems */
 
 
 /*
@@ -832,7 +833,7 @@ readid(FILEID id, int flags, STRING **retstr)
 			str = (char *)malloc(n + 1);
 		if (str == NULL) {
 			math_error("Out of memory for readid");
-			/*NOTREACHED*/
+			not_reached();
 		}
 		if (n > 0)
 			memcpy(&str[totlen], buf, n);
@@ -1458,7 +1459,7 @@ z2filepos(ZVALUE zpos)
 	if (zpos.len >= FILEPOS_BITS/BASEB) {
 		/* copy the lower FILEPOS_BITS of the ZVALUE */
 		memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
-		memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN);
+		memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN));
 	} else {
 		/* copy what bits we can into the temp value */
 		memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
@@ -1536,7 +1537,7 @@ getloc(FILEID id, ZVALUE *res)
 	fp = fiop->fp;
 	if (fp == NULL) {
 		math_error("Bogus internal file pointer!");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1695,7 +1696,7 @@ setloc(FILEID id, ZVALUE zpos)
 	if ((id == FILEID_STDIN) || (id == FILEID_STDOUT) ||
 	    (id == FILEID_STDERR)) {
 		math_error("Cannot fseek stdin, stdout, or stderr");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -1709,7 +1710,7 @@ setloc(FILEID id, ZVALUE zpos)
 	fp = fiop->fp;
 	if (fp == NULL) {
 		math_error("Bogus internal file pointer!");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	fiop->action = 0;
@@ -1960,7 +1961,7 @@ filesize(FILEIO *fiop)
 	/* return length */
 	if (fstat(fileno(fiop->fp), &sbuf) < 0) {
 		math_error("bad fstat");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	return sbuf.st_size;
 }
@@ -2021,7 +2022,7 @@ showfiles(void)
 			math_chr('\n');
 			continue;
 		}
-		printf(" size = %lld\n", (long long int)sizes[i]);
+		printf(" size = %ld\n", (long int)sizes[i]);
 		for (j = i + 1; j < idnum; j++) {
 			if (listed[j] || sizes[j] == -1)
 				continue;
@@ -2099,7 +2100,7 @@ getscanfield(FILE *fp, BOOL skip, unsigned int width, int scannum,
 				str = (char *) malloc(len + 1);
 			if (str == NULL) {
 				math_error("Out of memory for scanning");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			if (len)
 				memcpy(&str[totlen], buf, len);
@@ -2177,7 +2178,7 @@ getscanwhite(FILE *fp, BOOL skip, unsigned int width, int scannum,
 				str = (char *) malloc(len + 1);
 			if (str == NULL) {
 				math_error("Out of memory for scanning");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			if (len)
 				memcpy(&str[totlen], buf, len);
@@ -2328,7 +2329,7 @@ fscanfile(FILE *fp, char *fmt, int count, VALUE **vals)
 			var = *vals++;
 			count--;
 			if (var->v_type != V_ADDR)
-				math_error("Assigning to nonvariable");
+				math_error("Assigning to non-variable");
 			var = var->v_addr;
 			subtype = var->v_subtype;
 			freevalue(var);
@@ -2721,7 +2722,7 @@ fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res)
 			while (k < tmp.len && tmp.v[k] == 0);
 			if (k == tmp.len) {
 				math_error("This should not happen");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			tmp.v[k]--;
 			if (tmp.v[tmp.len - 1] == 0)

file.h

@@ -32,9 +32,9 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "have_fpos.h"
+# include "have_fgetsetpos.h"
 #else
-# include <calc/have_fpos.h>
+# include <calc/have_fgetsetpos.h>
 #endif
 
 
@@ -71,7 +71,7 @@ typedef struct {
  * Some obscure systems without fgetpos/fsetpos may not have a simple
  * scalar type.	 In these cases the f_tell macro below will fail.
  */
-#if defined(HAVE_FPOS)
+#if defined(HAVE_FGETSETPOS)
 
 #define f_seek_set(stream, loc) fsetpos((FILE*)(stream), (FILEPOS*)(loc))
 #define f_tell(stream, loc) fgetpos((FILE*)(stream), (FILEPOS*)(loc))

fposval.c

@@ -1,7 +1,7 @@
 /*
  * fposval - Determine information about the file position type
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2023  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
@@ -59,12 +59,20 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "have_fpos.h"
+#include "have_string.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#include "decl.h"
+#include "have_fgetsetpos.h"
 #include "endian_calc.h"
 #include "have_offscl.h"
 #include "have_posscl.h"
 #include "have_fpos_pos.h"
 #include "alloc.h"
+#include "have_unused.h"
+#include "have_memmv.h"
+#include "zmath.h"
 
 
 #include "banned.h"	/* include after system header <> includes */
@@ -73,7 +81,7 @@
 char *program;			/* our name */
 
 int
-main(int argc, char **argv)
+main(int UNUSED(argc), char **argv)
 {
 	int stsizelen;		/* bit length of st_size in buf */
 	int fileposlen;		/* bit length of FILEPOS */
@@ -89,7 +97,7 @@ main(int argc, char **argv)
 	/*
 	 * print the file position information
 	 */
-#if defined(HAVE_FPOS_POS)
+#if defined(HAVE_FPOS_POS) && defined(FPOS_POS_BITS)
 	fileposlen = FPOS_POS_BITS;
 #else /* ! HAVE_FPOS_POS */
 # if defined(FPOS_BITS)
@@ -107,13 +115,17 @@ main(int argc, char **argv)
 	 * Big Endian
 	 */
 	if (fileposlen == 64) {
-		printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-		    "SWAP_HALF_IN_B64(dest, src)");
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tSWAP_HALF_IN_B64(dest, src)\n");
 	} else if (fileposlen == 32) {
-		printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-		    "SWAP_HALF_IN_B32(dest, src)");
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tSWAP_HALF_IN_B32(dest, src)\n");
+	} else if (fileposlen%BASEB == 0) {
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tswap_HALFs(dest, src, %d)\n",
+		       fileposlen/BASEB);
 	} else {
-		fprintf(stderr, "%s: unexpected FILEPOS bit size: %d\n",
+		fprintf(stderr, "%s: unexpected BIG_ENDIAN FILEPOS bit size: %d\n",
 		    program, fileposlen);
 		exit(1);
 	}
@@ -122,16 +134,15 @@ main(int argc, char **argv)
 	 * Little Endian
 	 */
 #if defined(HAVE_FILEPOS_SCALAR)
-	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-	    "(*(dest) = *(src))");
+	printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+	       "\t(*(dest) = *(src))\n");
 #else /* HAVE_FILEPOS_SCALAR */
 	/*
 	 * Normally a "(*(dest) = *(src))" would do, but on some
 	 * systems a FILEPOS is not a scalar hence we must memcpy.
 	 */
-	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s\n",
-	    "\\\n\tmemcpy((void *)(dest), (void *)(src), "
-	    "sizeof(FPOS_POS_LEN))");
+	printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+	       "\tmemcpy((void *)(dest), (void *)(src), FILEPOS_LEN)\n");
 #endif /* HAVE_FILEPOS_SCALAR */
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	putchar('\n');

hash.c

@@ -1,7 +1,7 @@
 /*
  * hash - one-way hash routines
  *
- * Copyright (C) 1999-2007,2021  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021,2022  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
@@ -40,6 +40,7 @@
 #include "hash.h"
 
 
+#include "attribute.h"
 #include "banned.h"	/* include after system header <> includes */
 
 
@@ -94,7 +95,7 @@ hash_init(int type, HASH *state)
 		state = (HASH *)malloc(sizeof(HASH));
 		if (state == NULL) {
 			math_error("hash_init: cannot malloc HASH");
-			/*NOTREACHED*/
+			not_reached();
 		}
 	}
 
@@ -119,7 +120,7 @@ hash_init(int type, HASH *state)
 			if (state->chunksize > MAX_CHUNKSIZE) {
 				math_error(
 				  "internal error: MAX_CHUNKSIZE is too small");
-				/*NOTREACHED*/
+				not_reached();
 			}
 			return state;
 		}
@@ -174,7 +175,7 @@ hash_copy(HASH *state)
 	hnew = (HASH *)malloc(sizeof(HASH));
 	if (hnew == NULL) {
 		math_error("hash_init: cannot malloc HASH");
-		/*NOTREACHED*/
+		not_reached();
 	}
 
 	/*
@@ -955,6 +956,7 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_len(type, value->v_config->pow2, state);
 		state = hash_len(type, value->v_config->redc2, state);
 		state = hash_bool(type, value->v_config->tilde_ok, state);
+		state = hash_bool(type, value->v_config->tilde_space, state);
 		state = hash_bool(type, value->v_config->tab_ok, state);
 		state = hash_long(type, (long)value->v_config->quomod, state);
 		state = hash_long(type, (long)value->v_config->quo, state);
@@ -1000,6 +1002,7 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_int(type, value->v_config->baseb, state);
 		state = hash_bool(type, value->v_config->redecl_warn, state);
 		state = hash_bool(type, value->v_config->dupvar_warn, state);
+		state = hash_bool(type, value->v_config->fraction_space, state);
 		break;
 
 	case V_HASH:
@@ -1048,7 +1051,7 @@ hash_value(int type, void *v, HASH *state)
 
 	default:
 		math_error("hashing an unknown value");
-		/*NOTREACHED*/
+		not_reached();
 	}
 	return state;
 }

have_arc4random.c

@@ -0,0 +1,73 @@
+/*
+ * have_arc4random - Determine if we have the arc4random_buf() RNG
+ *
+ * Copyright (C) 2021  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2021/12/06 23:58:51
+ * File existed as early as:	2021
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_arc4random
+ *
+ * Not all enviroments have the arc4random_buf() function,
+ * so this may not compile on your system.
+ *
+ * This prog outputs:
+ *
+ *	HAVE_ARC4RANDOM
+ *		defined ==> have arc4random_buf() call
+ *		undefined ==> do not have arc4random_buf() call
+ */
+
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+#include <stdio.h>
+
+
+#include "banned.h"	/* include after system header <> includes */
+
+
+#define BUFLEN (32)		/* length of the buffer to fill */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_ARC4RANDOM)
+
+	printf("#undef HAVE_ARC4RANDOM /* no */\n");
+
+#else /* HAVE_NO_ARC4RANDOM */
+
+	/* buffer for arc4random_buf() to fill */
+	static char buf[BUFLEN];
+
+	arc4random_buf(buf, BUFLEN);
+	printf("#define HAVE_ARC4RANDOM /* yes */\n");
+
+#endif /* HAVE_NO_ARC4RANDOM */
+
+	/* exit(0); */
+	return 0;
+}

have_const.c

@@ -33,7 +33,7 @@
  * This prog outputs several defines:
  *
  *	HAVE_CONST
- *		defined ==> ok to use const
+ *		defined ==> OK to use const
  *		undefined ==> do not use const
  *
  *	CONST

have_environ.c

@@ -0,0 +1,71 @@
+/*
+ * have_environ - Determine if we have the environ user environment synbol
+ *
+ * Copyright (C) 2021  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2021/12/06 19:34:32
+ * File existed as early as:	2021
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_environ
+ *
+ * Not all enviroments have the user environment external:
+ *
+ *	extern char **environ;
+ *
+ * so this may not compile on your system.
+ *
+ * This prog outputs:
+ *
+ *	HAVE_ENVIRON
+ *		defined ==> environ is an non-NULL extern symbol
+ *		undefined ==> environ is NOT an extern symbol or is NULL
+ */
+
+#include <stdio.h>
+
+
+#include "banned.h"	/* include after system header <> includes */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_ENVIRON)
+
+	printf("#undef HAVE_ENVIRON /* no */\n");
+
+#else /* HAVE_NO_ENVIRON */
+
+	extern char **environ;
+
+	if (environ == NULL) {
+		printf("#define HAVE_ENVIRON /* no */\n");
+	} else {
+		printf("#define HAVE_ENVIRON /* yes */\n");
+	}
+
+#endif /* HAVE_NO_ENVIRON */
+
+	/* exit(0); */
+	return 0;
+}

have_fgetsetpos.c

@@ -1,7 +1,7 @@
 /*
  * have_fpos - Determine if have fgetpos and fsetpos functions
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2022  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
@@ -25,10 +25,10 @@
  */
 
 /*
- * If the symbol HAVE_NO_FPOS is defined, we will output nothing.
+ * If the symbol HAVE_NO_FGETSETPOS is defined, we will output nothing.
  * If we are able to compile this program, then we must have the
  * fgetpos and fsetpos functions and we will output the
- * appropriate have_fpos.h file body.
+ * appropriate have_fgetsetpos.h file body.
  */
 
 #include <stdio.h>
@@ -40,7 +40,7 @@
 int
 main(void)
 {
-#if !defined(HAVE_NO_FPOS)
+#if !defined(HAVE_NO_FGETSETPOS)
 	fpos_t pos;		/* file position */
 
 	/* get the current position */
@@ -49,9 +49,9 @@ main(void)
 	/* set the current position */
 	(void) fsetpos(stdin, &pos);
 
-	/* print a have_fpos.h body that says we have the functions */
-	printf("#undef HAVE_FPOS\n");
-	printf("#define HAVE_FPOS 1  /* yes */\n\n");
+	/* print a have_fgetsetpos.h body that says we have the functions */
+	printf("#undef HAVE_FGETSETPOS\n");
+	printf("#define HAVE_FGETSETPOS 1  /* yes */\n\n");
 	printf("typedef fpos_t FILEPOS;\n");
 #endif
 	/* exit(0); */

have_fpos_pos.c

@@ -24,16 +24,14 @@
  * 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 defined, 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_fgetsetpos.h"
 #include "have_posscl.h"
+#include "have_string.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
 
 
 #include "banned.h"	/* include after system header <> includes */
@@ -42,29 +40,43 @@
 int
 main(void)
 {
-#if !defined(HAVE_NO_FPOS) && !defined(HAVE_FILEPOS_SCALAR)
-	fpos_t pos;		/* file position */
+#if defined(HAVE_FILEPOS_SCALAR)
 
-	/* 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\n");
-	printf("#undef FPOS_POS_LEN\n");
-# if defined(FPOS_POS_BITS)
-	printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
-	printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
-# else
-	printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
-	printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
-# endif
-
-#else
-	/* we have no __pos element */
+	printf("/* HAVE_FILEPOS_SCALAR is defined, we assume FILEPOS is scalar */\n");
+	printf("/* we assume we have no __pos in FILEPOS */\n");
 	printf("#undef HAVE_FPOS_POS\t/* no */\n");
 	printf("#undef FPOS_POS_BITS\n");
 	printf("#undef FPOS_POS_LEN\n");
+
+#else
+
+	printf("/* HAVE_FILEPOS_SCALAR is undefined, we assume FILEPOS is not scalar */\n");
+# if defined(HAVE_NO_FPOS_POS)
+	printf("/* HAVE_NO_FPOS_POS defiled, we assume we have no __pos in FILEPOS */\n");
+	printf("#undef HAVE_FPOS_POS\t/* no */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#undef FPOS_POS_LEN\n");
+
+# elif defined(FPOS_POS_BITS)
+	printf("/* FPOS_POS_BITS defiled, assume we have __pos in FILEPOS */\n");
+	printf("#undef HAVE_FPOS_POS\n");
+	printf("#define HAVE_FPOS_POS 1  /* yes */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
+	printf("#undef FPOS_POS_LEN\n");
+	printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
+# else
+	fpos_t pos;		/* file position */
+
+	memset(&pos, 0, sizeof(pos));	/* zeroize pos to "set it" */
+	printf("/* we successfully compiled with a fpos_t type wit an __pos element */\n");
+	printf("#undef HAVE_FPOS_POS\n");
+	printf("#define HAVE_FPOS_POS 1  /* yes */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
+	printf("#undef FPOS_POS_LEN\n");
+	printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
+# endif
 #endif
 	/* exit(0); */
 	return 0;

have_gettime.c

@@ -34,10 +34,9 @@
  * This prog outputs several defines:
  *
  *	HAVE_GETTIME
- *		defined ==> use clock_gettime() for either CLOCK_SGI_CYCLE
- *			    and/or CLOCK_REALTIME
- *		undefined ==> clock_gettime() is not available for both
- *			      CLOCK_SGI_CYCLE and CLOCK_REALTIME
+ *		defined ==> use clock_gettime() from CLOCK_REALTIME
+ *		undefined ==> clock_gettime() is not available from
+ *			      CLOCK_REALTIME
  */
 
 #include <stdio.h>
@@ -50,19 +49,13 @@
 int
 main(void)
 {
-#if defined(HAVE_NO_GETTIME)
+#if defined(HAVE_NO_GETTIME) || defined(_WIN32) || defined(_WIN64)
 
 	printf("#undef HAVE_GETTIME /* no */\n");
 
 #else /* HAVE_NO_GETTIME */
 
-# if defined(CLOCK_SGI_CYCLE)
-
-	struct timespec sgi_cycle;	/* SGI hardware clock */
-	(void) clock_gettime(CLOCK_SGI_CYCLE, &sgi_cycle);
-	printf("#define HAVE_GETTIME /* yes - w/CLOCK_SGI_CYCLE */\n");
-
-# elif defined(CLOCK_REALTIME)
+# if defined(CLOCK_REALTIME)
 
 	struct timespec realtime;	/* POSIX realtime clock */
 	(void) clock_gettime(CLOCK_REALTIME, &realtime);
@@ -70,7 +63,7 @@ main(void)
 
 # else
 
-	printf("#undef HAVE_GETTIME /* no - no SGI_CYCLE and no REALTIME */\n");
+	printf("#undef HAVE_GETTIME /* no - no CLOCK_REALTIME */\n");
 
 # endif /* CLOCK_REALTIME */
 

have_offscl.c

@@ -38,7 +38,7 @@
  * This prog outputs several defines:
  *
  *	HAVE_OFF_T_SCALAR
- *		defined ==> ok to perform arithmetic ops, = and comparisons
+ *		defined ==> OK to perform arithmetic ops, = and comparisons
  *		undefined ==> convert to ZVALUE first
  */
 
@@ -69,7 +69,7 @@ main(void)
 	if (value > (off_t)1) {
 		--value;
 	}
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 	if (value <= (off_t)getppid()) {
 		--value;
 	}

have_posscl.c

@@ -37,7 +37,7 @@
  * This prog outputs several defines:
  *
  *	HAVE_FILEPOS_SCALAR
- *		defined ==> ok to perform arithmetic ops, = and comparisons
+ *		defined ==> OK to perform arithmetic ops, = and comparisons
  *		undefined ==> convert to ZVALUE first
  */
 
@@ -48,7 +48,7 @@
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 
 
 #include "banned.h"	/* include after system header <> includes */
@@ -69,7 +69,7 @@ main(void)
 	if (value > (FILEPOS)1) {
 		--value;
 	}
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
 	if (value <= (FILEPOS)getppid()) {
 		--value;
 	}

have_statfs.c

@@ -0,0 +1,82 @@
+/*
+ * have_statfs - Determine if we have statfs()
+ *
+ * Copyright (C) 2023  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.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2023/03/06 00:51:53
+ * File existed as early as:	2023
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_statfs
+ *
+ * Not all systems have the statfs() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_STATFS
+ *		defined ==> use statfs()
+ *		undefined ==> do not call or cannot call statfs()
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "have_sys_vfs.h"
+#if defined(HAVE_SYS_VFS_H)
+# include <sys/vfs.h>
+#endif /* HAVE_SYS_VFS_H */
+
+#include "have_sys_param.h"
+#if defined(HAVE_SYS_PARAM_H)
+# include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
+#include "have_sys_mount.h"
+#if defined(HAVE_SYS_MOUNT_H)
+# include <sys/mount.h>
+#endif /* HAVE_SYS_MOUNT_H */
+
+#include "banned.h"	/* include after system header <> includes */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_STATFS)
+
+	printf("#undef HAVE_STATFS /* no */\n");
+
+#else /* HAVE_NO_STATFS */
+
+	struct statfs statfs_dot;		/* usage stat of "." */
+
+	(void) statfs(".", &statfs_dot);
+
+	printf("#define HAVE_STATFS /* yes */\n");
+
+#endif /* HAVE_NO_STATFS */
+
+	/* exit(0); */
+	return 0;
+}

have_stdvs.c

@@ -152,7 +152,7 @@ main(void)
 	puts(" *");
 	puts(" * Systems that do not have vsnprintf() need something. In some");
 	puts(" * cases the snprintf function will deal correctly with the");
-	puts(" * va_alist 4th arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * va_alist 4th arg.  Same goes for a lack of an vsnprintf()");
 	puts(" * function.  In either case we use the #defines below and");
 	puts(" * hope for the best!");
 	puts(" */");

have_uid_t.c

@@ -33,7 +33,7 @@
  * This prog outputs several defines:
  *
  *	HAVE_UID_T
- *		defined ==> ok to use uid_t
+ *		defined ==> OK to use uid_t
  *		undefined ==> do not use uid_t
  */
 
@@ -65,6 +65,8 @@ main(void)
 	extern uid_t geteuid();
 
 	curds = geteuid();
+	/* force curds to be used, but do not print much info about our UID */
+	printf("/* geteuid() mod 2 == %ld */\n", ((long)curds) & 0x1);
 
 	printf("#define HAVE_UID_T /* yes */\n");
 

have_unused.c

@@ -34,7 +34,7 @@
  * This prog outputs several defines:
  *
  *	HAVE_UNUSED
- *		defined ==> ok to use unused
+ *		defined ==> OK to use unused
  *		undefined ==> do not use unused
  *
  *	UNUSED

have_varvs.c

@@ -141,7 +141,7 @@ main(void)
 	puts(" *");
 	puts(" * Systems that do not have vsnprintf() need something. In some");
 	puts(" * cases the snprintf() function will deal correctly with the");
-	puts(" * va_alist 4th arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * va_alist 4th arg.  Same goes for a lack of an vsnprintf()");
 	puts(" * function.  In either case we use the #defines below and");
 	puts(" * hope for the best!");
 	puts(" */");

help.c

@@ -40,7 +40,7 @@
 #include <unistd.h>
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(_WIN64)
 # define popen _popen
 # define pclose _pclose
 #endif
@@ -87,6 +87,7 @@ STATIC struct help_alias {
 	{"dm2d", "dms2d"},
 	{"gm2g", "gms2g"},
 	{"hm2d", "hms2d"},
+	{"release", "releases"},
 	{NULL, NULL}
 };
 

help/Makefile

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999-2006,2017,2021  Landon Curt Noll
+# Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
 # SRC: help/Makefile
 #
@@ -44,18 +44,23 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
+# On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/zsh
+#	SHELL= sh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= bash
+#SHELL= sh
+#if 0	/* start of skip for non-Gnu makefiles */
+#
+ifeq ($(target),Darwin)
+SHELL:= /bin/sh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 ####
@@ -102,15 +107,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:
@@ -220,10 +216,10 @@ T=
 # H=@:	do not report hsrc file formation progress
 # H=@	do echo hsrc file formation progress
 #
-# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S= >/dev/null 2>&1	silence ${CC} output during hsrc file formation
 # S=			full ${CC} output during hsrc file formation
 #
-# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E= 2>/dev/null	silence command stderr during hsrc file formation
 # E=			full command stderr during hsrc file formation
 #
 # V=@:	do not echo debug statements (quiet mode)
@@ -251,7 +247,7 @@ CHMOD= chmod
 CMP= cmp
 CP= cp
 FMT= fmt
-GREP= egrep
+GREP= grep
 ICFLAGS=
 ILDFLAGS=
 LCC= cc
@@ -270,7 +266,7 @@ TRUE= true
 # the extension required by such.
 #
 # EXT=				# normal Un*x / Linux / GNU/Linux systems
-# EXT=.exe			# windoz / Cygwin
+# EXT=.exe			# Windows / Cygwin
 #
 # If in doubt, use EXT=
 #
@@ -314,7 +310,7 @@ BLT_HELP_FILES_13= bugs changes
 
 STD_HELP_FILES_14= credit
 
-BLT_HELP_FILES_14= contrib COPYING COPYING-LGPL questions
+BLT_HELP_FILES_14= contrib COPYING COPYING-LGPL questions releases
 
 STD_HELP_FILES_15= wishlist todo
 
@@ -413,6 +409,10 @@ DISTLIST= ${STD_HELP_FILES} ${DETAIL_HELP} ${MAKE_FILE} \
 # These files are used to make (but not built) a calc .a link library
 #
 CALCLIBLIST=
+#
+# rules that are not also names of files
+#
+PHONY= all clobber distlist install
 
 all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
      ${SINGULAR_FILES} .all
@@ -426,6 +426,8 @@ all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
 	${RM} -f .all
 	${TOUCH} .all
 
+.PHONY: ${PHONY}
+
 bindings: ../cal/bindings
 	${RM} -f $@
 	${CP} ../cal/bindings $@
@@ -525,7 +527,7 @@ usage: ../calc.usage
 	fi
 
 ../calc.usage:
-	(cd ..; ${MAKE} -f ${TOP_MAKE_FILE} calc.usage)
+	(cd ..; ${MAKE} -f ${MAKE_FILE} calc.usage)
 
 custom_cal: ../custom/CUSTOM_CAL
 	${RM} -f $@
@@ -628,6 +630,18 @@ cscript: ../cscript/README
 	${Q} ${RM} -f $@
 	(cd ../cscript; ${MAKE} -f Makefile README)
 
+releases: ../README.RELEASE
+	${RM} -f $@
+	${CP} ../README.RELEASE $@
+	${CHMOD} 0444 $@
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
+	    echo ''; \
+	else \
+	    ${TRUE}; \
+	fi
+
 full: ${FULL_HELP_FILES} ${MAKE_FILE}
 	${Q} echo "forming full"
 	${Q} ${RM} -f $@
@@ -685,7 +699,7 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 # into a stand-alone program that generates a suitable function list
 # that is sandwiched between the top and bottom builtin help text.
 #
-# We form funclist.c by sedding out unwanted stuff from builtins table,
+# We form funclist.c by sed-ing out unwanted stuff from builtins table,
 # converting NUMBER* and VALUE into harmless types and converting
 # the showbuiltins() function into main().  Combined with the -DFUNCLIST
 # we will avoid all of the complex calc types, macros and defines and
@@ -703,7 +717,7 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 	    -I.. funclist.c -c ${S}
 	${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} ${S}
 	${Q} ${RM} -f builtin
-	${Q} ${GREP} -v '^#'  builtin.top > builtin
+	${Q} ${GREP} -E -v '^#'  builtin.top > builtin
 	${Q} ./funclist${EXT} | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
 	${Q} ${CAT} builtin.end >> builtin
@@ -743,14 +757,6 @@ calcliblist:
 	    fi; \
 	done
 
-# The BSDI cdrom makefile expects all help files to be pre-built.  This rule
-# creates these files so that the release can be shipped off to BSDI.  You can
-# ignore this rule.
-#
-bsdi: all
-	${RM} -f obj
-	${CP} obj.file obj
-
 # These next rule help form the ${DETAIL_HELP} makefile variables above.
 #
 # NOTE: The ${DETAIL_HELP} list does not include special help files.

help/abs

@@ -44,7 +44,7 @@ LINK LIBRARY
 SEE ALSO
     cmp, epsilon, hypot, norm, near, obj
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/access

@@ -20,8 +20,8 @@ DESCRIPTION
     'w' or bit 1 for writing, 'x' or bit 0 for execution.
 
 EXAMPLE
-    The system error-numbers and messages may differ for different
-	implementations
+    ; ## The system error-numbers and messages may differ
+    ; ## for different implementations
 
     ; !rm -f junk
     ; access("junk")
@@ -48,7 +48,7 @@ LINK LIBRARY
 SEE ALSO
     fopen, fclose, isfile, files
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/acot

@@ -18,7 +18,7 @@ DESCRIPTION
 
 EXAMPLE
     ; print acot(2, 1e-5),  acot(2, 1e-10), acot(2, 1e-15), acot(2, 1e-20)
-    .46365 .463647609 .463647609000806 .46364760900080611621
+    0.46365 0.463647609 0.463647609000806 0.46364760900080611621
 
 LIMITS
     none
@@ -29,7 +29,7 @@ LINK LIBRARY
 SEE ALSO
     asin, acos, atan, asec, acsc, epsilon
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/acoth

@@ -20,7 +20,7 @@ DESCRIPTION
 
 EXAMPLE
     ; print acoth(2, 1e-5), acoth(2, 1e-10), acoth(2, 1e-15), acoth(2, 1e-20)
-    .54931 .5493061443 .549306144334055 .5493061443340548457
+    0.54931 0.5493061443 0.549306144334055 0.5493061443340548457
 
 LIMITS
     none
@@ -31,7 +31,7 @@ LINK LIBRARY
 SEE ALSO
     asinh, acosh, atanh, asech, acsch, epsilon
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/acsc

@@ -18,7 +18,7 @@ DESCRIPTION
 
 EXAMPLE
     ; print acsc(2, 1e-5), acsc(2, 1e-10), acsc(2, 1e-15), acsc(2, 1e-20)
-    .5236 .5235987756 .523598775598299 .52359877559829887308
+    0.5236 0.5235987756 0.523598775598299 0.52359877559829887308
 
 LIMITS
     none
@@ -29,7 +29,7 @@ LINK LIBRARY
 SEE ALSO
     asin, acos, atan, asec, acot, epsilon
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/acsch

@@ -18,10 +18,9 @@ DESCRIPTION
 
 		acsch(x) = ln((1 + sqrt(1 + x^2))/x)
 
-
 EXAMPLE
     ; print acsch(2, 1e-5), acsch(2, 1e-10), acsch(2, 1e-15), acsch(2, 1e-20)
-    .48121 .4812118251 .481211825059603 .4812118250596034475
+    0.48121 0.4812118251 0.481211825059603 0.4812118250596034475
 
 LIMITS
     none
@@ -32,7 +31,7 @@ LINK LIBRARY
 SEE ALSO
     asinh, acosh, atanh, asech, acoth, epsilon
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/agd

@@ -33,7 +33,6 @@ DESCRIPTION
 
 	agd(z) = atanh(sin(x)/cosh(y)) + i * atan(sinh(y)/cos(x)>
 
-
 EXAMPLE
     ; print agd(1, 1e-5), agd(1, 1e-10), agd(1, 1e-15)
     1.22619 1.2261911709 1.226191170883517
@@ -45,7 +44,7 @@ EXAMPLE
     -1.93237 -1.9323667197 -1.932366719745925
 
     ; print agd(1+2i, 1e-5), agd(1+2i, 1e-10)
-    .22751+1.42291i .2275106584+1.4229114625i
+    0.22751+1.42291i 0.2275106584+1.4229114625i
 
 LIMITS
     none

help/appr

@@ -96,7 +96,7 @@ PROPERTIES
 
 	If y is nonzero, appr(x,y,8)/y = an odd integer n only if x = n * y.
 
-EXAMPLES
+EXAMPLE
     ; print appr(-5.44,0.1,0), appr(5.44,0.1,0), appr(5.7,1,0), appr(-5.7,1,0)
     -5.5 5.4 5 -6
 
@@ -119,26 +119,26 @@ EXAMPLES
     -5.5 5.5 5 -5
 
     ; print appr(-.44,0.1,11), appr(.44,0.1,11), appr(5.7,1,11), appr(-5.7,1,11)
-    -.4 .5 5 -6
+    -0.4 0.5 5 -6
 
     ; print appr(-.44,-.1,11),appr(.44,-.1,11),appr(5.7,-1,11),appr(-5.7,-1,11)
-    -.5 .4 6 -5
+    -0.5 0.4 6 -5
 
     ; print appr(-.44,0.1,12), appr(.44,0.1,12), appr(5.7,1,12), appr(-5.7,1,12)
-    -.4 .5 5 -6
+    -0.4 0.5 5 -6
 
     ; print appr(-.44,-.1,12),appr(.44,-.1,12),appr(5.7,-1,12),appr(-5.7,-1,12)
-    -.5 .4 6 -5
+    -0.5 0.4 6 -5
 
     ; print appr(-.44,0.1,15), appr(.44,0.1,15), appr(5.7,1,15), appr(-5.7,1,15)
-    -.4 .5 5 -6
+    -0.4 0.5 5 -6
 
     ; print appr(-.44,-.1,15),appr(.44,-.1,15),appr(5.7,-1,15),appr(-5.7,-1,15)
-    -.4 .5 5 -6
+    -0.4 0.5 5 -6
 
     ; x = sqrt(7-3i, 1e-20)
     ; print appr(x,1e-5,0), appr(x,1e-5,1), appr(x,1e-5,2), appr(x,1e-6,3)
-    2.70331-.55488i 2.70332-.55487i 2.70331-.55487i 2.70332-.55488i
+    2.70331-0.55488i 2.70332-0.55487i 2.70331-0.55487i 2.70332-0.55488i
 
 LIMITS
     none
@@ -151,7 +151,7 @@ LINK LIBRARY
 SEE ALSO
     round, bround, cfappr, cfsim
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/archive

@@ -1,21 +1,27 @@
 Where to get the latest versions of calc
 
-    Landon Noll maintains the official calc home page at:
+    Official calc source is maintained on GitHub:
+
+	https://github.com/lcn2/calc
+
+    Calc releases may be found as GitHub tagged releases:
+
+	https://github.com/lcn2/calc/releases?page=2
+
+     At the bottom of a given release is a "> Assets" that may
+     be opened to reveal down-loadable files such as source
+     tarballs, source zip files and RPMs.
+
+    Landon Noll also maintains a calc home page at:
 
 	    http://www.isthe.com/chongo/tech/comp/calc/
 
-    See:
-
-	    http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
-
-    for information on how to obtain up a recent version of calc.
-
 Landon Curt Noll
 http://www.isthe.com/chongo/
 
 chongo <was here> /\../\
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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