Release v2.14.2.0

The following are the changes in this release:

    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

CHANGES

@@ -1,4 +1,60 @@
-The following are the changes from calc version 2.14.2.3 to date:
+The following are the changes from calc version 2.14.2.0 to date:
+
+    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.
 
@@ -78,7 +134,7 @@ The following are the changes from calc version 2.14.2.3 to date:
     the Makefile dependency list via "make depend".
 
 
-The following are the changes from calc version 2.14.2.0 to 2.14.1.2:
+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

LIBRARY

@@ -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

Makefile

@@ -79,8 +79,8 @@ endif
 ifeq ($(hardware),)
 hardware=$(shell uname -m 2>/dev/null)
 endif
-ifeq ($(MINGW),)
-MINGW=$(shell uname -o 2>/dev/null)
+ifeq ($(OSNAME),)
+OSNAME=$(shell uname -o 2>/dev/null)
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
@@ -113,7 +113,7 @@ endif
 # then we will also need to use the Cygwin runtime enviroment
 # and the calc Cygwin make target.
 ##
-ifeq ($(MINGW),Cygwin)
+ifeq ($(OSNAME),Cygwin)
 target:= Cygwin
 endif
 #
@@ -1202,11 +1202,25 @@ CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
 #	READLINE_INCLUDE	Where the readline include files reside
 #				(leave blank if they are /usr/include/readline)
 #
+# NOTE: If you select the 'USE_READLINE=' mode, then we recommend you set:
+#
+#	READLINE_EXTRAS=
+#	READLINE_INCLUDE=
+#	READLINE_LIB=
+#
 # NOTE: The GNU-readline code is not shipped with calc.  You must have
 #	the appropriate headers and link libs installed on your system in
 #	order to use it.
 #
-# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+# To disable the use of the GNU-readline facility (as well as ncurses), set:
+#
+#	USE_READLINE=
+#	READLINE_EXTRAS=
+#	READLINE_INCLUDE=
+#	READLINE_LIB=
+#
+# If in doubt, set USE_READLINE, READLINE_EXTRAS, READLINE_INCLUDE, and
+# READLINE_LIB to nothing.
 #
 #USE_READLINE=
 USE_READLINE= -DUSE_READLINE
@@ -1367,7 +1381,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.4
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #
@@ -5688,7 +5702,7 @@ endif
 		continue; \
 	    fi; \
 	    ${RM} -f tmp; \
