diff options
Diffstat (limited to 'contrib/bc/include/vm.h')
| -rw-r--r-- | contrib/bc/include/vm.h | 458 |
1 files changed, 336 insertions, 122 deletions
diff --git a/contrib/bc/include/vm.h b/contrib/bc/include/vm.h index bbc5e57e2ac8..c56cc8e7370a 100644 --- a/contrib/bc/include/vm.h +++ b/contrib/bc/include/vm.h @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2018-2021 Gavin D. Howard and contributors. + * Copyright (c) 2018-2023 Gavin D. Howard and contributors. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -78,10 +78,6 @@ #endif // Set defaults. -// -#ifndef BC_ENABLE_NLS -#define BC_ENABLE_NLS (0) -#endif // BC_ENABLE_NLS #ifndef MAINEXEC #define MAINEXEC bc @@ -132,93 +128,105 @@ #if DC_ENABLED /// The flag for the extended register option. -#define DC_FLAG_X (UINTMAX_C(1)<<0) +#define DC_FLAG_X (UINTMAX_C(1) << 0) #endif // DC_ENABLED #if BC_ENABLED /// The flag for the POSIX warning option. -#define BC_FLAG_W (UINTMAX_C(1)<<1) +#define BC_FLAG_W (UINTMAX_C(1) << 1) /// The flag for the POSIX error option. -#define BC_FLAG_S (UINTMAX_C(1)<<2) +#define BC_FLAG_S (UINTMAX_C(1) << 2) /// The flag for the math library option. -#define BC_FLAG_L (UINTMAX_C(1)<<3) +#define BC_FLAG_L (UINTMAX_C(1) << 3) /// The flag for the global stacks option. -#define BC_FLAG_G (UINTMAX_C(1)<<4) +#define BC_FLAG_G (UINTMAX_C(1) << 4) #endif // BC_ENABLED /// The flag for quiet, though this one is reversed; the option clears the flag. -#define BC_FLAG_Q (UINTMAX_C(1)<<5) +#define BC_FLAG_Q (UINTMAX_C(1) << 5) /// The flag for interactive. -#define BC_FLAG_I (UINTMAX_C(1)<<6) +#define BC_FLAG_I (UINTMAX_C(1) << 6) /// The flag for prompt. This is also reversed; the option clears the flag. -#define BC_FLAG_P (UINTMAX_C(1)<<7) +#define BC_FLAG_P (UINTMAX_C(1) << 7) /// The flag for read prompt. This is also reversed; the option clears the flag. -#define BC_FLAG_R (UINTMAX_C(1)<<8) +#define BC_FLAG_R (UINTMAX_C(1) << 8) /// The flag for a leading zero. -#define BC_FLAG_Z (UINTMAX_C(1)<<9) +#define BC_FLAG_Z (UINTMAX_C(1) << 9) /// The flag for stdin being a TTY. -#define BC_FLAG_TTYIN (UINTMAX_C(1)<<10) +#define BC_FLAG_TTYIN (UINTMAX_C(1) << 10) /// The flag for TTY mode. -#define BC_FLAG_TTY (UINTMAX_C(1)<<11) +#define BC_FLAG_TTY (UINTMAX_C(1) << 11) /// The flag for reset on SIGINT. -#define BC_FLAG_SIGINT (UINTMAX_C(1)<<12) +#define BC_FLAG_SIGINT (UINTMAX_C(1) << 12) + +/// The flag for exiting with expressions. +#define BC_FLAG_EXPR_EXIT (UINTMAX_C(1) << 13) + +/// The flag for digit clamping. +#define BC_FLAG_DIGIT_CLAMP (UINTMAX_C(1) << 14) /// A convenience macro for getting the TTYIN flag. -#define BC_TTYIN (vm.flags & BC_FLAG_TTYIN) +#define BC_TTYIN (vm->flags & BC_FLAG_TTYIN) /// A convenience macro for getting the TTY flag. -#define BC_TTY (vm.flags & BC_FLAG_TTY) +#define BC_TTY (vm->flags & BC_FLAG_TTY) /// A convenience macro for getting the SIGINT flag. -#define BC_SIGINT (vm.flags & BC_FLAG_SIGINT) +#define BC_SIGINT (vm->flags & BC_FLAG_SIGINT) #if BC_ENABLED /// A convenience macro for getting the POSIX error flag. -#define BC_S (vm.flags & BC_FLAG_S) +#define BC_S (vm->flags & BC_FLAG_S) /// A convenience macro for getting the POSIX warning flag. -#define BC_W (vm.flags & BC_FLAG_W) +#define BC_W (vm->flags & BC_FLAG_W) /// A convenience macro for getting the math library flag. -#define BC_L (vm.flags & BC_FLAG_L) +#define BC_L (vm->flags & BC_FLAG_L) /// A convenience macro for getting the global stacks flag. -#define BC_G (vm.flags & BC_FLAG_G) +#define BC_G (vm->flags & BC_FLAG_G) #endif // BC_ENABLED #if DC_ENABLED /// A convenience macro for getting the extended register flag. -#define DC_X (vm.flags & DC_FLAG_X) +#define DC_X (vm->flags & DC_FLAG_X) #endif // DC_ENABLED /// A convenience macro for getting the interactive flag. -#define BC_I (vm.flags & BC_FLAG_I) +#define BC_I (vm->flags & BC_FLAG_I) /// A convenience macro for getting the prompt flag. -#define BC_P (vm.flags & BC_FLAG_P) +#define BC_P (vm->flags & BC_FLAG_P) /// A convenience macro for getting the read prompt flag. -#define BC_R (vm.flags & BC_FLAG_R) +#define BC_R (vm->flags & BC_FLAG_R) /// A convenience macro for getting the leading zero flag. -#define BC_Z (vm.flags & BC_FLAG_Z) +#define BC_Z (vm->flags & BC_FLAG_Z) + +/// A convenience macro for getting the expression exit flag. +#define BC_EXPR_EXIT (vm->flags & BC_FLAG_EXPR_EXIT) + +/// A convenience macro for getting the digit clamp flag. +#define BC_DIGIT_CLAMP (vm->flags & BC_FLAG_DIGIT_CLAMP) #if BC_ENABLED @@ -228,10 +236,57 @@ #if DC_ENABLED /// Returns true if bc is running. -#define BC_IS_BC (vm.name[0] != 'd') +#define BC_IS_BC (vm->name[0] != 'd') /// Returns true if dc is running. -#define BC_IS_DC (vm.name[0] == 'd') +#define BC_IS_DC (vm->name[0] == 'd') + +/// Returns the correct read prompt. +#define BC_VM_READ_PROMPT (BC_IS_BC ? "read> " : "?> ") + +/// Returns the string for the line length environment variable. +#define BC_VM_LINE_LENGTH_STR (BC_IS_BC ? "BC_LINE_LENGTH" : "DC_LINE_LENGTH") + +/// Returns the string for the environment args environment variable. +#define BC_VM_ENV_ARGS_STR (BC_IS_BC ? "BC_ENV_ARGS" : "DC_ENV_ARGS") + +/// Returns the string for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_STR (BC_IS_BC ? "BC_EXPR_EXIT" : "DC_EXPR_EXIT") + +/// Returns the default for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_DEF \ + (BC_IS_BC ? BC_DEFAULT_EXPR_EXIT : DC_DEFAULT_EXPR_EXIT) + +/// Returns the string for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_STR (BC_IS_BC ? "BC_DIGIT_CLAMP" : "DC_DIGIT_CLAMP") + +/// Returns the default for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_DEF \ + (BC_IS_BC ? BC_DEFAULT_DIGIT_CLAMP : DC_DEFAULT_DIGIT_CLAMP) + +/// Returns the string for the TTY mode environment variable. +#define BC_VM_TTY_MODE_STR (BC_IS_BC ? "BC_TTY_MODE" : "DC_TTY_MODE") + +/// Returns the default for the TTY mode environment variable. +#define BC_VM_TTY_MODE_DEF \ + (BC_IS_BC ? BC_DEFAULT_TTY_MODE : DC_DEFAULT_TTY_MODE) + +/// Returns the string for the prompt environment variable. +#define BC_VM_PROMPT_STR (BC_IS_BC ? "BC_PROMPT" : "DC_PROMPT") + +/// Returns the default for the prompt environment variable. +#define BC_VM_PROMPT_DEF (BC_IS_BC ? BC_DEFAULT_PROMPT : DC_DEFAULT_PROMPT) + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_STR \ + (BC_IS_BC ? "BC_SIGINT_RESET" : "DC_SIGINT_RESET") + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_DEF \ + (BC_IS_BC ? BC_DEFAULT_SIGINT_RESET : DC_DEFAULT_SIGINT_RESET) + +/// Returns true if the calculator should run stdin. +#define BC_VM_RUN_STDIN(has_file) (BC_IS_BC || !(has_file)) #else // DC_ENABLED @@ -241,6 +296,48 @@ /// Returns true if dc is running. #define BC_IS_DC (0) +/// Returns the correct read prompt. +#define BC_VM_READ_PROMPT ("read> ") + +/// Returns the string for the line length environment variable. +#define BC_VM_LINE_LENGTH_STR ("BC_LINE_LENGTH") + +/// Returns the string for the environment args environment variable. +#define BC_VM_ENV_ARGS_STR ("BC_ENV_ARGS") + +/// Returns the string for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_STR ("BC_EXPR_EXIT") + +/// Returns the default for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_DEF (BC_DEFAULT_EXPR_EXIT) + +/// Returns the string for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_STR ("BC_DIGIT_CLAMP") + +/// Returns the default for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_DEF (BC_DEFAULT_DIGIT_CLAMP) + +/// Returns the string for the TTY mode environment variable. +#define BC_VM_TTY_MODE_STR ("BC_TTY_MODE") + +/// Returns the default for the TTY mode environment variable. +#define BC_VM_TTY_MODE_DEF (BC_DEFAULT_TTY_MODE) + +/// Returns the string for the prompt environment variable. +#define BC_VM_PROMPT_STR ("BC_PROMPT") + +/// Returns the default for the SIGINT reset environment variable. +#define BC_VM_PROMPT_DEF (BC_DEFAULT_PROMPT) + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_STR ("BC_SIGINT_RESET") + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_DEF (BC_DEFAULT_SIGINT_RESET) + +/// Returns true if the calculator should run stdin. +#define BC_VM_RUN_STDIN(has_file) (BC_IS_BC) + #endif // DC_ENABLED #else // BC_ENABLED @@ -254,6 +351,48 @@ /// Returns true if dc is running. #define BC_IS_DC (1) +/// Returns the correct read prompt. +#define BC_VM_READ_PROMPT ("?> ") + +/// Returns the string for the line length environment variable. +#define BC_VM_LINE_LENGTH_STR ("DC_LINE_LENGTH") + +/// Returns the string for the environment args environment variable. +#define BC_VM_ENV_ARGS_STR ("DC_ENV_ARGS") + +/// Returns the string for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_STR ("DC_EXPR_EXIT") + +/// Returns the default for the expression exit environment variable. +#define BC_VM_EXPR_EXIT_DEF (DC_DEFAULT_EXPR_EXIT) + +/// Returns the string for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_STR ("DC_DIGIT_CLAMP") + +/// Returns the default for the digit clamp environment variable. +#define BC_VM_DIGIT_CLAMP_DEF (DC_DEFAULT_DIGIT_CLAMP) + +/// Returns the string for the TTY mode environment variable. +#define BC_VM_TTY_MODE_STR ("DC_TTY_MODE") + +/// Returns the default for the TTY mode environment variable. +#define BC_VM_TTY_MODE_DEF (DC_DEFAULT_TTY_MODE) + +/// Returns the string for the prompt environment variable. +#define BC_VM_PROMPT_STR ("DC_PROMPT") + +/// Returns the default for the SIGINT reset environment variable. +#define BC_VM_PROMPT_DEF (DC_DEFAULT_PROMPT) + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_STR ("DC_SIGINT_RESET") + +/// Returns the string for the SIGINT reset environment variable. +#define BC_VM_SIGINT_RESET_DEF (DC_DEFAULT_SIGINT_RESET) + +/// Returns true if the calculator should run stdin. +#define BC_VM_RUN_STDIN(has_file) (!(has_file)) + #endif // BC_ENABLED /// A convenience macro for checking if the prompt is enabled. @@ -261,7 +400,9 @@ #else // !BC_ENABLE_LIBRARY -#define BC_Z (vm.leading_zeroes) +#define BC_Z (vm->leading_zeroes) + +#define BC_DIGIT_CLAMP (vm->digit_clamp) #endif // !BC_ENABLE_LIBRARY @@ -314,18 +455,30 @@ /// Returns the max number of variables that is allowed. #define BC_MAX_VARS ((ulong) (SIZE_MAX - 1)) +#if BC_ENABLE_LINE_LIB + +/// The size of the global buffer. +#define BC_VM_BUF_SIZE (1 << 10) + +/// The amount of the global buffer allocated to stdin. +#define BC_VM_STDIN_BUF_SIZE (BC_VM_BUF_SIZE - 1) + +#else // BC_ENABLE_LINE_LIB + /// The size of the global buffer. -#define BC_VM_BUF_SIZE (1<<12) +#define BC_VM_BUF_SIZE (1 << 12) /// The amount of the global buffer allocated to stdout. -#define BC_VM_STDOUT_BUF_SIZE (1<<11) +#define BC_VM_STDOUT_BUF_SIZE (1 << 11) /// The amount of the global buffer allocated to stderr. -#define BC_VM_STDERR_BUF_SIZE (1<<10) +#define BC_VM_STDERR_BUF_SIZE (1 << 10) /// The amount of the global buffer allocated to stdin. #define BC_VM_STDIN_BUF_SIZE (BC_VM_STDERR_BUF_SIZE - 1) +#endif // BC_ENABLE_LINE_LIB + /// The max number of temporary BcNums that can be kept. #define BC_VM_MAX_TEMPS (1 << 9) @@ -354,8 +507,8 @@ /// The global vm struct. This holds all of the global data besides the file /// buffers. -typedef struct BcVm { - +typedef struct BcVm +{ /// The current status. This is volatile sig_atomic_t because it is also /// used in the signal handler. See the development manual /// (manuals/development.md#async-signal-safe-signal-handling) for more @@ -407,9 +560,13 @@ typedef struct BcVm { /// The vector for creating strings to pass to the client. BcVec out; +#if BC_ENABLE_EXTRA_MATH + /// The PRNG. BcRNG rng; +#endif // BC_ENABLE_EXTRA_MATH + /// The current error. BclError err; @@ -419,27 +576,21 @@ typedef struct BcVm { /// Whether or not to print leading zeros. bool leading_zeroes; + /// Whether or not to clamp digits that are greater than or equal to the + /// current ibase. + bool digit_clamp; + /// The number of "references," or times that the library was initialized. unsigned int refs; - /// Non-zero if bcl is running. This is volatile sig_atomic_t because it is - /// also used in the signal handler. See the development manual - /// (manuals/development.md#async-signal-safe-signal-handling) for more - /// information. - volatile sig_atomic_t running; - -#endif // BC_ENABLE_LIBRARY - -#if !BC_ENABLE_LIBRARY +#else // BC_ENABLE_LIBRARY /// A pointer to the filename of the current file. This is not owned by the /// BcVm struct. const char* file; /// The message printed when SIGINT happens. - const char *sigmsg; - -#endif // !BC_ENABLE_LIBRARY + const char* sigmsg; /// Non-zero when signals are "locked." This is volatile sig_atomic_t /// because it is also used in the signal handler. See the development @@ -454,8 +605,6 @@ typedef struct BcVm { /// information. volatile sig_atomic_t sig; -#if !BC_ENABLE_LIBRARY - /// The length of sigmsg. uchar siglen; @@ -483,8 +632,8 @@ typedef struct BcVm { /// True if EOF was encountered. bool eof; - /// True if bc is currently reading from stdin. - bool is_stdin; + /// The mode that the program is in. + uchar mode; #if BC_ENABLED @@ -494,13 +643,6 @@ typedef struct BcVm { #endif // BC_ENABLED -#endif // !BC_ENABLE_LIBRARY - - /// An array of maxes for the globals. - BcBigDig maxes[BC_PROG_GLOBALS_LEN + BC_ENABLE_EXTRA_MATH]; - -#if !BC_ENABLE_LIBRARY - /// A vector of filenames to process. BcVec files; @@ -509,10 +651,10 @@ typedef struct BcVm { /// The name of the calculator under use. This is used by BC_IS_BC and /// BC_IS_DC. - const char *name; + const char* name; /// The help text for the calculator. - const char *help; + const char* help; #if BC_ENABLE_HISTORY @@ -530,19 +672,21 @@ typedef struct BcVm { /// The function to call to parse expressions. BcParseExpr expr; - /// The text to display to label functions in error messages. - const char *func_header; - /// The names of the categories of errors. - const char *err_ids[BC_ERR_IDX_NELEMS + BC_ENABLED]; + const char* err_ids[BC_ERR_IDX_NELEMS + BC_ENABLED]; /// The messages for each error. - const char *err_msgs[BC_ERR_NELEMS]; + const char* err_msgs[BC_ERR_NELEMS]; +#if BC_ENABLE_NLS /// The locale. - const char *locale; + const char* locale; +#endif // BC_ENABLE_NLS -#endif // !BC_ENABLE_LIBRARY +#endif // BC_ENABLE_LIBRARY + + /// An array of maxes for the globals. + BcBigDig maxes[BC_PROG_GLOBALS_LEN + BC_ENABLE_EXTRA_MATH]; /// The last base used to parse. BcBigDig last_base; @@ -560,7 +704,7 @@ typedef struct BcVm { /// A buffer of environment arguments. This is the actual value of the /// environment variable. - char *env_args_buffer; + char* env_args_buffer; /// A vector for environment arguments after parsing. BcVec env_args; @@ -607,21 +751,14 @@ typedef struct BcVm { #endif // BC_ENABLE_NLS /// A pointer to the stdin buffer. - char *buf; + char* buf; /// The number of items in the input buffer. size_t buf_len; - /// The slab for constants in the main function. This is separate for - /// garbage collection reasons. - BcVec main_const_slab; - - //// The slab for all other strings for the main function. - BcVec main_slabs; - - /// The slab for function names, strings in other functions, and constants - /// in other functions. - BcVec other_slabs; + /// The slabs vector for constants, strings, function names, and other + /// string-like things. + BcVec slabs; #if BC_ENABLED @@ -632,6 +769,8 @@ typedef struct BcVm { #endif // BC_ENABLED #endif // !BC_ENABLE_LIBRARY + BcDig* temps_buf[BC_VM_MAX_TEMPS]; + #if BC_DEBUG_CODE /// The depth for BC_FUNC_ENTER and BC_FUNC_EXIT. @@ -645,65 +784,87 @@ typedef struct BcVm { * Print the copyright banner and help if it's non-NULL. * @param help The help message to print if it's non-NULL. */ -void bc_vm_info(const char* const help); +void +bc_vm_info(const char* const help); /** * The entrance point for bc/dc together. * @param argc The count of arguments. * @param argv The argument array. */ -void bc_vm_boot(int argc, char *argv[]); +void +bc_vm_boot(int argc, char* argv[]); /** * Initializes some of the BcVm global. This is separate to make things easier * on the library code. */ -void bc_vm_init(void); +void +bc_vm_init(void); /** * Frees the BcVm global. */ -void bc_vm_shutdown(void); +void +bc_vm_shutdown(void); /** * Add a temp to the temp array. * @param num The BcDig array to add to the temp array. */ -void bc_vm_addTemp(BcDig *num); +void +bc_vm_addTemp(BcDig* num); + +/** + * Return the temp on the top of the temp stack, or NULL if there are none. + * @return A temp, or NULL if none exist. + */ +BcDig* +bc_vm_takeTemp(void); /** - * Dish out a temp, or NULL if there are none. + * Gets the top temp of the temp stack. This is separate from bc_vm_takeTemp() + * to quiet a GCC warning about longjmp() clobbering in bc_num_init(). * @return A temp, or NULL if none exist. */ -BcDig* bc_vm_takeTemp(void); +BcDig* +bc_vm_getTemp(void); /** * Frees all temporaries. */ -void bc_vm_freeTemps(void); +void +bc_vm_freeTemps(void); -#if !BC_ENABLE_HISTORY +#if !BC_ENABLE_HISTORY || BC_ENABLE_LINE_LIB || BC_ENABLE_LIBRARY /** * Erases the flush argument if history does not exist because it does not * matter if history does not exist. */ -#define bc_vm_putchar(c, t) bc_vm_putchar(c) +#define bc_vm_putchar(c, t) bc_vm_putchar_impl(c) + +#else // !BC_ENABLE_HISTORY || BC_ENABLE_LINE_LIB || BC_ENABLE_LIBRARY -#endif // !BC_ENABLE_HISTORY +// This is here to satisfy a clang warning about recursive macros. +#define bc_vm_putchar(c, t) bc_vm_putchar_impl(c, t) + +#endif // !BC_ENABLE_HISTORY || BC_ENABLE_LINE_LIB || BC_ENABLE_LIBRARY /** * Print to stdout with limited formating. * @param fmt The format string. */ -void bc_vm_printf(const char *fmt, ...); +void +bc_vm_printf(const char* fmt, ...); /** * Puts a char into the stdout buffer. * @param c The character to put on the stdout buffer. * @param type The flush type. */ -void bc_vm_putchar(int c, BcFlushType type); +void +bc_vm_putchar(int c, BcFlushType type); /** * Multiplies @a n and @a size and throws an allocation error if overflow @@ -712,7 +873,8 @@ void bc_vm_putchar(int c, BcFlushType type); * @param size The size of each element. * @return The product of @a n and @a size. */ -size_t bc_vm_arraySize(size_t n, size_t size); +size_t +bc_vm_arraySize(size_t n, size_t size); /** * Adds @a a and @a b and throws an error if overflow occurs. @@ -720,14 +882,16 @@ size_t bc_vm_arraySize(size_t n, size_t size); * @param b The second operand. * @return The sum of @a a and @a b. */ -size_t bc_vm_growSize(size_t a, size_t b); +size_t +bc_vm_growSize(size_t a, size_t b); /** * Allocate @a n bytes and throw an allocation error if allocation fails. * @param n The bytes to allocate. * @return A pointer to the allocated memory. */ -void* bc_vm_malloc(size_t n); +void* +bc_vm_malloc(size_t n); /** * Reallocate @a ptr to be @a n bytes and throw an allocation error if @@ -736,41 +900,55 @@ void* bc_vm_malloc(size_t n); * @param n The bytes to allocate. * @return A pointer to the reallocated memory. */ -void* bc_vm_realloc(void *ptr, size_t n); +void* +bc_vm_realloc(void* ptr, size_t n); /** * Allocates space for, and duplicates, @a str. * @param str The string to allocate. * @return The allocated string. */ -char* bc_vm_strdup(const char *str); +char* +bc_vm_strdup(const char* str); /** - * Reads a line into BcVm's buffer field. + * Reads a line from stdin into BcVm's buffer field. * @param clear True if the buffer should be cleared first, false otherwise. * @return True if a line was read, false otherwise. */ -bool bc_vm_readLine(bool clear); +bool +bc_vm_readLine(bool clear); + +/** + * Reads a line from the command-line expressions into BcVm's buffer field. + * @param clear True if the buffer should be cleared first, false otherwise. + * @return True if a line was read, false otherwise. + */ +bool +bc_vm_readBuf(bool clear); /** * A convenience and portability function for OpenBSD's pledge(). * @param promises The promises to pledge(). * @param execpromises The exec promises to pledge(). */ -void bc_pledge(const char *promises, const char *execpromises); +void +bc_pledge(const char* promises, const char* execpromises); /** * Returns the value of an environment variable. * @param var The environment variable. * @return The value of the environment variable. */ -char* bc_vm_getenv(const char* var); +char* +bc_vm_getenv(const char* var); /** * Frees an environment variable value. * @param val The value to free. */ -void bc_vm_getenvFree(char* val); +void +bc_vm_getenvFree(char* val); #if BC_DEBUG_CODE @@ -778,13 +956,16 @@ void bc_vm_getenvFree(char* val); * Start executing a jump series. * @param f The name of the function that started the jump series. */ -void bc_vm_jmp(const char *f); +void +bc_vm_jmp(const char* f); + #else // BC_DEBUG_CODE /** * Start executing a jump series. */ -void bc_vm_jmp(void); +void +bc_vm_jmp(void); #endif // BC_DEBUG_CODE @@ -796,29 +977,59 @@ void bc_vm_jmp(void); * or no POSIX errors are enabled. * @param e The error. */ -void bc_vm_handleError(BcErr e); +void +bc_vm_handleError(BcErr e); /** * Handle a fatal error. * @param e The error. */ -void bc_vm_fatalError(BcErr e); +void +bc_vm_fatalError(BcErr e); /** * A function to call at exit. */ -void bc_vm_atexit(void); +void +bc_vm_atexit(void); #else // BC_ENABLE_LIBRARY /** + * Calculates the number of decimal digits in the argument. + * @param val The value to calculate the number of decimal digits in. + * @return The number of decimal digits in @a val. + */ +size_t +bc_vm_numDigits(size_t val); + +#if BC_DEBUG + +/** + * Handle an error. This is the true error handler. It will start a jump series + * if an error occurred. POSIX errors will not cause jumps when warnings are on + * or no POSIX errors are enabled. + * @param e The error. + * @param file The source file where the error occurred. + * @param fline The line in the source file where the error occurred. + * @param line The bc source line where the error occurred. + */ +void +bc_vm_handleError(BcErr e, const char* file, int fline, size_t line, ...); + +#else // BC_DEBUG + +/** * Handle an error. This is the true error handler. It will start a jump series * if an error occurred. POSIX errors will not cause jumps when warnings are on * or no POSIX errors are enabled. * @param e The error. - * @param line The source line where the error occurred. + * @param line The bc source line where the error occurred. */ -void bc_vm_handleError(BcErr e, size_t line, ...); +void +bc_vm_handleError(BcErr e, size_t line, ...); + +#endif // BC_DEBUG /** * Handle a fatal error. @@ -827,26 +1038,22 @@ void bc_vm_handleError(BcErr e, size_t line, ...); #if !BC_ENABLE_MEMCHECK BC_NORETURN #endif // !BC_ENABLE_MEMCHECK -void bc_vm_fatalError(BcErr e); +void +bc_vm_fatalError(BcErr e); /** * A function to call at exit. * @param status The exit status. */ -int bc_vm_atexit(int status); +int +bc_vm_atexit(int status); #endif // BC_ENABLE_LIBRARY /// A reference to the copyright header. extern const char bc_copyright[]; -/// A reference to the format string for source code line printing. -extern const char* const bc_err_line; - -/// A reference to the format string for source code function printing. -extern const char* const bc_err_func_header; - /// A reference to the array of default error category names. -extern const char *bc_errs[]; +extern const char* bc_errs[]; /// A reference to the array of error category indices for each error. extern const uchar bc_err_ids[]; @@ -867,10 +1074,17 @@ extern const char bc_pledge_end_history[]; /// A reference to the end pledge() promises when *not* using history. extern const char bc_pledge_end[]; +#if !BC_ENABLE_LIBRARY + /// A reference to the global data. -extern BcVm vm; +extern BcVm* vm; + +/// The global data. +extern BcVm vm_data; /// A reference to the global output buffers. extern char output_bufs[BC_VM_BUF_SIZE]; +#endif // !BC_ENABLE_LIBRARY + #endif // BC_VM_H |