drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

add errsym builtin function

Browse Source 
NOTE: errstr was renamed to errsym.

Added errsym builtin function.  The errsym(errnum | "E_STRING")
builtin, , when given a valid integer errnum that corresponds to a
calc error condition, will return an E_STRING string, AND when given
a valid E_STRING string that is associated with a calc error
condition, will return errnum integer that corresponds to a calc
error condition.

Supplying a non-integer numeric errnum code to error(), errno(),
strerror(), or errsym() will result in an error.
This commit is contained in:
Landon Curt Noll
2023-09-20 22:22:49 -07:00
parent 120527d375
commit 1a898caf3f
16 changed files with 366 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
help/Makefile
View File

@@ -206,7 +206,7 @@ DETAIL_HELP= abs access acos acosh acot acoth acovercos acoversin \
calcpath catalan ceil cfappr cfsim char cmdbuf cmp comb conj cos cosh \
cot coth count covercos coversin cp csc csch ctime d2dm d2dms d2g d2r \
delete den dereference det digit digits display dms2d dp epsilon \
errcount errmax errno error errstr estr euler eval exp fact factor \
errcount errmax errno error errsym estr euler eval exp fact factor \
fclose fcnt feof ferror fflush fgetc fgetfield fgetfile fgetline fgets \
fgetstr fib files floor fopen forall fpathopen fprintf fputc fputs \
fputstr frac free freebernoulli freeeuler freeglobals freeredc \

2
help/errcount
View File

@@ -45,7 +45,7 @@ LINK LIBRARY
none
SEE ALSO
errmax, errno, errorcodes, errstr, iserror, newerror, stoponerror, strerror
errmax, errno, errorcodes, errsym, iserror, newerror, stoponerror, strerror
## Copyright (C) 1999-2006,2021,2023 Landon Curt Noll
##

2
help/errmax
View File

@@ -42,7 +42,7 @@ LINK LIBRARY
none
SEE ALSO
errcount, errno, errorcodes, errstr, iserror, newerror, stoponerror, strerror
errcount, errno, errorcodes, errsym, iserror, newerror, stoponerror, strerror
## Copyright (C) 2006,2021,2023 Landon Curt Noll
##

17
help/errno
View File

@@ -37,7 +37,7 @@ DESCRIPTION
errno(10003); /* error 10003 has a E_STRING of "E_ADD" */
errno("E_ADD"); /* error 10003 has a E_STRING of "E_ADD" */
See help errstr for information on E_STRING errsym codes.
See help errsym for information on E_STRING errsym codes.
For a list of the E_STRING associated with calc computation error
codes, see help errorcodes.
@@ -102,8 +102,21 @@ LINK LIBRARY
CONST struct errtbl error_table[ECOUNT+2]; /* calc error codes, error symbols and error messages */
bool is_e_digits(CONST char *errsym);
bool is_valid_errnum(int errnum);
bool is_errnum_in_error_table(int errnum);
bool is_e_1string(CONST char *errsym);
bool is_e_2string(CONST char *errsym);
struct errtbl *find_errsym_in_errtbl(CONST char *errsym, CONST struct errtbl *tbl);
struct errtbl *find_errnum_in_errtbl(int errnum, CONST struct errtbl *tbl);
CONST struct errtbl *lookup_errnum_in_error_table(int errnum);
int errsym_2_errnum(CONST char *errsym);
char *errnum_2_errsym(int errnum, bool *palloced);
char *errnum_2_errmsg(int errnum, bool *palloced);
char *errsym_2_errmsg(CONST char *errsym, bool *palloced);
SEE ALSO
errcount, errmax, errorcodes, errstr, iserror, newerror, stoponerror, strerror
errcount, errmax, errorcodes, errsym, iserror, newerror, stoponerror, strerror
## Copyright (C) 1999-2006,2021,2023 Landon Curt Noll
##

15
help/error
View File

