From 9b6c308b4291cb3c07638a9472000e4f035e27c7 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sat, 30 Oct 1999 17:00:20 -0700 Subject: [PATCH] Release calc version 2.11.0t8.9 --- CHANGES | 14 +++++++++++++- README | 1 + calc.c | 2 +- calc.man | 9 +++++++++ custom/CUSTOM_CAL | 13 ++++++++++++- custom/HOW_TO_ADD | 27 ++++++++++++++++++++------- custom/pzasusb8.cal | 2 ++ help/archive | 22 +++++----------------- help/contrib | 42 +++++++++++++++++++++++++++--------------- help/credit | 39 ++++----------------------------------- help/overview | 6 ++++-- help/todo | 28 ++++++++++++++++++++++++++++ help/usage | 7 +++++++ lib/README | 2 +- version.c | 2 +- 15 files changed, 135 insertions(+), 81 deletions(-) diff --git a/CHANGES b/CHANGES index 3b39c89..00fa70a 100644 --- a/CHANGES +++ b/CHANGES @@ -132,13 +132,25 @@ Following is the change from calc version 2.11.0t8 to date: Fixed the help/custom_cal, help/new_custom, and help/copy files so that they contain the correct contents instead of the 'usage' file. - Fixed problem with loss of bindings when .calc -i args runs into + Fixed problem with loss of bindings when calc -i args runs into an error while processing 'args' and drops into interactive mode without the terminal bindings being set. + Added patch from Ernest Bowen to extablish the abort command as + well as to clarify the roles of quit and exit. See the help/command + file for details. + Updated to some extend, the help/statement and help/command help files with new information about SHOW, QUIT, EXIT and ABORT. + Added show sizes to pzasusb8.cal. + + Updated calc man page and help/usage file to reflect recent + command line changes. + + Fixed a bug, reported by Michael Somos , + which prevented calc -m from being used. + Fixed misc compiler warnings. diff --git a/README b/README index d1d8166..869b1f5 100644 --- a/README +++ b/README @@ -42,6 +42,7 @@ For overview of calc overview: > help define > help statement > help variable + > help usage For list of builtin functions: diff --git a/calc.c b/calc.c index 4d13ad6..d35cfff 100644 --- a/calc.c +++ b/calc.c @@ -87,7 +87,7 @@ main(int argc, char **argv) i_flag = TRUE; break; case 'm': - if (optarg[1] == '\0' || *optarg<'0' || *optarg>'7') { + if (optarg[1] != '\0' || *optarg<'0' || *optarg>'7') { /* * we are too early in processing to * call libcalc_call_me_last() diff --git a/calc.man b/calc.man index a4a1b0e..0fe3673 100644 --- a/calc.man +++ b/calc.man @@ -62,6 +62,13 @@ cause .B calc to try to process each line being read despite the errors that it encounters. +.sp 1 +By default, calc startup scripts ($CALCRC) are silently +ignored if not found. +This flag will report missing +startup scripts unless +.B \-d +is also given. .TP .B \-C @@ -112,6 +119,8 @@ It's nearly ten past six. .fi .in -5n .sp 1 +This flag disables the reporting of missing calc +startup scripts ($CALCRC). .TP .B \-e diff --git a/custom/CUSTOM_CAL b/custom/CUSTOM_CAL index 34e64ac..bd63df6 100644 --- a/custom/CUSTOM_CAL +++ b/custom/CUSTOM_CAL @@ -1,5 +1,5 @@ # -# Copyright (c) 1997 Landon Curt Noll +# Copyright (c) 1999 Landon Curt Noll # # Permission to use, copy, modify, and distribute this software and # its documentation for any purpose and without fee is hereby granted, @@ -44,8 +44,19 @@ calc library standards and guidelines. =-= +argv.cal + + argv(var, ...) + + print information about various args + halflen.cal halflen(num) Calculate the length of a numeric value in HALF's. + +pzasusb8.cal + + Run custom("pzasusb8") on a standard set of data, print Endian + related information and print value size information. diff --git a/custom/HOW_TO_ADD b/custom/HOW_TO_ADD index 318e6e7..f561529 100644 --- a/custom/HOW_TO_ADD +++ b/custom/HOW_TO_ADD @@ -38,17 +38,17 @@ Step 1: Do some background work you look at some examples of custom functions. Check out the following source files: - ../custom.c - custom.h - custtbl.c - c_*.[ch] - ../help/custom + custom.c + custom/custom.h + custom/custtbl.c + custom/c_*.[ch] + help/custom (or run: calc help custom) You would be well advised to look at a more recent calc source - such as one available in from the calc alpha test archive. + such as one available in from the calc version archive. See the following for more details: - ../help/archive + help/archive (or run: calc help archive) Step 2: Name your custom function @@ -604,3 +604,16 @@ Step 11: Install Although calc does not run setuid, you may need to be root to install the directories into which calc installs may be write protected. + + +Step 12: Contribute + + Your custom function may be of interest to some people and/or + serve as an example of what one can do with custom functions. + + Read the file: + + help/contrib (or run: calc help contrib) + + and consider submitting your custom function for possible + inclusion in later versions of calc. diff --git a/custom/pzasusb8.cal b/custom/pzasusb8.cal index fc8fec9..8057458 100644 --- a/custom/pzasusb8.cal +++ b/custom/pzasusb8.cal @@ -27,3 +27,5 @@ print "BIG_ENDIAN: ", custom("sysinfo", "BIG_ENDIAN"); print "LITTLE_ENDIAN: ", custom("sysinfo", "LITTLE_ENDIAN"); print "LONG_BITS: ", custom("sysinfo", "LONG_BITS"); print "LONGLONG_BITS: ", custom("sysinfo", "LONGLONG_BITS"); +print "Calc sizes:"; +show sizes; diff --git a/help/archive b/help/archive index 3bbcc9c..142221e 100644 --- a/help/archive +++ b/help/archive @@ -1,26 +1,14 @@ Where to get the the latest versions of calc - Landon Noll maintains the official calc ftp archive at: + Landon Noll maintains the official calc home page at: - ftp://ftp.uu.net/pub/calc + http://reality.sgi.com/chongo/tech/comp/calc/ - Alpha test versions, complete with bugs, untested code and - experimental features may be fetched (if you are brave) under: + See: - http://reality.sgi.com/chongo/tech/comp/calc/ + http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html - One may join the calc testing group by sending a request to: - - calc-tester-request@postofc.corp.sgi.com - - Your message body (not the subject) should consist of: - - subscribe calc-tester address - end - name your_full_name - - where "address" is your EMail address and "your_full_name" - is your full name. + for information on how to obtain up a recent version of calc. Landon Curt Noll http://reality.sgi.com/chongo diff --git a/help/contrib b/help/contrib index ee60411..5cc5998 100644 --- a/help/contrib +++ b/help/contrib @@ -5,30 +5,27 @@ We welcome and encourage you to send us: * custom functions that you have modified or written * any other source code modifications -Prior to doing so, you should consider trying your changes on the most -recent alpha test code. To obtain the most recent code, look under +Prior to doing so, you should consider applying your changes to the most +recent version of calc. + +Landon Noll maintains the official calc home page at: http://reality.sgi.com/chongo/tech/comp/calc/ -You should also consider joining the calc testing group by sending a -request to: +See: - calc-tester-request@postofc.corp.sgi.com + http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html - Your message body (not the subject) should consist of: +for information on how to obtain up a recent version of calc. - subscribe calc-tester address - end - name your_full_name - - where "address" is your EMail address and "your_full_name" - is your full name. +=-= In order to consider integrating your code, we need: - * help files (documentation) - * CHANGES text (brief description of what it does) - * regress.cal test (to test non-custom code) + * the calc version you are working with (use the latest calc, see above) + * 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, if applicable * your source code and/or source code changes (:-)) The best way to send us new code, if your changes are small, is @@ -45,6 +42,21 @@ Thanks for considering submitting code to calc. Calc is a collective work by a number of people. It would not be what it is today without your efforts and submissions! +=-= + +One may join the calc testing group by sending a request to: + + calc-tester-request@postofc.corp.sgi.com + + Your message body (not the subject) should consist of: + + subscribe calc-tester address + end + name your_full_name + + where "address" is your EMail address and "your_full_name" + is your full name. + Landon Curt Noll http://reality.sgi.com/chongo diff --git a/help/credit b/help/credit index 6869be4..a8c1d61 100644 --- a/help/credit +++ b/help/credit @@ -22,41 +22,10 @@ Credits Most of this source and binary has one of the following copyrights: - Copyright (c) 19xx David I. Bell - Copyright (c) 19xx David I. Bell and Landon Curt Noll - Copyright (c) 19xx Landon Curt Noll - Copyright (c) 19xx Ernest Bowen and Landon Curt Noll + Copyright (c) year David I. Bell + Copyright (c) year David I. Bell and Landon Curt Noll + Copyright (c) year Landon Curt Noll + Copyright (c) year Ernest Bowen and Landon Curt Noll Permission is granted to use, distribute, or modify this source, provided that this copyright notice remains intact. - - Send calc comments, suggestions, bug fixes, enhancements and - interesting calc scripts that you would like you see included in - future distributions to: - - calc-tester@postofc.corp.sgi.com - - Landon Noll maintains the official calc http/ftp archive at: - - ftp://reality.sgi.com/users/chongo/src/calc - http://reality.sgi.com/chongo/src/calc/ - - Alpha test versions, complete with bugs, untested code and - experimental features may be fetched (if you are brave) under: - - http://reality.sgi.com/chongo/tech/comp/calc/ - - One may join the calc testing group by sending a request to: - - calc-tester-request@postofc.corp.sgi.com - - Your message body (not the subject) should consist of: - - subscribe calc-tester address - end - name your_full_name - - where "address" is your EMail address and "your_full_name" - is your full name. - - Enjoy! diff --git a/help/overview b/help/overview index 1a1ff9e..6dfd40c 100644 --- a/help/overview +++ b/help/overview @@ -71,6 +71,10 @@ help stdlib + To learn how to invoke the calc command and about calc -flags, try: + + help usage + A full and extensive overview of calc may be obtained by: help full @@ -160,5 +164,3 @@ These can contain both functions to be defined, and expressions to be calculated. Global variables which are numbers can be saved to a file by using the 'write filename' command. - - XXX - update this file and add in new major features diff --git a/help/todo b/help/todo index 8a74a44..d612c33 100644 --- a/help/todo +++ b/help/todo @@ -21,6 +21,34 @@ Very High priority items: * Update the errmax about the meaning of errmax(-1). + * Review and if needed, correct/update the help topics: + + topic description + ----- ----------- + intro introduction to calc + overview overview of calc + assoc using associations + command top level commands + config configuration parameters + define how to define functions + environment how environment variables effect calc + errorcodes calc generated error codes + expression expression sequences + file using files + history command history + interrupt how interrupts are handled + list using lists + mat using matrices + obj user defined data types + operator math, relational, logic and variable access ... + statement flow control and declaration statements + types builtin data types + unexpected unexpected syntax/usage surprises for C ... + variable variables and variable declarations + libcalc using the arbitrary precision routines in ... + bugs known bugs and mis-features + wishlist wish list of future enhancements of calc + * Fix any 'Known bugs' as noted in the BUGS file or as displayed by 'calc help bugs'. diff --git a/help/usage b/help/usage index ff543f9..9e1af58 100644 --- a/help/usage +++ b/help/usage @@ -19,6 +19,10 @@ Calc command line will cause calc to try to process each line being read despite the errors that it encounters. + By default, calc startup scripts ($CALCRC) are silently + ignored if not found. This flag will report missing + startup scripts unless -d is also given. + -C Permit the execution of custom builtin functions. Without this flag, calling the custom() builtin function will simply generate an error. @@ -48,6 +52,9 @@ Calc command line It's nearly ten past six. + This flag disables the reporting of missing calc + startup scripts ($CALCRC). + -e Ignore any environment variables on startup. The getenv() builtin will still return values, however. diff --git a/lib/README b/lib/README index deed746..c8250ac 100644 --- a/lib/README +++ b/lib/README @@ -17,7 +17,7 @@ For example: will cause calc to load and execute the 'lucas.cal' library. Executing the library will cause several functions to be defined. -Executing the lucas function +Executing the lucas function: > lucas(149,60) 1 diff --git a/version.c b/version.c index cc72586..6c3ed23 100644 --- a/version.c +++ b/version.c @@ -12,7 +12,7 @@ #define MAJOR_VER 2 /* major version */ #define MINOR_VER 11 /* minor version */ #define MAJOR_PATCH 0 /* patch level or 0 if no patch */ -#define MINOR_PATCH "8.8" /* test number or empty string if no patch */ +#define MINOR_PATCH "8.9" /* test number or empty string if no patch */ /* * calc version constants