-	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' \
+	    ${SED} -e 's/^\(#[	 ]*include[	 ][	 ]*\)"/\1"calc\//' \
 	              $$i > tmp; \
 	    if ${CMP} -s tmp ${T}${CALC_INCDIR}/$$i; then \
 		${TRUE}; \
@@ -6401,7 +6415,9 @@ file.o: strl.h
 file.o: value.h
 file.o: zmath.h
 fposval.o: alloc.h
+fposval.o: attribute.h
 fposval.o: banned.h
+fposval.o: byteswap.h
 fposval.o: decl.h
 fposval.o: endian_calc.h
 fposval.o: fposval.c
@@ -6413,8 +6429,11 @@ fposval.o: have_memmv.h
 fposval.o: have_newstr.h
 fposval.o: have_offscl.h
 fposval.o: have_posscl.h
+fposval.o: have_stdlib.h
 fposval.o: have_string.h
 fposval.o: have_unused.h
+fposval.o: longbits.h
+fposval.o: zmath.h
 func.o: alloc.h
 func.o: attribute.h
 func.o: banned.h

Makefile.simple

@@ -1072,11 +1072,25 @@ CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
 #	READLINE_INCLUDE	Where the readline include files reside
 #				(leave blank if they are /usr/include/readline)
 #
+# NOTE: If you select the 'USE_READLINE=' mode, then we recommend you set:
+#
+#	READLINE_EXTRAS=
+#	READLINE_INCLUDE=
+#	READLINE_LIB=
+#
 # NOTE: The GNU-readline code is not shipped with calc.  You must have
 #	the appropriate headers and link libs installed on your system in
 #	order to use it.
 #
-# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+# To disable the use of the GNU-readline facility (as well as ncurses), set:
+#
+#	USE_READLINE=
+#	READLINE_EXTRAS=
+#	READLINE_INCLUDE=
+#	READLINE_LIB=
+#
+# If in doubt, set USE_READLINE, READLINE_EXTRAS, READLINE_INCLUDE, and
+# READLINE_LIB to nothing.
 #
 #USE_READLINE=
 USE_READLINE= -DUSE_READLINE
@@ -1225,7 +1239,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.4
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #
@@ -4972,7 +4986,7 @@ install: ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all custom/Makefile
 		continue; \
 	    fi; \
 	    ${RM} -f tmp; \
-	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' \
+	    ${SED} -e 's/^\(#[	 ]*include[	 ][	 ]*\)"/\1"calc\//' \
 	              $$i > tmp; \
 	    if ${CMP} -s tmp ${T}${CALC_INCDIR}/$$i; then \
 		${TRUE}; \
@@ -5685,7 +5699,9 @@ file.o: strl.h
 file.o: value.h
 file.o: zmath.h
 fposval.o: alloc.h
+fposval.o: attribute.h
 fposval.o: banned.h
+fposval.o: byteswap.h
 fposval.o: decl.h
 fposval.o: endian_calc.h
 fposval.o: fposval.c
@@ -5697,8 +5713,11 @@ fposval.o: have_memmv.h
 fposval.o: have_newstr.h
 fposval.o: have_offscl.h
 fposval.o: have_posscl.h
+fposval.o: have_stdlib.h
 fposval.o: have_string.h
 fposval.o: have_unused.h
+fposval.o: longbits.h
+fposval.o: zmath.h
 func.o: alloc.h
 func.o: attribute.h
 func.o: banned.h

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

cal/Makefile

@@ -267,21 +267,22 @@ TRUE= true
 # to keep this list in nice sorted order.
 #
 CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
-	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \
-	comma.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
+	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal \
+	chrem.cal comma.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 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.
 #

cal/README

@@ -1433,6 +1433,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/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;
+}

custom/Makefile

@@ -475,7 +475,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.4
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #

custom/Makefile.simple

@@ -445,7 +445,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.4
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #

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
@@ -72,6 +72,7 @@
 #include "alloc.h"
 #include "have_unused.h"
 #include "have_memmv.h"
+#include "zmath.h"
 
 
 #include "banned.h"	/* include after system header <> includes */

help/funclist.sed

@@ -2,11 +2,11 @@ s/VALUE/int/
 s/NUMBER[	 ]*\*/int /
 s/NUMBER/int/
 s/STRINGHEAD/int/
-s/\(".*",.*,.*\),.*,.*,.*,.*,/\1, 0, 0, 0, 0,/
+s/\(".*",.*,.*\),.*,.*,.*,.*,/\1, 0, 0, {.null = NULL}, {.null = NULL},/
 s/[	 ][	 ]*$//
 p
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,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

help/unexpected

@@ -556,8 +556,14 @@ Unexpected
 	; print sin(d2r(30))
 	0.5
 
+    * operator has has a higher precedence than <<
+    ==============================================
 
-## Copyright (C) 1999-2007,2014,2017,2021  Landon Curt Noll
+    The * operator has has a higher precedence than <<, which differs from the C language.
+    So 3 << 2*5 evaluates to 3072 in C, whereas 3 << 2*5 evaluates to 60 in calc.
+
+
+## Copyright (C) 1999-2007,2014,2017,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

hist.c

@@ -98,7 +98,7 @@ STATIC	struct {
 } HS;
 
 
-typedef void (*FUNCPTR)();
+typedef void (*FUNCPTR)(int);
 
 typedef struct {
 	char	*name;
@@ -106,38 +106,38 @@ typedef struct {
 } FUNC;
 
 /* declare binding functions */
-S_FUNC void flush_input(void);
-S_FUNC void start_of_line(void);
-S_FUNC void end_of_line(void);
-S_FUNC void forward_char(void);
-S_FUNC void backward_char(void);
-S_FUNC void forward_word(void);
-S_FUNC void backward_word(void);
-S_FUNC void delete_char(void);
-S_FUNC void forward_kill_char(void);
-S_FUNC void backward_kill_char(void);
-S_FUNC void forward_kill_word(void);
-S_FUNC void kill_line(void);
-S_FUNC void new_line(void);
-S_FUNC void save_line(void);
-S_FUNC void forward_history(void);
-S_FUNC void backward_history(void);
+S_FUNC void flush_input(int key);
+S_FUNC void start_of_line(int key);
+S_FUNC void end_of_line(int key);
+S_FUNC void forward_char(int key);
+S_FUNC void backward_char(int key);
+S_FUNC void forward_word(int key);
+S_FUNC void backward_word(int key);
+S_FUNC void delete_char(int key);
+S_FUNC void forward_kill_char(int key);
+S_FUNC void backward_kill_char(int key);
+S_FUNC void forward_kill_word(int key);
+S_FUNC void kill_line(int key);
+S_FUNC void new_line(int key);
+S_FUNC void save_line(int key);
+S_FUNC void forward_history(int key);
+S_FUNC void backward_history(int key);
 S_FUNC void insert_char(int key);
-S_FUNC void goto_line(void);
-S_FUNC void list_history(void);
-S_FUNC void refresh_line(void);
-S_FUNC void swap_chars(void);
-S_FUNC void set_mark(void);
-S_FUNC void yank(void);
-S_FUNC void save_region(void);
-S_FUNC void kill_region(void);
-S_FUNC void reverse_search(void);
-S_FUNC void quote_char(void);
-S_FUNC void uppercase_word(void);
-S_FUNC void lowercase_word(void);
-S_FUNC void ignore_char(void);
-S_FUNC void arrow_key(void);
-S_FUNC void quit_calc(void) __attribute__((noreturn));
+S_FUNC void goto_line(int key);
+S_FUNC void list_history(int key);
+S_FUNC void refresh_line(int key);
+S_FUNC void swap_chars(int key);
+S_FUNC void set_mark(int key);
+S_FUNC void yank(int key);
+S_FUNC void save_region(int key);
+S_FUNC void kill_region(int key);
+S_FUNC void reverse_search(int key);
+S_FUNC void quote_char(int key);
+S_FUNC void uppercase_word(int key);
+S_FUNC void lowercase_word(int key);
+S_FUNC void ignore_char(int key);
+S_FUNC void arrow_key(int key);
+S_FUNC void quit_calc(int key) __attribute__((noreturn));
 
 
 STATIC	FUNC	funcs[] =
@@ -217,8 +217,8 @@ STATIC	int		save_len;
 STATIC	KEY_MAP		*cur_map;
 STATIC	KEY_MAP		*base_map;
 STATIC	KEY_ENT		key_table[MAX_KEYS];
-STATIC  HIST*    	hist_first = NULL;
-STATIC  HIST*   	hist_last = NULL;
+STATIC  HIST*		hist_first = NULL;
+STATIC  HIST*		hist_last = NULL;
 STATIC	char		save_buffer[SAVE_SIZE];
 
 /* declare other static functions */
@@ -650,12 +650,11 @@ read_key(void)
 		ent = &cur_map->default_ent;
 	if (ent->next)
 		cur_map = ent->next;
-	if (ent->func)
-		/* ignore Saber-C warning #65 - has 1 arg, expecting 0 */
-		/*	  OK to ignore in proc read_key */
+	if (ent->func != NULL) {
 		(*ent->func)(key);
-	else
+	} else {
 		insert_char(key);
+	}
 }
 
 
@@ -797,20 +796,20 @@ find_func(char *name)
 
 
 S_FUNC void
-arrow_key(void)
+arrow_key(int UNUSED(key))
 {
 	switch (fgetc(stdin)) {
 	case 'A':
-		backward_history();
+		backward_history(0);
 		break;
 	case 'B':
-		forward_history();
+		forward_history(0);
 		break;
 	case 'C':
-		forward_char();
+		forward_char(0);
 		break;
 	case 'D':
-		backward_char();
+		backward_char(0);
 		break;
 	}
 }
@@ -867,13 +866,13 @@ decrement_end(int n)
 
 
 S_FUNC void
-ignore_char(void)
+ignore_char(int UNUSED(key))
 {
 }
 
 
 S_FUNC void
-flush_input(void)
+flush_input(int UNUSED(key))
 {
 	echo_rest_of_line();
 	while (HS.end > HS.buf)
@@ -884,21 +883,21 @@ flush_input(void)
 
 
 S_FUNC void
-start_of_line(void)
+start_of_line(int UNUSED(key))
 {
 	goto_start_of_line();
 }
 
 
 S_FUNC void
-end_of_line(void)
+end_of_line(int UNUSED(key))
 {
 	goto_end_of_line();
 }
 
 
 S_FUNC void
-forward_char(void)
+forward_char(int UNUSED(key))
 {
 	if (HS.pos < HS.end)
 		echo_char(*HS.pos++);
@@ -906,7 +905,7 @@ forward_char(void)
 
 
 S_FUNC void
-backward_char(void)
+backward_char(int UNUSED(key))
 {
 	if (HS.pos > HS.buf)
 		back_over_char((int)(*--HS.pos));
@@ -914,7 +913,7 @@ backward_char(void)
 
 
 S_FUNC void
-uppercase_word(void)
+uppercase_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -927,7 +926,7 @@ uppercase_word(void)
 
 
 S_FUNC void
-lowercase_word(void)
+lowercase_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -940,7 +939,7 @@ lowercase_word(void)
 
 
 S_FUNC void
-forward_word(void)
+forward_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -950,7 +949,7 @@ forward_word(void)
 
 
 S_FUNC void
-backward_word(void)
+backward_word(int UNUSED(key))
 {
 	if ((HS.pos > HS.buf) && in_word((int)(*HS.pos)))
 		back_over_char((int)(*--HS.pos));
@@ -964,7 +963,7 @@ backward_word(void)
 
 
 S_FUNC void
-forward_kill_char(void)
+forward_kill_char(int UNUSED(key))
 {
 	int	rest;
 	char	ch;
@@ -986,7 +985,7 @@ forward_kill_char(void)
 
 
 S_FUNC void
-delete_char(void)
+delete_char(int UNUSED(key))
 {
 	/*
 	 * quit delete_char (usually ^D) is at start of line and we are allowed
@@ -997,30 +996,30 @@ delete_char(void)
 	if ((HS.end == HS.buf) &&
 	    (conf->ctrl_d == CTRL_D_EMPTY_EOF ||
 	     (conf->ctrl_d == CTRL_D_VIRGIN_EOF && HS.virgin_line == TRUE))) {
-		quit_calc();
+		quit_calc(0);
 	}
 
 	/*
 	 * normal case: just forward_kill_char
 	 */
 	if (HS.end > HS.buf)
-		forward_kill_char();
+		forward_kill_char(0);
 }
 
 
 S_FUNC void
-backward_kill_char(void)
+backward_kill_char(int UNUSED(key))
 {
 	if (HS.pos > HS.buf) {
 		HS.pos--;
 		back_over_char((int)(*HS.pos));
-		forward_kill_char();
+		forward_kill_char(0);
 	}
 }
 
 
 S_FUNC void
-forward_kill_word(void)
+forward_kill_word(int UNUSED(key))
 {
 	char	*cp;
 
@@ -1044,7 +1043,7 @@ forward_kill_word(void)
 
 
 S_FUNC void
-kill_line(void)
+kill_line(int UNUSED(key))
 {
 	if (HS.end <= HS.pos)
 		return;
@@ -1063,7 +1062,7 @@ kill_line(void)
  * decide whether or not this should be done.
  */
 S_FUNC void
-new_line(void)
+new_line(int UNUSED(key))
 {
 	int	len;
 
@@ -1087,21 +1086,21 @@ new_line(void)
 
 
 S_FUNC void
-save_line(void)
+save_line(int UNUSED(key))
 {
 	int	len;
 
 	len = HS.end - HS.buf;
 	if (len > 0) {
 		hist_saveline(HS.buf, len);
-		flush_input();
+		flush_input(0);
 	}
 	HS.curhist = HS.histcount;
 }
 
 
 S_FUNC void
-goto_line(void)
+goto_line(int UNUSED(key))
 {
 	int	num;
 	char	*cp;
@@ -1115,7 +1114,7 @@ goto_line(void)
 		beep();
 		return;
 	}
-	flush_input();
+	flush_input(0);
 	HS.curhist = HS.histcount - num;
 	hp = get_event(HS.curhist);
 	memcpy(HS.buf, hp->data, hp->len);
@@ -1125,11 +1124,11 @@ goto_line(void)
 
 
 S_FUNC void
-forward_history(void)
+forward_history(int UNUSED(key))
 {
 	HIST	*hp;
 
-	flush_input();
+	flush_input(0);
 	if (++HS.curhist >= HS.histcount)
 		HS.curhist = 0;
 	hp = get_event(HS.curhist);
@@ -1142,11 +1141,11 @@ forward_history(void)
 
 
 S_FUNC void
-backward_history(void)
+backward_history(int UNUSED(key))
 {
 	HIST	*hp;
 
-	flush_input();
+	flush_input(0);
 	if (--HS.curhist < 0)
 		HS.curhist = HS.histcount - 1;
 	hp = get_event(HS.curhist);
@@ -1208,7 +1207,7 @@ insert_string(char *str, int len)
 
 
 S_FUNC void
-list_history(void)
+list_history(int UNUSED(key))
 {
 	HIST	*hp;
 	int	hnum;
@@ -1218,12 +1217,12 @@ list_history(void)
 		printf("\n%3d: ", HS.histcount - hnum);
 		echo_string(hp->data, hp->len);
 	}
-	refresh_line();
+	refresh_line(0);
 }
 
 
 S_FUNC void
-refresh_line(void)
+refresh_line(int UNUSED(key))
 {
 	char	*cp;
 
@@ -1239,7 +1238,7 @@ refresh_line(void)
 
 
 S_FUNC void
-swap_chars(void)
+swap_chars(int UNUSED(key))
 {
 	char	ch1;
 	char	ch2;
@@ -1258,14 +1257,14 @@ swap_chars(void)
 
 
 S_FUNC void
-set_mark(void)
+set_mark(int UNUSED(key))
 {
 	HS.mark = HS.pos;
 }
 
 
 S_FUNC void
-save_region(void)
+save_region(int UNUSED(key))
 {
 	int	len;
 
@@ -1280,7 +1279,7 @@ save_region(void)
 
 
 S_FUNC void
-kill_region(void)
+kill_region(int UNUSED(key))
 {
 	char	*cp;
 	char	*left;
@@ -1312,14 +1311,14 @@ kill_region(void)
 
 
 S_FUNC void
-yank(void)
+yank(int UNUSED(key))
 {
 	insert_string(save_buffer, save_len);
 }
 
 
 S_FUNC void
-reverse_search(void)
+reverse_search(int UNUSED(key))
 {
 	int	len;
 	int	count;
@@ -1345,7 +1344,7 @@ reverse_search(void)
 
 	HS.curhist = testhist;
 	save_pos = HS.pos;
-	flush_input();
+	flush_input(0);
 	memcpy(HS.buf, hp->data, hp->len);
 	HS.end = &HS.buf[hp->len];
 	goto_end_of_line();
@@ -1355,7 +1354,7 @@ reverse_search(void)
 
 
 S_FUNC void
-quote_char(void)
+quote_char(int UNUSED(key))
 {
 	int	ch;
 
@@ -1451,7 +1450,7 @@ memrcpy(char *dest, char *src, int len)
 #endif /* !USE_READLINE */
 
 S_FUNC void
-quit_calc(void)
+quit_calc(int UNUSED(ch))
 {
 	hist_term();
 	putchar('\n');
@@ -1493,7 +1492,7 @@ hist_getline(char *prompt, char *buf, size_t len)
 		case CTRL_D_VIRGIN_EOF:
 		case CTRL_D_EMPTY_EOF:
 		default:
-			quit_calc();
+			quit_calc(0);
 			not_reached();
 		}
 	}

version.c

@@ -83,8 +83,8 @@ static char *program;
  */
 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	14	/* minor library version */
-#define MAJOR_PATCH	1	/* major software version level */
-#define MINOR_PATCH	4	/* minor software version level */
+#define MAJOR_PATCH	2	/* major software version level */
+#define MINOR_PATCH	0	/* minor software version level */
 
 
 /*