@@ -52,7 +52,7 @@ DESCRIPTION
error(10003); /* error 10003 has a E_STRING of "E_ADD" */
error("E_ADD"); /* error 10003 has a E_STRING of "E_ADD" */
See help errstr for information on E_STRING errsym codes.
See help errsym for information on E_STRING errsym codes.
For a list of the E_STRING associated with calc computation error
codes, see help errorcodes.
@@ -138,6 +138,19 @@ LINK LIBRARY
CONST struct errtbl error_table[ECOUNT+2]; /* calc error codes, error symbols and error messages */
bool is_e_digits(CONST char *errsym);
bool is_valid_errnum(int errnum);
bool is_errnum_in_error_table(int errnum);
bool is_e_1string(CONST char *errsym);
bool is_e_2string(CONST char *errsym);
struct errtbl *find_errsym_in_errtbl(CONST char *errsym, CONST struct errtbl *tbl);
struct errtbl *find_errnum_in_errtbl(int errnum, CONST struct errtbl *tbl);
CONST struct errtbl *lookup_errnum_in_error_table(int errnum);
int errsym_2_errnum(CONST char *errsym);
char *errnum_2_errsym(int errnum, bool *palloced);
char *errnum_2_errmsg(int errnum, bool *palloced);
char *errsym_2_errmsg(CONST char *errsym, bool *palloced);
SEE ALSO
errcount, errmax, errorcodes, iserror, errno, strerror, newerror,
stoponerror

47
help/errstr → help/errsym
View File

@@ -1,8 +1,8 @@
NAME
errstr - convert between "E_STRING" errsym into a errnum number
errsym - convert between "E_STRING" errsym into a errnum number
SYNOPSIS
errstr(errnum | "E_STRING")
errsym(errnum | "E_STRING")
TYPES
errnum integer
@@ -18,7 +18,7 @@ DESCRIPTION
For example:
; print errstr(10003)
; print errsym(10003)
E_ADD
When an errnum that matches one of the following errtbl.h #define,
@@ -35,7 +35,7 @@ DESCRIPTION
For example:
; print errstr(0)
; print errsym(0)
E_NONE
When E__NONE <= errnum < E__BASE, or when E__USERDEF <= errnum <= E__USERMAX,
@@ -44,7 +44,7 @@ DESCRIPTION
For example:
; print errstr(123)
; print errsym(123)
E_123
For all other errnum values, an error is returned.
@@ -75,7 +75,7 @@ DESCRIPTION
For example:
; print errstr("E_NONE")
; print errsym("E_NONE")
0
For all other E_STRING strings that start with "E__", an error is returned.
@@ -91,18 +91,18 @@ DESCRIPTION
For example:
; print errstr("E_ADD")
; print errsym("E_ADD")
10003
For all other string arguments, an error is returned.
When errstr returns an integer, the global calc error count (see help errcount)
is NOT changed. And of course, when errstr("E_STRING") returns an error, the
When errsym returns an integer, the global calc error count (see help errcount)
is NOT changed. And of course, when errsym("E_STRING") returns an error, the
global calc error count is incremented by 1.
Consider the E_MUL calc error condition:
Given a E_STRING errsym, errstr("E_STRING") will return the errnum integer
Given a E_STRING errsym, errsym("E_STRING") will return the errnum integer
error code that is associated with the E_STRING errsym.
The 4th entry of struct errtbl error_table is:
@@ -116,8 +116,8 @@ DESCRIPTION
Thus 10005 is the errnum, "E_MUL" is the E_STRING errsym that is
associated with the errmsg error message: "Bad arguments for +".
In the above example, errstr("E_MUL") will return 10005.
Also errstr("E_10005") will also return 10005.
In the above example, errsym("E_MUL") will return 10005.
Also errsym("E_10005") will also return 10005.
To complete the E_STRING use in the above example:
@@ -128,16 +128,16 @@ DESCRIPTION
Both strerror(10005) and strerror("E_MUL") both return "Bad arguments for *"
EXAMPLE
; print errstr("E_ADD"), errstr("E_SUB"), errstr("E_MUL"), errstr("E_DIV")
; print errsym("E_ADD"), errsym("E_SUB"), errsym("E_MUL"), errsym("E_DIV")
10003 10004 10005 10006
; print errstr("E__NONE"), errstr("E__BASE"), errstr("E__USERDEF"), errstr("E__USERMAX")
; print errsym("E__NONE"), errsym("E__BASE"), errsym("E__USERDEF"), errsym("E__USERMAX")
0 10000 20000 32767
; print errstr(10003), errstr(10004), errstr(10005), errstr(10006)
; print errsym(10003), errsym(10004), errsym(10005), errsym(10006)
E_ADD E_SUB E_MUL E_DIV
; print errstr(0), errstr(10000), errstr(20000), errstr(32767)
; print errsym(0), errsym(10000), errsym(20000), errsym(32767)
E__NONE E__BASE E__USERDEF E__USERMAX
LIMITS
@@ -150,10 +150,23 @@ LINK LIBRARY
CONST struct errtbl error_table[ECOUNT+2]; /* calc error codes, error symbols and error messages */
bool is_e_digits(CONST char *errsym);
bool is_valid_errnum(int errnum);
bool is_errnum_in_error_table(int errnum);
bool is_e_1string(CONST char *errsym);
bool is_e_2string(CONST char *errsym);
struct errtbl *find_errsym_in_errtbl(CONST char *errsym, CONST struct errtbl *tbl);
struct errtbl *find_errnum_in_errtbl(int errnum, CONST struct errtbl *tbl);
CONST struct errtbl *lookup_errnum_in_error_table(int errnum);
int errsym_2_errnum(CONST char *errsym);
char *errnum_2_errsym(int errnum, bool *palloced);
char *errnum_2_errmsg(int errnum, bool *palloced);
char *errsym_2_errmsg(CONST char *errsym, bool *palloced);
SEE ALSO
errcount, errmax, errno, errorcodes, iserror, newerror, stoponerror, strerror
## Copyright (C) 1999-2006,2023 Landon Curt Noll
## 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

