X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fbc.c;h=ee4f2136430badf09bf4b6391cef5468139d8499;hb=1a6a482d19b9226ef764de89283cebdacdce77aa;hp=c819decffe70a67d274fa7d152a48ad913ab34f9;hpb=d4744adf35c678554e609a74eeebc7b7603ee25d;p=oweals%2Fbusybox.git diff --git a/miscutils/bc.c b/miscutils/bc.c index c819decff..ee4f21364 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -116,7 +116,7 @@ //See www.gnu.org/software/bc/manual/bc.html //usage:#define bc_trivial_usage -//usage: "[-sqli] FILE..." +//usage: "[-sqliw] FILE..." //usage: //usage:#define bc_full_usage "\n" //usage: "\nArbitrary precision calculator" @@ -127,6 +127,7 @@ //usage: "\n -q Quiet" //usage: "\n -w Warn if extensions are used" ///////: "\n -v Version" +//usage: "\n$BC_LINE_LENGTH changes output width" //usage: //usage:#define bc_example_usage //usage: "3 + 4.129\n" @@ -168,140 +169,10 @@ #include "libbb.h" typedef enum BcStatus { - BC_STATUS_SUCCESS, - -// BC_STATUS_ALLOC_ERR, -// BC_STATUS_INPUT_EOF, - BC_STATUS_BIN_FILE, -// BC_STATUS_PATH_IS_DIR, - - BC_STATUS_LEX_BAD_CHAR, - BC_STATUS_LEX_NO_STRING_END, - BC_STATUS_LEX_NO_COMMENT_END, - BC_STATUS_LEX_EOF, -#if ENABLE_DC - BC_STATUS_LEX_EXTENDED_REG, -#endif - BC_STATUS_PARSE_BAD_TOKEN, - BC_STATUS_PARSE_BAD_EXP, - BC_STATUS_PARSE_EMPTY_EXP, - BC_STATUS_PARSE_BAD_PRINT, - BC_STATUS_PARSE_BAD_FUNC, - BC_STATUS_PARSE_BAD_ASSIGN, - BC_STATUS_PARSE_NO_AUTO, - BC_STATUS_PARSE_DUPLICATE_LOCAL, - BC_STATUS_PARSE_NO_BLOCK_END, - - BC_STATUS_MATH_NEGATIVE, - BC_STATUS_MATH_NON_INTEGER, - BC_STATUS_MATH_OVERFLOW, - BC_STATUS_MATH_DIVIDE_BY_ZERO, - BC_STATUS_MATH_BAD_STRING, - -// BC_STATUS_EXEC_FILE_ERR, - BC_STATUS_EXEC_MISMATCHED_PARAMS, - BC_STATUS_EXEC_UNDEFINED_FUNC, - BC_STATUS_EXEC_FILE_NOT_EXECUTABLE, - BC_STATUS_EXEC_NUM_LEN, - BC_STATUS_EXEC_NAME_LEN, - BC_STATUS_EXEC_STRING_LEN, - BC_STATUS_EXEC_ARRAY_LEN, - BC_STATUS_EXEC_BAD_IBASE, -// BC_STATUS_EXEC_BAD_SCALE, - BC_STATUS_EXEC_BAD_READ_EXPR, - BC_STATUS_EXEC_REC_READ, - BC_STATUS_EXEC_BAD_TYPE, -// BC_STATUS_EXEC_BAD_OBASE, - BC_STATUS_EXEC_SIGNAL, - BC_STATUS_EXEC_STACK, - -// BC_STATUS_VEC_OUT_OF_BOUNDS, - BC_STATUS_VEC_ITEM_EXISTS, -#if ENABLE_BC - BC_STATUS_POSIX_NAME_LEN, - BC_STATUS_POSIX_COMMENT, - BC_STATUS_POSIX_BAD_KW, - BC_STATUS_POSIX_DOT, - BC_STATUS_POSIX_RET, - BC_STATUS_POSIX_BOOL, - BC_STATUS_POSIX_REL_POS, - BC_STATUS_POSIX_MULTIREL, - BC_STATUS_POSIX_FOR1, - BC_STATUS_POSIX_FOR2, - BC_STATUS_POSIX_FOR3, - BC_STATUS_POSIX_BRACE, -#endif -// BC_STATUS_QUIT, -// BC_STATUS_LIMITS, - -// BC_STATUS_INVALID_OPTION, + BC_STATUS_SUCCESS = 0, + BC_STATUS_FAILURE = 1, + BC_STATUS_PARSE_EMPTY_EXP = 2, // bc_parse_expr() uses this } BcStatus; -// Keep enum above and messages below in sync! -static const char *const bc_err_msgs[] = { - NULL, -// "memory allocation error", -// "I/O error", - "file is not text:", -// "path is a directory:", - - "bad character", - "string end could not be found", - "comment end could not be found", - "end of file", -#if ENABLE_DC - "extended register", -#endif - "bad token", - "bad expression", - "empty expression", - "bad print statement", - "bad function definition", - "bad assignment: left side must be scale, ibase, " - "obase, last, var, or array element", - "no auto variable found", - "function parameter or auto var has the same name as another", - "block end could not be found", - - "negative number", - "non integer number", - "overflow", - "divide by zero", - "bad number string", - -// "could not open file:", - "mismatched parameters", // wrong number of them, to be exact - "undefined function", - "file is not executable:", - "number too long: must be [1, BC_NUM_MAX]", - "name too long: must be [1, BC_NAME_MAX]", - "string too long: must be [1, BC_STRING_MAX]", - "array too long; must be [1, BC_DIM_MAX]", - "bad ibase; must be [2, 16]", -// "bad scale; must be [0, BC_SCALE_MAX]", - "bad read() expression", - "read() call inside of a read() call", - "variable is wrong type", -// "bad obase; must be [2, BC_BASE_MAX]", - "signal caught and not handled", - "stack has too few elements", - -// "index is out of bounds", - "item already exists", -#if ENABLE_BC - "POSIX only allows one character names; the following is bad:", - "POSIX does not allow '#' script comments", - "POSIX does not allow the following keyword:", - "POSIX does not allow a period ('.') as a shortcut for the last result", - "POSIX requires parentheses around return expressions", - "POSIX does not allow boolean operators; the following is bad:", - "POSIX does not allow comparison operators outside if or loops", - "POSIX requires exactly one comparison operator per condition", - "POSIX does not allow an empty init expression in a for loop", - "POSIX does not allow an empty condition expression in a for loop", - "POSIX does not allow an empty update expression in a for loop", - "POSIX requires the left brace be on the same line as the function header", -#endif -}; #define BC_VEC_INVALID_IDX ((size_t) -1) #define BC_VEC_START_CAP (1 << 5) @@ -319,10 +190,6 @@ typedef struct BcVec { #define bc_vec_pop(v) (bc_vec_npop((v), 1)) #define bc_vec_top(v) (bc_vec_item_rev((v), 0)) -#define bc_map_init(v) (bc_vec_init((v), sizeof(BcId), bc_id_free)) - -#define BC_READ_BIN_CHAR(c) ((((c) < ' ' && !isspace((c))) || (c) > '~')) - typedef signed char BcDig; typedef struct BcNum { @@ -351,14 +218,6 @@ typedef struct BcNum { typedef BcStatus (*BcNumBinaryOp)(BcNum *, BcNum *, BcNum *, size_t); typedef void (*BcNumDigitOp)(size_t, size_t, bool, size_t *, size_t); -static void bc_num_init(BcNum *n, size_t req); -static void bc_num_expand(BcNum *n, size_t req); -static void bc_num_copy(BcNum *d, BcNum *s); -static void bc_num_free(void *num); - -static BcStatus bc_num_ulong(BcNum *n, unsigned long *result); -static void bc_num_ulong2num(BcNum *n, unsigned long val); - static BcStatus bc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale); static BcStatus bc_num_sub(BcNum *a, BcNum *b, BcNum *c, size_t scale); static BcStatus bc_num_mul(BcNum *a, BcNum *b, BcNum *c, size_t scale); @@ -521,9 +380,6 @@ typedef struct BcInstPtr { size_t len; } BcInstPtr; -static void bc_array_expand(BcVec *a, size_t len); -static int bc_id_cmp(const void *e1, const void *e2); - // BC_LEX_NEG is not used in lexing; it is only for parsing. typedef enum BcLexType { @@ -579,19 +435,21 @@ typedef enum BcLexType { BC_LEX_NAME, BC_LEX_NUMBER, - BC_LEX_KEY_AUTO, + BC_LEX_KEY_1st_keyword, + BC_LEX_KEY_AUTO = BC_LEX_KEY_1st_keyword, BC_LEX_KEY_BREAK, BC_LEX_KEY_CONTINUE, BC_LEX_KEY_DEFINE, BC_LEX_KEY_ELSE, BC_LEX_KEY_FOR, BC_LEX_KEY_HALT, - BC_LEX_KEY_IBASE, + // code uses "type - BC_LEX_KEY_IBASE + BC_INST_IBASE" construct, + BC_LEX_KEY_IBASE, // relative order should match for: BC_INST_IBASE BC_LEX_KEY_IF, - BC_LEX_KEY_LAST, + BC_LEX_KEY_LAST, // relative order should match for: BC_INST_LAST BC_LEX_KEY_LENGTH, BC_LEX_KEY_LIMITS, - BC_LEX_KEY_OBASE, + BC_LEX_KEY_OBASE, // relative order should match for: BC_INST_OBASE BC_LEX_KEY_PRINT, BC_LEX_KEY_QUIT, BC_LEX_KEY_READ, @@ -628,8 +486,68 @@ typedef enum BcLexType { BC_LEX_NQUIT, BC_LEX_SCALE_FACTOR, #endif - } BcLexType; +// must match order of BC_LEX_KEY_foo etc above +#if ENABLE_BC +struct BcLexKeyword { + char name8[8]; +}; +#define BC_LEX_KW_ENTRY(a, b, c) \ + { .name8 = a /*, .len = b, .posix = c*/ } +static const struct BcLexKeyword bc_lex_kws[20] = { + BC_LEX_KW_ENTRY("auto" , 4, 1), // 0 + BC_LEX_KW_ENTRY("break" , 5, 1), // 1 + BC_LEX_KW_ENTRY("continue", 8, 0), // 2 note: this one has no terminating NUL + BC_LEX_KW_ENTRY("define" , 6, 1), // 3 + + BC_LEX_KW_ENTRY("else" , 4, 0), // 4 + BC_LEX_KW_ENTRY("for" , 3, 1), // 5 + BC_LEX_KW_ENTRY("halt" , 4, 0), // 6 + BC_LEX_KW_ENTRY("ibase" , 5, 1), // 7 + + BC_LEX_KW_ENTRY("if" , 2, 1), // 8 + BC_LEX_KW_ENTRY("last" , 4, 0), // 9 + BC_LEX_KW_ENTRY("length" , 6, 1), // 10 + BC_LEX_KW_ENTRY("limits" , 6, 0), // 11 + + BC_LEX_KW_ENTRY("obase" , 5, 1), // 12 + BC_LEX_KW_ENTRY("print" , 5, 0), // 13 + BC_LEX_KW_ENTRY("quit" , 4, 1), // 14 + BC_LEX_KW_ENTRY("read" , 4, 0), // 15 + + BC_LEX_KW_ENTRY("return" , 6, 1), // 16 + BC_LEX_KW_ENTRY("scale" , 5, 1), // 17 + BC_LEX_KW_ENTRY("sqrt" , 4, 1), // 18 + BC_LEX_KW_ENTRY("while" , 5, 1), // 19 +}; +enum { + POSIX_KWORD_MASK = 0 + | (1 << 0) + | (1 << 1) + | (0 << 2) + | (1 << 3) + \ + | (0 << 4) + | (1 << 5) + | (0 << 6) + | (1 << 7) + \ + | (1 << 8) + | (0 << 9) + | (1 << 10) + | (0 << 11) + \ + | (1 << 12) + | (0 << 13) + | (1 << 14) + | (0 << 15) + \ + | (1 << 16) + | (1 << 17) + | (1 << 18) + | (1 << 19) +}; +#endif struct BcLex; typedef BcStatus (*BcLexNext)(struct BcLex *); @@ -639,7 +557,6 @@ typedef struct BcLex { const char *buf; size_t i; size_t line; - const char *f; size_t len; bool newline; @@ -700,11 +617,6 @@ typedef struct BcLex { BC_PARSE_FLAG_LOOP | BC_PARSE_FLAG_LOOP_INNER | BC_PARSE_FLAG_IF | \ BC_PARSE_FLAG_ELSE | BC_PARSE_FLAG_IF_END))) -typedef struct BcOp { - char prec; - bool left; -} BcOp; - typedef struct BcParseNext { uint32_t len; BcLexType tokens[4]; @@ -743,45 +655,6 @@ typedef struct BcParse { } BcParse; -#if ENABLE_BC - -typedef struct BcLexKeyword { - const char name[9]; - const char len; - const bool posix; -} BcLexKeyword; - -#define BC_LEX_KW_ENTRY(a, b, c) \ - { \ - .name = a, .len = (b), .posix = (c) \ - } - -static BcStatus bc_lex_token(BcLex *l); - -#define BC_PARSE_TOP_OP(p) (*((BcLexType *) bc_vec_top(&(p)->ops))) -#define BC_PARSE_LEAF(p, rparen) \ - (((p) >= BC_INST_NUM && (p) <= BC_INST_SQRT) || (rparen) || \ - (p) == BC_INST_INC_POST || (p) == BC_INST_DEC_POST) - -// We can calculate the conversion between tokens and exprs by subtracting the -// position of the first operator in the lex enum and adding the position of the -// first in the expr enum. Note: This only works for binary operators. -#define BC_PARSE_TOKEN_INST(t) ((char) ((t) -BC_LEX_NEG + BC_INST_NEG)) - -static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next); - -#endif // ENABLE_BC - -#if ENABLE_DC - -#define DC_PARSE_BUF_LEN ((int) (sizeof(uint32_t) * CHAR_BIT)) - -static BcStatus dc_lex_token(BcLex *l); - -static BcStatus dc_parse_expr(BcParse *p, uint8_t flags); - -#endif // ENABLE_DC - typedef struct BcProgram { size_t len; @@ -839,7 +712,7 @@ typedef struct BcProgram { typedef unsigned long (*BcProgramBuiltIn)(BcNum *); static void bc_program_addFunc(char *name, size_t *idx); -static BcStatus bc_program_reset(BcStatus s); +static void bc_program_reset(void); #define BC_FLAG_X (1 << 0) #define BC_FLAG_W (1 << 1) @@ -862,92 +735,88 @@ static BcStatus bc_program_reset(BcStatus s); #define BC_MAX_VARS ((unsigned long) SIZE_MAX - 1) struct globals { + IF_FEATURE_BC_SIGNALS(smallint ttyin;) + smallint eof; char sbgn; char send; BcParse prs; BcProgram prog; - unsigned flags; + // For error messages. Can be set to current parsed line, + // or [TODO] to current executing line (can be before last parsed one) + unsigned err_line; + BcVec files; char *env_args; - - smallint tty; - smallint ttyin; - smallint eof; } FIX_ALIASING; #define G (*ptr_to_globals) #define INIT_G() do { \ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) -#define G_posix (ENABLE_BC && (G.flags & BC_FLAG_S)) -#define G_warn (ENABLE_BC && (G.flags & BC_FLAG_W)) -#define G_exreg (ENABLE_DC && (G.flags & BC_FLAG_X)) +#define FREE_G() do { \ + FREE_PTR_TO_GLOBALS(); \ +} while (0) +#define G_posix (ENABLE_BC && (option_mask32 & BC_FLAG_S)) +#define G_warn (ENABLE_BC && (option_mask32 & BC_FLAG_W)) +#define G_exreg (ENABLE_DC && (option_mask32 & BC_FLAG_X)) #define G_interrupt (ENABLE_FEATURE_BC_SIGNALS ? bb_got_signal : 0) - - -#define IS_BC (ENABLE_BC && (!ENABLE_DC || applet_name[0] == 'b')) - -#if ENABLE_BC -static BcStatus bc_vm_posixError(BcStatus s, const char *file, size_t line, - const char *msg); +#if ENABLE_FEATURE_BC_SIGNALS +# define G_ttyin G.ttyin +#else +# define G_ttyin 0 #endif - -static void bc_vm_info(void); - -static const char bc_err_fmt[] = "\nerror: %s\n"; -static const char bc_warn_fmt[] = "\nwarning: %s\n"; -static const char bc_err_line[] = ":%zu\n\n"; +#define IS_BC (ENABLE_BC && (!ENABLE_DC || applet_name[0] == 'b')) #if ENABLE_BC -static const BcLexKeyword bc_lex_kws[20] = { - BC_LEX_KW_ENTRY("auto", 4, true), - BC_LEX_KW_ENTRY("break", 5, true), - BC_LEX_KW_ENTRY("continue", 8, false), - BC_LEX_KW_ENTRY("define", 6, true), - BC_LEX_KW_ENTRY("else", 4, false), - BC_LEX_KW_ENTRY("for", 3, true), - BC_LEX_KW_ENTRY("halt", 4, false), - BC_LEX_KW_ENTRY("ibase", 5, true), - BC_LEX_KW_ENTRY("if", 2, true), - BC_LEX_KW_ENTRY("last", 4, false), - BC_LEX_KW_ENTRY("length", 6, true), - BC_LEX_KW_ENTRY("limits", 6, false), - BC_LEX_KW_ENTRY("obase", 5, true), - BC_LEX_KW_ENTRY("print", 5, false), - BC_LEX_KW_ENTRY("quit", 4, true), - BC_LEX_KW_ENTRY("read", 4, false), - BC_LEX_KW_ENTRY("return", 6, true), - BC_LEX_KW_ENTRY("scale", 5, true), - BC_LEX_KW_ENTRY("sqrt", 4, true), - BC_LEX_KW_ENTRY("while", 5, true), -}; -// This is an array that corresponds to token types. An entry is +// This is a bit array that corresponds to token types. An entry is // true if the token is valid in an expression, false otherwise. -static const bool bc_parse_exprs[] = { - false, false, true, true, true, true, true, true, true, true, true, true, - true, true, true, true, true, true, true, true, true, true, true, true, - true, true, true, false, false, true, true, false, false, false, false, - false, false, false, true, true, false, false, false, false, false, false, - false, true, false, true, true, true, true, false, false, true, false, true, - true, false, +enum { + BC_PARSE_EXPRS_BITS = 0 + + ((uint64_t)((0 << 0)+(0 << 1)+(1 << 2)+(1 << 3)+(1 << 4)+(1 << 5)+(1 << 6)+(1 << 7)) << (0*8)) + + ((uint64_t)((1 << 0)+(1 << 1)+(1 << 2)+(1 << 3)+(1 << 4)+(1 << 5)+(1 << 6)+(1 << 7)) << (1*8)) + + ((uint64_t)((1 << 0)+(1 << 1)+(1 << 2)+(1 << 3)+(1 << 4)+(1 << 5)+(1 << 6)+(1 << 7)) << (2*8)) + + ((uint64_t)((1 << 0)+(1 << 1)+(1 << 2)+(0 << 3)+(0 << 4)+(1 << 5)+(1 << 6)+(0 << 7)) << (3*8)) + + ((uint64_t)((0 << 0)+(0 << 1)+(0 << 2)+(0 << 3)+(0 << 4)+(0 << 5)+(1 << 6)+(1 << 7)) << (4*8)) + + ((uint64_t)((0 << 0)+(0 << 1)+(0 << 2)+(0 << 3)+(0 << 4)+(0 << 5)+(0 << 6)+(1 << 7)) << (5*8)) + + ((uint64_t)((0 << 0)+(1 << 1)+(1 << 2)+(1 << 3)+(1 << 4)+(0 << 5)+(0 << 6)+(1 << 7)) << (6*8)) + + ((uint64_t)((0 << 0)+(1 << 1)+(1 << 2)+(0 << 3) ) << (7*8)) }; +static ALWAYS_INLINE long bc_parse_exprs(unsigned i) +{ +#if ULONG_MAX > 0xffffffff + // 64-bit version (will not work correctly for 32-bit longs!) + return BC_PARSE_EXPRS_BITS & (1UL << i); +#else + // 32-bit version + unsigned long m = (uint32_t)BC_PARSE_EXPRS_BITS; + if (i >= 32) { + m = (uint32_t)(BC_PARSE_EXPRS_BITS >> 32); + i &= 31; + } + return m & (1UL << i); +#endif +} // This is an array of data for operators that correspond to token types. -static const BcOp bc_parse_ops[] = { - { 0, false }, { 0, false }, - { 1, false }, - { 2, false }, - { 3, true }, { 3, true }, { 3, true }, - { 4, true }, { 4, true }, - { 6, true }, { 6, true }, { 6, true }, { 6, true }, { 6, true }, { 6, true }, - { 1, false }, - { 7, true }, { 7, true }, - { 5, false }, { 5, false }, { 5, false }, { 5, false }, { 5, false }, - { 5, false }, { 5, false }, +static const uint8_t bc_parse_ops[] = { +#define OP(p,l) ((int)(l) * 0x10 + (p)) + OP(0, false), OP( 0, false ), // inc dec + OP(1, false), // neg + OP(2, false), + OP(3, true ), OP( 3, true ), OP( 3, true ), // pow mul div + OP(4, true ), OP( 4, true ), // mod + - + OP(6, true ), OP( 6, true ), OP( 6, true ), OP( 6, true ), OP( 6, true ), OP( 6, true ), // == <= >= != < > + OP(1, false), // not + OP(7, true ), OP( 7, true ), // or and + OP(5, false), OP( 5, false ), OP( 5, false ), OP( 5, false ), OP( 5, false ), // ^= *= /= %= += + OP(5, false), OP( 5, false ), // -= = +#undef OP }; +#define bc_parse_op_PREC(i) (bc_parse_ops[i] & 0x0f) +#define bc_parse_op_LEFT(i) (bc_parse_ops[i] & 0x10) // These identify what tokens can come after expressions in certain cases. static const BcParseNext bc_parse_next_expr = @@ -971,8 +840,6 @@ static const BcLexType dc_lex_regs[] = { BC_LEX_STORE_PUSH, }; -static const size_t dc_lex_regs_len = sizeof(dc_lex_regs) / sizeof(BcLexType); - static const BcLexType dc_lex_tokens[] = { BC_LEX_OP_MODULUS, BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_LPAREN, BC_LEX_INVALID, BC_LEX_OP_MULTIPLY, BC_LEX_OP_PLUS, BC_LEX_INVALID, @@ -1032,96 +899,6 @@ static const BcNumBinaryOp bc_program_ops[] = { bc_num_pow, bc_num_mul, bc_num_div, bc_num_mod, bc_num_add, bc_num_sub, }; -static const char bc_program_stdin_name[] = ""; -static const char bc_program_ready_msg[] = "ready for more input\n"; - -#if ENABLE_BC -static const char *bc_lib_name = "gen/lib.bc"; - -static const char bc_lib[] = { - 115,99,97,108,101,61,50,48,10,100,101,102,105,110,101,32,101,40,120,41,123, - 10,9,97,117,116,111,32,98,44,115,44,110,44,114,44,100,44,105,44,112,44,102, - 44,118,10,9,98,61,105,98,97,115,101,10,9,105,98,97,115,101,61,65,10,9,105,102, - 40,120,60,48,41,123,10,9,9,110,61,49,10,9,9,120,61,45,120,10,9,125,10,9,115, - 61,115,99,97,108,101,10,9,114,61,54,43,115,43,48,46,52,52,42,120,10,9,115,99, - 97,108,101,61,115,99,97,108,101,40,120,41,43,49,10,9,119,104,105,108,101,40, - 120,62,49,41,123,10,9,9,100,43,61,49,10,9,9,120,47,61,50,10,9,9,115,99,97,108, - 101,43,61,49,10,9,125,10,9,115,99,97,108,101,61,114,10,9,114,61,120,43,49,10, - 9,112,61,120,10,9,102,61,118,61,49,10,9,102,111,114,40,105,61,50,59,118,33, - 61,48,59,43,43,105,41,123,10,9,9,112,42,61,120,10,9,9,102,42,61,105,10,9,9, - 118,61,112,47,102,10,9,9,114,43,61,118,10,9,125,10,9,119,104,105,108,101,40, - 40,100,45,45,41,33,61,48,41,114,42,61,114,10,9,115,99,97,108,101,61,115,10, - 9,105,98,97,115,101,61,98,10,9,105,102,40,110,33,61,48,41,114,101,116,117,114, - 110,40,49,47,114,41,10,9,114,101,116,117,114,110,40,114,47,49,41,10,125,10, - 100,101,102,105,110,101,32,108,40,120,41,123,10,9,97,117,116,111,32,98,44,115, - 44,114,44,112,44,97,44,113,44,105,44,118,10,9,98,61,105,98,97,115,101,10,9, - 105,98,97,115,101,61,65,10,9,105,102,40,120,60,61,48,41,123,10,9,9,114,61,40, - 49,45,49,48,94,115,99,97,108,101,41,47,49,10,9,9,105,98,97,115,101,61,98,10, - 9,9,114,101,116,117,114,110,40,114,41,10,9,125,10,9,115,61,115,99,97,108,101, - 10,9,115,99,97,108,101,43,61,54,10,9,112,61,50,10,9,119,104,105,108,101,40, - 120,62,61,50,41,123,10,9,9,112,42,61,50,10,9,9,120,61,115,113,114,116,40,120, - 41,10,9,125,10,9,119,104,105,108,101,40,120,60,61,48,46,53,41,123,10,9,9,112, - 42,61,50,10,9,9,120,61,115,113,114,116,40,120,41,10,9,125,10,9,114,61,97,61, - 40,120,45,49,41,47,40,120,43,49,41,10,9,113,61,97,42,97,10,9,118,61,49,10,9, - 102,111,114,40,105,61,51,59,118,33,61,48,59,105,43,61,50,41,123,10,9,9,97,42, - 61,113,10,9,9,118,61,97,47,105,10,9,9,114,43,61,118,10,9,125,10,9,114,42,61, - 112,10,9,115,99,97,108,101,61,115,10,9,105,98,97,115,101,61,98,10,9,114,101, - 116,117,114,110,40,114,47,49,41,10,125,10,100,101,102,105,110,101,32,115,40, - 120,41,123,10,9,97,117,116,111,32,98,44,115,44,114,44,110,44,97,44,113,44,105, - 10,9,98,61,105,98,97,115,101,10,9,105,98,97,115,101,61,65,10,9,115,61,115,99, - 97,108,101,10,9,115,99,97,108,101,61,49,46,49,42,115,43,50,10,9,97,61,97,40, - 49,41,10,9,105,102,40,120,60,48,41,123,10,9,9,110,61,49,10,9,9,120,61,45,120, - 10,9,125,10,9,115,99,97,108,101,61,48,10,9,113,61,40,120,47,97,43,50,41,47, - 52,10,9,120,61,120,45,52,42,113,42,97,10,9,105,102,40,113,37,50,33,61,48,41, - 120,61,45,120,10,9,115,99,97,108,101,61,115,43,50,10,9,114,61,97,61,120,10, - 9,113,61,45,120,42,120,10,9,102,111,114,40,105,61,51,59,97,33,61,48,59,105, - 43,61,50,41,123,10,9,9,97,42,61,113,47,40,105,42,40,105,45,49,41,41,10,9,9, - 114,43,61,97,10,9,125,10,9,115,99,97,108,101,61,115,10,9,105,98,97,115,101, - 61,98,10,9,105,102,40,110,33,61,48,41,114,101,116,117,114,110,40,45,114,47, - 49,41,10,9,114,101,116,117,114,110,40,114,47,49,41,10,125,10,100,101,102,105, - 110,101,32,99,40,120,41,123,10,9,97,117,116,111,32,98,44,115,10,9,98,61,105, - 98,97,115,101,10,9,105,98,97,115,101,61,65,10,9,115,61,115,99,97,108,101,10, - 9,115,99,97,108,101,42,61,49,46,50,10,9,120,61,115,40,50,42,97,40,49,41,43, - 120,41,10,9,115,99,97,108,101,61,115,10,9,105,98,97,115,101,61,98,10,9,114, - 101,116,117,114,110,40,120,47,49,41,10,125,10,100,101,102,105,110,101,32,97, - 40,120,41,123,10,9,97,117,116,111,32,98,44,115,44,114,44,110,44,97,44,109,44, - 116,44,102,44,105,44,117,10,9,98,61,105,98,97,115,101,10,9,105,98,97,115,101, - 61,65,10,9,110,61,49,10,9,105,102,40,120,60,48,41,123,10,9,9,110,61,45,49,10, - 9,9,120,61,45,120,10,9,125,10,9,105,102,40,120,61,61,49,41,123,10,9,9,105,102, - 40,115,99,97,108,101,60,54,53,41,123,10,9,9,9,114,101,116,117,114,110,40,46, - 55,56,53,51,57,56,49,54,51,51,57,55,52,52,56,51,48,57,54,49,53,54,54,48,56, - 52,53,56,49,57,56,55,53,55,50,49,48,52,57,50,57,50,51,52,57,56,52,51,55,55, - 54,52,53,53,50,52,51,55,51,54,49,52,56,48,47,110,41,10,9,9,125,10,9,125,10, - 9,105,102,40,120,61,61,46,50,41,123,10,9,9,105,102,40,115,99,97,108,101,60, - 54,53,41,123,10,9,9,9,114,101,116,117,114,110,40,46,49,57,55,51,57,53,53,53, - 57,56,52,57,56,56,48,55,53,56,51,55,48,48,52,57,55,54,53,49,57,52,55,57,48, - 50,57,51,52,52,55,53,56,53,49,48,51,55,56,55,56,53,50,49,48,49,53,49,55,54, - 56,56,57,52,48,50,47,110,41,10,9,9,125,10,9,125,10,9,115,61,115,99,97,108,101, - 10,9,105,102,40,120,62,46,50,41,123,10,9,9,115,99,97,108,101,43,61,53,10,9, - 9,97,61,97,40,46,50,41,10,9,125,10,9,115,99,97,108,101,61,115,43,51,10,9,119, - 104,105,108,101,40,120,62,46,50,41,123,10,9,9,109,43,61,49,10,9,9,120,61,40, - 120,45,46,50,41,47,40,49,43,46,50,42,120,41,10,9,125,10,9,114,61,117,61,120, - 10,9,102,61,45,120,42,120,10,9,116,61,49,10,9,102,111,114,40,105,61,51,59,116, - 33,61,48,59,105,43,61,50,41,123,10,9,9,117,42,61,102,10,9,9,116,61,117,47,105, - 10,9,9,114,43,61,116,10,9,125,10,9,115,99,97,108,101,61,115,10,9,105,98,97, - 115,101,61,98,10,9,114,101,116,117,114,110,40,40,109,42,97,43,114,41,47,110, - 41,10,125,10,100,101,102,105,110,101,32,106,40,110,44,120,41,123,10,9,97,117, - 116,111,32,98,44,115,44,111,44,97,44,105,44,118,44,102,10,9,98,61,105,98,97, - 115,101,10,9,105,98,97,115,101,61,65,10,9,115,61,115,99,97,108,101,10,9,115, - 99,97,108,101,61,48,10,9,110,47,61,49,10,9,105,102,40,110,60,48,41,123,10,9, - 9,110,61,45,110,10,9,9,105,102,40,110,37,50,61,61,49,41,111,61,49,10,9,125, - 10,9,97,61,49,10,9,102,111,114,40,105,61,50,59,105,60,61,110,59,43,43,105,41, - 97,42,61,105,10,9,115,99,97,108,101,61,49,46,53,42,115,10,9,97,61,40,120,94, - 110,41,47,50,94,110,47,97,10,9,114,61,118,61,49,10,9,102,61,45,120,42,120,47, - 52,10,9,115,99,97,108,101,61,115,99,97,108,101,43,108,101,110,103,116,104,40, - 97,41,45,115,99,97,108,101,40,97,41,10,9,102,111,114,40,105,61,49,59,118,33, - 61,48,59,43,43,105,41,123,10,9,9,118,61,118,42,102,47,105,47,40,110,43,105, - 41,10,9,9,114,43,61,118,10,9,125,10,9,115,99,97,108,101,61,115,10,9,105,98, - 97,115,101,61,98,10,9,105,102,40,111,33,61,48,41,97,61,45,97,10,9,114,101,116, - 117,114,110,40,97,42,114,47,49,41,10,125,10,0 -}; -#endif // ENABLE_BC - static void fflush_and_check(void) { fflush_all(); @@ -1129,6 +906,16 @@ static void fflush_and_check(void) bb_perror_msg_and_die("output error"); } +#if ENABLE_FEATURE_CLEAN_UP +#define quit_or_return_for_exit() \ +do { \ + IF_FEATURE_BC_SIGNALS(G_ttyin = 0;) /* do not loop in main loop anymore */ \ + return BC_STATUS_FAILURE; \ +} while (0) +#else +#define quit_or_return_for_exit() quit() +#endif + static void quit(void) NORETURN; static void quit(void) { @@ -1138,6 +925,103 @@ static void quit(void) exit(0); } +static void bc_verror_msg(const char *fmt, va_list p) +{ + const char *sv = sv; /* for compiler */ + if (G.prog.file) { + sv = applet_name; + applet_name = xasprintf("%s: %s:%u", applet_name, G.prog.file, G.err_line); + } + bb_verror_msg(fmt, p, NULL); + if (G.prog.file) { + free((char*)applet_name); + applet_name = sv; + } +} + +static NOINLINE int bc_error_fmt(const char *fmt, ...) +{ + va_list p; + + va_start(p, fmt); + bc_verror_msg(fmt, p); + va_end(p); + + if (!ENABLE_FEATURE_CLEAN_UP && !G_ttyin) + exit(1); + return BC_STATUS_FAILURE; +} + +static NOINLINE int bc_posix_error_fmt(const char *fmt, ...) +{ + va_list p; + + // Are non-POSIX constructs totally ok? + if (!(option_mask32 & (BC_FLAG_S|BC_FLAG_W))) + return BC_STATUS_SUCCESS; // yes + + va_start(p, fmt); + bc_verror_msg(fmt, p); + va_end(p); + + // Do we treat non-POSIX constructs as errors? + if (!(option_mask32 & BC_FLAG_S)) + return BC_STATUS_SUCCESS; // no, it's a warning + if (!ENABLE_FEATURE_CLEAN_UP && !G_ttyin) + exit(1); + return BC_STATUS_FAILURE; +} + +// We use error functions with "return bc_error(FMT[, PARAMS])" idiom. +// This idiom begs for tail-call optimization, but for it to work, +// function must not have calller-cleaned parameters on stack. +// Unfortunately, vararg functions do exactly that on most arches. +// Thus, these shims for the cases when we have no PARAMS: +static int bc_error(const char *msg) +{ + return bc_error_fmt("%s", msg); +} +static int bc_posix_error(const char *msg) +{ + return bc_posix_error_fmt("%s", msg); +} +static int bc_POSIX_does_not_allow(const char *msg) +{ + return bc_posix_error_fmt("%s%s", "POSIX does not allow ", msg); +} +static int bc_POSIX_does_not_allow_bool_ops_this_is_bad(const char *msg) +{ + return bc_posix_error_fmt("%s%s %s", "POSIX does not allow ", "boolean operators; the following is bad:", msg); +} +static int bc_POSIX_does_not_allow_empty_X_expression_in_for(const char *msg) +{ + return bc_posix_error_fmt("%san empty %s expression in a for loop", "POSIX does not allow ", msg); +} +static int bc_error_bad_character(char c) +{ + return bc_error_fmt("bad character '%c'", c); +} +static int bc_error_bad_expression(void) +{ + return bc_error("bad expression"); +} +static int bc_error_bad_token(void) +{ + return bc_error("bad token"); +} +static int bc_error_stack_has_too_few_elements(void) +{ + return bc_error("stack has too few elements"); +} +static int bc_error_variable_is_wrong_type(void) +{ + return bc_error("variable is wrong type"); +} +static int bc_error_nested_read_call(void) +{ + return bc_error("read() call inside of a read() call"); +} + static void bc_vec_grow(BcVec *v, size_t n) { size_t cap = v->cap * 2; @@ -1155,6 +1039,11 @@ static void bc_vec_init(BcVec *v, size_t esize, BcVecFree dtor) v->v = xmalloc(esize * BC_VEC_START_CAP); } +static void bc_char_vec_init(BcVec *v) +{ + bc_vec_init(v, sizeof(char), NULL); +} + static void bc_vec_expand(BcVec *v, size_t req) { if (v->cap < req) { @@ -1173,6 +1062,11 @@ static void bc_vec_npop(BcVec *v, size_t n) } } +static void bc_vec_pop_all(BcVec *v) +{ + bc_vec_npop(v, v->len); +} + static void bc_vec_push(BcVec *v, const void *data) { if (v->len + 1 > v->cap) bc_vec_grow(v, 1); @@ -1185,6 +1079,13 @@ static void bc_vec_pushByte(BcVec *v, char data) bc_vec_push(v, &data); } +static void bc_vec_pushZeroByte(BcVec *v) +{ + //bc_vec_pushByte(v, '\0'); + // better: + bc_vec_push(v, &const_int_0); +} + static void bc_vec_pushAt(BcVec *v, const void *data, size_t idx) { if (idx == v->len) @@ -1204,19 +1105,19 @@ static void bc_vec_pushAt(BcVec *v, const void *data, size_t idx) static void bc_vec_string(BcVec *v, size_t len, const char *str) { - bc_vec_npop(v, v->len); + bc_vec_pop_all(v); bc_vec_expand(v, len + 1); memcpy(v->v, str, len); v->len = len; - bc_vec_pushByte(v, '\0'); + bc_vec_pushZeroByte(v); } static void bc_vec_concat(BcVec *v, const char *str) { size_t len; - if (v->len == 0) bc_vec_pushByte(v, '\0'); + if (v->len == 0) bc_vec_pushZeroByte(v); len = v->len + strlen(str); @@ -1239,10 +1140,20 @@ static void *bc_vec_item_rev(const BcVec *v, size_t idx) static void bc_vec_free(void *vec) { BcVec *v = (BcVec *) vec; - bc_vec_npop(v, v->len); + bc_vec_pop_all(v); free(v->v); } +static int bc_id_cmp(const void *e1, const void *e2) +{ + return strcmp(((const BcId *) e1)->name, ((const BcId *) e2)->name); +} + +static void bc_id_free(void *id) +{ + free(((BcId *) id)->name); +} + static size_t bc_map_find(const BcVec *v, const void *ptr) { size_t low = 0, high = v->len; @@ -1264,20 +1175,17 @@ static size_t bc_map_find(const BcVec *v, const void *ptr) return low; } -static BcStatus bc_map_insert(BcVec *v, const void *ptr, size_t *i) +static int bc_map_insert(BcVec *v, const void *ptr, size_t *i) { - BcStatus s = BC_STATUS_SUCCESS; + size_t n = *i = bc_map_find(v, ptr); - *i = bc_map_find(v, ptr); - - if (*i == v->len) + if (n == v->len) bc_vec_push(v, ptr); - else if (!bc_id_cmp(ptr, bc_vec_item(v, *i))) - s = BC_STATUS_VEC_ITEM_EXISTS; + else if (!bc_id_cmp(ptr, bc_vec_item(v, n))) + return 0; // "was not inserted" else - bc_vec_pushAt(v, ptr, *i); - - return s; + bc_vec_pushAt(v, ptr, n); + return 1; // "was inserted" } static size_t bc_map_index(const BcVec *v, const void *ptr) @@ -1289,56 +1197,63 @@ static size_t bc_map_index(const BcVec *v, const void *ptr) static BcStatus bc_read_line(BcVec *vec, const char *prompt) { - int i; - signed char c; + bool bad_chars; - bc_vec_npop(vec, vec->len); + do { + int i; - fflush_and_check(); + bad_chars = 0; + bc_vec_pop_all(vec); + + fflush_and_check(); #if ENABLE_FEATURE_BC_SIGNALS - if (bb_got_signal) { // ^C was pressed + if (bb_got_signal) { // ^C was pressed intr: - bb_got_signal = 0; // resets G_interrupt to zero - fputs(IS_BC - ? "\ninterrupt (type \"quit\" to exit)\n" - : "\ninterrupt (type \"q\" to exit)\n" - , stderr); - } + bb_got_signal = 0; // resets G_interrupt to zero + fputs(IS_BC + ? "\ninterrupt (type \"quit\" to exit)\n" + : "\ninterrupt (type \"q\" to exit)\n" + , stderr); + } #endif - if (G.ttyin && !G_posix) - fputs(prompt, stderr); - fflush_and_check(); + if (G_ttyin && !G_posix) + fputs(prompt, stderr); #if ENABLE_FEATURE_BC_SIGNALS - errno = 0; + errno = 0; #endif - do { - i = fgetc(stdin); - - if (i == EOF) { + do { + i = fgetc(stdin); + if (i == EOF) { #if ENABLE_FEATURE_BC_SIGNALS - // Both conditions appear simultaneously, check both just in case - if (errno == EINTR || bb_got_signal) { - // ^C was pressed - clearerr(stdin); - goto intr; - } + // Both conditions appear simultaneously, check both just in case + if (errno == EINTR || bb_got_signal) { + // ^C was pressed + clearerr(stdin); + goto intr; + } #endif - if (ferror(stdin)) - quit(); // this emits error message - G.eof = 1; - // Note: EOF does not append '\n', therefore: - // printf 'print 123\n' | bc - works - // printf 'print 123' | bc - fails (syntax error) - break; - } + if (ferror(stdin)) + quit(); // this emits error message + G.eof = 1; + // Note: EOF does not append '\n', therefore: + // printf 'print 123\n' | bc - works + // printf 'print 123' | bc - fails (syntax error) + break; + } - c = (signed char) i; - if (i > UCHAR_MAX || BC_READ_BIN_CHAR(c)) return BC_STATUS_BIN_FILE; - bc_vec_push(vec, &c); - } while (c != '\n'); + if ((i < ' ' && i != '\t' && i != '\r' && i != '\n') // also allow '\v' '\f'? + || i > 0x7e + ) { + // Bad chars on this line, ignore entire line + bc_error_fmt("illegal character 0x%02x", i); + bad_chars = 1; + } + bc_vec_pushByte(vec, (char)i); + } while (i != '\n'); + } while (bad_chars); - bc_vec_pushByte(vec, '\0'); + bc_vec_pushZeroByte(vec); return BC_STATUS_SUCCESS; } @@ -1352,7 +1267,10 @@ static char* bc_read_file(const char *path) buf = xmalloc_open_read_close(path, &size); for (i = 0; i < size; ++i) { - if (BC_READ_BIN_CHAR(buf[i])) { + char c = buf[i]; + if ((c < ' ' && c != '\t' && c != '\r' && c != '\n') // also allow '\v' '\f'? + || c > 0x7e + ) { free(buf); buf = NULL; break; @@ -1362,32 +1280,6 @@ static char* bc_read_file(const char *path) return buf; } -static void bc_args(int argc, char **argv) -{ - int i; - - GETOPT_RESET(); -#if ENABLE_FEATURE_BC_LONG_OPTIONS - G.flags = getopt32long(argv, "xwvsqli", - "extended-register\0" No_argument "x" - "warn\0" No_argument "w" - "version\0" No_argument "v" - "standard\0" No_argument "s" - "quiet\0" No_argument "q" - "mathlib\0" No_argument "l" - "interactive\0" No_argument "i" - ); -#else - G.flags = getopt32(argv, "xwvsqli"); -#endif - - if (G.flags & BC_FLAG_V) bc_vm_info(); - // should not be necessary, getopt32() handles this?? - //if (argv[optind] && !strcmp(argv[optind], "--")) ++optind; - - for (i = optind; i < argc; ++i) bc_vec_push(&G.files, argv + i); -} - static void bc_num_setToZero(BcNum *n, size_t scale) { n->len = 0; @@ -1415,6 +1307,74 @@ static void bc_num_ten(BcNum *n) n->num[1] = 1; } +static void bc_num_init(BcNum *n, size_t req) +{ + req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE; + memset(n, 0, sizeof(BcNum)); + n->num = xmalloc(req); + n->cap = req; +} + +static void bc_num_expand(BcNum *n, size_t req) +{ + req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE; + if (req > n->cap) { + n->num = xrealloc(n->num, req); + n->cap = req; + } +} + +static void bc_num_free(void *num) +{ + free(((BcNum *) num)->num); +} + +static void bc_num_copy(BcNum *d, BcNum *s) +{ + if (d != s) { + bc_num_expand(d, s->cap); + d->len = s->len; + d->neg = s->neg; + d->rdx = s->rdx; + memcpy(d->num, s->num, sizeof(BcDig) * d->len); + } +} + +static BcStatus bc_num_ulong(BcNum *n, unsigned long *result) +{ + size_t i; + unsigned long pow; + + if (n->neg) return bc_error("negative number"); + + for (*result = 0, pow = 1, i = n->rdx; i < n->len; ++i) { + + unsigned long prev = *result, powprev = pow; + + *result += ((unsigned long) n->num[i]) * pow; + pow *= 10; + + if (*result < prev || pow < powprev) + return bc_error("overflow"); + } + + return BC_STATUS_SUCCESS; +} + +static void bc_num_ulong2num(BcNum *n, unsigned long val) +{ + size_t len; + BcDig *ptr; + unsigned long i; + + bc_num_zero(n); + + if (val == 0) return; + + for (len = 1, i = ULONG_MAX; i != 0; i /= 10, ++len) bc_num_expand(n, len); + for (ptr = n->num, i = 0; val; ++i, ++n->len, val /= 10) ptr[i] = val % 10; +} + static void bc_num_subArrays(BcDig *restrict a, BcDig *restrict b, size_t len) { @@ -1556,7 +1516,8 @@ static void bc_num_split(BcNum *restrict n, size_t idx, BcNum *restrict a, static BcStatus bc_num_shift(BcNum *n, size_t places) { if (places == 0 || n->len == 0) return BC_STATUS_SUCCESS; - if (places + n->len > BC_MAX_NUM) return BC_STATUS_EXEC_NUM_LEN; + if (places + n->len > BC_MAX_NUM) + return bc_error("number too long: must be [1, BC_NUM_MAX]"); if (n->rdx >= places) n->rdx -= places; @@ -1719,16 +1680,16 @@ static BcStatus bc_num_k(BcNum *restrict a, BcNum *restrict b, BcNum *restrict c) { BcStatus s; - int carry; - size_t i, j, len, max = BC_MAX(a->len, b->len), max2 = (max + 1) / 2; + size_t max = BC_MAX(a->len, b->len), max2 = (max + 1) / 2; BcNum l1, h1, l2, h2, m2, m1, z0, z1, z2, temp; - bool aone = BC_NUM_ONE(a); + bool aone; if (a->len == 0 || b->len == 0) { bc_num_zero(c); return BC_STATUS_SUCCESS; } - else if (aone || BC_NUM_ONE(b)) { + aone = BC_NUM_ONE(a); + if (aone || BC_NUM_ONE(b)) { bc_num_copy(c, aone ? b : a); return BC_STATUS_SUCCESS; } @@ -1736,23 +1697,31 @@ static BcStatus bc_num_k(BcNum *restrict a, BcNum *restrict b, if (a->len + b->len < BC_NUM_KARATSUBA_LEN || a->len < BC_NUM_KARATSUBA_LEN || b->len < BC_NUM_KARATSUBA_LEN) { + size_t i, j, len; + unsigned carry; + bc_num_expand(c, a->len + b->len + 1); memset(c->num, 0, sizeof(BcDig) * c->cap); - c->len = carry = len = 0; + c->len = len = 0; for (i = 0; i < b->len; ++i) { + carry = 0; for (j = 0; j < a->len; ++j) { - int in = (int) c->num[i + j]; - in += ((int) a->num[j]) * ((int) b->num[i]) + carry; + unsigned in = c->num[i + j]; + in += ((unsigned) a->num[j]) * ((unsigned) b->num[i]) + carry; + // note: compilers prefer _unsigned_ div/const carry = in / 10; c->num[i + j] = (BcDig)(in % 10); } c->num[i + j] += (BcDig) carry; len = BC_MAX(len, i + j + !!carry); - carry = 0; + + // a=2^1000000 + // a*a <- without check below, this will not be interruptible + if (G_interrupt) return BC_STATUS_FAILURE; } c->len = len; @@ -1864,7 +1833,7 @@ static BcStatus bc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) bool zero = true; if (b->len == 0) - return BC_STATUS_MATH_DIVIDE_BY_ZERO; + return bc_error("divide by zero"); else if (a->len == 0) { bc_num_setToZero(c, scale); return BC_STATUS_SUCCESS; @@ -1912,12 +1881,19 @@ static BcStatus bc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) for (q = 0; (!s && n[len] != 0) || bc_num_compare(n, p, len) >= 0; ++q) bc_num_subArrays(n, p, len); c->num[i] = q; + // a=2^100000 + // scale=40000 + // 1/a <- without check below, this will not be interruptible + if (G_interrupt) { + s = BC_STATUS_FAILURE; + break; + } } bc_num_retireMul(c, scale, a->neg, b->neg); bc_num_free(&cp); - return BC_STATUS_SUCCESS; // can't make void, see bc_num_binary() + return s; } static BcStatus bc_num_r(BcNum *a, BcNum *b, BcNum *restrict c, @@ -1927,7 +1903,8 @@ static BcStatus bc_num_r(BcNum *a, BcNum *b, BcNum *restrict c, BcNum temp; bool neg; - if (b->len == 0) return BC_STATUS_MATH_DIVIDE_BY_ZERO; + if (b->len == 0) + return bc_error("divide by zero"); if (a->len == 0) { bc_num_setToZero(d, ts); @@ -1935,7 +1912,8 @@ static BcStatus bc_num_r(BcNum *a, BcNum *b, BcNum *restrict c, } bc_num_init(&temp, d->cap); - bc_num_d(a, b, c, scale); + s = bc_num_d(a, b, c, scale); + if (s) goto err; if (scale != 0) scale = ts; @@ -1976,7 +1954,7 @@ static BcStatus bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) size_t i, powrdx, resrdx; bool neg, zero; - if (b->rdx) return BC_STATUS_MATH_NON_INTEGER; + if (b->rdx) return bc_error("non integer number"); if (b->len == 0) { bc_num_one(c); @@ -2011,6 +1989,11 @@ static BcStatus bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) powrdx <<= 1; s = bc_num_mul(©, ©, ©, powrdx); if (s) goto err; + // Not needed: bc_num_mul() has a check for ^C: + //if (G_interrupt) { + // s = BC_STATUS_FAILURE; + // goto err; + //} } bc_num_copy(c, ©); @@ -2026,6 +2009,11 @@ static BcStatus bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) s = bc_num_mul(c, ©, c, resrdx); if (s) goto err; } + // Not needed: bc_num_mul() has a check for ^C: + //if (G_interrupt) { + // s = BC_STATUS_FAILURE; + // goto err; + //} } if (neg) { @@ -2130,8 +2118,9 @@ static void bc_num_parseDecimal(BcNum *n, const char *val) ptr = strchr(val, '.'); - // Explicitly test for NULL here to produce either a 0 or 1. - n->rdx = (size_t)((ptr != NULL) * ((val + len) - (ptr + 1))); + n->rdx = 0; + if (ptr != NULL) + n->rdx = (size_t)((val + len) - (ptr + 1)); if (!zero) { for (i = len - 1; i < len; ++n->len, i -= 1 + (i && val[i - 1] == '.')) @@ -2361,60 +2350,28 @@ static BcStatus bc_num_printBase(BcNum *n, BcNum *base, size_t base_t, print = bc_num_printHex; } else { - for (i = base_t - 1, width = 0; i != 0; i /= 10, ++width); - print = bc_num_printDigits; - } - - s = bc_num_printNum(n, base, width, nchars, line_len, print); - n->neg = neg; - - return s; -} - -#if ENABLE_DC -static BcStatus bc_num_stream(BcNum *n, BcNum *base, size_t *nchars, size_t len) -{ - return bc_num_printNum(n, base, 1, nchars, len, bc_num_printChar); -} -#endif - -static void bc_num_init(BcNum *n, size_t req) -{ - req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE; - memset(n, 0, sizeof(BcNum)); - n->num = xmalloc(req); - n->cap = req; -} - -static void bc_num_expand(BcNum *n, size_t req) -{ - req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE; - if (req > n->cap) { - n->num = xrealloc(n->num, req); - n->cap = req; + for (i = base_t - 1, width = 0; i != 0; i /= 10, ++width); + print = bc_num_printDigits; } -} -static void bc_num_free(void *num) -{ - free(((BcNum *) num)->num); + s = bc_num_printNum(n, base, width, nchars, line_len, print); + n->neg = neg; + + return s; } -static void bc_num_copy(BcNum *d, BcNum *s) +#if ENABLE_DC +static BcStatus bc_num_stream(BcNum *n, BcNum *base, size_t *nchars, size_t len) { - if (d != s) { - bc_num_expand(d, s->cap); - d->len = s->len; - d->neg = s->neg; - d->rdx = s->rdx; - memcpy(d->num, s->num, sizeof(BcDig) * d->len); - } + return bc_num_printNum(n, base, 1, nchars, len, bc_num_printChar); } +#endif static BcStatus bc_num_parse(BcNum *n, const char *val, BcNum *base, size_t base_t) { - if (!bc_num_strValid(val, base_t)) return BC_STATUS_MATH_BAD_STRING; + if (!bc_num_strValid(val, base_t)) + return bc_error("bad number string"); if (base_t == 10) bc_num_parseDecimal(n, val); @@ -2448,40 +2405,6 @@ static BcStatus bc_num_print(BcNum *n, BcNum *base, size_t base_t, bool newline, return s; } -static BcStatus bc_num_ulong(BcNum *n, unsigned long *result) -{ - size_t i; - unsigned long pow; - - if (n->neg) return BC_STATUS_MATH_NEGATIVE; - - for (*result = 0, pow = 1, i = n->rdx; i < n->len; ++i) { - - unsigned long prev = *result, powprev = pow; - - *result += ((unsigned long) n->num[i]) * pow; - pow *= 10; - - if (*result < prev || pow < powprev) return BC_STATUS_MATH_OVERFLOW; - } - - return BC_STATUS_SUCCESS; -} - -static void bc_num_ulong2num(BcNum *n, unsigned long val) -{ - size_t len; - BcDig *ptr; - unsigned long i; - - bc_num_zero(n); - - if (val == 0) return; - - for (len = 1, i = ULONG_MAX; i != 0; i /= 10, ++len) bc_num_expand(n, len); - for (ptr = n->num, i = 0; val; ++i, ++n->len, val /= 10) ptr[i] = val % 10; -} - static BcStatus bc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale) { BcNumBinaryOp op = (!a->neg == !b->neg) ? bc_num_a : bc_num_s; @@ -2534,7 +2457,7 @@ static BcStatus bc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale) return BC_STATUS_SUCCESS; } else if (a->neg) - return BC_STATUS_MATH_NEGATIVE; + return bc_error("negative number"); else if (BC_NUM_ONE(a)) { bc_num_one(b); bc_num_extend(b, scale); @@ -2653,9 +2576,12 @@ static BcStatus bc_num_modexp(BcNum *a, BcNum *b, BcNum *c, BcNum *restrict d) BcStatus s; BcNum base, exp, two, temp; - if (c->len == 0) return BC_STATUS_MATH_DIVIDE_BY_ZERO; - if (a->rdx || b->rdx || c->rdx) return BC_STATUS_MATH_NON_INTEGER; - if (b->neg) return BC_STATUS_MATH_NEGATIVE; + if (c->len == 0) + return bc_error("divide by zero"); + if (a->rdx || b->rdx || c->rdx) + return bc_error("non integer number"); + if (b->neg) + return bc_error("negative number"); bc_num_expand(d, c->len); bc_num_init(&base, c->len); @@ -2698,24 +2624,14 @@ err: } #endif // ENABLE_DC -static int bc_id_cmp(const void *e1, const void *e2) -{ - return strcmp(((const BcId *) e1)->name, ((const BcId *) e2)->name); -} - -static void bc_id_free(void *id) -{ - free(((BcId *) id)->name); -} - static BcStatus bc_func_insert(BcFunc *f, char *name, bool var) { BcId a; size_t i; for (i = 0; i < f->autos.len; ++i) { - if (!strcmp(name, ((BcId *) bc_vec_item(&f->autos, i))->name)) - return BC_STATUS_PARSE_DUPLICATE_LOCAL; + if (strcmp(name, ((BcId *) bc_vec_item(&f->autos, i))->name) == 0) + return bc_error("function parameter or auto var has the same name as another"); } a.idx = var; @@ -2728,7 +2644,7 @@ static BcStatus bc_func_insert(BcFunc *f, char *name, bool var) static void bc_func_init(BcFunc *f) { - bc_vec_init(&f->code, sizeof(char), NULL); + bc_char_vec_init(&f->code); bc_vec_init(&f->autos, sizeof(BcId), bc_id_free); bc_vec_init(&f->labels, sizeof(size_t), NULL); f->nparams = 0; @@ -2742,6 +2658,8 @@ static void bc_func_free(void *func) bc_vec_free(&f->labels); } +static void bc_array_expand(BcVec *a, size_t len); + static void bc_array_init(BcVec *a, bool nums) { if (nums) @@ -2751,21 +2669,6 @@ static void bc_array_init(BcVec *a, bool nums) bc_array_expand(a, 1); } -static void bc_array_copy(BcVec *d, const BcVec *s) -{ - size_t i; - - bc_vec_npop(d, d->len); - bc_vec_expand(d, s->cap); - d->len = s->len; - - for (i = 0; i < s->len; ++i) { - BcNum *dnum = bc_vec_item(d, i), *snum = bc_vec_item(s, i); - bc_num_init(dnum, snum->len); - bc_num_copy(dnum, snum); - } -} - static void bc_array_expand(BcVec *a, size_t len) { BcResultData data; @@ -2784,6 +2687,21 @@ static void bc_array_expand(BcVec *a, size_t len) } } +static void bc_array_copy(BcVec *d, const BcVec *s) +{ + size_t i; + + bc_vec_pop_all(d); + bc_vec_expand(d, s->cap); + d->len = s->len; + + for (i = 0; i < s->len; ++i) { + BcNum *dnum = bc_vec_item(d, i), *snum = bc_vec_item(s, i); + bc_num_init(dnum, snum->len); + bc_num_copy(dnum, snum); + } +} + static void bc_string_free(void *string) { free(*((char **) string)); @@ -2896,10 +2814,11 @@ static BcStatus bc_lex_number(BcLex *l, char start) c = buf[++i]; } - len = i + 1 * !last_pt - bslashes * 2; - if (len > BC_MAX_NUM) return BC_STATUS_EXEC_NUM_LEN; + len = i + !last_pt - bslashes * 2; + if (len > BC_MAX_NUM) + return bc_error("number too long: must be [1, BC_NUM_MAX]"); - bc_vec_npop(&l->t.v, l->t.v.len); + bc_vec_pop_all(&l->t.v); bc_vec_expand(&l->t.v, len + 1); bc_vec_push(&l->t.v, &start); @@ -2918,7 +2837,7 @@ static BcStatus bc_lex_number(BcLex *l, char start) bc_vec_push(&l->t.v, &c); } - bc_vec_pushByte(&l->t.v, '\0'); + bc_vec_pushZeroByte(&l->t.v); l->i += i; return BC_STATUS_SUCCESS; @@ -2934,7 +2853,8 @@ static BcStatus bc_lex_name(BcLex *l) while ((c >= 'a' && c <= 'z') || isdigit(c) || c == '_') c = buf[++i]; - if (i > BC_MAX_STRING) return BC_STATUS_EXEC_NAME_LEN; + if (i > BC_MAX_STRING) + return bc_error("name too long: must be [1, BC_NAME_MAX]"); bc_vec_string(&l->t.v, i, buf); // Increment the index. We minus 1 because it has already been incremented. @@ -2946,7 +2866,7 @@ static BcStatus bc_lex_name(BcLex *l) static void bc_lex_init(BcLex *l, BcLexNext next) { l->next = next; - bc_vec_init(&l->t.v, sizeof(char), NULL); + bc_char_vec_init(&l->t.v); } static void bc_lex_free(BcLex *l) @@ -2954,11 +2874,10 @@ static void bc_lex_free(BcLex *l) bc_vec_free(&l->t.v); } -static void bc_lex_file(BcLex *l, const char *file) +static void bc_lex_file(BcLex *l) { - l->line = 1; + G.err_line = l->line = 1; l->newline = false; - l->f = file; } static BcStatus bc_lex_next(BcLex *l) @@ -2966,9 +2885,10 @@ static BcStatus bc_lex_next(BcLex *l) BcStatus s; l->t.last = l->t.t; - if (l->t.last == BC_LEX_EOF) return BC_STATUS_LEX_EOF; + if (l->t.last == BC_LEX_EOF) return bc_error("end of file"); l->line += l->newline; + G.err_line = l->line; l->t.t = BC_LEX_EOF; l->newline = (l->i == l->len); @@ -2996,34 +2916,42 @@ static BcStatus bc_lex_text(BcLex *l, const char *text) static BcStatus bc_lex_identifier(BcLex *l) { BcStatus s; - size_t i; + unsigned i; const char *buf = l->buf + l->i - 1; - for (i = 0; i < sizeof(bc_lex_kws) / sizeof(bc_lex_kws[0]); ++i) { - - unsigned long len = (unsigned long) bc_lex_kws[i].len; - - if (strncmp(buf, bc_lex_kws[i].name, len) == 0) { - - l->t.t = BC_LEX_KEY_AUTO + (BcLexType) i; - - if (!bc_lex_kws[i].posix) { - s = bc_vm_posixError(BC_STATUS_POSIX_BAD_KW, l->f, l->line, - bc_lex_kws[i].name); - if (s) return s; - } - - // We minus 1 because the index has already been incremented. - l->i += len - 1; - return BC_STATUS_SUCCESS; + for (i = 0; i < ARRAY_SIZE(bc_lex_kws); ++i) { + const char *keyword8 = bc_lex_kws[i].name8; + unsigned j = 0; + while (buf[j] != '\0' && buf[j] == keyword8[j]) { + j++; + if (j == 8) goto match; + } + if (keyword8[j] != '\0') + continue; + match: + // buf starts with keyword bc_lex_kws[i] + l->t.t = BC_LEX_KEY_1st_keyword + i; + if (!((1 << i) & POSIX_KWORD_MASK)) { + s = bc_posix_error_fmt("%sthe '%.8s' keyword", "POSIX does not allow ", bc_lex_kws[i].name8); + if (s) return s; } + + // We minus 1 because the index has already been incremented. + l->i += j - 1; + return BC_STATUS_SUCCESS; } s = bc_lex_name(l); if (s) return s; - if (l->t.v.len - 1 > 1) - s = bc_vm_posixError(BC_STATUS_POSIX_NAME_LEN, l->f, l->line, buf); + if (l->t.v.len > 2) { + // Prevent this: + // >>> qwe=1 + // bc: POSIX only allows one character names; the following is bad: 'qwe=1 + // ' + unsigned len = strchrnul(buf, '\n') - buf; + s = bc_posix_error_fmt("POSIX only allows one character names; the following is bad: '%.*s'", len, buf); + } return s; } @@ -3039,15 +2967,17 @@ static BcStatus bc_lex_string(BcLex *l) if (c == '\0') { l->i = i; - return BC_STATUS_LEX_NO_STRING_END; + return bc_error("string end could not be found"); } len = i - l->i; - if (len > BC_MAX_STRING) return BC_STATUS_EXEC_STRING_LEN; + if (len > BC_MAX_STRING) + return bc_error("string too long: must be [1, BC_STRING_MAX]"); bc_vec_string(&l->t.v, len, l->buf + l->i); l->i = i + 1; l->line += nls; + G.err_line = l->line; return BC_STATUS_SUCCESS; } @@ -3066,25 +2996,29 @@ static BcStatus bc_lex_comment(BcLex *l) { size_t i, nls = 0; const char *buf = l->buf; - bool end = false; - char c; l->t.t = BC_LEX_WHITESPACE; - - for (i = ++l->i; !end; i += !end) { - - for (c = buf[i]; c != '*' && c != 0; c = buf[++i]) nls += (c == '\n'); - - if (c == 0 || buf[i + 1] == '\0') { + i = ++l->i; + for (;;) { + char c = buf[i]; + check_star: + if (c == '*') { + c = buf[++i]; + if (c == '/') + break; + goto check_star; + } + if (c == '\0') { l->i = i; - return BC_STATUS_LEX_NO_COMMENT_END; + return bc_error("comment end could not be found"); } - - end = buf[i + 1] == '/'; + nls += (c == '\n'); + i++; } - l->i = i + 2; + l->i = i + 1; l->line += nls; + G.err_line = l->line; return BC_STATUS_SUCCESS; } @@ -3120,7 +3054,7 @@ static BcStatus bc_lex_token(BcLex *l) bc_lex_assign(l, BC_LEX_OP_REL_NE, BC_LEX_OP_BOOL_NOT); if (l->t.t == BC_LEX_OP_BOOL_NOT) { - s = bc_vm_posixError(BC_STATUS_POSIX_BOOL, l->f, l->line, "!"); + s = bc_POSIX_does_not_allow_bool_ops_this_is_bad("!"); if (s) return s; } @@ -3135,7 +3069,7 @@ static BcStatus bc_lex_token(BcLex *l) case '#': { - s = bc_vm_posixError(BC_STATUS_POSIX_COMMENT, l->f, l->line, NULL); + s = bc_POSIX_does_not_allow("'#' script comments"); if (s) return s; bc_lex_lineComment(l); @@ -3154,7 +3088,7 @@ static BcStatus bc_lex_token(BcLex *l) c2 = l->buf[l->i]; if (c2 == '&') { - s = bc_vm_posixError(BC_STATUS_POSIX_BOOL, l->f, l->line, "&&"); + s = bc_POSIX_does_not_allow_bool_ops_this_is_bad("&&"); if (s) return s; ++l->i; @@ -3162,7 +3096,7 @@ static BcStatus bc_lex_token(BcLex *l) } else { l->t.t = BC_LEX_INVALID; - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character('&'); } break; @@ -3217,7 +3151,7 @@ static BcStatus bc_lex_token(BcLex *l) s = bc_lex_number(l, c); else { l->t.t = BC_LEX_KEY_LAST; - s = bc_vm_posixError(BC_STATUS_POSIX_DOT, l->f, l->line, NULL); + s = bc_POSIX_does_not_allow("a period ('.') as a shortcut for the last result"); } break; } @@ -3291,7 +3225,7 @@ static BcStatus bc_lex_token(BcLex *l) ++l->i; } else - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character(c); break; } @@ -3344,8 +3278,7 @@ static BcStatus bc_lex_token(BcLex *l) c2 = l->buf[l->i]; if (c2 == '|') { - - s = bc_vm_posixError(BC_STATUS_POSIX_BOOL, l->f, l->line, "||"); + s = bc_POSIX_does_not_allow_bool_ops_this_is_bad("||"); if (s) return s; ++l->i; @@ -3353,7 +3286,7 @@ static BcStatus bc_lex_token(BcLex *l) } else { l->t.t = BC_LEX_INVALID; - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character(c); } break; @@ -3362,7 +3295,7 @@ static BcStatus bc_lex_token(BcLex *l) default: { l->t.t = BC_LEX_INVALID; - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character(c); break; } } @@ -3380,14 +3313,14 @@ static BcStatus dc_lex_register(BcLex *l) bc_lex_whitespace(l); ++l->i; if (!G_exreg) - s = BC_STATUS_LEX_EXTENDED_REG; + s = bc_error("extended register"); else s = bc_lex_name(l); } else { - bc_vec_npop(&l->t.v, l->t.v.len); + bc_vec_pop_all(&l->t.v); bc_vec_pushByte(&l->t.v, l->buf[l->i - 1]); - bc_vec_pushByte(&l->t.v, '\0'); + bc_vec_pushZeroByte(&l->t.v); l->t.t = BC_LEX_NAME; } @@ -3400,7 +3333,7 @@ static BcStatus dc_lex_string(BcLex *l) char c; l->t.t = BC_LEX_STR; - bc_vec_npop(&l->t.v, l->t.v.len); + bc_vec_pop_all(&l->t.v); for (c = l->buf[i]; c != 0 && depth; c = l->buf[++i]) { @@ -3413,14 +3346,16 @@ static BcStatus dc_lex_string(BcLex *l) if (c == '\0') { l->i = i; - return BC_STATUS_LEX_NO_STRING_END; + return bc_error("string end could not be found"); } - bc_vec_pushByte(&l->t.v, '\0'); - if (i - l->i > BC_MAX_STRING) return BC_STATUS_EXEC_STRING_LEN; + bc_vec_pushZeroByte(&l->t.v); + if (i - l->i > BC_MAX_STRING) + return bc_error("string too long: must be [1, BC_STRING_MAX]"); l->i = i; l->line += nls; + G.err_line = l->line; return BC_STATUS_SUCCESS; } @@ -3431,8 +3366,9 @@ static BcStatus dc_lex_token(BcLex *l) char c = l->buf[l->i++], c2; size_t i; - for (i = 0; i < dc_lex_regs_len; ++i) { - if (l->t.last == dc_lex_regs[i]) return dc_lex_register(l); + for (i = 0; i < ARRAY_SIZE(dc_lex_regs); ++i) { + if (l->t.last == dc_lex_regs[i]) + return dc_lex_register(l); } if (c >= '%' && c <= '~' && @@ -3473,7 +3409,7 @@ static BcStatus dc_lex_token(BcLex *l) else if (c2 == '>') l->t.t = BC_LEX_OP_REL_GE; else - return BC_STATUS_LEX_BAD_CHAR; + return bc_error_bad_character(c); ++l->i; break; @@ -3490,7 +3426,7 @@ static BcStatus dc_lex_token(BcLex *l) if (isdigit(l->buf[l->i])) s = bc_lex_number(l, c); else - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character(c); break; } @@ -3524,7 +3460,7 @@ static BcStatus dc_lex_token(BcLex *l) default: { l->t.t = BC_LEX_INVALID; - s = BC_STATUS_LEX_BAD_CHAR; + s = bc_error_bad_character(c); break; } } @@ -3582,24 +3518,26 @@ static BcStatus bc_parse_text(BcParse *p, const char *text) p->func = bc_vec_item(&G.prog.fns, p->fidx); - if (!strcmp(text, "") && !BC_PARSE_CAN_EXEC(p)) { + if (!text[0] && !BC_PARSE_CAN_EXEC(p)) { p->l.t.t = BC_LEX_INVALID; s = p->parse(p); if (s) return s; - if (!BC_PARSE_CAN_EXEC(p)) return BC_STATUS_EXEC_FILE_NOT_EXECUTABLE; + if (!BC_PARSE_CAN_EXEC(p)) + return bc_error("file is not executable"); } return bc_lex_text(&p->l, text); } -static BcStatus bc_parse_reset(BcParse *p, BcStatus s) +// Called when bc/dc_parse_parse() detects a failure, +// resets parsing structures. +static void bc_parse_reset(BcParse *p) { if (p->fidx != BC_PROG_MAIN) { - p->func->nparams = 0; - bc_vec_npop(&p->func->code, p->func->code.len); - bc_vec_npop(&p->func->autos, p->func->autos.len); - bc_vec_npop(&p->func->labels, p->func->labels.len); + bc_vec_pop_all(&p->func->code); + bc_vec_pop_all(&p->func->autos); + bc_vec_pop_all(&p->func->labels); bc_parse_updateFunc(p, BC_PROG_MAIN); } @@ -3609,11 +3547,11 @@ static BcStatus bc_parse_reset(BcParse *p, BcStatus s) p->auto_part = (p->nbraces = 0); bc_vec_npop(&p->flags, p->flags.len - 1); - bc_vec_npop(&p->exits, p->exits.len); - bc_vec_npop(&p->conds, p->conds.len); - bc_vec_npop(&p->ops, p->ops.len); + bc_vec_pop_all(&p->exits); + bc_vec_pop_all(&p->conds); + bc_vec_pop_all(&p->ops); - return bc_program_reset(s); + bc_program_reset(); } static void bc_parse_free(BcParse *p) @@ -3634,7 +3572,7 @@ static void bc_parse_create(BcParse *p, size_t func, bc_vec_init(&p->flags, sizeof(uint8_t), NULL); bc_vec_init(&p->exits, sizeof(BcInstPtr), NULL); bc_vec_init(&p->conds, sizeof(size_t), NULL); - bc_vec_pushByte(&p->flags, 0); + bc_vec_pushZeroByte(&p->flags); bc_vec_init(&p->ops, sizeof(BcLexType), NULL); p->parse = parse; @@ -3643,23 +3581,36 @@ static void bc_parse_create(BcParse *p, size_t func, } #if ENABLE_BC + +#define BC_PARSE_TOP_OP(p) (*((BcLexType *) bc_vec_top(&(p)->ops))) +#define BC_PARSE_LEAF(p, rparen) \ + (((p) >= BC_INST_NUM && (p) <= BC_INST_SQRT) || (rparen) || \ + (p) == BC_INST_INC_POST || (p) == BC_INST_DEC_POST) + +// We can calculate the conversion between tokens and exprs by subtracting the +// position of the first operator in the lex enum and adding the position of the +// first in the expr enum. Note: This only works for binary operators. +#define BC_PARSE_TOKEN_INST(t) ((char) ((t) -BC_LEX_NEG + BC_INST_NEG)) + static BcStatus bc_parse_else(BcParse *p); static BcStatus bc_parse_stmt(BcParse *p); +static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next); +static BcStatus bc_parse_expr_empty_ok(BcParse *p, uint8_t flags, BcParseNext next); static BcStatus bc_parse_operator(BcParse *p, BcLexType type, size_t start, size_t *nexprs, bool next) { BcStatus s = BC_STATUS_SUCCESS; BcLexType t; - char l, r = bc_parse_ops[type - BC_LEX_OP_INC].prec; - bool left = bc_parse_ops[type - BC_LEX_OP_INC].left; + char l, r = bc_parse_op_PREC(type - BC_LEX_OP_INC); + bool left = bc_parse_op_LEFT(type - BC_LEX_OP_INC); while (p->ops.len > start) { t = BC_PARSE_TOP_OP(p); if (t == BC_LEX_LPAREN) break; - l = bc_parse_ops[t - BC_LEX_OP_INC].prec; + l = bc_parse_op_PREC(t - BC_LEX_OP_INC); if (l >= r && (l != r || !left)) break; bc_parse_push(p, BC_PARSE_TOKEN_INST(t)); @@ -3677,7 +3628,8 @@ static BcStatus bc_parse_rightParen(BcParse *p, size_t ops_bgn, size_t *nexs) { BcLexType top; - if (p->ops.len <= ops_bgn) return BC_STATUS_PARSE_BAD_EXP; + if (p->ops.len <= ops_bgn) + return bc_error_bad_expression(); top = BC_PARSE_TOP_OP(p); while (top != BC_LEX_LPAREN) { @@ -3687,7 +3639,8 @@ static BcStatus bc_parse_rightParen(BcParse *p, size_t ops_bgn, size_t *nexs) bc_vec_pop(&p->ops); *nexs -= top != BC_LEX_OP_BOOL_NOT && top != BC_LEX_NEG; - if (p->ops.len <= ops_bgn) return BC_STATUS_PARSE_BAD_EXP; + if (p->ops.len <= ops_bgn) + return bc_error_bad_expression(); top = BC_PARSE_TOP_OP(p); } @@ -3718,7 +3671,7 @@ static BcStatus bc_parse_params(BcParse *p, uint8_t flags) } } - if (comma) return BC_STATUS_PARSE_BAD_TOKEN; + if (comma) return bc_error_bad_token(); bc_parse_push(p, BC_INST_CALL); bc_parse_pushIndex(p, nparams); @@ -3737,7 +3690,7 @@ static BcStatus bc_parse_call(BcParse *p, char *name, uint8_t flags) if (s) goto err; if (p->l.t.t != BC_LEX_RPAREN) { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); goto err; } @@ -3779,7 +3732,7 @@ static BcStatus bc_parse_name(BcParse *p, BcInst *type, uint8_t flags) if (p->l.t.t == BC_LEX_RBRACKET) { if (!(flags & BC_PARSE_ARRAY)) { - s = BC_STATUS_PARSE_BAD_EXP; + s = bc_error_bad_expression(); goto err; } @@ -3802,7 +3755,7 @@ static BcStatus bc_parse_name(BcParse *p, BcInst *type, uint8_t flags) else if (p->l.t.t == BC_LEX_LPAREN) { if (flags & BC_PARSE_NOCALL) { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); goto err; } @@ -3828,11 +3781,11 @@ static BcStatus bc_parse_read(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_LPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); bc_parse_push(p, BC_INST_READ); @@ -3846,7 +3799,7 @@ static BcStatus bc_parse_builtin(BcParse *p, BcLexType type, uint8_t flags, s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_LPAREN) return bc_error_bad_token(); flags = (flags & ~(BC_PARSE_PRINT | BC_PARSE_REL)) | BC_PARSE_ARRAY; @@ -3856,7 +3809,7 @@ static BcStatus bc_parse_builtin(BcParse *p, BcLexType type, uint8_t flags, s = bc_parse_expr(p, flags, bc_parse_next_rel); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); *prev = (type == BC_LEX_KEY_LENGTH) ? BC_INST_LENGTH : BC_INST_SQRT; bc_parse_push(p, *prev); @@ -3885,7 +3838,7 @@ static BcStatus bc_parse_scale(BcParse *p, BcInst *type, uint8_t flags) s = bc_parse_expr(p, flags, bc_parse_next_rel); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); bc_parse_push(p, BC_INST_SCALE_FUNC); return bc_lex_next(&p->l); @@ -3942,7 +3895,7 @@ static BcStatus bc_parse_incdec(BcParse *p, BcInst *prev, bool *paren_expr, s = bc_lex_next(&p->l); if (s) return s; if (p->l.t.t == BC_LEX_LPAREN) - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); else bc_parse_push(p, BC_INST_SCALE); break; @@ -3950,7 +3903,7 @@ static BcStatus bc_parse_incdec(BcParse *p, BcInst *prev, bool *paren_expr, default: { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); break; } } @@ -4011,7 +3964,7 @@ static BcStatus bc_parse_print(BcParse *p) type = p->l.t.t; if (type == BC_LEX_SCOLON || type == BC_LEX_NLINE) - return BC_STATUS_PARSE_BAD_PRINT; + return bc_error("bad print statement"); while (!s && type != BC_LEX_SCOLON && type != BC_LEX_NLINE) { @@ -4031,7 +3984,7 @@ static BcStatus bc_parse_print(BcParse *p) } if (s) return s; - if (comma) return BC_STATUS_PARSE_BAD_TOKEN; + if (comma) return bc_error_bad_token(); return bc_lex_next(&p->l); } @@ -4042,7 +3995,7 @@ static BcStatus bc_parse_return(BcParse *p) BcLexType t; bool paren; - if (!BC_PARSE_FUNC(p)) return BC_STATUS_PARSE_BAD_TOKEN; + if (!BC_PARSE_FUNC(p)) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4054,17 +4007,15 @@ static BcStatus bc_parse_return(BcParse *p) bc_parse_push(p, BC_INST_RET0); else { - s = bc_parse_expr(p, 0, bc_parse_next_expr); - if (s && s != BC_STATUS_PARSE_EMPTY_EXP) - return s; - else if (s == BC_STATUS_PARSE_EMPTY_EXP) { + s = bc_parse_expr_empty_ok(p, 0, bc_parse_next_expr); + if (s == BC_STATUS_PARSE_EMPTY_EXP) { bc_parse_push(p, BC_INST_RET0); s = bc_lex_next(&p->l); - if (s) return s; } + if (s) return s; if (!paren || p->l.t.last != BC_LEX_RPAREN) { - s = bc_vm_posixError(BC_STATUS_POSIX_RET, p->l.f, p->l.line, NULL); + s = bc_posix_error("POSIX requires parentheses around return expressions"); if (s) return s; } @@ -4079,18 +4030,18 @@ static BcStatus bc_parse_endBody(BcParse *p, bool brace) BcStatus s = BC_STATUS_SUCCESS; if (p->flags.len <= 1 || (brace && p->nbraces == 0)) - return BC_STATUS_PARSE_BAD_TOKEN; + return bc_error_bad_token(); if (brace) { if (p->l.t.t == BC_LEX_RBRACE) { - if (!p->nbraces) return BC_STATUS_PARSE_BAD_TOKEN; + if (!p->nbraces) return bc_error_bad_token(); --p->nbraces; s = bc_lex_next(&p->l); if (s) return s; } else - return BC_STATUS_PARSE_BAD_TOKEN; + return bc_error_bad_token(); } if (BC_PARSE_IF(p)) { @@ -4176,13 +4127,13 @@ static BcStatus bc_parse_if(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_LPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; s = bc_parse_expr(p, BC_PARSE_REL, bc_parse_next_rel); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4203,7 +4154,7 @@ static BcStatus bc_parse_else(BcParse *p) { BcInstPtr ip; - if (!BC_PARSE_IF_END(p)) return BC_STATUS_PARSE_BAD_TOKEN; + if (!BC_PARSE_IF_END(p)) return bc_error_bad_token(); ip.idx = p->func->labels.len; ip.func = ip.len = 0; @@ -4227,7 +4178,7 @@ static BcStatus bc_parse_while(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_LPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4245,7 +4196,7 @@ static BcStatus bc_parse_while(BcParse *p) s = bc_parse_expr(p, BC_PARSE_REL, bc_parse_next_rel); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4264,17 +4215,17 @@ static BcStatus bc_parse_for(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_LPAREN) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; if (p->l.t.t != BC_LEX_SCOLON) s = bc_parse_expr(p, 0, bc_parse_next_for); else - s = bc_vm_posixError(BC_STATUS_POSIX_FOR1, p->l.f, p->l.line, NULL); + s = bc_POSIX_does_not_allow_empty_X_expression_in_for("init"); if (s) return s; - if (p->l.t.t != BC_LEX_SCOLON) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_SCOLON) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4288,10 +4239,10 @@ static BcStatus bc_parse_for(BcParse *p) if (p->l.t.t != BC_LEX_SCOLON) s = bc_parse_expr(p, BC_PARSE_REL, bc_parse_next_for); else - s = bc_vm_posixError(BC_STATUS_POSIX_FOR2, p->l.f, p->l.line, NULL); + s = bc_POSIX_does_not_allow_empty_X_expression_in_for("condition"); if (s) return s; - if (p->l.t.t != BC_LEX_SCOLON) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_SCOLON) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4309,11 +4260,11 @@ static BcStatus bc_parse_for(BcParse *p) if (p->l.t.t != BC_LEX_RPAREN) s = bc_parse_expr(p, 0, bc_parse_next_rel); else - s = bc_vm_posixError(BC_STATUS_POSIX_FOR3, p->l.f, p->l.line, NULL); + s = bc_POSIX_does_not_allow_empty_X_expression_in_for("update"); if (s) return s; - if (p->l.t.t != BC_LEX_RPAREN) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_RPAREN) return bc_error_bad_token(); bc_parse_push(p, BC_INST_JUMP); bc_parse_pushIndex(p, cond_idx); bc_vec_push(&p->func->labels, &p->func->code.len); @@ -4336,17 +4287,17 @@ static BcStatus bc_parse_loopExit(BcParse *p, BcLexType type) size_t i; BcInstPtr *ip; - if (!BC_PARSE_LOOP(p)) return BC_STATUS_PARSE_BAD_TOKEN; + if (!BC_PARSE_LOOP(p)) return bc_error_bad_token(); if (type == BC_LEX_KEY_BREAK) { - if (p->exits.len == 0) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->exits.len == 0) return bc_error_bad_token(); i = p->exits.len - 1; ip = bc_vec_item(&p->exits, i); while (!ip->func && i < p->exits.len) ip = bc_vec_item(&p->exits, i--); - if (i >= p->exits.len && !ip->func) return BC_STATUS_PARSE_BAD_TOKEN; + if (i >= p->exits.len && !ip->func) return bc_error_bad_token(); i = ip->idx; } @@ -4360,7 +4311,7 @@ static BcStatus bc_parse_loopExit(BcParse *p, BcLexType type) if (s) return s; if (p->l.t.t != BC_LEX_SCOLON && p->l.t.t != BC_LEX_NLINE) - return BC_STATUS_PARSE_BAD_TOKEN; + return bc_error_bad_token(); return bc_lex_next(&p->l); } @@ -4374,20 +4325,23 @@ static BcStatus bc_parse_func(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_NAME) return BC_STATUS_PARSE_BAD_FUNC; + if (p->l.t.t != BC_LEX_NAME) + return bc_error("bad function definition"); name = xstrdup(p->l.t.v.v); bc_parse_addFunc(p, name, &p->fidx); s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_LPAREN) return BC_STATUS_PARSE_BAD_FUNC; + if (p->l.t.t != BC_LEX_LPAREN) + return bc_error("bad function definition"); s = bc_lex_next(&p->l); if (s) return s; while (p->l.t.t != BC_LEX_RPAREN) { - if (p->l.t.t != BC_LEX_NAME) return BC_STATUS_PARSE_BAD_FUNC; + if (p->l.t.t != BC_LEX_NAME) + return bc_error("bad function definition"); ++p->func->nparams; @@ -4403,7 +4357,7 @@ static BcStatus bc_parse_func(BcParse *p) if (s) goto err; if (p->l.t.t != BC_LEX_RBRACKET) { - s = BC_STATUS_PARSE_BAD_FUNC; + s = bc_error("bad function definition"); goto err; } @@ -4421,7 +4375,7 @@ static BcStatus bc_parse_func(BcParse *p) if (s) goto err; } - if (comma) return BC_STATUS_PARSE_BAD_FUNC; + if (comma) return bc_error("bad function definition"); flags = BC_PARSE_FLAG_FUNC | BC_PARSE_FLAG_FUNC_INNER | BC_PARSE_FLAG_BODY; bc_parse_startBody(p, flags); @@ -4430,7 +4384,7 @@ static BcStatus bc_parse_func(BcParse *p) if (s) return s; if (p->l.t.t != BC_LEX_LBRACE) - s = bc_vm_posixError(BC_STATUS_POSIX_BRACE, p->l.f, p->l.line, NULL); + s = bc_posix_error("POSIX requires the left brace be on the same line as the function header"); return s; @@ -4445,7 +4399,7 @@ static BcStatus bc_parse_auto(BcParse *p) bool comma, var, one; char *name; - if (!p->auto_part) return BC_STATUS_PARSE_BAD_TOKEN; + if (!p->auto_part) return bc_error_bad_token(); s = bc_lex_next(&p->l); if (s) return s; @@ -4465,7 +4419,7 @@ static BcStatus bc_parse_auto(BcParse *p) if (s) goto err; if (p->l.t.t != BC_LEX_RBRACKET) { - s = BC_STATUS_PARSE_BAD_FUNC; + s = bc_error("bad function definition"); goto err; } @@ -4483,11 +4437,11 @@ static BcStatus bc_parse_auto(BcParse *p) if (s) goto err; } - if (comma) return BC_STATUS_PARSE_BAD_FUNC; - if (!one) return BC_STATUS_PARSE_NO_AUTO; + if (comma) return bc_error("bad function definition"); + if (!one) return bc_error("no auto variable found"); if (p->l.t.t != BC_LEX_NLINE && p->l.t.t != BC_LEX_SCOLON) - return BC_STATUS_PARSE_BAD_TOKEN; + return bc_error_bad_token(); return bc_lex_next(&p->l); @@ -4505,7 +4459,7 @@ static BcStatus bc_parse_body(BcParse *p, bool brace) if (*flag_ptr & BC_PARSE_FLAG_FUNC_INNER) { - if (!brace) return BC_STATUS_PARSE_BAD_TOKEN; + if (!brace) return bc_error_bad_token(); p->auto_part = p->l.t.t != BC_LEX_KEY_AUTO; if (!p->auto_part) { @@ -4542,7 +4496,7 @@ static BcStatus bc_parse_stmt(BcParse *p) case BC_LEX_LBRACE: { - if (!BC_PARSE_BODY(p)) return BC_STATUS_PARSE_BAD_TOKEN; + if (!BC_PARSE_BODY(p)) return bc_error_bad_token(); ++p->nbraces; s = bc_lex_next(&p->l); @@ -4670,7 +4624,7 @@ static BcStatus bc_parse_stmt(BcParse *p) // "quit" is a compile-time command. For example, // "if (0 == 1) quit" terminates when parsing the statement, // not when it is executed - quit(); + quit_or_return_for_exit(); } case BC_LEX_KEY_RETURN: @@ -4687,7 +4641,7 @@ static BcStatus bc_parse_stmt(BcParse *p) default: { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); break; } } @@ -4700,21 +4654,23 @@ static BcStatus bc_parse_parse(BcParse *p) BcStatus s; if (p->l.t.t == BC_LEX_EOF) - s = p->flags.len > 0 ? BC_STATUS_PARSE_NO_BLOCK_END : BC_STATUS_LEX_EOF; + s = p->flags.len > 0 ? bc_error("block end could not be found") : bc_error("end of file"); else if (p->l.t.t == BC_LEX_KEY_DEFINE) { - if (!BC_PARSE_CAN_EXEC(p)) return BC_STATUS_PARSE_BAD_TOKEN; + if (!BC_PARSE_CAN_EXEC(p)) return bc_error_bad_token(); s = bc_parse_func(p); } else s = bc_parse_stmt(p); - if (s || G_interrupt) - s = bc_parse_reset(p, s); + if (s || G_interrupt) { + bc_parse_reset(p); + s = BC_STATUS_FAILURE; + } return s; } -static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) +static BcStatus bc_parse_expr_empty_ok(BcParse *p, uint8_t flags, BcParseNext next) { BcStatus s = BC_STATUS_SUCCESS; BcInst prev = BC_INST_PRINT; @@ -4728,7 +4684,7 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) paren_expr = rprn = done = get_token = assign = false; bin_last = true; - for (; !G_interrupt && !s && !done && bc_parse_exprs[t]; t = p->l.t.t) { + for (; !G_interrupt && !s && !done && bc_parse_exprs(t); t = p->l.t.t) { switch (t) { case BC_LEX_OP_INC: @@ -4759,7 +4715,11 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) prev != BC_INST_SCALE && prev != BC_INST_IBASE && prev != BC_INST_OBASE && prev != BC_INST_LAST) { - s = BC_STATUS_PARSE_BAD_ASSIGN; + s = bc_error("bad assignment:" + " left side must be scale," + " ibase, obase, last, var," + " or array element" + ); break; } } @@ -4779,10 +4739,10 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_OP_BOOL_OR: case BC_LEX_OP_BOOL_AND: { - if (((t == BC_LEX_OP_BOOL_NOT) != bin_last) || - (t != BC_LEX_OP_BOOL_NOT && prev == BC_INST_BOOL_NOT)) - { - return BC_STATUS_PARSE_BAD_EXP; + if (((t == BC_LEX_OP_BOOL_NOT) != bin_last) + || (t != BC_LEX_OP_BOOL_NOT && prev == BC_INST_BOOL_NOT) + ) { + return bc_error_bad_expression(); } nrelops += t >= BC_LEX_OP_REL_EQ && t <= BC_LEX_OP_REL_GT; @@ -4796,8 +4756,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_LPAREN: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); ++nparens; paren_expr = rprn = bin_last = false; get_token = true; @@ -4809,7 +4769,7 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_RPAREN: { if (bin_last || prev == BC_INST_BOOL_NOT) - return BC_STATUS_PARSE_BAD_EXP; + return bc_error_bad_expression(); if (nparens == 0) { s = BC_STATUS_SUCCESS; @@ -4831,8 +4791,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_NAME: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); paren_expr = true; rprn = get_token = bin_last = false; s = bc_parse_name(p, &prev, flags & ~BC_PARSE_NOCALL); @@ -4843,8 +4803,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_NUMBER: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); bc_parse_number(p, &prev, &nexprs); paren_expr = get_token = true; rprn = bin_last = false; @@ -4856,8 +4816,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_KEY_LAST: case BC_LEX_KEY_OBASE: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); prev = (char) (t - BC_LEX_KEY_IBASE + BC_INST_IBASE); bc_parse_push(p, (char) prev); @@ -4871,8 +4831,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_KEY_LENGTH: case BC_LEX_KEY_SQRT: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); s = bc_parse_builtin(p, t, flags, &prev); paren_expr = true; rprn = get_token = bin_last = false; @@ -4884,9 +4844,9 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_KEY_READ: { if (BC_PARSE_LEAF(prev, rprn)) - return BC_STATUS_PARSE_BAD_EXP; + return bc_error_bad_expression(); else if (flags & BC_PARSE_NOREAD) - s = BC_STATUS_EXEC_REC_READ; + s = bc_error_nested_read_call(); else s = bc_parse_read(p); @@ -4900,8 +4860,8 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) case BC_LEX_KEY_SCALE: { - if (BC_PARSE_LEAF(prev, rprn)) return BC_STATUS_PARSE_BAD_EXP; - + if (BC_PARSE_LEAF(prev, rprn)) + return bc_error_bad_expression(); s = bc_parse_scale(p, &prev, flags); paren_expr = true; rprn = get_token = bin_last = false; @@ -4913,7 +4873,7 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) default: { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); break; } } @@ -4922,7 +4882,7 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) } if (s) return s; - if (G_interrupt) return BC_STATUS_EXEC_SIGNAL; + if (G_interrupt) return BC_STATUS_FAILURE; // ^C: stop parsing while (p->ops.len > ops_bgn) { @@ -4930,7 +4890,7 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) assign = top >= BC_LEX_OP_ASSIGN_POWER && top <= BC_LEX_OP_ASSIGN; if (top == BC_LEX_LPAREN || top == BC_LEX_RPAREN) - return BC_STATUS_PARSE_BAD_EXP; + return bc_error_bad_expression(); bc_parse_push(p, BC_PARSE_TOKEN_INST(top)); @@ -4938,18 +4898,21 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) bc_vec_pop(&p->ops); } - s = BC_STATUS_PARSE_BAD_EXP; - if (prev == BC_INST_BOOL_NOT || nexprs != 1) return s; + if (prev == BC_INST_BOOL_NOT || nexprs != 1) + return bc_error_bad_expression(); - for (i = 0; s && i < next.len; ++i) s *= t != next.tokens[i]; - if (s) return s; + for (i = 0; i < next.len; ++i) + if (t == next.tokens[i]) + goto ok; + return bc_error_bad_expression(); + ok: if (!(flags & BC_PARSE_REL) && nrelops) { - s = bc_vm_posixError(BC_STATUS_POSIX_REL_POS, p->l.f, p->l.line, NULL); + s = bc_POSIX_does_not_allow("comparison operators outside if or loops"); if (s) return s; } else if ((flags & BC_PARSE_REL) && nrelops > 1) { - s = bc_vm_posixError(BC_STATUS_POSIX_MULTIREL, p->l.f, p->l.line, NULL); + s = bc_posix_error("POSIX requires exactly one comparison operator per condition"); if (s) return s; } @@ -4961,6 +4924,16 @@ static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) return s; } +static BcStatus bc_parse_expr(BcParse *p, uint8_t flags, BcParseNext next) +{ + BcStatus s; + + s = bc_parse_expr_empty_ok(p, flags, next); + if (s == BC_STATUS_PARSE_EMPTY_EXP) + return bc_error("empty expression"); + return s; +} + static void bc_parse_init(BcParse *p, size_t func) { bc_parse_create(p, func, bc_parse_parse, bc_lex_token); @@ -4970,9 +4943,13 @@ static BcStatus bc_parse_expression(BcParse *p, uint8_t flags) { return bc_parse_expr(p, flags, bc_parse_next_read); } + #endif // ENABLE_BC #if ENABLE_DC + +#define DC_PARSE_BUF_LEN ((int) (sizeof(uint32_t) * CHAR_BIT)) + static BcStatus dc_parse_register(BcParse *p) { BcStatus s; @@ -4980,7 +4957,7 @@ static BcStatus dc_parse_register(BcParse *p) s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_NAME) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_NAME) return bc_error_bad_token(); name = xstrdup(p->l.t.v.v); bc_parse_pushName(p, name); @@ -5087,7 +5064,8 @@ static BcStatus dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) if (t == BC_LEX_NEG) { s = bc_lex_next(&p->l); if (s) return s; - if (p->l.t.t != BC_LEX_NUMBER) return BC_STATUS_PARSE_BAD_TOKEN; + if (p->l.t.t != BC_LEX_NUMBER) + return bc_error_bad_token(); } bc_parse_number(p, &prev, &p->nbraces); @@ -5101,7 +5079,7 @@ static BcStatus dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) case BC_LEX_KEY_READ: { if (flags & BC_PARSE_NOREAD) - s = BC_STATUS_EXEC_REC_READ; + s = bc_error_nested_read_call(); else bc_parse_push(p, BC_INST_READ); get_token = true; @@ -5136,7 +5114,7 @@ static BcStatus dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) default: { - s = BC_STATUS_PARSE_BAD_TOKEN; + s = bc_error_bad_token(); get_token = true; break; } @@ -5178,11 +5156,14 @@ static BcStatus dc_parse_parse(BcParse *p) BcStatus s; if (p->l.t.t == BC_LEX_EOF) - s = BC_STATUS_LEX_EOF; + s = bc_error("end of file"); else s = dc_parse_expr(p, 0); - if (s || G_interrupt) s = bc_parse_reset(p, s); + if (s || G_interrupt) { + bc_parse_reset(p); + s = BC_STATUS_FAILURE; + } return s; } @@ -5191,6 +5172,7 @@ static void dc_parse_init(BcParse *p, size_t func) { bc_parse_create(p, func, dc_parse_parse, dc_lex_token); } + #endif // ENABLE_DC static void common_parse_init(BcParse *p, size_t func) @@ -5213,20 +5195,18 @@ static BcStatus common_parse_expr(BcParse *p, uint8_t flags) static BcVec* bc_program_search(char *id, bool var) { - BcStatus s; BcId e, *ptr; BcVec *v, *map; size_t i; BcResultData data; - bool new; + int new; v = var ? &G.prog.vars : &G.prog.arrs; map = var ? &G.prog.var_map : &G.prog.arr_map; e.name = id; e.idx = v->len; - s = bc_map_insert(map, &e, &i); - new = s != BC_STATUS_VEC_ITEM_EXISTS; + new = bc_map_insert(map, &e, &i); // 1 if insertion was successful if (new) { bc_array_init(&data.v, var); @@ -5320,7 +5300,8 @@ static BcStatus bc_program_binOpPrep(BcResult **l, BcNum **ln, bool hex; BcResultType lt, rt; - if (!BC_PROG_STACK(&G.prog.results, 2)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 2)) + return bc_error_stack_has_too_few_elements(); *r = bc_vec_item_rev(&G.prog.results, 0); *l = bc_vec_item_rev(&G.prog.results, 1); @@ -5342,8 +5323,9 @@ static BcStatus bc_program_binOpPrep(BcResult **l, BcNum **ln, } if (!BC_PROG_NUM((*l), (*ln)) && (!assign || (*l)->t != BC_RESULT_VAR)) - return BC_STATUS_EXEC_BAD_TYPE; - if (!assign && !BC_PROG_NUM((*r), (*ln))) return BC_STATUS_EXEC_BAD_TYPE; + return bc_error_variable_is_wrong_type(); + if (!assign && !BC_PROG_NUM((*r), (*ln))) + return bc_error_variable_is_wrong_type(); return s; } @@ -5360,13 +5342,15 @@ static BcStatus bc_program_prep(BcResult **r, BcNum **n) { BcStatus s; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); *r = bc_vec_top(&G.prog.results); s = bc_program_num(*r, n, false); if (s) return s; - if (!BC_PROG_NUM((*r), (*n))) return BC_STATUS_EXEC_BAD_TYPE; + if (!BC_PROG_NUM((*r), (*n))) + return bc_error_variable_is_wrong_type(); return s; } @@ -5401,6 +5385,7 @@ err: static BcStatus bc_program_read(void) { + const char *sv_file; BcStatus s; BcParse parse; BcVec buf; @@ -5410,17 +5395,21 @@ static BcStatus bc_program_read(void) for (i = 0; i < G.prog.stack.len; ++i) { BcInstPtr *ip_ptr = bc_vec_item(&G.prog.stack, i); - if (ip_ptr->func == BC_PROG_READ) return BC_STATUS_EXEC_REC_READ; + if (ip_ptr->func == BC_PROG_READ) + return bc_error_nested_read_call(); } - bc_vec_npop(&f->code, f->code.len); - bc_vec_init(&buf, sizeof(char), NULL); + bc_vec_pop_all(&f->code); + bc_char_vec_init(&buf); + + sv_file = G.prog.file; + G.prog.file = NULL; s = bc_read_line(&buf, "read> "); if (s) goto io_err; common_parse_init(&parse, BC_PROG_READ); - bc_lex_file(&parse.l, bc_program_stdin_name); + bc_lex_file(&parse.l); s = bc_parse_text(&parse, buf.v); if (s) goto exec_err; @@ -5428,7 +5417,7 @@ static BcStatus bc_program_read(void) if (s) goto exec_err; if (parse.l.t.t != BC_LEX_NLINE && parse.l.t.t != BC_LEX_EOF) { - s = BC_STATUS_EXEC_BAD_READ_EXPR; + s = bc_error("bad read() expression"); goto exec_err; } @@ -5443,6 +5432,7 @@ static BcStatus bc_program_read(void) bc_vec_push(&G.prog.stack, &ip); exec_err: + G.prog.file = sv_file; bc_parse_free(&parse); io_err: bc_vec_free(&buf); @@ -5571,7 +5561,8 @@ static BcStatus bc_program_print(char inst, size_t idx) BcNum *num = NULL; bool pop = inst != BC_INST_PRINT; - if (!BC_PROG_STACK(&G.prog.results, idx + 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, idx + 1)) + return bc_error_stack_has_too_few_elements(); r = bc_vec_item_rev(&G.prog.results, idx); s = bc_program_num(r, &num, false); @@ -5702,7 +5693,8 @@ static BcStatus bc_program_assignStr(BcResult *r, BcVec *v, res.t = BC_RESULT_STR; if (!push) { - if (!BC_PROG_STACK(&G.prog.results, 2)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 2)) + return bc_error_stack_has_too_few_elements(); bc_vec_pop(v); bc_vec_pop(&G.prog.results); } @@ -5723,14 +5715,17 @@ static BcStatus bc_program_copyToVar(char *name, bool var) BcVec *v; BcNum *n; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); ptr = bc_vec_top(&G.prog.results); - if ((ptr->t == BC_RESULT_ARRAY) != !var) return BC_STATUS_EXEC_BAD_TYPE; + if ((ptr->t == BC_RESULT_ARRAY) != !var) + return bc_error_variable_is_wrong_type(); v = bc_program_search(name, var); #if ENABLE_DC - if (ptr->t == BC_RESULT_STR && !var) return BC_STATUS_EXEC_BAD_TYPE; + if (ptr->t == BC_RESULT_STR && !var) + return bc_error_variable_is_wrong_type(); if (ptr->t == BC_RESULT_STR) return bc_program_assignStr(ptr, v, true); #endif @@ -5775,7 +5770,8 @@ static BcStatus bc_program_assign(char inst) BcVec *v; - if (left->t != BC_RESULT_VAR) return BC_STATUS_EXEC_BAD_TYPE; + if (left->t != BC_RESULT_VAR) + return bc_error_variable_is_wrong_type(); v = bc_program_search(left->d.id.name, true); return bc_program_assignStr(right, v, false); @@ -5783,11 +5779,15 @@ static BcStatus bc_program_assign(char inst) #endif if (left->t == BC_RESULT_CONSTANT || left->t == BC_RESULT_TEMP) - return BC_STATUS_PARSE_BAD_ASSIGN; + return bc_error("bad assignment:" + " left side must be scale," + " ibase, obase, last, var," + " or array element" + ); #if ENABLE_BC if (inst == BC_INST_ASSIGN_DIVIDE && !bc_num_cmp(r, &G.prog.zero)) - return BC_STATUS_MATH_DIVIDE_BY_ZERO; + return bc_error("divide by zero"); if (assign) bc_num_copy(l, r); @@ -5800,25 +5800,35 @@ static BcStatus bc_program_assign(char inst) #endif if (ib || sc || left->t == BC_RESULT_OBASE) { - + static const char *const msg[] = { + "bad ibase; must be [2, 16]", //BC_RESULT_IBASE + "bad scale; must be [0, BC_SCALE_MAX]", //BC_RESULT_SCALE + NULL, //can't happen //BC_RESULT_LAST + NULL, //can't happen //BC_RESULT_CONSTANT + NULL, //can't happen //BC_RESULT_ONE + "bad obase; must be [2, BC_BASE_MAX]", //BC_RESULT_OBASE + }; size_t *ptr; s = bc_num_ulong(l, &val); - if (s) return s; - s = left->t - BC_RESULT_IBASE + BC_STATUS_EXEC_BAD_IBASE; - + if (s) + return s; + s = left->t - BC_RESULT_IBASE; if (sc) { max = BC_MAX_SCALE; ptr = &G.prog.scale; } else { - if (val < BC_NUM_MIN_BASE) return s; + if (val < BC_NUM_MIN_BASE) + return bc_error(msg[s]); max = ib ? BC_NUM_MAX_IBASE : BC_MAX_OBASE; ptr = ib ? &G.prog.ib_t : &G.prog.ob_t; } - if (val > max) return s; - if (!sc) bc_num_copy(ib ? &G.prog.ib : &G.prog.ob, l); + if (val > max) + return bc_error(msg[s]); + if (!sc) + bc_num_copy(ib ? &G.prog.ib : &G.prog.ob, l); *ptr = (size_t) val; s = BC_STATUS_SUCCESS; @@ -5855,7 +5865,7 @@ static BcStatus bc_program_pushVar(char *code, size_t *bgn, if (!BC_PROG_STACK(v, 2 - copy)) { free(name); - return BC_STATUS_EXEC_STACK; + return bc_error_stack_has_too_few_elements(); } free(name); @@ -5907,7 +5917,7 @@ static BcStatus bc_program_pushArray(char *code, size_t *bgn, if (s) goto err; if (temp > BC_MAX_DIM) { - s = BC_STATUS_EXEC_ARRAY_LEN; + s = bc_error("array too long; must be [1, BC_DIM_MAX]"); goto err; } @@ -5967,8 +5977,12 @@ static BcStatus bc_program_call(char *code, size_t *idx) ip.func = bc_program_index(code, idx); func = bc_vec_item(&G.prog.fns, ip.func); - if (func->code.len == 0) return BC_STATUS_EXEC_UNDEFINED_FUNC; - if (nparams != func->nparams) return BC_STATUS_EXEC_MISMATCHED_PARAMS; + if (func->code.len == 0) { + return bc_error("undefined function"); + } + if (nparams != func->nparams) { + return bc_error_fmt("function has %u parameters, but called with %u", func->nparams, nparams); + } ip.len = G.prog.results.len - nparams; for (i = 0; i < nparams; ++i) { @@ -5977,7 +5991,7 @@ static BcStatus bc_program_call(char *code, size_t *idx) arg = bc_vec_top(&G.prog.results); if ((!a->idx) != (arg->t == BC_RESULT_ARRAY) || arg->t == BC_RESULT_STR) - return BC_STATUS_EXEC_BAD_TYPE; + return bc_error_variable_is_wrong_type(); s = bc_program_copyToVar(a->name, a->idx); if (s) return s; @@ -6013,7 +6027,7 @@ static BcStatus bc_program_return(char inst) BcInstPtr *ip = bc_vec_top(&G.prog.stack); if (!BC_PROG_STACK(&G.prog.results, ip->len + inst == BC_INST_RET)) - return BC_STATUS_EXEC_STACK; + return bc_error_stack_has_too_few_elements(); f = bc_vec_item(&G.prog.fns, ip->func); res.t = BC_RESULT_TEMP; @@ -6075,14 +6089,16 @@ static BcStatus bc_program_builtin(char inst) BcResult res; bool len = inst == BC_INST_LENGTH; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); opnd = bc_vec_top(&G.prog.results); s = bc_program_num(opnd, &num, false); if (s) return s; #if ENABLE_DC - if (!BC_PROG_NUM(opnd, num) && !len) return BC_STATUS_EXEC_BAD_TYPE; + if (!BC_PROG_NUM(opnd, num) && !len) + return bc_error_variable_is_wrong_type(); #endif bc_num_init(&res.d.n, BC_NUM_DEF_SIZE); @@ -6147,14 +6163,16 @@ static BcStatus bc_program_modexp(void) BcResult *r1, *r2, *r3, res; BcNum *n1, *n2, *n3; - if (!BC_PROG_STACK(&G.prog.results, 3)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 3)) + return bc_error_stack_has_too_few_elements(); s = bc_program_binOpPrep(&r2, &n2, &r3, &n3, false); if (s) return s; r1 = bc_vec_item_rev(&G.prog.results, 2); s = bc_program_num(r1, &n1, false); if (s) return s; - if (!BC_PROG_NUM(r1, n1)) return BC_STATUS_EXEC_BAD_TYPE; + if (!BC_PROG_NUM(r1, n1)) + return bc_error_variable_is_wrong_type(); // Make sure that the values have their pointers updated, if necessary. if (r1->t == BC_RESULT_VAR || r1->t == BC_RESULT_ARRAY_ELEM) { @@ -6205,7 +6223,8 @@ static BcStatus bc_program_asciify(void) size_t len = G.prog.strs.len, idx; unsigned long val; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); r = bc_vec_top(&G.prog.results); s = bc_program_num(r, &num, false); @@ -6273,7 +6292,8 @@ static BcStatus bc_program_printStream(void) size_t idx; char *str; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); r = bc_vec_top(&G.prog.results); s = bc_program_num(r, &n, false); @@ -6305,9 +6325,12 @@ static BcStatus bc_program_nquit(void) bc_vec_pop(&G.prog.results); if (G.prog.stack.len < val) - return BC_STATUS_EXEC_STACK; - if (G.prog.stack.len == val) + return bc_error_stack_has_too_few_elements(); + if (G.prog.stack.len == val) { + if (ENABLE_FEATURE_CLEAN_UP) + return BC_STATUS_FAILURE; quit(); + } bc_vec_npop(&G.prog.stack, val); @@ -6327,7 +6350,8 @@ static BcStatus bc_program_execStr(char *code, size_t *bgn, BcNum *n; bool exec; - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); r = bc_vec_top(&G.prog.results); @@ -6360,7 +6384,7 @@ static BcStatus bc_program_execStr(char *code, size_t *bgn, if (!exec) goto exit; if (!BC_PROG_STR(n)) { - s = BC_STATUS_EXEC_BAD_TYPE; + s = bc_error_variable_is_wrong_type(); goto exit; } @@ -6392,7 +6416,7 @@ static BcStatus bc_program_execStr(char *code, size_t *bgn, if (s) goto err; if (prs.l.t.t != BC_LEX_EOF) { - s = BC_STATUS_PARSE_BAD_EXP; + s = bc_error_bad_expression(); goto err; } @@ -6411,7 +6435,7 @@ static BcStatus bc_program_execStr(char *code, size_t *bgn, err: bc_parse_free(&prs); f = bc_vec_item(&G.prog.fns, fidx); - bc_vec_npop(&f->code, f->code.len); + bc_vec_pop_all(&f->code); exit: bc_vec_pop(&G.prog.results); return s; @@ -6438,28 +6462,28 @@ static void bc_program_pushGlobal(char inst) static void bc_program_addFunc(char *name, size_t *idx) { - BcStatus s; BcId entry, *entry_ptr; BcFunc f; + int inserted; entry.name = name; entry.idx = G.prog.fns.len; - s = bc_map_insert(&G.prog.fn_map, &entry, idx); - if (s) free(name); + inserted = bc_map_insert(&G.prog.fn_map, &entry, idx); + if (!inserted) free(name); entry_ptr = bc_vec_item(&G.prog.fn_map, *idx); *idx = entry_ptr->idx; - if (s == BC_STATUS_VEC_ITEM_EXISTS) { + if (!inserted) { BcFunc *func = bc_vec_item(&G.prog.fns, entry_ptr->idx); // We need to reset these, so the function can be repopulated. func->nparams = 0; - bc_vec_npop(&func->autos, func->autos.len); - bc_vec_npop(&func->code, func->code.len); - bc_vec_npop(&func->labels, func->labels.len); + bc_vec_pop_all(&func->autos); + bc_vec_pop_all(&func->code); + bc_vec_pop_all(&func->labels); } else { bc_func_init(&f); @@ -6467,30 +6491,22 @@ static void bc_program_addFunc(char *name, size_t *idx) } } -static BcStatus bc_program_reset(BcStatus s) +// Called when parsing or execution detects a failure, +// resets execution structures. +static void bc_program_reset(void) { BcFunc *f; BcInstPtr *ip; bc_vec_npop(&G.prog.stack, G.prog.stack.len - 1); - bc_vec_npop(&G.prog.results, G.prog.results.len); + bc_vec_pop_all(&G.prog.results); f = bc_vec_item(&G.prog.fns, 0); ip = bc_vec_top(&G.prog.stack); ip->idx = f->code.len; - if (!s && G_interrupt && !G.tty) quit(); - - if (!s || s == BC_STATUS_EXEC_SIGNAL) { - if (!G.ttyin) - quit(); - fflush_and_check(); // make sure buffered stdout is printed - fputs(bc_program_ready_msg, stderr); - fflush_and_check(); - s = BC_STATUS_SUCCESS; - } - - return s; + // If !tty, no need to check for ^C: we don't have ^C handler, + // we would be killed by a signal and won't reach this place } static BcStatus bc_program_exec(void) @@ -6545,7 +6561,7 @@ static BcStatus bc_program_exec(void) case BC_INST_HALT: { - quit(); + quit_or_return_for_exit(); break; } @@ -6623,7 +6639,7 @@ static BcStatus bc_program_exec(void) case BC_INST_POP: { if (!BC_PROG_STACK(&G.prog.results, 1)) - s = BC_STATUS_EXEC_STACK; + s = bc_error_stack_has_too_few_elements(); else bc_vec_pop(&G.prog.results); break; @@ -6723,7 +6739,7 @@ static BcStatus bc_program_exec(void) case BC_INST_CLEAR_STACK: { - bc_vec_npop(&G.prog.results, G.prog.results.len); + bc_vec_pop_all(&G.prog.results); break; } @@ -6735,7 +6751,8 @@ static BcStatus bc_program_exec(void) case BC_INST_DUPLICATE: { - if (!BC_PROG_STACK(&G.prog.results, 1)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 1)) + return bc_error_stack_has_too_few_elements(); ptr = bc_vec_top(&G.prog.results); bc_result_copy(&r, ptr); bc_vec_push(&G.prog.results, &r); @@ -6746,7 +6763,8 @@ static BcStatus bc_program_exec(void) { BcResult *ptr2; - if (!BC_PROG_STACK(&G.prog.results, 2)) return BC_STATUS_EXEC_STACK; + if (!BC_PROG_STACK(&G.prog.results, 2)) + return bc_error_stack_has_too_few_elements(); ptr = bc_vec_item_rev(&G.prog.results, 0); ptr2 = bc_vec_item_rev(&G.prog.results, 1); @@ -6788,7 +6806,7 @@ static BcStatus bc_program_exec(void) case BC_INST_QUIT: { if (G.prog.stack.len <= 2) - quit(); + quit_or_return_for_exit(); bc_vec_npop(&G.prog.stack, 2); break; } @@ -6801,7 +6819,10 @@ static BcStatus bc_program_exec(void) #endif // ENABLE_DC } - if (s || G_interrupt) s = bc_program_reset(s); + if (s || G_interrupt) { + bc_program_reset(); + break; + } // If the stack has changed, pointers may be invalid. ip = bc_vec_top(&G.prog.stack); @@ -6821,43 +6842,44 @@ static void bc_vm_info(void) , applet_name); } -static BcStatus bc_vm_error(BcStatus s, const char *file, size_t line) -{ - if (!s || s > BC_STATUS_VEC_ITEM_EXISTS) return s; - - fprintf(stderr, bc_err_fmt, bc_err_msgs[s]); - fprintf(stderr, " %s", file); - fprintf(stderr, bc_err_line + 4 * !line, line); - - return s * (!G.ttyin || !!strcmp(file, bc_program_stdin_name)); -} - -#if ENABLE_BC -static BcStatus bc_vm_posixError(BcStatus s, const char *file, size_t line, - const char *msg) +static void bc_args(char **argv) { - const char *fmt; + unsigned opts; + int i; - if (!(G.flags & (BC_FLAG_S|BC_FLAG_W))) return BC_STATUS_SUCCESS; - if (s < BC_STATUS_POSIX_NAME_LEN) return BC_STATUS_SUCCESS; + GETOPT_RESET(); +#if ENABLE_FEATURE_BC_LONG_OPTIONS + opts = option_mask32 |= getopt32long(argv, "xwvsqli", + "extended-register\0" No_argument "x" + "warn\0" No_argument "w" + "version\0" No_argument "v" + "standard\0" No_argument "s" + "quiet\0" No_argument "q" + "mathlib\0" No_argument "l" + "interactive\0" No_argument "i" + ); +#else + opts = option_mask32 |= getopt32(argv, "xwvsqli"); +#endif + if (getenv("POSIXLY_CORRECT")) + option_mask32 |= BC_FLAG_S; - fmt = G_posix ? bc_err_fmt : bc_warn_fmt; - fprintf(stderr, fmt, bc_err_msgs[s]); - if (msg) fprintf(stderr, " %s\n", msg); - fprintf(stderr, " %s", file); - fprintf(stderr, bc_err_line + 4 * !line, line); +///should be in bc_vm_run() instead?? + if (opts & BC_FLAG_V) { + bc_vm_info(); + exit(0); + } - if (G.ttyin || !G_posix) - s = BC_STATUS_SUCCESS; - return s; + for (i = optind; argv[i]; ++i) + bc_vec_push(&G.files, argv + i); } +#if ENABLE_BC static void bc_vm_envArgs(void) { - static const char* const bc_args_env_name = "BC_ENV_ARGS"; - BcVec v; - char *env_args = getenv(bc_args_env_name), *buf; + char *buf; + char *env_args = getenv("BC_ENV_ARGS"); if (!env_args) return; @@ -6865,40 +6887,39 @@ static void bc_vm_envArgs(void) buf = G.env_args; bc_vec_init(&v, sizeof(char *), NULL); - bc_vec_push(&v, &bc_args_env_name); - while (*buf != 0) { - if (!isspace(*buf)) { - bc_vec_push(&v, &buf); - while (*buf != 0 && !isspace(*buf)) ++buf; - if (*buf != 0) (*(buf++)) = '\0'; - } - else - ++buf; + while (*(buf = skip_whitespace(buf)) != '\0') { + bc_vec_push(&v, &buf); + buf = skip_non_whitespace(buf); + if (!*buf) + break; + *buf++ = '\0'; } - bc_args((int) v.len, (char **) v.v); + // NULL terminate, and pass argv[] so that first arg is argv[1] + if (sizeof(int) == sizeof(char*)) { + bc_vec_push(&v, &const_int_0); + } else { + static char *const nullptr = NULL; + bc_vec_push(&v, &nullptr); + } + bc_args(((char **)v.v) - 1); bc_vec_free(&v); } #endif // ENABLE_BC -static size_t bc_vm_envLen(const char *var) +static unsigned bc_vm_envLen(const char *var) { - char *lenv = getenv(var); - size_t i, len = BC_NUM_PRINT_WIDTH; - int num; + char *lenv; + unsigned len; + lenv = getenv(var); + len = BC_NUM_PRINT_WIDTH; if (!lenv) return len; - len = strlen(lenv); - - for (num = 1, i = 0; num && i < len; ++i) num = isdigit(lenv[i]); - if (num) { - len = (size_t) atoi(lenv) - 1; - if (len < 2 || len >= INT32_MAX) len = BC_NUM_PRINT_WIDTH; - } - else + len = bb_strtou(lenv, NULL, 10) - 1; + if (errno || len < 2 || len >= INT_MAX) len = BC_NUM_PRINT_WIDTH; return len; @@ -6908,14 +6929,10 @@ static BcStatus bc_vm_process(const char *text) { BcStatus s = bc_parse_text(&G.prs, text); - s = bc_vm_error(s, G.prs.l.f, G.prs.l.line); if (s) return s; while (G.prs.l.t.t != BC_LEX_EOF) { - s = G.prs.parse(&G.prs); - - s = bc_vm_error(s, G.prs.l.f, G.prs.l.line); if (s) return s; } @@ -6923,7 +6940,7 @@ static BcStatus bc_vm_process(const char *text) s = bc_program_exec(); fflush_and_check(); if (s) - s = bc_vm_error(bc_program_reset(s), G.prs.l.f, 0); + bc_program_reset(); } return s; @@ -6931,25 +6948,29 @@ static BcStatus bc_vm_process(const char *text) static BcStatus bc_vm_file(const char *file) { - BcStatus s; + const char *sv_file; char *data; + BcStatus s; BcFunc *main_func; BcInstPtr *ip; - G.prog.file = file; data = bc_read_file(file); - if (!data) return bc_vm_error(BC_STATUS_BIN_FILE, file, 0); + if (!data) return bc_error_fmt("file '%s' is not text", file); - bc_lex_file(&G.prs.l, file); + sv_file = G.prog.file; + G.prog.file = file; + bc_lex_file(&G.prs.l); s = bc_vm_process(data); if (s) goto err; main_func = bc_vec_item(&G.prog.fns, BC_PROG_MAIN); ip = bc_vec_item(&G.prog.stack, 0); - if (main_func->code.len < ip->idx) s = BC_STATUS_EXEC_FILE_NOT_EXECUTABLE; + if (main_func->code.len < ip->idx) + s = bc_error_fmt("file '%s' is not executable", file); err: + G.prog.file = sv_file; free(data); return s; } @@ -6961,17 +6982,18 @@ static BcStatus bc_vm_stdin(void) size_t len, i, str = 0; bool comment = false; - G.prog.file = bc_program_stdin_name; - bc_lex_file(&G.prs.l, bc_program_stdin_name); + G.prog.file = NULL; + bc_lex_file(&G.prs.l); - bc_vec_init(&buffer, sizeof(char), NULL); - bc_vec_init(&buf, sizeof(char), NULL); - bc_vec_pushByte(&buffer, '\0'); + bc_char_vec_init(&buffer); + bc_char_vec_init(&buf); + bc_vec_pushZeroByte(&buffer); // This loop is complex because the vm tries not to send any lines that end // with a backslash to the parser. The reason for that is because the parser // treats a backslash+newline combo as whitespace, per the bc spec. In that // case, and for strings and comments, the parser will expect more stuff. + s = BC_STATUS_SUCCESS; while (!G.eof && (s = bc_read_line(&buf, ">>> ")) == BC_STATUS_SUCCESS) { char *string = buf.v; @@ -7016,57 +7038,256 @@ static BcStatus bc_vm_stdin(void) bc_vec_concat(&buffer, buf.v); s = bc_vm_process(buffer.v); - if (s) goto err; + if (s) { + if (ENABLE_FEATURE_CLEAN_UP && !G_ttyin) { + // Debug config, non-interactive mode: + // return all the way back to main. + // Non-debug builds do not come here, they exit. + break; + } + fflush_and_check(); + fputs("ready for more input\n", stderr); + } - bc_vec_npop(&buffer, buffer.len); + bc_vec_pop_all(&buffer); } - if (s == BC_STATUS_BIN_FILE) s = bc_vm_error(s, G.prs.l.f, 0); - - if (str) - s = bc_vm_error(BC_STATUS_LEX_NO_STRING_END, G.prs.l.f, - G.prs.l.line); - else if (comment) - s = bc_vm_error(BC_STATUS_LEX_NO_COMMENT_END, G.prs.l.f, - G.prs.l.line); + if (str) { + s = bc_error("string end could not be found"); + } + else if (comment) { + s = bc_error("comment end could not be found"); + } -err: bc_vec_free(&buf); bc_vec_free(&buffer); return s; } +#if ENABLE_BC +static const char bc_lib[] = { + "scale=20" +"\n" "define e(x){" +"\n" "auto b,s,n,r,d,i,p,f,v" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "if(x<0){" +"\n" "n=1" +"\n" "x=-x" +"\n" "}" +"\n" "s=scale" +"\n" "r=6+s+0.44*x" +"\n" "scale=scale(x)+1" +"\n" "while(x>1){" +"\n" "d+=1" +"\n" "x/=2" +"\n" "scale+=1" +"\n" "}" +"\n" "scale=r" +"\n" "r=x+1" +"\n" "p=x" +"\n" "f=v=1" +"\n" "for(i=2;v!=0;++i){" +"\n" "p*=x" +"\n" "f*=i" +"\n" "v=p/f" +"\n" "r+=v" +"\n" "}" +"\n" "while((d--)!=0)r*=r" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "if(n!=0)return(1/r)" +"\n" "return(r/1)" +"\n" "}" +"\n" "define l(x){" +"\n" "auto b,s,r,p,a,q,i,v" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "if(x<=0){" +"\n" "r=(1-10^scale)/1" +"\n" "ibase=b" +"\n" "return(r)" +"\n" "}" +"\n" "s=scale" +"\n" "scale+=6" +"\n" "p=2" +"\n" "while(x>=2){" +"\n" "p*=2" +"\n" "x=sqrt(x)" +"\n" "}" +"\n" "while(x<=0.5){" +"\n" "p*=2" +"\n" "x=sqrt(x)" +"\n" "}" +"\n" "r=a=(x-1)/(x+1)" +"\n" "q=a*a" +"\n" "v=1" +"\n" "for(i=3;v!=0;i+=2){" +"\n" "a*=q" +"\n" "v=a/i" +"\n" "r+=v" +"\n" "}" +"\n" "r*=p" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "return(r/1)" +"\n" "}" +"\n" "define s(x){" +"\n" "auto b,s,r,n,a,q,i" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "s=scale" +"\n" "scale=1.1*s+2" +"\n" "a=a(1)" +"\n" "if(x<0){" +"\n" "n=1" +"\n" "x=-x" +"\n" "}" +"\n" "scale=0" +"\n" "q=(x/a+2)/4" +"\n" "x=x-4*q*a" +"\n" "if(q%2!=0)x=-x" +"\n" "scale=s+2" +"\n" "r=a=x" +"\n" "q=-x*x" +"\n" "for(i=3;a!=0;i+=2){" +"\n" "a*=q/(i*(i-1))" +"\n" "r+=a" +"\n" "}" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "if(n!=0)return(-r/1)" +"\n" "return(r/1)" +"\n" "}" +"\n" "define c(x){" +"\n" "auto b,s" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "s=scale" +"\n" "scale*=1.2" +"\n" "x=s(2*a(1)+x)" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "return(x/1)" +"\n" "}" +"\n" "define a(x){" +"\n" "auto b,s,r,n,a,m,t,f,i,u" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "n=1" +"\n" "if(x<0){" +"\n" "n=-1" +"\n" "x=-x" +"\n" "}" +"\n" "if(x==1){" +"\n" "if(scale<65){" +"\n" "return(.7853981633974483096156608458198757210492923498437764552437361480/n)" +"\n" "}" +"\n" "}" +"\n" "if(x==.2){" +"\n" "if(scale<65){" +"\n" "return(.1973955598498807583700497651947902934475851037878521015176889402/n)" +"\n" "}" +"\n" "}" +"\n" "s=scale" +"\n" "if(x>.2){" +"\n" "scale+=5" +"\n" "a=a(.2)" +"\n" "}" +"\n" "scale=s+3" +"\n" "while(x>.2){" +"\n" "m+=1" +"\n" "x=(x-.2)/(1+.2*x)" +"\n" "}" +"\n" "r=u=x" +"\n" "f=-x*x" +"\n" "t=1" +"\n" "for(i=3;t!=0;i+=2){" +"\n" "u*=f" +"\n" "t=u/i" +"\n" "r+=t" +"\n" "}" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "return((m*a+r)/n)" +"\n" "}" +"\n" "define j(n,x){" +"\n" "auto b,s,o,a,i,v,f" +"\n" "b=ibase" +"\n" "ibase=A" +"\n" "s=scale" +"\n" "scale=0" +"\n" "n/=1" +"\n" "if(n<0){" +"\n" "n=-n" +"\n" "if(n%2==1)o=1" +"\n" "}" +"\n" "a=1" +"\n" "for(i=2;i<=n;++i)a*=i" +"\n" "scale=1.5*s" +"\n" "a=(x^n)/2^n/a" +"\n" "r=v=1" +"\n" "f=-x*x/4" +"\n" "scale=scale+length(a)-scale(a)" +"\n" "for(i=1;v!=0;++i){" +"\n" "v=v*f/i/(n+i)" +"\n" "r+=v" +"\n" "}" +"\n" "scale=s" +"\n" "ibase=b" +"\n" "if(o!=0)a=-a" +"\n" "return(a*r/1)" +"\n" "}" +}; +#endif // ENABLE_BC + static BcStatus bc_vm_exec(void) { BcStatus s = BC_STATUS_SUCCESS; size_t i; #if ENABLE_BC - if (G.flags & BC_FLAG_L) { + if (option_mask32 & BC_FLAG_L) { - bc_lex_file(&G.prs.l, bc_lib_name); + // We know that internal library is not buggy, + // thus error checking is normally disabled. +# define DEBUG_LIB 0 + bc_lex_file(&G.prs.l); s = bc_parse_text(&G.prs, bc_lib); + if (DEBUG_LIB && s) return s; - while (!s && G.prs.l.t.t != BC_LEX_EOF) s = G.prs.parse(&G.prs); - - if (s) return s; + while (G.prs.l.t.t != BC_LEX_EOF) { + s = G.prs.parse(&G.prs); + if (DEBUG_LIB && s) return s; + } s = bc_program_exec(); - if (s) return s; + if (DEBUG_LIB && s) return s; } #endif for (i = 0; !s && i < G.files.len; ++i) s = bc_vm_file(*((char **) bc_vec_item(&G.files, i))); - if (s) return s; + if (s) { + if (ENABLE_FEATURE_CLEAN_UP && !G_ttyin) { + // Debug config, non-interactive mode: + // return all the way back to main. + // Non-debug builds do not come here, they exit. + return s; + } + fflush_and_check(); + fputs("ready for more input\n", stderr); + } - if (IS_BC || !G.files.len) s = bc_vm_stdin(); - if (!s && !BC_PARSE_CAN_EXEC(&G.prs)) s = bc_vm_process(""); + if (IS_BC || !G.files.len) + s = bc_vm_stdin(); + if (!s && !BC_PARSE_CAN_EXEC(&G.prs)) + s = bc_vm_process(""); return s; } #if ENABLE_FEATURE_CLEAN_UP -static void bc_program_free() +static void bc_program_free(void) { bc_num_free(&G.prog.ib); bc_num_free(&G.prog.ob); @@ -7098,7 +7319,7 @@ static void bc_vm_free(void) } #endif -static void bc_program_init(size_t line_len) +static void bc_program_init(void) { size_t idx; BcInstPtr ip; @@ -7107,7 +7328,6 @@ static void bc_program_init(size_t line_len) memset(&ip, 0, sizeof(BcInstPtr)); /* G.prog.nchars = G.prog.scale = 0; - already is */ - G.prog.len = line_len; bc_num_init(&G.prog.ib, BC_NUM_DEF_SIZE); bc_num_ten(&G.prog.ib); @@ -7136,16 +7356,16 @@ static void bc_program_init(size_t line_len) bc_num_one(&G.prog.one); bc_vec_init(&G.prog.fns, sizeof(BcFunc), bc_func_free); - bc_map_init(&G.prog.fn_map); + bc_vec_init(&G.prog.fn_map, sizeof(BcId), bc_id_free); bc_program_addFunc(xstrdup("(main)"), &idx); bc_program_addFunc(xstrdup("(read)"), &idx); bc_vec_init(&G.prog.vars, sizeof(BcVec), bc_vec_free); - bc_map_init(&G.prog.var_map); + bc_vec_init(&G.prog.var_map, sizeof(BcId), bc_id_free); bc_vec_init(&G.prog.arrs, sizeof(BcVec), bc_vec_free); - bc_map_init(&G.prog.arr_map); + bc_vec_init(&G.prog.arr_map, sizeof(BcId), bc_id_free); bc_vec_init(&G.prog.strs, sizeof(char *), bc_string_free); bc_vec_init(&G.prog.consts, sizeof(char *), bc_string_free); @@ -7154,23 +7374,12 @@ static void bc_program_init(size_t line_len) bc_vec_push(&G.prog.stack, &ip); } -static void bc_vm_init(const char *env_len) +static void bc_vm_init(void) { - size_t len = bc_vm_envLen(env_len); - -#if ENABLE_FEATURE_BC_SIGNALS - signal_no_SA_RESTART_empty_mask(SIGINT, record_signo); -#endif - bc_vec_init(&G.files, sizeof(char *), NULL); - - if (IS_BC) { - if (getenv("POSIXLY_CORRECT")) - G.flags |= BC_FLAG_S; + if (IS_BC) bc_vm_envArgs(); - } - - bc_program_init(len); + bc_program_init(); if (IS_BC) { bc_parse_init(&G.prs, BC_PROG_MAIN); } else { @@ -7178,45 +7387,68 @@ static void bc_vm_init(const char *env_len) } } -static BcStatus bc_vm_run(int argc, char *argv[], - const char *env_len) +static BcStatus bc_vm_run(char **argv, const char *env_len) { BcStatus st; - bc_vm_init(env_len); - bc_args(argc, argv); + G.prog.len = bc_vm_envLen(env_len); - G.ttyin = isatty(0); - G.tty = G.ttyin || (G.flags & BC_FLAG_I) || isatty(1); + bc_vm_init(); + bc_args(argv); + + if (isatty(0)) { +#if ENABLE_FEATURE_BC_SIGNALS + G_ttyin = 1; + // With SA_RESTART, most system calls will restart + // (IOW: they won't fail with EINTR). + // In particular, this means ^C won't cause + // stdout to get into "error state" if SIGINT hits + // within write() syscall. + // The downside is that ^C while line input is taken + // will only be handled after [Enter] since read() + // from stdin is not interrupted by ^C either, + // it restarts, thus fgetc() does not return on ^C. + signal_SA_RESTART_empty_mask(SIGINT, record_signo); + + // Without SA_RESTART, this exhibits a bug: + // "while (1) print 1" and try ^C-ing it. + // Intermittently, instead of returning to input line, + // you'll get "output error: Interrupted system call" + // and exit. + //signal_no_SA_RESTART_empty_mask(SIGINT, record_signo); +#endif + if (!(option_mask32 & BC_FLAG_Q)) + bc_vm_info(); + } - if (G.ttyin && !(G.flags & BC_FLAG_Q)) bc_vm_info(); st = bc_vm_exec(); #if ENABLE_FEATURE_CLEAN_UP bc_vm_free(); + FREE_G(); #endif return st; } #if ENABLE_BC int bc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int bc_main(int argc, char **argv) +int bc_main(int argc UNUSED_PARAM, char **argv) { INIT_G(); G.sbgn = G.send = '"'; - return bc_vm_run(argc, argv, "BC_LINE_LENGTH"); + return bc_vm_run(argv, "BC_LINE_LENGTH"); } #endif #if ENABLE_DC int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int dc_main(int argc, char **argv) +int dc_main(int argc UNUSED_PARAM, char **argv) { INIT_G(); G.sbgn = '['; G.send = ']'; - return bc_vm_run(argc, argv, "DC_LINE_LENGTH"); + return bc_vm_run(argv, "DC_LINE_LENGTH"); } #endif