2
help/iserror
View File

@@ -25,7 +25,7 @@ LINK LIBRARY
none
SEE ALSO
errcount, errmax, errno, errorcodes, errstr, newerror, stoponerror, strerror
errcount, errmax, errno, errorcodes, errsym, newerror, stoponerror, strerror
isassoc, isatty, isblk, isconfig, isdefined, iseven, isfile,
ishash, isident, isint, islist, ismat, ismult, isnull, isnum, isobj,

2
help/newerror
View File

@@ -73,7 +73,7 @@ LINK LIBRARY
none
SEE ALSO
errcount, errmax, errno, errorcodes, errstr, iserror, stoponerror, strerror
errcount, errmax, errno, errorcodes, errsym, iserror, stoponerror, strerror
## Copyright (C) 1999-2006,2023 Landon Curt Noll
##

2
help/stoponerror
View File

@@ -36,7 +36,7 @@ LINK LIBRARY
none
SEE ALSO
errcount, errmax, errno, errorcodes, errstr, iserror, newerror, strerror
errcount, errmax, errno, errorcodes, errsym, iserror, newerror, strerror
## Copyright (C) 2006,2021,2023 Landon Curt Noll
##

17
help/strerror
View File

@@ -33,7 +33,7 @@ DESCRIPTION
cstrerror(10003); /* error 10003 has a E_STRING of "E_ADD" */
cstrerror("E_ADD"); /* error 10003 has a E_STRING of "E_ADD" */
See help errstr for information on E_STRING errsym codes.
See help errsym for information on E_STRING errsym codes.
For a list of the E_STRING associated with calc computation error
codes, see help errorcodes.
@@ -106,8 +106,21 @@ LINK LIBRARY
CONST struct errtbl error_table[ECOUNT+2]; /* calc error codes, error symbols and error messages */
bool is_e_digits(CONST char *errsym);
bool is_valid_errnum(int errnum);
bool is_errnum_in_error_table(int errnum);
bool is_e_1string(CONST char *errsym);
bool is_e_2string(CONST char *errsym);
struct errtbl *find_errsym_in_errtbl(CONST char *errsym, CONST struct errtbl *tbl);
struct errtbl *find_errnum_in_errtbl(int errnum, CONST struct errtbl *tbl);
CONST struct errtbl *lookup_errnum_in_error_table(int errnum);
int errsym_2_errnum(CONST char *errsym);
char *errnum_2_errsym(int errnum, bool *palloced);
char *errnum_2_errmsg(int errnum, bool *palloced);
char *errsym_2_errmsg(CONST char *errsym, bool *palloced);
SEE ALSO
errcount, errmax, errno, errorcodes, errstr, iserror, newerror, stoponerror
errcount, errmax, errno, errorcodes, errsym, iserror, newerror, stoponerror
strcat, strcpy, strlen, strncmp, strncpy, strpos,
strprintf, strscan, strscanf, substr,