diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2022-06-11 11:03:06 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2022-06-11 11:14:37 +0000 |
| commit | 78bc019d220e05abb5b12f678f9b4a847019bbcc (patch) | |
| tree | 33bdfb45d63993d3547fd78c0d96a2b72b259d16 /contrib | |
| parent | 36447829aee545ad9eafbfff3a783ee58cfb28fd (diff) | |
| parent | bd54318046bfee055b140705a5cfd4148e78da07 (diff) | |
| download | src-78bc019d220e05abb5b12f678f9b4a847019bbcc.tar.gz src-78bc019d220e05abb5b12f678f9b4a847019bbcc.zip | |
usr.bin/bc: update to version 5.3.1
This version adds support for command line editing and history using
the libedit or readline libraries in addition to the line editing
features available in previous versions.
The version in the base system is configured to use libedit.
This allows to choose between emacs and vi line editing commands and
to use command overrides via a ~/.editrc file.
Merge commit 'bd54318046bfee055b140705a5cfd4148e78da07'
PR: 264010
MFC after: 2 weeks
Diffstat (limited to 'contrib')
92 files changed, 9122 insertions, 4648 deletions
diff --git a/contrib/bc/Makefile.in b/contrib/bc/Makefile.in index b9136a57aa92..041b9b014cfd 100644 --- a/contrib/bc/Makefile.in +++ b/contrib/bc/Makefile.in @@ -147,6 +147,7 @@ BC_ENABLE_EXTRA_MATH_NAME = BC_ENABLE_EXTRA_MATH BC_ENABLE_EXTRA_MATH = %%EXTRA_MATH%% BC_ENABLE_NLS = %%NLS%% BC_LONG_BIT = %%LONG_BIT%% +BC_EXCLUDE_EXTRA_MATH = %%EXCLUDE_EXTRA_MATH%% BC_ENABLE_AFL = %%FUZZ%% BC_ENABLE_MEMCHECK = %%MEMCHECK%% @@ -201,14 +202,14 @@ DC_DEFS = $(DC_DEFS1) $(DC_DEFS2) $(DC_DEFS3) $(DC_DEFS4) CPPFLAGS1 = -D$(BC_ENABLED_NAME)=$(BC_ENABLED) -D$(DC_ENABLED_NAME)=$(DC_ENABLED) CPPFLAGS2 = $(CPPFLAGS1) -I$(INCDIR)/ -DBUILD_TYPE=$(BC_BUILD_TYPE) %%LONG_BIT_DEFINE%% CPPFLAGS3 = $(CPPFLAGS2) -DEXECPREFIX=$(EXEC_PREFIX) -DMAINEXEC=$(MAIN_EXEC) -CPPFLAGS4 = $(CPPFLAGS3) -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 %%BSD%% +CPPFLAGS4 = $(CPPFLAGS3) %%BSD%% CPPFLAGS5 = $(CPPFLAGS4) -DBC_NUM_KARATSUBA_LEN=$(BC_NUM_KARATSUBA_LEN) CPPFLAGS6 = $(CPPFLAGS5) -DBC_ENABLE_NLS=$(BC_ENABLE_NLS) CPPFLAGS7 = $(CPPFLAGS6) -D$(BC_ENABLE_EXTRA_MATH_NAME)=$(BC_ENABLE_EXTRA_MATH) CPPFLAGS8 = $(CPPFLAGS7) -DBC_ENABLE_HISTORY=$(BC_ENABLE_HISTORY) -DBC_ENABLE_LIBRARY=$(BC_ENABLE_LIBRARY) CPPFLAGS = $(CPPFLAGS8) -DBC_ENABLE_MEMCHECK=$(BC_ENABLE_MEMCHECK) -DBC_ENABLE_AFL=$(BC_ENABLE_AFL) -CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% -LDFLAGS = %%LDFLAGS%% +CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% -I$(INCLUDEDIR) +LDFLAGS = %%LDFLAGS%% -L$(LIBDIR) HOSTCFLAGS = %%HOSTCFLAGS%% @@ -235,25 +236,25 @@ $(GEN_EXEC): $(GEN_DIR) %%GEN_EXEC_TARGET%% $(BC_LIB_C): $(GEN_EXEC) $(BC_LIB) - $(GEN_EMU) $(GEN_EXEC) $(BC_LIB) $(BC_LIB_C) $(BC_LIB_C_ARGS) + $(GEN_EMU) $(GEN_EXEC) $(BC_LIB) $(BC_LIB_C) $(BC_EXCLUDE_EXTRA_MATH) $(BC_LIB_C_ARGS) $(BC_LIB_O): $(BC_LIB_C) $(CC) $(CFLAGS) -o $@ -c $< $(BC_LIB2_C): $(GEN_EXEC) $(BC_LIB2) - $(GEN_EMU) $(GEN_EXEC) $(BC_LIB2) $(BC_LIB2_C) $(BC_LIB2_C_ARGS) + $(GEN_EMU) $(GEN_EXEC) $(BC_LIB2) $(BC_LIB2_C) $(BC_EXCLUDE_EXTRA_MATH) $(BC_LIB2_C_ARGS) $(BC_LIB2_O): $(BC_LIB2_C) $(CC) $(CFLAGS) -o $@ -c $< $(BC_HELP_C): $(GEN_EXEC) $(BC_HELP) - $(GEN_EMU) $(GEN_EXEC) $(BC_HELP) $(BC_HELP_C) bc_help "" $(BC_ENABLED_NAME) + $(GEN_EMU) $(GEN_EXEC) $(BC_HELP) $(BC_HELP_C) $(BC_EXCLUDE_EXTRA_MATH) bc_help "" $(BC_ENABLED_NAME) $(BC_HELP_O): $(BC_HELP_C) $(CC) $(CFLAGS) -o $@ -c $< $(DC_HELP_C): $(GEN_EXEC) $(DC_HELP) - $(GEN_EMU) $(GEN_EXEC) $(DC_HELP) $(DC_HELP_C) dc_help "" $(DC_ENABLED_NAME) + $(GEN_EMU) $(GEN_EXEC) $(DC_HELP) $(DC_HELP_C) $(BC_EXCLUDE_EXTRA_MATH) dc_help "" $(DC_ENABLED_NAME) $(DC_HELP_O): $(DC_HELP_C) $(CC) $(CFLAGS) -o $@ -c $< diff --git a/contrib/bc/NEWS.md b/contrib/bc/NEWS.md index 1a8a5dd31ad8..6fa0cbdd1bb8 100644 --- a/contrib/bc/NEWS.md +++ b/contrib/bc/NEWS.md @@ -1,5 +1,28 @@ # News +## 5.3.1 + +This is a production release that fixes a build problem in the FreeBSD base +system, as well as a problem in the `en_US` locale. If you don't have problems +with either, you do not need to upgrade. + +## 5.3.0 + +This is a production release that adds features and has a few bug fixes. + +First, support for editline and readline history has been added. To use +editline, pass `-e` to `configure.sh`, and to use readline, pass `-r`. + +Second, history support for Windows has been fixed and re-enabled. + +Third, command-line options to set `scale`, `ibase`, `obase`, and `seed` were +added. This was requested long ago, and I originally disagreed with the idea. + +Fourth, the manuals had typos and were missing information. That has been fixed. + +Fifth, the manuals received different formatting to be more readable as +manpages. + ## 5.2.5 This is a production release that fixes this `bc`'s behavior on `^D` to match diff --git a/contrib/bc/README.md b/contrib/bc/README.md index 259ab923bfc4..64c58410162c 100644 --- a/contrib/bc/README.md +++ b/contrib/bc/README.md @@ -1,5 +1,10 @@ # `bc` +***WARNING: New user registration for https://git.yzena.com/ is disabled because +of spam. If you need to report a bug with `bc`, email gavin at this site minus +the `git.` part for an account, and I will create one for you. Or you can report +an issue at [GitHub][29].*** + ***WARNING: This project has moved to [https://git.yzena.com/][20] for [these reasons][21], though GitHub will remain a mirror.*** @@ -71,8 +76,8 @@ Also, if building with MSBuild, the MSBuild bundled with Visual Studio is required. **Note**: Unlike the POSIX-compatible platforms, only one build configuration is -supported on Windows: extra math and prompt enabled, history and NLS (locale -support) disabled, with both calculators built. +supported on Windows: extra math and history enabled, NLS (locale support) +disabled, with both calculators built. #### `bc` @@ -179,9 +184,6 @@ see the [build manual][5]. The library API can be found in [`manuals/bcl.3.md`][26] or `man bcl` once the library is installed. -The library is built as `bin/libbcl.a` on POSIX-compatible systems or as -`Release/bcl/bcl.lib` on Windows. - #### Package and Distro Maintainers This section is for package and distro maintainers. @@ -289,8 +291,7 @@ with POSIX `bc`. The math has been tested with 40+ million random problems, so it is as correct as I can make it. This `bc` can be used as a drop-in replacement for any existing `bc`. This `bc` -is also compatible with MinGW toolchains, though history is not supported on -Windows. +is also compatible with MinGW toolchains. In addition, this `bc` is considered complete; i.e., there will be no more releases with additional features. However, it *is* actively maintained, so if @@ -405,18 +406,18 @@ Files: Makefile.in The Makefile template. NEWS.md The changelog. NOTICE.md List of contributors and copyright owners. - RELEASE.md A checklist for making a release (maintainer use only). Folders: - gen The bc math library, help texts, and code to generate C source. - include All header files. - locales Locale files, in .msg format. Patches welcome for translations. - manuals Manuals for both programs. - src All source code. - scripts A bunch of shell scripts to help with development and building. - tests All tests. - vs Files needed for the build on Windows. + benchmarks A folder of benchmarks for various aspects of bc performance. + gen The bc math library, help texts, and code to generate C source. + include All header files. + locales Locale files, in .msg format. Patches welcome for translations. + manuals Manuals for both programs. + src All source code. + scripts A bunch of shell scripts to help with development and building. + tests All tests. + vs Files needed for the build on Windows. [1]: https://www.gnu.org/software/bc/ [4]: ./LICENSE.md @@ -439,3 +440,4 @@ Folders: [26]: ./manuals/bcl.3.md [27]: https://en.wikipedia.org/wiki/Bus_factor [28]: ./manuals/development.md +[29]: https://github.com/gavinhoward/bc diff --git a/contrib/bc/configure.sh b/contrib/bc/configure.sh index fc66ffc51066..5dc4853fbb47 100755 --- a/contrib/bc/configure.sh +++ b/contrib/bc/configure.sh @@ -52,12 +52,13 @@ usage() { printf 'usage:\n' printf ' %s -h\n' "$script" printf ' %s --help\n' "$script" - printf ' %s [-a|-bD|-dB|-c] [-CEfgGHlmMNtTvz] [-O OPT_LEVEL] [-k KARATSUBA_LEN]\\\n' "$script" + printf ' %s [-a|-bD|-dB|-c] [-CeEfgGHlmMNrtTvz] [-O OPT_LEVEL] [-k KARATSUBA_LEN]\\\n' "$script" printf ' [-s SETTING] [-S SETTING]\n' printf ' %s \\\n' "$script" printf ' [--library|--bc-only --disable-dc|--dc-only --disable-bc|--coverage] \\\n' printf ' [--force --debug --disable-extra-math --disable-generated-tests] \\\n' printf ' [--disable-history --disable-man-pages --disable-nls --disable-strip] \\\n' + printf ' [--enable-editline] [--enable-readline] \\\n' printf ' [--install-all-locales] [--opt=OPT_LEVEL] \\\n' printf ' [--karatsuba-len=KARATSUBA_LEN] \\\n' printf ' [--set-default-on=SETTING] [--set-default-off=SETTING] \\\n' @@ -87,6 +88,11 @@ usage() { printf ' -D, --disable-dc\n' printf ' Disable dc. It is an error if "-d", "--dc-only", "-B", or "--disable-bc"\n' printf ' are specified too.\n' + printf ' -e, --enable-editline\n' + printf ' Enable the use of libedit/editline. This is meant for those users that\n' + printf ' want vi-like or Emacs-like behavior in history.This option is ignored if\n' + printf ' history is disabled. It is an error if this option is enabled when the\n' + printf ' -r/--enable-readline option is enabled.\n' printf ' -E, --disable-extra-math\n' printf ' Disable extra math. This includes: "$" operator (truncate to integer),\n' printf ' "@" operator (set number of decimal places), and r(x, p) (rounding\n' @@ -125,6 +131,11 @@ usage() { printf ' Set the optimization level. This can also be included in the CFLAGS,\n' printf ' but it is provided, so maintainers can build optimized debug builds.\n' printf ' This is passed through to the compiler, so it must be supported.\n' + printf ' -r, --enable-readline\n' + printf ' Enable the use of libreadline/readline. This is meant for those users\n' + printf ' that want vi-like or Emacs-like behavior in history.This option is\n' + printf ' ignored if history is disabled. It is an error if this option is\n' + printf ' enabled when the -e/--enable-editline option is enabled.\n' printf ' -s SETTING, --set-default-on SETTING\n' printf ' Set the default named by SETTING to on. See below for possible values\n' printf ' for SETTING. For multiple instances of the -s or -S for the the same\n' @@ -233,11 +244,10 @@ usage() { printf ' "$HOSTCC" and run on the host machine. Using `gen/strgen.sh`\n' printf ' removes the need to compile and run an executable on the host\n' printf ' machine since `gen/strgen.sh` is a POSIX shell script. However,\n' - printf ' `gen/lib2.bc` is perilously close to 4095 characters, the max\n' - printf ' supported length of a string literal in C99 (and it could be\n' - printf ' added to in the future), and `gen/strgen.sh` generates a string\n' - printf ' literal instead of an array, as `gen/strgen.c` does. For most\n' - printf ' production-ready compilers, this limit probably is not\n' + printf ' `gen/lib2.bc` is over 4095 characters, the max supported length\n' + printf ' of a string literal in C99, and `gen/strgen.sh` generates a\n' + printf ' string literal instead of an array, as `gen/strgen.c` does. For\n' + printf ' most production-ready compilers, this limit probably is not\n' printf ' enforced, but it could be. Both options are still available for\n' printf ' this reason. If you are sure your compiler does not have the\n' printf ' limit and do not want to compile and run a binary on the host\n' @@ -667,6 +677,8 @@ coverage=0 karatsuba_len=32 debug=0 hist=1 +editline=0 +readline=0 extra_math=1 optimization="" generate_tests=1 @@ -697,7 +709,7 @@ dc_default_expr_exit=1 # getopts is a POSIX utility, but it cannot handle long options. Thus, the # handling of long options is done by hand, and that's the reason that short and # long options cannot be mixed. -while getopts "abBcdDEfgGhHk:lMmNO:S:s:tTvz-" opt; do +while getopts "abBcdDeEfgGhHk:lMmNO:rS:s:tTvz-" opt; do case "$opt" in a) library=1 ;; @@ -707,6 +719,7 @@ while getopts "abBcdDEfgGhHk:lMmNO:S:s:tTvz-" opt; do C) clean=0 ;; d) dc_only=1 ;; D) bc_only=1 ;; + e) editline=1 ;; E) extra_math=0 ;; f) force=1 ;; g) debug=1 ;; @@ -719,6 +732,7 @@ while getopts "abBcdDEfgGhHk:lMmNO:S:s:tTvz-" opt; do M) install_manpages=0 ;; N) nls=0 ;; O) optimization="$OPTARG" ;; + r) readline=1 ;; S) set_default 0 "$OPTARG" ;; s) set_default 1 "$OPTARG" ;; t) time_tests=1 ;; @@ -844,6 +858,8 @@ while getopts "abBcdDEfgGhHk:lMmNO:S:s:tTvz-" opt; do disable-man-pages) install_manpages=0 ;; disable-nls) nls=0 ;; disable-strip) strip_bin=0 ;; + enable-editline) editline=1 ;; + enable-readline) readline=1 ;; enable-test-timing) time_tests=1 ;; enable-valgrind) vg=1 ;; enable-fuzz-mode) fuzz=1 ;; @@ -863,6 +879,8 @@ while getopts "abBcdDEfgGhHk:lMmNO:S:s:tTvz-" opt; do usage "No arg allowed for --$arg option" ;; enable-memcheck* | install-all-locales*) usage "No arg allowed for --$arg option" ;; + enable-editline* | enable-readline*) + usage "No arg allowed for --$arg option" ;; '') break ;; # "--" terminates argument processing * ) usage "Invalid option $LONG_OPTARG" ;; esac @@ -1333,12 +1351,17 @@ fi # Like the above tested locale support, this tests history. if [ "$hist" -eq 1 ]; then + if [ "$editline" -ne 0 ] && [ "$readline" -ne 0 ]; then + usage "Must only enable one of readline or editline" + fi + set +e printf 'Testing history...\n' flags="-DBC_ENABLE_HISTORY=1 -DBC_ENABLED=$bc -DDC_ENABLED=$dc" flags="$flags -DBC_ENABLE_NLS=$nls -DBC_ENABLE_LIBRARY=0 -DBC_ENABLE_AFL=0" + flags="$flags -DBC_ENABLE_EDITLINE=$editline -DBC_ENABLE_READLINE=$readline" flags="$flags -DBC_ENABLE_EXTRA_MATH=$extra_math -I$scriptdir/include/" flags="$flags -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700" @@ -1366,13 +1389,56 @@ if [ "$hist" -eq 1 ]; then fi -# We have to disable the history tests if it is disabled or valgrind is on. +# We have to disable the history tests if it is disabled or valgrind is on. Or +# if we are using editline or readline. if [ "$hist" -eq 0 ] || [ "$vg" -ne 0 ]; then test_bc_history_prereqs=" test_bc_history_skip" test_dc_history_prereqs=" test_dc_history_skip" history_tests="@printf 'Skipping history tests...\\\\n'" + CFLAGS="$CFLAGS -DBC_ENABLE_EDITLINE=0 -DBC_ENABLE_READLINE=0" +else + + if [ "$editline" -eq 0 ] && [ "$readline" -eq 0 ]; then + history_tests="@printf '\$(TEST_STARS)\\\\n\\\\nRunning history tests...\\\\n\\\\n'" + history_tests="$history_tests \&\& \$(TESTSDIR)/history.sh bc -a \&\&" + history_tests="$history_tests \$(TESTSDIR)/history.sh dc -a \&\& printf" + history_tests="$history_tests '\\\\nAll history tests passed.\\\\n\\\\n\$(TEST_STARS)\\\\n'" + else + test_bc_history_prereqs=" test_bc_history_skip" + test_dc_history_prereqs=" test_dc_history_skip" + history_tests="@printf 'Skipping history tests...\\\\n'" + fi + + # We are also setting the CFLAGS and LDFLAGS here. + if [ "$editline" -ne 0 ]; then + LDFLAGS="$LDFLAGS -ledit" + CFLAGS="$CFLAGS -DBC_ENABLE_EDITLINE=1 -DBC_ENABLE_READLINE=0" + elif [ "$readline" -ne 0 ]; then + LDFLAGS="$LDFLAGS -lreadline" + CFLAGS="$CFLAGS -DBC_ENABLE_EDITLINE=0 -DBC_ENABLE_READLINE=1" + else + CFLAGS="$CFLAGS -DBC_ENABLE_EDITLINE=0 -DBC_ENABLE_READLINE=0" + fi + +fi + +# Test FreeBSD. This is not in an if statement because regardless of whatever +# the user says, we need to know if we are on FreeBSD. If we are, we cannot set +# _POSIX_C_SOURCE and _XOPEN_SOURCE. The FreeBSD headers turn *off* stuff when +# that is done. +set +e +printf 'Testing for FreeBSD...\n' + +flags="-DBC_TEST_FREEBSD -DBC_ENABLE_AFL=0" +"$CC" $CPPFLAGS $CFLAGS $flags "-I$scriptdir/include" -E "$scriptdir/include/status.h" > /dev/null 2>&1 + +err="$?" + +if [ "$err" -ne 0 ]; then + printf 'On FreeBSD. Not using _POSIX_C_SOURCE and _XOPEN_SOURCE.\n\n' else - history_tests="@printf '\$(TEST_STARS)\\\\n\\\\nRunning history tests...\\\\n\\\\n' \&\& \$(TESTSDIR)/history.sh bc -a \&\& \$(TESTSDIR)/history.sh dc -a \&\& printf '\\\\nAll history tests passed.\\\\n\\\\n\$(TEST_STARS)\\\\n'" + printf 'Not on FreeBSD. Using _POSIX_C_SOURCE and _XOPEN_SOURCE.\n\n' + CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700" fi # Test OpenBSD. This is not in an if statement because regardless of whatever @@ -1431,9 +1497,11 @@ headers="\$(HEADERS)" # This series of if statements figure out what source files are *not* needed. if [ "$extra_math" -eq 0 ]; then + exclude_extra_math=1 manpage_args="E" unneeded="$unneeded rand.c" else + exclude_extra_math=0 headers="$headers \$(EXTRA_MATH_HEADERS)" fi @@ -1645,6 +1713,7 @@ contents=$(replace "$contents" "DC_ERROR_TESTS" "$dc_err_tests") contents=$(replace "$contents" "DC_TEST_EXEC" "$dc_test_exec") contents=$(replace "$contents" "BUILD_TYPE" "$manpage_args") +contents=$(replace "$contents" "EXCLUDE_EXTRA_MATH" "$exclude_extra_math") contents=$(replace "$contents" "LIBRARY" "$library") contents=$(replace "$contents" "HISTORY" "$hist") diff --git a/contrib/bc/gen/bc_help.txt b/contrib/bc/gen/bc_help.txt index 36329b1d7aaf..7189d5bae723 100644 --- a/contrib/bc/gen/bc_help.txt +++ b/contrib/bc/gen/bc_help.txt @@ -62,6 +62,14 @@ This bc has three differences to the GNU bc: This bc also implements the dot (.) extension of the BSD bc. Options: +{{ A H N HN }} + + -E seed --seed=seed + + Sets the builtin variable seed to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. +{{ end }} -e expr --expression=expr @@ -82,6 +90,12 @@ Options: Print this usage message and exit. + -I ibase --ibase=ibase + + Sets the builtin variable ibase to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -i --interactive Force interactive mode. @@ -104,6 +118,12 @@ Options: This bc may load more functions with these options. See the manpage or online documentation for details. + -O obase --obase=obase + + Sets the builtin variable obase to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -P --no-prompt Disable the prompts in interactive mode. @@ -127,6 +147,12 @@ Options: Don't print version and copyright. + -S scale --scale=scale + + Sets the builtin variable scale to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -s --standard Error if any non-POSIX extensions are used. diff --git a/contrib/bc/gen/dc_help.txt b/contrib/bc/gen/dc_help.txt index a0f275b60b64..05a9a68fafc1 100644 --- a/contrib/bc/gen/dc_help.txt +++ b/contrib/bc/gen/dc_help.txt @@ -71,6 +71,14 @@ This dc has a few differences from the two above: that requires a register name is taken as the register name. Options: +{{ A H N HN }} + + -E seed --seed=seed + + Sets the builtin variable seed to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. +{{ end }} -e expr --expression=expr @@ -85,6 +93,12 @@ Options: Print this usage message and exit. + -I ibase --ibase=ibase + + Sets the builtin variable ibase to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -i --interactive Put dc into interactive mode. See the man page for more details. @@ -93,6 +107,12 @@ Options: Disable line length checking. + -O obase --obase=obase + + Sets the builtin variable obase to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -P --no-prompt Disable the prompts in interactive mode. @@ -101,6 +121,12 @@ Options: Disable the read prompt in interactive mode. + -S scale --scale=scale + + Sets the builtin variable scale to the given value assuming that the given + value is in base 10. It is a fatal error if the given value is not a valid + number. + -V --version Print version and copyright and exit. diff --git a/contrib/bc/gen/strgen.c b/contrib/bc/gen/strgen.c index 63faf1ec3472..f4d01ca1391e 100644 --- a/contrib/bc/gen/strgen.c +++ b/contrib/bc/gen/strgen.c @@ -33,6 +33,7 @@ * */ +#include <assert.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> @@ -40,17 +41,39 @@ #include <errno.h> -// For some reason, Windows needs this header. +#include <fcntl.h> +#include <sys/stat.h> + +#ifndef _WIN32 +#include <unistd.h> +#endif // _WIN32 + +// For some reason, Windows can't have this header. #ifndef _WIN32 #include <libgen.h> #endif // _WIN32 +// This pulls in cross-platform stuff. +#include "../include/bcl.h" + +#define BC_ERR(v) (v) + +// clang-format off + +// The usage help. +static const char* const bc_gen_usage = + "usage: %s input output exclude name [label [define [remove_tabs]]]\n"; + +static const char* const bc_gen_ex_start = "{{ A H N HN }}"; +static const char* const bc_gen_ex_end = "{{ end }}"; + // This is exactly what it looks like. It just slaps a simple license header on // the generated C source file. static const char* const bc_gen_header = "// Copyright (c) 2018-2021 Gavin D. Howard and contributors.\n" "// Licensed under the 2-clause BSD license.\n" "// *** AUTOMATICALLY GENERATED FROM %s. DO NOT MODIFY. ***\n\n"; +// clang-format on // These are just format strings used to generate the C source. static const char* const bc_gen_label = "const char *%s = \"%s\";\n\n"; @@ -77,8 +100,9 @@ static const char* const bc_gen_name_extern = "extern const char %s[];\n\n"; * @param filename The name of the file. * @param mode The mode to open the file in. */ -static void open_file(FILE** f, const char* filename, const char* mode) { - +static void +open_file(FILE** f, const char* filename, const char* mode) +{ #ifndef _WIN32 *f = fopen(filename, mode); @@ -94,6 +118,108 @@ static void open_file(FILE** f, const char* filename, const char* mode) { } /** + * A portability file open function. This is copied from src/read.c. Make sure + * to update that if this changes. + * @param path The path to the file to open. + * @param mode The mode to open in. + */ +static int +bc_read_open(const char* path, int mode) +{ + int fd; + +#ifndef _WIN32 + fd = open(path, mode); +#else // _WIN32 + fd = -1; + open(&fd, path, mode); +#endif + + return fd; +} + +/** + * Reads a file and returns the file as a string. This has been copied from + * src/read.c. Make sure to change that if this changes. + * @param path The path to the file. + * @return The contents of the file as a string. + */ +static char* +bc_read_file(const char* path) +{ + int e = IO_ERR; + size_t size, to_read; + struct stat pstat; + int fd; + char* buf; + char* buf2; + + // This has been copied from src/read.c. Make sure to change that if this + // changes. + + assert(path != NULL); + +#ifndef NDEBUG + // Need this to quiet MSan. + // NOLINTNEXTLINE + memset(&pstat, 0, sizeof(struct stat)); +#endif // NDEBUG + + fd = bc_read_open(path, O_RDONLY); + + // If we can't read a file, we just barf. + if (BC_ERR(fd < 0)) + { + fprintf(stderr, "Could not open file: %s\n", path); + exit(INVALID_INPUT_FILE); + } + + // The reason we call fstat is to eliminate TOCTOU race conditions. This + // way, we have an open file, so it's not going anywhere. + if (BC_ERR(fstat(fd, &pstat) == -1)) + { + fprintf(stderr, "Could not stat file: %s\n", path); + exit(INVALID_INPUT_FILE); + } + + // Make sure it's not a directory. + if (BC_ERR(S_ISDIR(pstat.st_mode))) + { + fprintf(stderr, "Path is directory: %s\n", path); + exit(INVALID_INPUT_FILE); + } + + // Get the size of the file and allocate that much. + size = (size_t) pstat.st_size; + buf = (char*) malloc(size + 1); + if (buf == NULL) + { + fprintf(stderr, "Could not malloc\n"); + exit(INVALID_INPUT_FILE); + } + buf2 = buf; + to_read = size; + + do + { + // Read the file. We just bail if a signal interrupts. This is so that + // users can interrupt the reading of big files if they want. + ssize_t r = read(fd, buf2, to_read); + if (BC_ERR(r < 0)) exit(e); + to_read -= (size_t) r; + buf2 += (size_t) r; + } + while (to_read); + + // Got to have a nul byte. + buf[size] = '\0'; + + close(fd); + + return buf; +} + +/** * Outputs a label, which is a string literal that the code can use as a name * for the file that is being turned into a string. This is important for the * math libraries because the parse and lex code expects a filename. The label @@ -112,8 +238,9 @@ static void open_file(FILE** f, const char* filename, const char* mode) { * @param name The actual label text, which is a filename. * @return Positive if no error, negative on error, just like *printf(). */ -static int output_label(FILE* out, const char* label, const char* name) { - +static int +output_label(FILE* out, const char* label, const char* name) +{ #ifndef _WIN32 return fprintf(out, bc_gen_label, label, name); @@ -125,7 +252,10 @@ static int output_label(FILE* out, const char* label, const char* name) { int ret; // This loop counts how many backslashes there are in the label. - for (i = 0; i < len; ++i) count += (name[i] == '\\'); + for (i = 0; i < len; ++i) + { + count += (name[i] == '\\'); + } buf = (char*) malloc(len + 1 + count); if (buf == NULL) return -1; @@ -136,11 +266,12 @@ static int output_label(FILE* out, const char* label, const char* name) { // label byte-for-byte, unless it encounters a backslash, in which case, it // copies the backslash twice to have it escaped properly in the string // literal. - for (i = 0; i < len; ++i) { - + for (i = 0; i < len; ++i) + { buf[i + count] = name[i]; - if (name[i] == '\\') { + if (name[i] == '\\') + { count += 1; buf[i + count] = name[i]; } @@ -178,9 +309,10 @@ static int output_label(FILE* out, const char* label, const char* name) { * * The required command-line parameters are: * - * input Input filename. - * output Output filename. - * name The name of the char array. + * input Input filename. + * output Output filename. + * exclude Whether to exclude extra math-only stuff. + * name The name of the char array. * * The optional parameters are: * @@ -202,34 +334,41 @@ static int output_label(FILE* out, const char* label, const char* name) { * All text files that are transformed have license comments. This program finds * the end of that comment and strips it out as well. */ -int main(int argc, char *argv[]) { - - FILE *in, *out; - char *label, *define, *name; - int c, count, slashes, err = IO_ERR; - bool has_label, has_define, remove_tabs; - - if (argc < 4) { - printf("usage: %s input output name [label [define [remove_tabs]]]\n", - argv[0]); +int +main(int argc, char* argv[]) +{ + char* in; + FILE* out; + const char* label; + const char* define; + char* name; + unsigned int count, slashes, err = IO_ERR; + bool has_label, has_define, remove_tabs, exclude_extra_math; + size_t i; + + if (argc < 5) + { + printf(bc_gen_usage, argv[0]); return INVALID_PARAMS; } - name = argv[3]; + exclude_extra_math = (strtoul(argv[3], NULL, 10) != 0); - has_label = (argc > 4 && strcmp("", argv[4]) != 0); - label = has_label ? argv[4] : ""; + name = argv[4]; - has_define = (argc > 5 && strcmp("", argv[5]) != 0); - define = has_define ? argv[5] : ""; + has_label = (argc > 5 && strcmp("", argv[5]) != 0); + label = has_label ? argv[5] : ""; - remove_tabs = (argc > 6); + has_define = (argc > 6 && strcmp("", argv[6]) != 0); + define = has_define ? argv[6] : ""; - open_file(&in, argv[1], "r"); - if (!in) return INVALID_INPUT_FILE; + remove_tabs = (argc > 7); + + in = bc_read_file(argv[1]); + if (in == NULL) return INVALID_INPUT_FILE; open_file(&out, argv[2], "w"); - if (!out) goto out_err; + if (out == NULL) goto out_err; if (fprintf(out, bc_gen_header, argv[1]) < 0) goto err; if (has_label && fprintf(out, bc_gen_label_extern, label) < 0) goto err; @@ -238,46 +377,121 @@ int main(int argc, char *argv[]) { if (has_label && output_label(out, label, argv[1]) < 0) goto err; if (fprintf(out, bc_gen_name, name) < 0) goto err; - c = count = slashes = 0; + i = count = slashes = 0; // This is where the end of the license comment is found. - while (slashes < 2 && (c = fgetc(in)) >= 0) { - slashes += (slashes == 1 && c == '/' && fgetc(in) == '\n'); - slashes += (!slashes && c == '/' && fgetc(in) == '*'); + while (slashes < 2 && in[i] > 0) + { + if (slashes == 1 && in[i] == '*' && in[i + 1] == '/' && + (in[i + 2] == '\n' || in[i + 2] == '\r')) + { + slashes += 1; + i += 2; + } + else if (!slashes && in[i] == '/' && in[i + 1] == '*') + { + slashes += 1; + i += 1; + } + + i += 1; } // The file is invalid if the end of the license comment could not be found. - if (c < 0) { + if (in[i] == 0) + { + fprintf(stderr, "Could not find end of license comment\n"); err = INVALID_INPUT_FILE; goto err; } + i += 1; + // Do not put extra newlines at the beginning of the char array. - while ((c = fgetc(in)) == '\n'); + while (in[i] == '\n' || in[i] == '\r') + { + i += 1; + } // This loop is what generates the actual char array. It counts how many // chars it has printed per line in order to insert newlines at appropriate // places. It also skips tabs if they should be removed. - while (c >= 0) { - + while (in[i] != 0) + { int val; - if (!remove_tabs || c != '\t') { + if (in[i] == '\r') + { + i += 1; + continue; + } + + if (!remove_tabs || in[i] != '\t') + { + // Check for excluding something for extra math. + if (in[i] == '{') + { + // If we found the start... + if (!strncmp(in + i, bc_gen_ex_start, strlen(bc_gen_ex_start))) + { + if (exclude_extra_math) + { + // Get past the braces. + i += 2; + + // Find the end of the end. + while (in[i] != '{' && strncmp(in + i, bc_gen_ex_end, + strlen(bc_gen_ex_end))) + { + i += 1; + } + + i += strlen(bc_gen_ex_end); + + // Skip the last newline. + if (in[i] == '\r') i += 1; + i += 1; + continue; + } + else + { + i += strlen(bc_gen_ex_start); + + // Skip the last newline. + if (in[i] == '\r') i += 1; + i += 1; + continue; + } + } + else if (!exclude_extra_math && + !strncmp(in + i, bc_gen_ex_end, strlen(bc_gen_ex_end))) + { + i += strlen(bc_gen_ex_end); + + // Skip the last newline. + if (in[i] == '\r') i += 1; + i += 1; + continue; + } + } + // Print a tab if we are at the beginning of a line. if (!count && fputc('\t', out) == EOF) goto err; - val = fprintf(out, "%d,", c); + // Print the character. + val = fprintf(out, "%d,", in[i]); if (val < 0) goto err; - count += val; - - if (count > MAX_WIDTH) { + // Adjust the count. + count += (unsigned int) val; + if (count > MAX_WIDTH) + { count = 0; if (fputc('\n', out) == EOF) goto err; } } - c = fgetc(in); + i += 1; } // Make sure the end looks nice and insert the NUL byte at the end. @@ -289,6 +503,6 @@ int main(int argc, char *argv[]) { err: fclose(out); out_err: - fclose(in); - return err; + free(in); + return (int) err; } diff --git a/contrib/bc/gen/strgen.sh b/contrib/bc/gen/strgen.sh index acaa6cdf0791..ca67fda3ae71 100755 --- a/contrib/bc/gen/strgen.sh +++ b/contrib/bc/gen/strgen.sh @@ -32,24 +32,39 @@ export LC_CTYPE=C progname=${0##*/} +script="$0" +scriptdir=$(dirname "$script") +. "$scriptdir/../scripts/functions.sh" + # See strgen.c comment on main() for what these mean. Note, however, that this # script generates a string literal, not a char array. To understand the # consequences of that, see manuals/development.md#strgenc. if [ $# -lt 3 ]; then - echo "usage: $progname input output name [label [define [remove_tabs]]]" + echo "usage: $progname input output exclude name [label [define [remove_tabs]]]" exit 1 fi input="$1" output="$2" -name="$3" -label="$4" -define="$5" -remove_tabs="$6" +exclude="$3" +name="$4" +label="$5" +define="$6" +remove_tabs="$7" + +tmpinput=$(mktemp -t "${input##*/}") + +if [ "$exclude" -ne 0 ]; then + filter_text "$input" "$tmpinput" "E" +else + filter_text "$input" "$tmpinput" "A" +fi -exec < "$input" +exec < "$tmpinput" exec > "$output" +rm -f "$tmpinput" + if [ -n "$label" ]; then nameline="const char *${label} = \"${input}\";" labelexternline="extern const char *${label};" @@ -83,3 +98,7 @@ $(sed -e "$remtabsexpr " -e '1,/^$/d; s:\\n:\\\\n:g; s:":\\":g; s:^:":; s:$:\\n" ; ${condend} EOF + +#if [ "$exclude" -ne 0 ]; then + #rm -rf "$input" +#fi diff --git a/contrib/bc/include/args.h b/contrib/bc/include/args.h index a2f5b416ce9b..cf6bcbef621c 100644 --- a/contrib/bc/include/args.h +++ b/contrib/bc/include/args.h @@ -46,8 +46,10 @@ * @param argv The array of arguments. * @param exit_exprs True if bc/dc should exit when there are expressions, * false otherwise. + * @param scale The current scale. */ -void bc_args(int argc, char *argv[], bool exit_exprs); +void +bc_args(int argc, char* argv[], bool exit_exprs, BcBigDig scale); // A reference to the list of long options. extern const BcOptLong bc_args_lopt[]; diff --git a/contrib/bc/include/bc.h b/contrib/bc/include/bc.h index a4198b91ebc6..06b2131c967b 100644 --- a/contrib/bc/include/bc.h +++ b/contrib/bc/include/bc.h @@ -49,7 +49,8 @@ * The main function for bc. It just sets variables and passes its arguments * through to @a bc_vm_boot(). */ -void bc_main(int argc, char *argv[]); +void +bc_main(int argc, char* argv[]); // These are references to the help text, the library text, and the "filename" // for the library. @@ -66,8 +67,8 @@ extern const char* bc_lib2_name; /** * A struct containing information about a bc keyword. */ -typedef struct BcLexKeyword { - +typedef struct BcLexKeyword +{ /// Holds the length of the keyword along with a bit that, if set, means the /// keyword is used in POSIX bc. uchar data; @@ -87,8 +88,10 @@ typedef struct BcLexKeyword { #define BC_LEX_KW_LEN(kw) ((size_t) ((kw)->data & ~(BC_LEX_CHAR_MSB(1)))) /// A macro to easily build a keyword entry. See bc_lex_kws in src/data.c. -#define BC_LEX_KW_ENTRY(a, b, c) \ - { .data = ((b) & ~(BC_LEX_CHAR_MSB(1))) | BC_LEX_CHAR_MSB(c), .name = a } +#define BC_LEX_KW_ENTRY(a, b, c) \ + { \ + .data = ((b) & ~(BC_LEX_CHAR_MSB(1))) | BC_LEX_CHAR_MSB(c), .name = a \ + } #if BC_ENABLE_EXTRA_MATH @@ -113,7 +116,8 @@ extern const size_t bc_lex_kws_len; * @a BcLexNext.) * @param l The lexer. */ -void bc_lex_token(BcLex *l); +void +bc_lex_token(BcLex* l); // The following section is for flags needed when parsing bc code. These flags // are complicated, but necessary. Why you ask? Because bc's standard is awful. @@ -144,49 +148,49 @@ void bc_lex_token(BcLex *l); // flag stack. All `p` arguments are pointers to a BcParse. // This flag is set if the parser has seen a left brace. -#define BC_PARSE_FLAG_BRACE (UINTMAX_C(1)<<0) +#define BC_PARSE_FLAG_BRACE (UINTMAX_C(1) << 0) #define BC_PARSE_BRACE(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_BRACE) // This flag is set if the parser is parsing inside of the braces of a function // body. -#define BC_PARSE_FLAG_FUNC_INNER (UINTMAX_C(1)<<1) +#define BC_PARSE_FLAG_FUNC_INNER (UINTMAX_C(1) << 1) #define BC_PARSE_FUNC_INNER(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_FUNC_INNER) // This flag is set if the parser is parsing a function. It is different from // the one above because it is set if it is parsing a function body *or* header, // not just if it's parsing a function body. -#define BC_PARSE_FLAG_FUNC (UINTMAX_C(1)<<2) +#define BC_PARSE_FLAG_FUNC (UINTMAX_C(1) << 2) #define BC_PARSE_FUNC(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_FUNC) // This flag is set if the parser is expecting to parse a body, whether of a // function, an if statement, or a loop. -#define BC_PARSE_FLAG_BODY (UINTMAX_C(1)<<3) +#define BC_PARSE_FLAG_BODY (UINTMAX_C(1) << 3) #define BC_PARSE_BODY(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_BODY) // This flag is set if bc is parsing a loop. This is important because the break // and continue keywords are only valid inside of a loop. -#define BC_PARSE_FLAG_LOOP (UINTMAX_C(1)<<4) +#define BC_PARSE_FLAG_LOOP (UINTMAX_C(1) << 4) #define BC_PARSE_LOOP(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_LOOP) // This flag is set if bc is parsing the body of a loop. It is different from // the one above the same way @a BC_PARSE_FLAG_FUNC_INNER is different from // @a BC_PARSE_FLAG_FUNC. -#define BC_PARSE_FLAG_LOOP_INNER (UINTMAX_C(1)<<5) +#define BC_PARSE_FLAG_LOOP_INNER (UINTMAX_C(1) << 5) #define BC_PARSE_LOOP_INNER(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_LOOP_INNER) // This flag is set if bc is parsing an if statement. -#define BC_PARSE_FLAG_IF (UINTMAX_C(1)<<6) +#define BC_PARSE_FLAG_IF (UINTMAX_C(1) << 6) #define BC_PARSE_IF(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_IF) // This flag is set if bc is parsing an else statement. This is important // because of "else if" constructions, among other things. -#define BC_PARSE_FLAG_ELSE (UINTMAX_C(1)<<7) +#define BC_PARSE_FLAG_ELSE (UINTMAX_C(1) << 7) #define BC_PARSE_ELSE(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_ELSE) // This flag is set if bc just finished parsing an if statement and its body. // It tells the parser that it can probably expect an else statement next. This // flag is, thus, one of the most subtle. -#define BC_PARSE_FLAG_IF_END (UINTMAX_C(1)<<8) +#define BC_PARSE_FLAG_IF_END (UINTMAX_C(1) << 8) #define BC_PARSE_IF_END(p) (BC_PARSE_TOP_FLAG(p) & BC_PARSE_FLAG_IF_END) /** @@ -230,7 +234,7 @@ void bc_lex_token(BcLex *l); * @param t The token to return operator data for. * @return The operator data for @a t. */ -#define BC_PARSE_OP_DATA(t) bc_parse_ops[((t) - BC_LEX_OP_INC)] +#define BC_PARSE_OP_DATA(t) bc_parse_ops[((t) -BC_LEX_OP_INC)] /** * Returns non-zero if operator @a op is left associative, zero otherwise. @@ -261,7 +265,7 @@ void bc_lex_token(BcLex *l); * @param e8 The eighth bit. * @return An expression entry for bc_parse_exprs[]. */ -#define BC_PARSE_EXPR_ENTRY(e1, e2, e3, e4, e5, e6, e7, e8) \ +#define BC_PARSE_EXPR_ENTRY(e1, e2, e3, e4, e5, e6, e7, e8) \ ((UINTMAX_C(e1) << 7) | (UINTMAX_C(e2) << 6) | (UINTMAX_C(e3) << 5) | \ (UINTMAX_C(e4) << 4) | (UINTMAX_C(e5) << 3) | (UINTMAX_C(e6) << 2) | \ (UINTMAX_C(e7) << 1) | (UINTMAX_C(e8) << 0)) @@ -272,7 +276,7 @@ void bc_lex_token(BcLex *l); * @return True if i is an expression token, false otherwise. */ #define BC_PARSE_EXPR(i) \ - (bc_parse_exprs[(((i) & (uchar) ~(0x07)) >> 3)] & (1 << (7 - ((i) & 0x07)))) + (bc_parse_exprs[(((i) & (uchar) ~(0x07)) >> 3)] & (1 << (7 - ((i) &0x07)))) /** * Returns the operator (by lex token) that is at the top of the operator @@ -337,7 +341,7 @@ void bc_lex_token(BcLex *l); * @param t The token to turn into an instruction. * @return The token as an instruction. */ -#define BC_PARSE_TOKEN_INST(t) ((uchar) ((t) - BC_LEX_NEG + BC_INST_NEG)) +#define BC_PARSE_TOKEN_INST(t) ((uchar) ((t) -BC_LEX_NEG + BC_INST_NEG)) /** * Returns true if the token is a bc keyword. @@ -353,8 +357,8 @@ void bc_lex_token(BcLex *l); /// /// Obviously, @a len is the number of tokens in the @a tokens array. If more /// than 4 is needed in the future, @a tokens will have to be changed. -typedef struct BcParseNext { - +typedef struct BcParseNext +{ /// The number of tokens in the tokens array. uchar len; @@ -368,13 +372,15 @@ typedef struct BcParseNext { /// A macro to generate a BcParseNext literal from BcParseNext data. See /// src/data.c for examples. -#define BC_PARSE_NEXT(a, ...) \ - { .len = (uchar) (a), BC_PARSE_NEXT_TOKENS(__VA_ARGS__) } +#define BC_PARSE_NEXT(a, ...) \ + { \ + .len = (uchar) (a), BC_PARSE_NEXT_TOKENS(__VA_ARGS__) \ + } /// A status returned by @a bc_parse_expr_err(). It can either return success or /// an error indicating an empty expression. -typedef enum BcParseStatus { - +typedef enum BcParseStatus +{ BC_PARSE_STATUS_SUCCESS, BC_PARSE_STATUS_EMPTY_EXPR, @@ -387,14 +393,16 @@ typedef enum BcParseStatus { * @param flags Flags that define the requirements that the parsed code must * meet or an error will result. See @a BcParseExpr for more info. */ -void bc_parse_expr(BcParse *p, uint8_t flags); +void +bc_parse_expr(BcParse* p, uint8_t flags); /** * The @a BcParseParse function for bc. (See include/parse.h for a definition of * @a BcParseParse.) * @param p The parser. */ -void bc_parse_parse(BcParse *p); +void +bc_parse_parse(BcParse* p); /** * Ends a series of if statements. This is to ensure that full parses happen @@ -403,7 +411,8 @@ void bc_parse_parse(BcParse *p); * function definition, we know we can add an empty else clause. * @param p The parser. */ -void bc_parse_endif(BcParse *p); +void +bc_parse_endif(BcParse* p); /// References to the signal message and its length. extern const char bc_sig_msg[]; diff --git a/contrib/bc/include/bcl.h b/contrib/bc/include/bcl.h index 9c0e5e59cfd0..54be3239d241 100644 --- a/contrib/bc/include/bcl.h +++ b/contrib/bc/include/bcl.h @@ -73,7 +73,7 @@ #define STDOUT_FILENO _fileno(stdout) #define STDERR_FILENO _fileno(stderr) #define ssize_t SSIZE_T -#define S_ISDIR(m) ((m) & _S_IFDIR) +#define S_ISDIR(m) ((m) & (_S_IFDIR)) #define O_RDONLY _O_RDONLY #define stat _stat #define fstat _fstat @@ -129,8 +129,8 @@ typedef uint32_t BclRandInt; #if BC_ENABLE_LIBRARY -typedef enum BclError { - +typedef enum BclError +{ BCL_ERROR_NONE, BCL_ERROR_INVALID_NUM, @@ -151,8 +151,8 @@ typedef enum BclError { } BclError; -typedef struct BclNumber { - +typedef struct BclNumber +{ size_t i; } BclNumber; @@ -161,81 +161,179 @@ struct BclCtxt; typedef struct BclCtxt* BclContext; -void bcl_handleSignal(void); -bool bcl_running(void); - -BclError bcl_init(void); -void bcl_free(void); - -bool bcl_abortOnFatalError(void); -void bcl_setAbortOnFatalError(bool abrt); -bool bcl_leadingZeroes(void); -void bcl_setLeadingZeroes(bool leadingZeroes); - -void bcl_gc(void); - -BclError bcl_pushContext(BclContext ctxt); -void bcl_popContext(void); -BclContext bcl_context(void); - -BclContext bcl_ctxt_create(void); -void bcl_ctxt_free(BclContext ctxt); -void bcl_ctxt_freeNums(BclContext ctxt); - -size_t bcl_ctxt_scale(BclContext ctxt); -void bcl_ctxt_setScale(BclContext ctxt, size_t scale); -size_t bcl_ctxt_ibase(BclContext ctxt); -void bcl_ctxt_setIbase(BclContext ctxt, size_t ibase); -size_t bcl_ctxt_obase(BclContext ctxt); -void bcl_ctxt_setObase(BclContext ctxt, size_t obase); - -BclError bcl_err(BclNumber n); - -BclNumber bcl_num_create(void); -void bcl_num_free(BclNumber n); - -bool bcl_num_neg(BclNumber n); -void bcl_num_setNeg(BclNumber n, bool neg); -size_t bcl_num_scale(BclNumber n); -BclError bcl_num_setScale(BclNumber n, size_t scale); -size_t bcl_num_len(BclNumber n); - -BclError bcl_copy(BclNumber d, BclNumber s); -BclNumber bcl_dup(BclNumber s); - -BclError bcl_bigdig(BclNumber n, BclBigDig *result); -BclNumber bcl_bigdig2num(BclBigDig val); - -BclNumber bcl_add(BclNumber a, BclNumber b); -BclNumber bcl_sub(BclNumber a, BclNumber b); -BclNumber bcl_mul(BclNumber a, BclNumber b); -BclNumber bcl_div(BclNumber a, BclNumber b); -BclNumber bcl_mod(BclNumber a, BclNumber b); -BclNumber bcl_pow(BclNumber a, BclNumber b); -BclNumber bcl_lshift(BclNumber a, BclNumber b); -BclNumber bcl_rshift(BclNumber a, BclNumber b); -BclNumber bcl_sqrt(BclNumber a); -BclError bcl_divmod(BclNumber a, BclNumber b, BclNumber *c, BclNumber *d); -BclNumber bcl_modexp(BclNumber a, BclNumber b, BclNumber c); - -ssize_t bcl_cmp(BclNumber a, BclNumber b); - -void bcl_zero(BclNumber n); -void bcl_one(BclNumber n); - -BclNumber bcl_parse(const char *restrict val); -char* bcl_string(BclNumber n); - -BclNumber bcl_irand(BclNumber a); -BclNumber bcl_frand(size_t places); -BclNumber bcl_ifrand(BclNumber a, size_t places); - -BclError bcl_rand_seedWithNum(BclNumber n); -BclError bcl_rand_seed(unsigned char seed[BCL_SEED_SIZE]); -void bcl_rand_reseed(void); -BclNumber bcl_rand_seed2num(void); -BclRandInt bcl_rand_int(void); -BclRandInt bcl_rand_bounded(BclRandInt bound); +void +bcl_handleSignal(void); + +bool +bcl_running(void); + +BclError +bcl_init(void); + +void +bcl_free(void); + +bool +bcl_abortOnFatalError(void); + +void +bcl_setAbortOnFatalError(bool abrt); + +bool +bcl_leadingZeroes(void); + +void +bcl_setLeadingZeroes(bool leadingZeroes); + +void +bcl_gc(void); + +BclError +bcl_pushContext(BclContext ctxt); + +void +bcl_popContext(void); + +BclContext +bcl_context(void); + +BclContext +bcl_ctxt_create(void); + +void +bcl_ctxt_free(BclContext ctxt); + +void +bcl_ctxt_freeNums(BclContext ctxt); + +size_t +bcl_ctxt_scale(BclContext ctxt); + +void +bcl_ctxt_setScale(BclContext ctxt, size_t scale); + +size_t +bcl_ctxt_ibase(BclContext ctxt); + +void +bcl_ctxt_setIbase(BclContext ctxt, size_t ibase); + +size_t +bcl_ctxt_obase(BclContext ctxt); + +void +bcl_ctxt_setObase(BclContext ctxt, size_t obase); + +BclError +bcl_err(BclNumber n); + +BclNumber +bcl_num_create(void); + +void +bcl_num_free(BclNumber n); + +bool +bcl_num_neg(BclNumber n); + +void +bcl_num_setNeg(BclNumber n, bool neg); + +size_t +bcl_num_scale(BclNumber n); + +BclError +bcl_num_setScale(BclNumber n, size_t scale); + +size_t +bcl_num_len(BclNumber n); + +BclError +bcl_copy(BclNumber d, BclNumber s); + +BclNumber +bcl_dup(BclNumber s); + +BclError +bcl_bigdig(BclNumber n, BclBigDig* result); + +BclNumber +bcl_bigdig2num(BclBigDig val); + +BclNumber +bcl_add(BclNumber a, BclNumber b); + +BclNumber +bcl_sub(BclNumber a, BclNumber b); + +BclNumber +bcl_mul(BclNumber a, BclNumber b); + +BclNumber +bcl_div(BclNumber a, BclNumber b); + +BclNumber +bcl_mod(BclNumber a, BclNumber b); + +BclNumber +bcl_pow(BclNumber a, BclNumber b); + +BclNumber +bcl_lshift(BclNumber a, BclNumber b); + +BclNumber +bcl_rshift(BclNumber a, BclNumber b); + +BclNumber +bcl_sqrt(BclNumber a); + +BclError +bcl_divmod(BclNumber a, BclNumber b, BclNumber* c, BclNumber* d); + +BclNumber +bcl_modexp(BclNumber a, BclNumber b, BclNumber c); + +ssize_t +bcl_cmp(BclNumber a, BclNumber b); + +void +bcl_zero(BclNumber n); + +void +bcl_one(BclNumber n); + +BclNumber +bcl_parse(const char* restrict val); + +char* +bcl_string(BclNumber n); + +BclNumber +bcl_irand(BclNumber a); + +BclNumber +bcl_frand(size_t places); + +BclNumber +bcl_ifrand(BclNumber a, size_t places); + +BclError +bcl_rand_seedWithNum(BclNumber n); + +BclError +bcl_rand_seed(unsigned char seed[BCL_SEED_SIZE]); + +void +bcl_rand_reseed(void); + +BclNumber +bcl_rand_seed2num(void); + +BclRandInt +bcl_rand_int(void); + +BclRandInt +bcl_rand_bounded(BclRandInt bound); #endif // BC_ENABLE_LIBRARY diff --git a/contrib/bc/include/dc.h b/contrib/bc/include/dc.h index 88b5e054f878..42cd842b57ce 100644 --- a/contrib/bc/include/dc.h +++ b/contrib/bc/include/dc.h @@ -46,7 +46,8 @@ * The main function for dc. It just sets variables and passes its arguments * through to @a bc_vm_boot(). */ -void dc_main(int argc, char *argv[]); +void +dc_main(int argc, char* argv[]); // A reference to the dc help text. extern const char dc_help[]; @@ -56,7 +57,8 @@ extern const char dc_help[]; * @a BcLexNext.) * @param l The lexer. */ -void dc_lex_token(BcLex *l); +void +dc_lex_token(BcLex* l); /** * Returns true if the negative char `_` should be treated as a command or not. @@ -66,7 +68,8 @@ void dc_lex_token(BcLex *l); * @return True if a negative should be treated as a command, false if it * should be treated as a negative sign on a number. */ -bool dc_lex_negCommand(BcLex *l); +bool +dc_lex_negCommand(BcLex* l); // References to the signal message and its length. extern const char dc_sig_msg[]; @@ -88,7 +91,8 @@ extern const uint8_t dc_parse_insts[]; * @a BcParseParse.) * @param p The parser. */ -void dc_parse_parse(BcParse *p); +void +dc_parse_parse(BcParse* p); /** * The @a BcParseExpr function for dc. (See include/parse.h for a definition of @@ -97,7 +101,8 @@ void dc_parse_parse(BcParse *p); * @param flags Flags that define the requirements that the parsed code must * meet or an error will result. See @a BcParseExpr for more info. */ -void dc_parse_expr(BcParse *p, uint8_t flags); +void +dc_parse_expr(BcParse* p, uint8_t flags); #endif // DC_ENABLED diff --git a/contrib/bc/include/file.h b/contrib/bc/include/file.h index b30b932c9abb..30a0d9011c00 100644 --- a/contrib/bc/include/file.h +++ b/contrib/bc/include/file.h @@ -38,18 +38,34 @@ #include <stdarg.h> +#include <history.h> #include <vector.h> #define BC_FILE_ULL_LENGTH (21) +#if BC_ENABLE_LINE_LIB + +#include <stdio.h> + /// The file struct. -typedef struct BcFile { +typedef struct BcFile +{ + // The file. This is here simply to make the line lib code as compatible + // with the existing code as possible. + FILE* f; + +} BcFile; +#else // BC_ENABLE_LINE_LIB + +/// The file struct. +typedef struct BcFile +{ // The actual file descriptor. int fd; // The buffer for the file. - char *buf; + char* buf; // The length (number of actual chars) in the buffer. size_t len; @@ -59,13 +75,15 @@ typedef struct BcFile { } BcFile; -#if BC_ENABLE_HISTORY +#endif // BC_ENABLE_LINE_LIB + +#if BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB /// Types of flushing. These are important because of history and printing /// strings without newlines, something that users could use as their own /// prompts. -typedef enum BcFlushType { - +typedef enum BcFlushType +{ /// Do not clear the stored partial line, but don't add to it. BC_FLUSH_NO_EXTRAS_NO_CLEAR, @@ -80,10 +98,10 @@ typedef enum BcFlushType { } BcFlushType; -#else // BC_ENABLE_HISTORY +#else // BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB // These make sure that the BcFlushType parameter disappears if history is not -// used. +// used, editline is used, or readline is used. #define bc_file_putchar(f, t, c) bc_file_putchar(f, c) #define bc_file_flushErr(f, t) bc_file_flushErr(f) @@ -91,7 +109,19 @@ typedef enum BcFlushType { #define bc_file_write(f, t, b, n) bc_file_write(f, b, n) #define bc_file_puts(f, t, s) bc_file_puts(f, s) -#endif // BC_ENABLE_HISTORY +#endif // BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB + +#if BC_ENABLE_LINE_LIB + +/** + * Initialize a file. + * @param f The file to initialize. + * @param file The stdio file. + */ +void +bc_file_init(BcFile* f, FILE* file); + +#else // BC_ENABLE_LINE_LIB /** * Initialize a file. @@ -100,13 +130,17 @@ typedef enum BcFlushType { * @param buf The buffer for the file. * @param cap The capacity of the buffer. */ -void bc_file_init(BcFile *f, int fd, char *buf, size_t cap); +void +bc_file_init(BcFile* f, int fd, char* buf, size_t cap); + +#endif // BC_ENABLE_LINE_LIB /** * Frees a file, including flushing it. * @param f The file to free. */ -void bc_file_free(BcFile *f); +void +bc_file_free(BcFile* f); /** * Print a char into the file. @@ -114,7 +148,8 @@ void bc_file_free(BcFile *f); * @param type The flush type. * @param c The character to write. */ -void bc_file_putchar(BcFile *restrict f, BcFlushType type, uchar c); +void +bc_file_putchar(BcFile* restrict f, BcFlushType type, uchar c); /** * Flush and return an error if it failed. This is meant to be used when needing @@ -124,14 +159,16 @@ void bc_file_putchar(BcFile *restrict f, BcFlushType type, uchar c); * @param type The flush type. * @return A status indicating if an error occurred. */ -BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type); +BcStatus +bc_file_flushErr(BcFile* restrict f, BcFlushType type); /** * Flush and throw an error on failure. * @param f The file to flush. * @param type The flush type. */ -void bc_file_flush(BcFile *restrict f, BcFlushType type); +void +bc_file_flush(BcFile* restrict f, BcFlushType type); /** * Write the contents of buf to the file. @@ -140,22 +177,24 @@ void bc_file_flush(BcFile *restrict f, BcFlushType type); * @param buf The buffer whose contents will be written to the file. * @param n The length of buf. */ -void bc_file_write(BcFile *restrict f, BcFlushType type, - const char *buf, size_t n); +void +bc_file_write(BcFile* restrict f, BcFlushType type, const char* buf, size_t n); /** * Write to the file like fprintf would. This is very rudimentary. * @param f The file to flush. * @param fmt The format string. */ -void bc_file_printf(BcFile *restrict f, const char *fmt, ...); +void +bc_file_printf(BcFile* restrict f, const char* fmt, ...); /** * Write to the file like vfprintf would. This is very rudimentary. * @param f The file to flush. * @param fmt The format string. */ -void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args); +void +bc_file_vprintf(BcFile* restrict f, const char* fmt, va_list args); /** * Write str to the file. @@ -163,15 +202,16 @@ void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args); * @param type The flush type. * @param str The string to write to the file. */ -void bc_file_puts(BcFile *restrict f, BcFlushType type, const char *str); +void +bc_file_puts(BcFile* restrict f, BcFlushType type, const char* str); -#if BC_ENABLE_HISTORY +#if BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB // Some constant flush types for ease of use. extern const BcFlushType bc_flush_none; extern const BcFlushType bc_flush_err; extern const BcFlushType bc_flush_save; -#endif // BC_ENABLE_HISTORY +#endif // BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB #endif // BC_FILE_H diff --git a/contrib/bc/include/history.h b/contrib/bc/include/history.h index 8d9c3417d897..1e9962ded1eb 100644 --- a/contrib/bc/include/history.h +++ b/contrib/bc/include/history.h @@ -83,9 +83,88 @@ #define BC_ENABLE_HISTORY (1) #endif // BC_ENABLE_HISTORY -#if BC_ENABLE_HISTORY +#ifndef BC_ENABLE_EDITLINE +#define BC_ENABLE_EDITLINE (0) +#endif // BC_ENABLE_EDITLINE + +#ifndef BC_ENABLE_READLINE +#define BC_ENABLE_READLINE (0) +#endif // BC_ENABLE_READLINE + +#if BC_ENABLE_EDITLINE && BC_ENABLE_READLINE +#error Must enable only one of editline or readline, not both. +#endif // BC_ENABLE_EDITLINE && BC_ENABLE_READLINE + +#if BC_ENABLE_EDITLINE || BC_ENABLE_READLINE +#define BC_ENABLE_LINE_LIB (1) +#else // BC_ENABLE_EDITLINE || BC_ENABLE_READLINE +#define BC_ENABLE_LINE_LIB (0) +#endif // BC_ENABLE_EDITLINE || BC_ENABLE_READLINE + +#if BC_ENABLE_LINE_LIB #include <stdbool.h> +#include <setjmp.h> +#include <signal.h> + +#include <status.h> +#include <vector.h> + +extern sigjmp_buf bc_history_jmpbuf; +extern volatile sig_atomic_t bc_history_inlinelib; + +#endif // BC_ENABLE_LINE_LIB + +#if BC_ENABLE_EDITLINE + +#include <stdio.h> +#include <histedit.h> + +/** + * The history struct for editline. + */ +typedef struct BcHistory +{ + /// A place to store the current line. + EditLine* el; + + /// The history. + History* hist; + + /// Whether the terminal is bad. This is more or less not used. + bool badTerm; + +} BcHistory; + +// The path to the editrc and its length. +extern const char bc_history_editrc[]; +extern const size_t bc_history_editrc_len; + +#else // BC_ENABLE_EDITLINE + +#if BC_ENABLE_READLINE + +#include <stdio.h> +#include <readline/readline.h> +#include <readline/history.h> + +/** + * The history struct for readline. + */ +typedef struct BcHistory +{ + /// A place to store the current line. + char* line; + + /// Whether the terminal is bad. This is more or less not used. + bool badTerm; + +} BcHistory; + +#else // BC_ENABLE_READLINE + +#if BC_ENABLE_HISTORY + #include <stddef.h> #include <signal.h> @@ -106,7 +185,7 @@ #include <conio.h> #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif // _WIN32 @@ -154,9 +233,12 @@ #define BC_HISTORY_DEBUG_BUF_SIZE (1024) +// clang-format off #define lndebug(...) \ - do { \ - if (bc_history_debug_fp.fd == 0) { \ + do \ + { \ + if (bc_history_debug_fp.fd == 0) \ + { \ bc_history_debug_buf = bc_vm_malloc(BC_HISTORY_DEBUG_BUF_SIZE); \ bc_file_init(&bc_history_debug_fp, \ open("/tmp/lndebug.txt", O_APPEND), \ @@ -169,15 +251,17 @@ } \ bc_file_printf(&bc_history_debug_fp, ", " __VA_ARGS__); \ bc_file_flush(&bc_history_debug_fp); \ - } while (0) + } \ + while (0) #else // BC_DEBUG_CODE #define lndebug(fmt, ...) #endif // BC_DEBUG_CODE +// clang-format on /// An enum of useful actions. To understand what these mean, check terminal /// emulators for their shortcuts or the VT100 codes. -typedef enum BcHistoryAction { - +typedef enum BcHistoryAction +{ BC_ACTION_NULL = 0, BC_ACTION_CTRL_A = 1, BC_ACTION_CTRL_B = 2, @@ -200,7 +284,7 @@ typedef enum BcHistoryAction { BC_ACTION_CTRL_Z = 26, BC_ACTION_ESC = 27, BC_ACTION_CTRL_BSLASH = 28, - BC_ACTION_BACKSPACE = 127 + BC_ACTION_BACKSPACE = 127 } BcHistoryAction; @@ -208,8 +292,8 @@ typedef enum BcHistoryAction { * This represents the state during line editing. We pass this state * to functions implementing specific editing functionalities. */ -typedef struct BcHistory { - +typedef struct BcHistory +{ /// Edited line buffer. BcVec buf; @@ -220,7 +304,7 @@ typedef struct BcHistory { BcVec extras; /// Prompt to display. - const char *prompt; + const char* prompt; /// Prompt length. size_t plen; @@ -273,38 +357,14 @@ typedef struct BcHistory { } BcHistory; /** - * Get a line from stdin using history. This returns a status because I don't - * want to throw errors while the terminal is in raw mode. - * @param h The history data. - * @param vec A vector to put the line into. - * @param prompt The prompt to display, if desired. - * @return A status indicating an error, if any. Returning a status here - * is better because if we throw an error out of history, we - * leave the terminal in raw mode or in some other half-baked - * state. - */ -BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt); - -/** - * Initialize history data. - * @param h The struct to initialize. - */ -void bc_history_init(BcHistory *h); - -/** - * Free history data (and recook the terminal). - * @param h The struct to free. - */ -void bc_history_free(BcHistory *h); - -/** * Frees strings used by history. * @param str The string to free. */ -void bc_history_string_free(void *str); +void +bc_history_string_free(void* str); // A list of terminals that don't work. -extern const char *bc_history_bad_terms[]; +extern const char* bc_history_bad_terms[]; // A tab in history and its length. extern const char bc_history_tab[]; @@ -323,16 +383,53 @@ extern const size_t bc_history_combo_chars_len; // Debug data. extern BcFile bc_history_debug_fp; -extern char *bc_history_debug_buf; +extern char* bc_history_debug_buf; /** * A function to print keycodes for debugging. * @param h The history data. */ -void bc_history_printKeyCodes(BcHistory* h); +void +bc_history_printKeyCodes(BcHistory* h); #endif // BC_DEBUG_CODE #endif // BC_ENABLE_HISTORY +#endif // BC_ENABLE_READLINE + +#endif // BC_ENABLE_EDITLINE + +#if BC_ENABLE_HISTORY + +/** + * Get a line from stdin using history. This returns a status because I don't + * want to throw errors while the terminal is in raw mode. + * @param h The history data. + * @param vec A vector to put the line into. + * @param prompt The prompt to display, if desired. + * @return A status indicating an error, if any. Returning a status here + * is better because if we throw an error out of history, we + * leave the terminal in raw mode or in some other half-baked + * state. + */ +BcStatus +bc_history_line(BcHistory* h, BcVec* vec, const char* prompt); + +/** + * Initialize history data. + * @param h The struct to initialize. + */ +void +bc_history_init(BcHistory* h); + +/** + * Free history data (and recook the terminal). + * @param h The struct to free. + */ +void +bc_history_free(BcHistory* h); + +#endif // BC_ENABLE_HISTORY + #endif // BC_HISTORY_H diff --git a/contrib/bc/include/lang.h b/contrib/bc/include/lang.h index b7d12b53c7f3..6b8ebabf6a95 100644 --- a/contrib/bc/include/lang.h +++ b/contrib/bc/include/lang.h @@ -47,8 +47,8 @@ #include <num.h> /// The instructions for bytecode. -typedef enum BcInst { - +typedef enum BcInst +{ #if BC_ENABLED /// Postfix increment and decrement. Prefix are translated into @@ -329,15 +329,15 @@ typedef enum BcInst { } BcInst; #if BC_C11 -static_assert(BC_INST_INVALID <= UCHAR_MAX, - "Too many instructions to fit into an unsigned char"); +_Static_assert(BC_INST_INVALID <= UCHAR_MAX, + "Too many instructions to fit into an unsigned char"); #endif // BC_C11 /// Used by maps to identify where items are in the array. -typedef struct BcId { - +typedef struct BcId +{ /// The name of the item. - char *name; + char* name; /// The index into the array where the item is. size_t idx; @@ -345,8 +345,8 @@ typedef struct BcId { } BcId; /// The location of a var, array, or array element. -typedef struct BcLoc { - +typedef struct BcLoc +{ /// The index of the var or array. size_t loc; @@ -356,10 +356,10 @@ typedef struct BcLoc { } BcLoc; /// An entry for a constant. -typedef struct BcConst { - +typedef struct BcConst +{ /// The original string as parsed from the source code. - char *val; + char* val; /// The last base that the constant was parsed in. BcBigDig base; @@ -372,8 +372,8 @@ typedef struct BcConst { /// A function. This is also used in dc, not just bc. The reason is that strings /// are executed in dc, and they are converted to functions in order to be /// executed. -typedef struct BcFunc { - +typedef struct BcFunc +{ /// The bytecode instructions. BcVec code; @@ -399,7 +399,7 @@ typedef struct BcFunc { BcVec consts; /// The function's name. - const char *name; + const char* name; #if BC_ENABLED /// True if the function is a void function. @@ -409,8 +409,8 @@ typedef struct BcFunc { } BcFunc; /// Types of results that can be pushed onto the results stack. -typedef enum BcResultType { - +typedef enum BcResultType +{ /// Result is a variable. BC_RESULT_VAR, @@ -464,8 +464,8 @@ typedef enum BcResultType { } BcResultType; /// A union to store data for various result types. -typedef union BcResultData { - +typedef union BcResultData +{ /// A number. Strings are stored here too; they are numbers with /// cap == 0 && num == NULL. The string's index into the strings vector is /// stored in the scale field. But this is only used for strings stored in @@ -482,8 +482,8 @@ typedef union BcResultData { } BcResultData; /// A tagged union for results. -typedef struct BcResult { - +typedef struct BcResult +{ /// The tag. The type of the result. BcResultType t; @@ -494,8 +494,8 @@ typedef struct BcResult { /// An instruction pointer. This is how bc knows where in the bytecode vector, /// and which function, the current execution is. -typedef struct BcInstPtr { - +typedef struct BcInstPtr +{ /// The index of the currently executing function in the fns vector. size_t func; @@ -510,8 +510,8 @@ typedef struct BcInstPtr { } BcInstPtr; /// Types of identifiers. -typedef enum BcType { - +typedef enum BcType +{ /// Variable. BC_TYPE_VAR, @@ -529,8 +529,8 @@ typedef enum BcType { #if BC_ENABLED /// An auto variable in bc. -typedef struct BcAuto { - +typedef struct BcAuto +{ /// The index of the variable in the vars or arrs vectors. size_t idx; @@ -549,7 +549,8 @@ struct BcProgram; * @param name The name of the function. The string is assumed to be owned by * some other entity. */ -void bc_func_init(BcFunc *f, const char* name); +void +bc_func_init(BcFunc* f, const char* name); /** * Inserts an auto into the function. @@ -560,15 +561,17 @@ void bc_func_init(BcFunc *f, const char* name); * @param line The line in the source code where the insert happened. This is * solely for error reporting. */ -void bc_func_insert(BcFunc *f, struct BcProgram* p, char* name, - BcType type, size_t line); +void +bc_func_insert(BcFunc* f, struct BcProgram* p, char* name, BcType type, + size_t line); /** * Resets a function in preparation for it to be reused. This can happen in bc * because it is a dynamic language and functions can be redefined. * @param f The functio to reset. */ -void bc_func_reset(BcFunc *f); +void +bc_func_reset(BcFunc* f); #ifndef NDEBUG /** @@ -577,7 +580,8 @@ void bc_func_reset(BcFunc *f); * check for memory leaks. * @param func The function to free as a void pointer. */ -void bc_func_free(void *func); +void +bc_func_free(void* func); #endif // NDEBUG /** @@ -591,7 +595,8 @@ void bc_func_free(void *func); * @param nums True if the array should be for numbers, false if it should be * for vectors. */ -void bc_array_init(BcVec *a, bool nums); +void +bc_array_init(BcVec* a, bool nums); /** * Copies an array to another array. This is used to do pass arrays to functions @@ -600,19 +605,22 @@ void bc_array_init(BcVec *a, bool nums); * @param d The destination array. * @param s The source array. */ -void bc_array_copy(BcVec *d, const BcVec *s); +void +bc_array_copy(BcVec* d, const BcVec* s); /** * Frees a string stored in a function. This is a destructor. * @param string The string to free as a void pointer. */ -void bc_string_free(void *string); +void +bc_string_free(void* string); /** * Frees a constant stored in a function. This is a destructor. * @param constant The constant to free as a void pointer. */ -void bc_const_free(void *constant); +void +bc_const_free(void* constant); /** * Clears a result. It sets the type to BC_RESULT_TEMP and clears the union by @@ -620,7 +628,8 @@ void bc_const_free(void *constant); * uninitialized data. * @param r The result to clear. */ -void bc_result_clear(BcResult *r); +void +bc_result_clear(BcResult* r); /** * Copies a result into another. This is done for things like duplicating the @@ -629,13 +638,15 @@ void bc_result_clear(BcResult *r); * @param d The destination result. * @param src The source result. */ -void bc_result_copy(BcResult *d, BcResult *src); +void +bc_result_copy(BcResult* d, BcResult* src); /** * Frees a result. This is a destructor. * @param result The result to free as a void pointer. */ -void bc_result_free(void *result); +void +bc_result_free(void* result); /** * Expands an array to @a len. This can happen because in bc, you do not have to @@ -646,7 +657,8 @@ void bc_result_free(void *result); * @param a The array to expand. * @param len The length to expand to. */ -void bc_array_expand(BcVec *a, size_t len); +void +bc_array_expand(BcVec* a, size_t len); /** * Compare two BcId's and return the result. Since they are just comparing the @@ -656,7 +668,8 @@ void bc_array_expand(BcVec *a, size_t len); * @param e2 The second id. * @return The result of strcmp() on the BcId's names. */ -int bc_id_cmp(const BcId *e1, const BcId *e2); +int +bc_id_cmp(const BcId* e1, const BcId* e2); #if BC_ENABLED diff --git a/contrib/bc/include/lex.h b/contrib/bc/include/lex.h index 129b9940618f..20be6efa9cde 100644 --- a/contrib/bc/include/lex.h +++ b/contrib/bc/include/lex.h @@ -84,8 +84,8 @@ ((c) == '.' && !(pt) && !(int_only))) /// An enum of lex token types. -typedef enum BcLexType { - +typedef enum BcLexType +{ /// End of file. BC_LEX_EOF, @@ -462,10 +462,10 @@ struct BcLex; typedef void (*BcLexNext)(struct BcLex* l); /// The lexer. -typedef struct BcLex { - +typedef struct BcLex +{ /// A pointer to the text to lex. - const char *buf; + const char* buf; /// The current index into buf. size_t i; @@ -502,7 +502,8 @@ typedef struct BcLex { * Initializes a lexer. * @param l The lexer to initialize. */ -void bc_lex_init(BcLex *l); +void +bc_lex_init(BcLex* l); /** * Frees a lexer. This is not guarded by #ifndef NDEBUG because a separate @@ -510,14 +511,16 @@ void bc_lex_init(BcLex *l); * that parser needs a lexer. * @param l The lexer to free. */ -void bc_lex_free(BcLex *l); +void +bc_lex_free(BcLex* l); /** * Sets the filename that the lexer will be lexing. * @param l The lexer. * @param file The filename that the lexer will lex. */ -void bc_lex_file(BcLex *l, const char *file); +void +bc_lex_file(BcLex* l, const char* file); /** * Sets the text the lexer will lex. @@ -527,32 +530,37 @@ void bc_lex_file(BcLex *l, const char *file); * @param is_exprs True if the text is from command-line expressions, false * otherwise. */ -void bc_lex_text(BcLex *l, const char *text, bool is_stdin, bool is_exprs); +void +bc_lex_text(BcLex* l, const char* text, bool is_stdin, bool is_exprs); /** * Generic next function for the parser to call. It takes care of calling the * correct @a BcLexNext function and consuming whitespace. * @param l The lexer. */ -void bc_lex_next(BcLex *l); +void +bc_lex_next(BcLex* l); /** * Lexes a line comment (one beginning with '#' and going to a newline). * @param l The lexer. */ -void bc_lex_lineComment(BcLex *l); +void +bc_lex_lineComment(BcLex* l); /** * Lexes a general comment (C-style comment). * @param l The lexer. */ -void bc_lex_comment(BcLex *l); +void +bc_lex_comment(BcLex* l); /** * Lexes whitespace, finding as much as possible. * @param l The lexer. */ -void bc_lex_whitespace(BcLex *l); +void +bc_lex_whitespace(BcLex* l); /** * Lexes a number that begins with char @a start. This takes care of parsing @@ -562,32 +570,37 @@ void bc_lex_whitespace(BcLex *l); * this function, the lexer had to eat the first char. It fixes * that by passing it in. */ -void bc_lex_number(BcLex *l, char start); +void +bc_lex_number(BcLex* l, char start); /** * Lexes a name/identifier. * @param l The lexer. */ -void bc_lex_name(BcLex *l); +void +bc_lex_name(BcLex* l); /** * Lexes common whitespace characters. * @param l The lexer. * @param c The character to lex. */ -void bc_lex_commonTokens(BcLex *l, char c); +void +bc_lex_commonTokens(BcLex* l, char c); /** * Throws a parse error because char @a c was invalid. * @param l The lexer. * @param c The problem character. */ -void bc_lex_invalidChar(BcLex *l, char c); +void +bc_lex_invalidChar(BcLex* l, char c); /** * Reads a line from stdin and puts it into the lexer's buffer. * @param l The lexer. */ -bool bc_lex_readLine(BcLex *l); +bool +bc_lex_readLine(BcLex* l); #endif // BC_LEX_H diff --git a/contrib/bc/include/library.h b/contrib/bc/include/library.h index 8a055eb81063..63d24ee5f7a9 100644 --- a/contrib/bc/include/library.h +++ b/contrib/bc/include/library.h @@ -46,12 +46,14 @@ * @param l The label to jump to on error. */ #define BC_FUNC_HEADER_LOCK(l) \ - do { \ + do \ + { \ BC_SIG_LOCK; \ BC_SETJMP_LOCKED(l); \ vm.err = BCL_ERROR_NONE; \ vm.running = 1; \ - } while (0) + } \ + while (0) /** * A footer to unlock and stop the jumping if an error happened. It also sets @@ -59,25 +61,29 @@ * @param e The error variable to set. */ #define BC_FUNC_FOOTER_UNLOCK(e) \ - do { \ + do \ + { \ BC_SIG_ASSERT_LOCKED; \ e = vm.err; \ vm.running = 0; \ BC_UNSETJMP; \ BC_LONGJMP_STOP; \ vm.sig_lock = 0; \ - } while (0) + } \ + while (0) /** * A header that sets a jump and sets running. * @param l The label to jump to on error. */ #define BC_FUNC_HEADER(l) \ - do { \ + do \ + { \ BC_SETJMP(l); \ vm.err = BCL_ERROR_NONE; \ vm.running = 1; \ - } while (0) + } \ + while (0) /** * A header that assumes that signals are already locked. It sets a jump and @@ -85,23 +91,27 @@ * @param l The label to jump to on error. */ #define BC_FUNC_HEADER_INIT(l) \ - do { \ + do \ + { \ BC_SETJMP_LOCKED(l); \ vm.err = BCL_ERROR_NONE; \ vm.running = 1; \ - } while (0) + } \ + while (0) /** * A footer for functions that do not return an error code. It clears running * and unlocks the signals. It also stops the jumping. */ #define BC_FUNC_FOOTER_NO_ERR \ - do { \ + do \ + { \ vm.running = 0; \ BC_UNSETJMP; \ BC_LONGJMP_STOP; \ vm.sig_lock = 0; \ - } while (0) + } \ + while (0) /** * A footer for functions that *do* return an error code. It clears running and @@ -109,10 +119,12 @@ * @param e The error variable to set. */ #define BC_FUNC_FOOTER(e) \ - do { \ + do \ + { \ e = vm.err; \ BC_FUNC_FOOTER_NO_ERR; \ - } while (0) + } \ + while (0) /** * A footer that sets up n based the value of e and sets up the return value in @@ -123,13 +135,16 @@ * @param idx The idx to set as the return value. */ #define BC_MAYBE_SETUP(c, e, n, idx) \ - do { \ - if (BC_ERR((e) != BCL_ERROR_NONE)) { \ + do \ + { \ + if (BC_ERR((e) != BCL_ERROR_NONE)) \ + { \ if ((n).num != NULL) bc_num_free(&(n)); \ idx.i = 0 - (size_t) (e); \ } \ else idx = bcl_num_insert(c, &(n)); \ - } while (0) + } \ + while (0) /** * A header to check the context and return an error encoded in a number if it @@ -137,37 +152,44 @@ * @param c The context. */ #define BC_CHECK_CTXT(c) \ - do { \ + do \ + { \ c = bcl_context(); \ - if (BC_ERR(c == NULL)) { \ + if (BC_ERR(c == NULL)) \ + { \ BclNumber n_num; \ n_num.i = 0 - (size_t) BCL_ERROR_INVALID_CONTEXT; \ return n_num; \ } \ - } while (0) - + } \ + while (0) /** * A header to check the context and return an error directly if it is bad. * @param c The context. */ #define BC_CHECK_CTXT_ERR(c) \ - do { \ + do \ + { \ c = bcl_context(); \ - if (BC_ERR(c == NULL)) { \ + if (BC_ERR(c == NULL)) \ + { \ return BCL_ERROR_INVALID_CONTEXT; \ } \ - } while (0) + } \ + while (0) /** * A header to check the context and abort if it is bad. * @param c The context. */ #define BC_CHECK_CTXT_ASSERT(c) \ - do { \ + do \ + { \ c = bcl_context(); \ assert(c != NULL); \ - } while (0) + } \ + while (0) /** * A header to check the number in the context and return an error encoded as a @@ -176,16 +198,22 @@ * @param n The BclNumber. */ #define BC_CHECK_NUM(c, n) \ - do { \ - if (BC_ERR((n).i >= (c)->nums.len)) { \ + do \ + { \ + if (BC_ERR((n).i >= (c)->nums.len)) \ + { \ if ((n).i > 0 - (size_t) BCL_ERROR_NELEMS) return (n); \ - else { \ + else \ + { \ BclNumber n_num; \ n_num.i = 0 - (size_t) BCL_ERROR_INVALID_NUM; \ return n_num; \ } \ } \ - } while (0) + } \ + while (0) + +//clang-format off /** * A header to check the number in the context and return an error directly if @@ -194,13 +222,20 @@ * @param n The BclNumber. */ #define BC_CHECK_NUM_ERR(c, n) \ - do { \ - if (BC_ERR((n).i >= (c)->nums.len)) { \ + do \ + { \ + if (BC_ERR((n).i >= (c)->nums.len)) \ + { \ if ((n).i > 0 - (size_t) BCL_ERROR_NELEMS) \ + { \ return (BclError) (0 - (n).i); \ + } \ else return BCL_ERROR_INVALID_NUM; \ } \ - } while (0) + } \ + while (0) + +//clang-format on /** * Turns a BclNumber into a BcNum. @@ -213,11 +248,12 @@ * Frees a BcNum for bcl. This is a destructor. * @param num The BcNum to free, as a void pointer. */ -void bcl_num_destruct(void *num); +void +bcl_num_destruct(void* num); /// The actual context struct. -typedef struct BclCtxt { - +typedef struct BclCtxt +{ /// The context's scale. size_t scale; diff --git a/contrib/bc/include/num.h b/contrib/bc/include/num.h index bfd360b520f3..4a4dc5bc54fa 100644 --- a/contrib/bc/include/num.h +++ b/contrib/bc/include/num.h @@ -106,12 +106,12 @@ typedef int_least16_t BcDig; #define BC_NUM_DEF_SIZE (8) /// The actual number struct. This is where the magic happens. -typedef struct BcNum { - +typedef struct BcNum +{ /// The limb array. It is restrict because *no* other item should own the /// array. For more information, see the development manual /// (manuals/development.md#numbers). - BcDig *restrict num; + BcDig* restrict num; /// The number of limbs before the decimal (radix) point. This also stores /// the negative bit in the least significant bit since it uses at least two @@ -259,8 +259,7 @@ struct BcRNG; * @param v The value to set the rdx to. * @param neg The value to set the negative bit to. */ -#define BC_NUM_RDX_SET_NEG(n, v, neg) \ - ((n)->rdx = (((v) << 1) | (neg))) +#define BC_NUM_RDX_SET_NEG(n, v, neg) ((n)->rdx = (((v) << 1) | (neg))) /** * Returns true if the rdx and scale for @a n match. @@ -350,11 +349,11 @@ struct BcRNG; // These are for debugging only. #if BC_DEBUG_CODE -#define BC_NUM_PRINT(x) fprintf(stderr, "%s = %lu\n", #x, (unsigned long)(x)) +#define BC_NUM_PRINT(x) fprintf(stderr, "%s = %lu\n", #x, (unsigned long) (x)) #define DUMP_NUM bc_num_dump #else // BC_DEBUG_CODE #undef DUMP_NUM -#define DUMP_NUM(x,y) +#define DUMP_NUM(x, y) #define BC_NUM_PRINT(x) #endif // BC_DEBUG_CODE @@ -419,7 +418,8 @@ typedef void (*BcNumShiftAddOp)(BcDig* restrict a, const BcDig* restrict b, * @param n The number to initialize. * @param req The number of limbs @a n must have in its limb array. */ -void bc_num_init(BcNum *restrict n, size_t req); +void +bc_num_init(BcNum* restrict n, size_t req); /** * Initializes (sets up) @a n with the preallocated limb array @a num that has @@ -429,7 +429,8 @@ void bc_num_init(BcNum *restrict n, size_t req); * @param num The preallocated limb array. * @param cap The capacity of @a num. */ -void bc_num_setup(BcNum *restrict n, BcDig *restrict num, size_t cap); +void +bc_num_setup(BcNum* restrict n, BcDig* restrict num, size_t cap); /** * Copies @a s into @a d. This does a deep copy and requires that @a d is @@ -437,7 +438,8 @@ void bc_num_setup(BcNum *restrict n, BcDig *restrict num, size_t cap); * @param d The destination BcNum. * @param s The source BcNum. */ -void bc_num_copy(BcNum *d, const BcNum *s); +void +bc_num_copy(BcNum* d, const BcNum* s); /** * Creates @a d and copies @a s into @a d. This does a deep copy and requires @@ -445,7 +447,8 @@ void bc_num_copy(BcNum *d, const BcNum *s); * @param d The destination BcNum. * @param s The source BcNum. */ -void bc_num_createCopy(BcNum *d, const BcNum *s); +void +bc_num_createCopy(BcNum* d, const BcNum* s); /** * Creates (initializes) @a n and sets its value to the equivalent of @a val. @@ -453,27 +456,31 @@ void bc_num_createCopy(BcNum *d, const BcNum *s); * @param n The number to initialize and set. * @param val The value to set @a n's value to. */ -void bc_num_createFromBigdig(BcNum *restrict n, BcBigDig val); +void +bc_num_createFromBigdig(BcNum* restrict n, BcBigDig val); /** * Makes @a n valid for holding strings. @a n must *not* be allocated; this * simply clears some fields, including setting the num field to NULL. * @param n The number to clear. */ -void bc_num_clear(BcNum *restrict n); +void +bc_num_clear(BcNum* restrict n); /** * Frees @a num, which is a BcNum as a void pointer. This is a destructor. * @param num The BcNum to free as a void pointer. */ -void bc_num_free(void *num); +void +bc_num_free(void* num); /** * Returns the scale of @a n. * @param n The number. * @return The scale of @a n. */ -size_t bc_num_scale(const BcNum *restrict n); +size_t +bc_num_scale(const BcNum* restrict n); /** * Returns the length (in decimal digits) of @a n. This is complicated. First, @@ -483,7 +490,8 @@ size_t bc_num_scale(const BcNum *restrict n); * @param n The number. * @return The length of @a n. */ -size_t bc_num_len(const BcNum *restrict n); +size_t +bc_num_len(const BcNum* restrict n); /** * Convert a number to a BcBigDig (hardware integer). This version does error @@ -492,7 +500,8 @@ size_t bc_num_len(const BcNum *restrict n); * @param n The number to convert. * @return The number as a hardware integer. */ -BcBigDig bc_num_bigdig(const BcNum *restrict n); +BcBigDig +bc_num_bigdig(const BcNum* restrict n); /** * Convert a number to a BcBigDig (hardware integer). This version does no error @@ -500,7 +509,8 @@ BcBigDig bc_num_bigdig(const BcNum *restrict n); * @param n The number to convert. * @return The number as a hardware integer. */ -BcBigDig bc_num_bigdig2(const BcNum *restrict n); +BcBigDig +bc_num_bigdig2(const BcNum* restrict n); /** * Sets @a n to the value of @a val. @a n is expected to be a valid and @@ -508,7 +518,8 @@ BcBigDig bc_num_bigdig2(const BcNum *restrict n); * @param n The number to set. * @param val The value to set the number to. */ -void bc_num_bigdig2num(BcNum *restrict n, BcBigDig val); +void +bc_num_bigdig2num(BcNum* restrict n, BcBigDig val); #if BC_ENABLE_EXTRA_MATH @@ -519,22 +530,24 @@ void bc_num_bigdig2num(BcNum *restrict n, BcBigDig val); * @param b The return value. * @param rng The pseudo-random number generator. */ -void bc_num_irand(BcNum *restrict a, BcNum *restrict b, - struct BcRNG *restrict rng); +void +bc_num_irand(BcNum* restrict a, BcNum* restrict b, struct BcRNG* restrict rng); /** * Sets the seed for the PRNG @a rng from @a n. * @param n The new seed for the PRNG. * @param rng The PRNG to set the seed for. */ -void bc_num_rng(const BcNum *restrict n, struct BcRNG *rng); +void +bc_num_rng(const BcNum* restrict n, struct BcRNG* rng); /** * Sets @a n to the value produced by the PRNG. This implements rand(). * @param n The number to set. * @param rng The pseudo-random number generator. */ -void bc_num_createFromRNG(BcNum *restrict n, struct BcRNG *rng); +void +bc_num_createFromRNG(BcNum* restrict n, struct BcRNG* rng); #endif // BC_ENABLE_EXTRA_MATH @@ -545,7 +558,8 @@ void bc_num_createFromRNG(BcNum *restrict n, struct BcRNG *rng); * @param c The return value. * @param scale The current scale. */ -void bc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_add(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The subtract function. This is a BcNumBinaryOp function. @@ -554,7 +568,8 @@ void bc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_sub(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_sub(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The multiply function. @@ -563,7 +578,8 @@ void bc_num_sub(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_mul(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_mul(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The division function. @@ -572,7 +588,8 @@ void bc_num_mul(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_div(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_div(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The modulus function. @@ -581,7 +598,8 @@ void bc_num_div(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_mod(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_mod(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The power function. @@ -590,7 +608,8 @@ void bc_num_mod(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_pow(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_pow(BcNum* a, BcNum* b, BcNum* c, size_t scale); #if BC_ENABLE_EXTRA_MATH /** @@ -600,7 +619,8 @@ void bc_num_pow(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_places(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_places(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The left shift function (<< operator). This is a BcNumBinaryOp function. @@ -609,7 +629,8 @@ void bc_num_places(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_lshift(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_lshift(BcNum* a, BcNum* b, BcNum* c, size_t scale); /** * The right shift function (>> operator). This is a BcNumBinaryOp function. @@ -618,7 +639,8 @@ void bc_num_lshift(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param c The return value. * @param scale The current scale. */ -void bc_num_rshift(BcNum *a, BcNum *b, BcNum *c, size_t scale); +void +bc_num_rshift(BcNum* a, BcNum* b, BcNum* c, size_t scale); #endif // BC_ENABLE_EXTRA_MATH @@ -628,7 +650,8 @@ void bc_num_rshift(BcNum *a, BcNum *b, BcNum *c, size_t scale); * @param b The return value. * @param scale The current scale. */ -void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale); +void +bc_num_sqrt(BcNum* restrict a, BcNum* restrict b, size_t scale); /** * Divsion and modulus together. This is a dc extension. @@ -638,7 +661,8 @@ void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale); * @param d The second return value (modulus). * @param scale The current scale. */ -void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale); +void +bc_num_divmod(BcNum* a, BcNum* b, BcNum* c, BcNum* d, size_t scale); /** * A function returning the required allocation size for an addition or a @@ -649,7 +673,8 @@ void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale); * @return The size of allocation needed for the result of add or subtract * with @a a, @a b, and @a scale. */ -size_t bc_num_addReq(const BcNum* a, const BcNum* b, size_t scale); +size_t +bc_num_addReq(const BcNum* a, const BcNum* b, size_t scale); /** * A function returning the required allocation size for a multiplication. This @@ -660,7 +685,8 @@ size_t bc_num_addReq(const BcNum* a, const BcNum* b, size_t scale); * @return The size of allocation needed for the result of multiplication * with @a a, @a b, and @a scale. */ -size_t bc_num_mulReq(const BcNum *a, const BcNum *b, size_t scale); +size_t +bc_num_mulReq(const BcNum* a, const BcNum* b, size_t scale); /** * A function returning the required allocation size for a division or modulus. @@ -671,7 +697,8 @@ size_t bc_num_mulReq(const BcNum *a, const BcNum *b, size_t scale); * @return The size of allocation needed for the result of division or * modulus with @a a, @a b, and @a scale. */ -size_t bc_num_divReq(const BcNum *a, const BcNum *b, size_t scale); +size_t +bc_num_divReq(const BcNum* a, const BcNum* b, size_t scale); /** * A function returning the required allocation size for an exponentiation. This @@ -682,7 +709,8 @@ size_t bc_num_divReq(const BcNum *a, const BcNum *b, size_t scale); * @return The size of allocation needed for the result of exponentiation * with @a a, @a b, and @a scale. */ -size_t bc_num_powReq(const BcNum *a, const BcNum *b, size_t scale); +size_t +bc_num_powReq(const BcNum* a, const BcNum* b, size_t scale); #if BC_ENABLE_EXTRA_MATH @@ -695,7 +723,8 @@ size_t bc_num_powReq(const BcNum *a, const BcNum *b, size_t scale); * @return The size of allocation needed for the result of places, left * shift, or right shift with @a a, @a b, and @a scale. */ -size_t bc_num_placesReq(const BcNum *a, const BcNum *b, size_t scale); +size_t +bc_num_placesReq(const BcNum* a, const BcNum* b, size_t scale); #endif // BC_ENABLE_EXTRA_MATH @@ -705,7 +734,8 @@ size_t bc_num_placesReq(const BcNum *a, const BcNum *b, size_t scale); * @param n The number to truncate. * @param places The number of places to truncate @a n by. */ -void bc_num_truncate(BcNum *restrict n, size_t places); +void +bc_num_truncate(BcNum* restrict n, size_t places); /** * Extend @a n *by* @a places decimal places. This only extends places *after* @@ -713,7 +743,8 @@ void bc_num_truncate(BcNum *restrict n, size_t places); * @param n The number to truncate. * @param places The number of places to extend @a n by. */ -void bc_num_extend(BcNum *restrict n, size_t places); +void +bc_num_extend(BcNum* restrict n, size_t places); /** * Shifts @a n right by @a places decimal places. This is the workhorse of the @@ -722,7 +753,8 @@ void bc_num_extend(BcNum *restrict n, size_t places); * @param n The number to shift right. * @param places The number of decimal places to shift @a n right by. */ -void bc_num_shiftRight(BcNum *restrict n, size_t places); +void +bc_num_shiftRight(BcNum* restrict n, size_t places); /** * Compare a and b and return the result of their comparison as an ssize_t. @@ -732,7 +764,8 @@ void bc_num_shiftRight(BcNum *restrict n, size_t places); * @param b The second number. * @return The result of the comparison. */ -ssize_t bc_num_cmp(const BcNum *a, const BcNum *b); +ssize_t +bc_num_cmp(const BcNum* a, const BcNum* b); /** * Modular exponentiation. @@ -741,28 +774,30 @@ ssize_t bc_num_cmp(const BcNum *a, const BcNum *b); * @param c The third parameter. * @param d The return value. */ -void bc_num_modexp(BcNum *a, BcNum *b, BcNum *c, BcNum *restrict d); +void +bc_num_modexp(BcNum* a, BcNum* b, BcNum* c, BcNum* restrict d); /** * Sets @a n to zero with a scale of zero. * @param n The number to zero. */ -void bc_num_zero(BcNum *restrict n); +void +bc_num_zero(BcNum* restrict n); /** * Sets @a n to one with a scale of zero. * @param n The number to set to one. */ -void bc_num_one(BcNum *restrict n); +void +bc_num_one(BcNum* restrict n); /** * An efficient function to compare @a n to zero. * @param n The number to compare to zero. * @return The result of the comparison. */ -ssize_t bc_num_cmpZero(const BcNum *n); - -#if !defined(NDEBUG) || BC_ENABLE_LIBRARY +ssize_t +bc_num_cmpZero(const BcNum* n); /** * Check a number string for validity and return true if it is, false otherwise. @@ -772,9 +807,8 @@ ssize_t bc_num_cmpZero(const BcNum *n); * @param val The string to check. * @return True if the string is a valid number, false otherwise. */ -bool bc_num_strValid(const char *restrict val); - -#endif // !defined(NDEBUG) || BC_ENABLE_LIBRARY +bool +bc_num_strValid(const char* restrict val); /** * Parses a number string into the number @a n according to @a base. @@ -782,7 +816,8 @@ bool bc_num_strValid(const char *restrict val); * @param val The number string to parse. * @param base The base to parse the number string by. */ -void bc_num_parse(BcNum *restrict n, const char *restrict val, BcBigDig base); +void +bc_num_parse(BcNum* restrict n, const char* restrict val, BcBigDig base); /** * Prints the number @a n according to @a base. @@ -791,7 +826,8 @@ void bc_num_parse(BcNum *restrict n, const char *restrict val, BcBigDig base); * @param newline True if a newline should be inserted at the end, false * otherwise. */ -void bc_num_print(BcNum *restrict n, BcBigDig base, bool newline); +void +bc_num_print(BcNum* restrict n, BcBigDig base, bool newline); #if !BC_ENABLE_LIBRARY @@ -799,7 +835,8 @@ void bc_num_print(BcNum *restrict n, BcBigDig base, bool newline); * Prints a number as a character stream. * @param n The number to print as a character stream. */ -void bc_num_stream(BcNum *restrict n); +void +bc_num_stream(BcNum* restrict n); #endif // !BC_ENABLE_LIBRARY @@ -811,7 +848,8 @@ void bc_num_stream(BcNum *restrict n); * @param name The label to print the number with. * @param emptyline True if there should be an empty line after the number. */ -void bc_num_printDebug(const BcNum *n, const char *name, bool emptyline); +void +bc_num_printDebug(const BcNum* n, const char* name, bool emptyline); /** * Print the limbs of @a n. This is a debug-only function. @@ -819,7 +857,8 @@ void bc_num_printDebug(const BcNum *n, const char *name, bool emptyline); * @param len The length of the number. * @param emptyline True if there should be an empty line after the number. */ -void bc_num_printDigs(const BcDig* n, size_t len, bool emptyline); +void +bc_num_printDigs(const BcDig* n, size_t len, bool emptyline); /** * Print debug info about @a n along with its limbs. @@ -827,14 +866,16 @@ void bc_num_printDigs(const BcDig* n, size_t len, bool emptyline); * @param name The label to print the number with. * @param emptyline True if there should be an empty line after the number. */ -void bc_num_printWithDigs(const BcNum *n, const char *name, bool emptyline); +void +bc_num_printWithDigs(const BcNum* n, const char* name, bool emptyline); /** * Dump debug info about a BcNum variable. * @param varname The variable name. * @param n The number. */ -void bc_num_dump(const char *varname, const BcNum *n); +void +bc_num_dump(const char* varname, const BcNum* n); #endif // BC_DEBUG_CODE @@ -842,7 +883,7 @@ void bc_num_dump(const char *varname, const BcNum *n); extern const char bc_num_hex_digits[]; /// An array of powers of 10 for easy conversion from number of digits to -//powers. +/// powers. extern const BcBigDig bc_num_pow10[BC_BASE_DIGS + 1]; /// A reference to a constant array that is the max of a BigDig. diff --git a/contrib/bc/include/opt.h b/contrib/bc/include/opt.h index cffe63682236..3c465c80fbf6 100644 --- a/contrib/bc/include/opt.h +++ b/contrib/bc/include/opt.h @@ -44,10 +44,10 @@ #include <stdlib.h> /// The data required to parse command-line arguments. -typedef struct BcOpt { - +typedef struct BcOpt +{ /// The array of arguments. - char **argv; + char** argv; /// The index of the current argument. size_t optind; @@ -59,13 +59,13 @@ typedef struct BcOpt { int subopt; /// The option argument. - char *optarg; + char* optarg; } BcOpt; /// The types of arguments. This is specially adapted for bc. -typedef enum BcOptType { - +typedef enum BcOptType +{ /// No argument required. BC_OPT_NONE, @@ -84,10 +84,10 @@ typedef enum BcOptType { } BcOptType; /// A struct to hold const data for long options. -typedef struct BcOptLong { - +typedef struct BcOptLong +{ /// The name of the option. - const char *name; + const char* name; /// The type of the option. BcOptType type; @@ -102,7 +102,8 @@ typedef struct BcOptLong { * @param o The option data to initialize. * @param argv The array of arguments. */ -void bc_opt_init(BcOpt *o, char **argv); +void +bc_opt_init(BcOpt* o, char** argv); /** * Parse an option. This returns a value the same way getopt() and getopt_long() @@ -111,7 +112,8 @@ void bc_opt_init(BcOpt *o, char **argv); * @param longopts The long options. * @return A character for the parsed option, or -1 if done. */ -int bc_opt_parse(BcOpt *o, const BcOptLong *longopts); +int +bc_opt_parse(BcOpt* o, const BcOptLong* longopts); /** * Returns true if the option is `--` and not a long option. diff --git a/contrib/bc/include/parse.h b/contrib/bc/include/parse.h index 35ca1652fc98..e692462395ca 100644 --- a/contrib/bc/include/parse.h +++ b/contrib/bc/include/parse.h @@ -53,23 +53,24 @@ /// loops, while loops, and if statements. This is because POSIX requires that /// certain operators are *only* used in those cases. It's whacked, but that's /// how it is. -#define BC_PARSE_REL (UINTMAX_C(1)<<0) +#define BC_PARSE_REL (UINTMAX_C(1) << 0) /// A flag that requires that the expression is valid for a print statement. -#define BC_PARSE_PRINT (UINTMAX_C(1)<<1) +#define BC_PARSE_PRINT (UINTMAX_C(1) << 1) /// A flag that requires that the expression does *not* have any function call. -#define BC_PARSE_NOCALL (UINTMAX_C(1)<<2) +#define BC_PARSE_NOCALL (UINTMAX_C(1) << 2) -/// A flag that requires that the expression does *not* have a read() expression. -#define BC_PARSE_NOREAD (UINTMAX_C(1)<<3) +/// A flag that requires that the expression does *not* have a read() +/// expression. +#define BC_PARSE_NOREAD (UINTMAX_C(1) << 3) /// A flag that *allows* (rather than requires) that an array appear in the /// expression. This is mostly used as parameters in bc. -#define BC_PARSE_ARRAY (UINTMAX_C(1)<<4) +#define BC_PARSE_ARRAY (UINTMAX_C(1) << 4) /// A flag that requires that the expression is not empty and returns a value. -#define BC_PARSE_NEEDVAL (UINTMAX_C(1)<<5) +#define BC_PARSE_NEEDVAL (UINTMAX_C(1) << 5) /** * Returns true if the parser has been initialized. @@ -154,8 +155,8 @@ typedef void (*BcParseParse)(struct BcParse* p); typedef void (*BcParseExpr)(struct BcParse* p, uint8_t flags); /// The parser struct. -typedef struct BcParse { - +typedef struct BcParse +{ /// The lexer. BcLex l; @@ -191,11 +192,11 @@ typedef struct BcParse { #endif // BC_ENABLED /// A reference to the program to grab the current function when necessary. - struct BcProgram *prog; + struct BcProgram* prog; /// A reference to the current function. The function is what holds the /// bytecode vector that the parser is filling. - BcFunc *func; + BcFunc* func; /// The index of the function. size_t fidx; @@ -214,40 +215,46 @@ typedef struct BcParse { * @param prog A referenc to the program. * @param func The index of the current function. */ -void bc_parse_init(BcParse *p, struct BcProgram *prog, size_t func); +void +bc_parse_init(BcParse* p, struct BcProgram* prog, size_t func); /** * Frees a parser. This is not guarded by #ifndef NDEBUG because a separate * parser is created at runtime to parse read() expressions and dc strings. * @param p The parser to free. */ -void bc_parse_free(BcParse *p); +void +bc_parse_free(BcParse* p); /** * Resets the parser. Resetting means erasing all state to the point that the * parser would think it was just initialized. * @param p The parser to reset. */ -void bc_parse_reset(BcParse *p); +void +bc_parse_reset(BcParse* p); /** * Adds a string. See @a BcProgram in include/program.h for more details. * @param p The parser that parsed the string. */ -void bc_parse_addString(BcParse *p); +void +bc_parse_addString(BcParse* p); /** * Adds a number. See @a BcProgram in include/program.h for more details. * @param p The parser that parsed the number. */ -void bc_parse_number(BcParse *p); +void +bc_parse_number(BcParse* p); /** * Update the current function in the parser. * @param p The parser. * @param fidx The index of the new function. */ -void bc_parse_updateFunc(BcParse *p, size_t fidx); +void +bc_parse_updateFunc(BcParse* p, size_t fidx); /** * Adds a new variable or array. See @a BcProgram in include/program.h for more @@ -256,7 +263,8 @@ void bc_parse_updateFunc(BcParse *p, size_t fidx); * @param name The name of the variable or array to add. * @param var True if the name is for a variable, false if it's for an array. */ -void bc_parse_pushName(const BcParse* p, char *name, bool var); +void +bc_parse_pushName(const BcParse* p, char* name, bool var); /** * Sets the text that the parser will parse. @@ -266,7 +274,8 @@ void bc_parse_pushName(const BcParse* p, char *name, bool var); * @param is_exprs True if the text is from command-line expressions, false * otherwise. */ -void bc_parse_text(BcParse *p, const char *text, bool is_stdin, bool is_exprs); +void +bc_parse_text(BcParse* p, const char* text, bool is_stdin, bool is_exprs); // References to const 0 and 1 strings for special cases. bc and dc have // specific instructions for 0 and 1 because they pop up so often and (in the diff --git a/contrib/bc/include/program.h b/contrib/bc/include/program.h index 3f90f2b9f552..1a87aa612c90 100644 --- a/contrib/bc/include/program.h +++ b/contrib/bc/include/program.h @@ -64,8 +64,8 @@ /// The length of the globals array. #define BC_PROG_GLOBALS_LEN (3 + BC_ENABLE_EXTRA_MATH) -typedef struct BcProgram { - +typedef struct BcProgram +{ /// The array of globals values. BcBigDig globals[BC_PROG_GLOBALS_LEN]; @@ -86,10 +86,10 @@ typedef struct BcProgram { BcVec stack; /// A pointer to the current function's constants. - BcVec *consts; + BcVec* consts; /// A pointer to the current function's strings. - BcVec *strs; + BcVec* strs; /// The array of functions. BcVec fns; @@ -206,8 +206,7 @@ typedef struct BcProgram { /// This define disappears the parameter last because for dc only, last is /// always true. -#define bc_program_copyToVar(p, name, t, last) \ - bc_program_copyToVar(p, name, t) +#define bc_program_copyToVar(p, name, t, last) bc_program_copyToVar(p, name, t) #endif // !BC_ENABLED @@ -263,13 +262,14 @@ typedef struct BcProgram { * @param r The BcResult to store the result into. * @param n The parameter to the unary operation. */ -typedef void (*BcProgramUnary)(BcResult *r, BcNum *n); +typedef void (*BcProgramUnary)(BcResult* r, BcNum* n); /** * Initializes the BcProgram. * @param p The program to initialize. */ -void bc_program_init(BcProgram *p); +void +bc_program_init(BcProgram* p); #ifndef NDEBUG @@ -279,7 +279,8 @@ void bc_program_init(BcProgram *p); * exit. * @param p The program to initialize. */ -void bc_program_free(BcProgram *p); +void +bc_program_free(BcProgram* p); #endif // NDEBUG @@ -290,7 +291,8 @@ void bc_program_free(BcProgram *p); * Prints the bytecode in a function. This is a debug-only function. * @param p The program. */ -void bc_program_code(const BcProgram *p); +void +bc_program_code(const BcProgram* p); /** * Prints an instruction. This is a debug-only function. @@ -299,14 +301,16 @@ void bc_program_code(const BcProgram *p); * @param bgn A pointer to the current index. It is also updated to the next * index. */ -void bc_program_printInst(const BcProgram *p, const char *code, - size_t *restrict bgn); +void +bc_program_printInst(const BcProgram* p, const char* code, + size_t* restrict bgn); /** * Prints the stack. This is a debug-only function. * @param p The program. */ -void bc_program_printStackDebug(BcProgram* p); +void +bc_program_printStackDebug(BcProgram* p); #endif // BC_ENABLED && DC_ENABLED #endif // BC_DEBUG_CODE @@ -318,7 +322,8 @@ void bc_program_printStackDebug(BcProgram* p); * @param var True if the search should be for a variable, false for an array. * @return The index of the variable or array in the correct array. */ -size_t bc_program_search(BcProgram *p, const char* id, bool var); +size_t +bc_program_search(BcProgram* p, const char* id, bool var); /** * Adds a string to a function and returns the string's index in the function. @@ -326,7 +331,8 @@ size_t bc_program_search(BcProgram *p, const char* id, bool var); * @param str The string to add. * @param fidx The index of the function to add to. */ -size_t bc_program_addString(BcProgram *p, const char *str, size_t fidx); +size_t +bc_program_addString(BcProgram* p, const char* str, size_t fidx); /** * Inserts a function into the program and returns the index of the function in @@ -335,33 +341,38 @@ size_t bc_program_addString(BcProgram *p, const char *str, size_t fidx); * @param name The name of the function. * @return The index of the function after insertion. */ -size_t bc_program_insertFunc(BcProgram *p, const char *name); +size_t +bc_program_insertFunc(BcProgram* p, const char* name); /** * Resets a program, usually because of resetting after an error. * @param p The program to reset. */ -void bc_program_reset(BcProgram *p); +void +bc_program_reset(BcProgram* p); /** * Executes bc or dc code in the BcProgram. * @param p The program. */ -void bc_program_exec(BcProgram *p); +void +bc_program_exec(BcProgram* p); /** * Negates a copy of a BcNum. This is a BcProgramUnary function. * @param r The BcResult to store the result into. * @param n The parameter to the unary operation. */ -void bc_program_negate(BcResult *r, BcNum *n); +void +bc_program_negate(BcResult* r, BcNum* n); /** * Returns a boolean not of a BcNum. This is a BcProgramUnary function. * @param r The BcResult to store the result into. * @param n The parameter to the unary operation. */ -void bc_program_not(BcResult *r, BcNum *n); +void +bc_program_not(BcResult* r, BcNum* n); #if BC_ENABLE_EXTRA_MATH @@ -370,10 +381,30 @@ void bc_program_not(BcResult *r, BcNum *n); * @param r The BcResult to store the result into. * @param n The parameter to the unary operation. */ -void bc_program_trunc(BcResult *r, BcNum *n); +void +bc_program_trunc(BcResult* r, BcNum* n); + +/** + * Assigns a value to the seed builtin variable. + * @param p The program. + * @param val The value to assign to the seed. + */ +void +bc_program_assignSeed(BcProgram* p, BcNum* val); #endif // BC_ENABLE_EXTRA_MATH +/** + * Assigns a value to a builtin value that is not seed. + * @param p The program. + * @param scale True if the builtin is scale. + * @param obase True if the builtin is obase. This cannot be true at the same + * time @a scale is. + * @param val The value to assign to the builtin. + */ +void +bc_program_assignBuiltin(BcProgram* p, bool scale, bool obase, BcBigDig val); + /// A reference to an array of binary operator functions. extern const BcNumBinaryOp bc_program_ops[]; @@ -406,34 +437,42 @@ extern const char bc_program_esc_seqs[]; #if BC_DEBUG_CODE +// clang-format off #define BC_PROG_JUMP(inst, code, ip) \ - do { \ + do \ + { \ inst = (uchar) (code)[(ip)->idx++]; \ bc_file_printf(&vm.ferr, "inst: %s\n", bc_inst_names[inst]); \ bc_file_flush(&vm.ferr, bc_flush_none); \ goto *bc_program_inst_lbls[inst]; \ - } while (0) + } \ + while (0) +// clang-format on #else // BC_DEBUG_CODE +// clang-format off #define BC_PROG_JUMP(inst, code, ip) \ - do { \ + do \ + { \ inst = (uchar) (code)[(ip)->idx++]; \ goto *bc_program_inst_lbls[inst]; \ - } while (0) + } \ + while (0) +// clang-format on #endif // BC_DEBUG_CODE -#define BC_PROG_DIRECT_JUMP(l) goto lbl_ ## l; -#define BC_PROG_LBL(l) lbl_ ## l +#define BC_PROG_DIRECT_JUMP(l) goto lbl_##l; +#define BC_PROG_LBL(l) lbl_##l #define BC_PROG_FALLTHROUGH #if BC_C11 #define BC_PROG_LBLS_SIZE (sizeof(bc_program_inst_lbls) / sizeof(void*)) -#define BC_PROG_LBLS_ASSERT \ - static_assert(BC_PROG_LBLS_SIZE == BC_INST_INVALID + 1,\ - "bc_program_inst_lbls[] mismatches the instructions") +#define BC_PROG_LBLS_ASSERT \ + _Static_assert(BC_PROG_LBLS_SIZE == BC_INST_INVALID + 1, \ + "bc_program_inst_lbls[] mismatches the instructions") #else // BC_C11 @@ -447,197 +486,199 @@ extern const char bc_program_esc_seqs[]; #if BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_INC, \ - &&lbl_BC_INST_DEC, \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_TRUNC, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_PLACES, \ - &&lbl_BC_INST_LSHIFT, \ - &&lbl_BC_INST_RSHIFT, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_POWER, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY, \ - &&lbl_BC_INST_ASSIGN_DIVIDE, \ - &&lbl_BC_INST_ASSIGN_MODULUS, \ - &&lbl_BC_INST_ASSIGN_PLUS, \ - &&lbl_BC_INST_ASSIGN_MINUS, \ - &&lbl_BC_INST_ASSIGN_PLACES, \ - &&lbl_BC_INST_ASSIGN_LSHIFT, \ - &&lbl_BC_INST_ASSIGN_RSHIFT, \ - &&lbl_BC_INST_ASSIGN, \ - &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLACES_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_LSHIFT_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_RSHIFT_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_LAST, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_SEED, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_IRAND, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_RAND, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_MAXRAND, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_GLOBAL_STACKS, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_PRINT_STR, \ - &&lbl_BC_INST_JUMP, \ - &&lbl_BC_INST_JUMP_ZERO, \ - &&lbl_BC_INST_CALL, \ - &&lbl_BC_INST_RET, \ - &&lbl_BC_INST_RET0, \ - &&lbl_BC_INST_RET_VOID, \ - &&lbl_BC_INST_HALT, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_POP_EXEC, \ - &&lbl_BC_INST_EXECUTE, \ - &&lbl_BC_INST_EXEC_COND, \ - &&lbl_BC_INST_PRINT_STACK, \ - &&lbl_BC_INST_CLEAR_STACK, \ - &&lbl_BC_INST_REG_STACK_LEN, \ - &&lbl_BC_INST_STACK_LEN, \ - &&lbl_BC_INST_DUPLICATE, \ - &&lbl_BC_INST_LOAD, \ - &&lbl_BC_INST_PUSH_VAR, \ - &&lbl_BC_INST_PUSH_TO_VAR, \ - &&lbl_BC_INST_QUIT, \ - &&lbl_BC_INST_NQUIT, \ - &&lbl_BC_INST_EXEC_STACK_LEN, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_INC, \ + &&lbl_BC_INST_DEC, \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_TRUNC, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_PLACES, \ + &&lbl_BC_INST_LSHIFT, \ + &&lbl_BC_INST_RSHIFT, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_POWER, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY, \ + &&lbl_BC_INST_ASSIGN_DIVIDE, \ + &&lbl_BC_INST_ASSIGN_MODULUS, \ + &&lbl_BC_INST_ASSIGN_PLUS, \ + &&lbl_BC_INST_ASSIGN_MINUS, \ + &&lbl_BC_INST_ASSIGN_PLACES, \ + &&lbl_BC_INST_ASSIGN_LSHIFT, \ + &&lbl_BC_INST_ASSIGN_RSHIFT, \ + &&lbl_BC_INST_ASSIGN, \ + &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLACES_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_LSHIFT_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_RSHIFT_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_LAST, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_SEED, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_IRAND, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_RAND, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_MAXRAND, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_GLOBAL_STACKS, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_PRINT_STR, \ + &&lbl_BC_INST_JUMP, \ + &&lbl_BC_INST_JUMP_ZERO, \ + &&lbl_BC_INST_CALL, \ + &&lbl_BC_INST_RET, \ + &&lbl_BC_INST_RET0, \ + &&lbl_BC_INST_RET_VOID, \ + &&lbl_BC_INST_HALT, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_POP_EXEC, \ + &&lbl_BC_INST_EXECUTE, \ + &&lbl_BC_INST_EXEC_COND, \ + &&lbl_BC_INST_PRINT_STACK, \ + &&lbl_BC_INST_CLEAR_STACK, \ + &&lbl_BC_INST_REG_STACK_LEN, \ + &&lbl_BC_INST_STACK_LEN, \ + &&lbl_BC_INST_DUPLICATE, \ + &&lbl_BC_INST_LOAD, \ + &&lbl_BC_INST_PUSH_VAR, \ + &&lbl_BC_INST_PUSH_TO_VAR, \ + &&lbl_BC_INST_QUIT, \ + &&lbl_BC_INST_NQUIT, \ + &&lbl_BC_INST_EXEC_STACK_LEN, \ + &&lbl_BC_INST_INVALID, \ + } #else // BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_INC, \ - &&lbl_BC_INST_DEC, \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_POWER, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY, \ - &&lbl_BC_INST_ASSIGN_DIVIDE, \ - &&lbl_BC_INST_ASSIGN_MODULUS, \ - &&lbl_BC_INST_ASSIGN_PLUS, \ - &&lbl_BC_INST_ASSIGN_MINUS, \ - &&lbl_BC_INST_ASSIGN, \ - &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_LAST, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_GLOBAL_STACKS, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_PRINT_STR, \ - &&lbl_BC_INST_JUMP, \ - &&lbl_BC_INST_JUMP_ZERO, \ - &&lbl_BC_INST_CALL, \ - &&lbl_BC_INST_RET, \ - &&lbl_BC_INST_RET0, \ - &&lbl_BC_INST_RET_VOID, \ - &&lbl_BC_INST_HALT, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_POP_EXEC, \ - &&lbl_BC_INST_EXECUTE, \ - &&lbl_BC_INST_EXEC_COND, \ - &&lbl_BC_INST_PRINT_STACK, \ - &&lbl_BC_INST_CLEAR_STACK, \ - &&lbl_BC_INST_REG_STACK_LEN, \ - &&lbl_BC_INST_STACK_LEN, \ - &&lbl_BC_INST_DUPLICATE, \ - &&lbl_BC_INST_LOAD, \ - &&lbl_BC_INST_PUSH_VAR, \ - &&lbl_BC_INST_PUSH_TO_VAR, \ - &&lbl_BC_INST_QUIT, \ - &&lbl_BC_INST_NQUIT, \ - &&lbl_BC_INST_EXEC_STACK_LEN, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_INC, \ + &&lbl_BC_INST_DEC, \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_POWER, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY, \ + &&lbl_BC_INST_ASSIGN_DIVIDE, \ + &&lbl_BC_INST_ASSIGN_MODULUS, \ + &&lbl_BC_INST_ASSIGN_PLUS, \ + &&lbl_BC_INST_ASSIGN_MINUS, \ + &&lbl_BC_INST_ASSIGN, \ + &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_LAST, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_GLOBAL_STACKS, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_PRINT_STR, \ + &&lbl_BC_INST_JUMP, \ + &&lbl_BC_INST_JUMP_ZERO, \ + &&lbl_BC_INST_CALL, \ + &&lbl_BC_INST_RET, \ + &&lbl_BC_INST_RET0, \ + &&lbl_BC_INST_RET_VOID, \ + &&lbl_BC_INST_HALT, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_POP_EXEC, \ + &&lbl_BC_INST_EXECUTE, \ + &&lbl_BC_INST_EXEC_COND, \ + &&lbl_BC_INST_PRINT_STACK, \ + &&lbl_BC_INST_CLEAR_STACK, \ + &&lbl_BC_INST_REG_STACK_LEN, \ + &&lbl_BC_INST_STACK_LEN, \ + &&lbl_BC_INST_DUPLICATE, \ + &&lbl_BC_INST_LOAD, \ + &&lbl_BC_INST_PUSH_VAR, \ + &&lbl_BC_INST_PUSH_TO_VAR, \ + &&lbl_BC_INST_QUIT, \ + &&lbl_BC_INST_NQUIT, \ + &&lbl_BC_INST_EXEC_STACK_LEN, \ + &&lbl_BC_INST_INVALID, \ + } #endif // BC_ENABLE_EXTRA_MATH @@ -645,169 +686,171 @@ extern const char bc_program_esc_seqs[]; #if BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_INC, \ - &&lbl_BC_INST_DEC, \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_TRUNC, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_PLACES, \ - &&lbl_BC_INST_LSHIFT, \ - &&lbl_BC_INST_RSHIFT, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_POWER, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY, \ - &&lbl_BC_INST_ASSIGN_DIVIDE, \ - &&lbl_BC_INST_ASSIGN_MODULUS, \ - &&lbl_BC_INST_ASSIGN_PLUS, \ - &&lbl_BC_INST_ASSIGN_MINUS, \ - &&lbl_BC_INST_ASSIGN_PLACES, \ - &&lbl_BC_INST_ASSIGN_LSHIFT, \ - &&lbl_BC_INST_ASSIGN_RSHIFT, \ - &&lbl_BC_INST_ASSIGN, \ - &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLACES_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_LSHIFT_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_RSHIFT_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_LAST, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_SEED, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_IRAND, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_RAND, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_MAXRAND, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_GLOBAL_STACKS, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_PRINT_STR, \ - &&lbl_BC_INST_JUMP, \ - &&lbl_BC_INST_JUMP_ZERO, \ - &&lbl_BC_INST_CALL, \ - &&lbl_BC_INST_RET, \ - &&lbl_BC_INST_RET0, \ - &&lbl_BC_INST_RET_VOID, \ - &&lbl_BC_INST_HALT, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_INC, \ + &&lbl_BC_INST_DEC, \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_TRUNC, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_PLACES, \ + &&lbl_BC_INST_LSHIFT, \ + &&lbl_BC_INST_RSHIFT, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_POWER, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY, \ + &&lbl_BC_INST_ASSIGN_DIVIDE, \ + &&lbl_BC_INST_ASSIGN_MODULUS, \ + &&lbl_BC_INST_ASSIGN_PLUS, \ + &&lbl_BC_INST_ASSIGN_MINUS, \ + &&lbl_BC_INST_ASSIGN_PLACES, \ + &&lbl_BC_INST_ASSIGN_LSHIFT, \ + &&lbl_BC_INST_ASSIGN_RSHIFT, \ + &&lbl_BC_INST_ASSIGN, \ + &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLACES_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_LSHIFT_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_RSHIFT_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_LAST, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_SEED, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_IRAND, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_RAND, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_MAXRAND, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_GLOBAL_STACKS, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_PRINT_STR, \ + &&lbl_BC_INST_JUMP, \ + &&lbl_BC_INST_JUMP_ZERO, \ + &&lbl_BC_INST_CALL, \ + &&lbl_BC_INST_RET, \ + &&lbl_BC_INST_RET0, \ + &&lbl_BC_INST_RET_VOID, \ + &&lbl_BC_INST_HALT, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_INVALID, \ + } #else // BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_INC, \ - &&lbl_BC_INST_DEC, \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_POWER, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY, \ - &&lbl_BC_INST_ASSIGN_DIVIDE, \ - &&lbl_BC_INST_ASSIGN_MODULUS, \ - &&lbl_BC_INST_ASSIGN_PLUS, \ - &&lbl_BC_INST_ASSIGN_MINUS, \ - &&lbl_BC_INST_ASSIGN, \ - &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_LAST, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_GLOBAL_STACKS, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_PRINT_STR, \ - &&lbl_BC_INST_JUMP, \ - &&lbl_BC_INST_JUMP_ZERO, \ - &&lbl_BC_INST_CALL, \ - &&lbl_BC_INST_RET, \ - &&lbl_BC_INST_RET0, \ - &&lbl_BC_INST_RET_VOID, \ - &&lbl_BC_INST_HALT, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_INC, \ + &&lbl_BC_INST_DEC, \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_POWER, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY, \ + &&lbl_BC_INST_ASSIGN_DIVIDE, \ + &&lbl_BC_INST_ASSIGN_MODULUS, \ + &&lbl_BC_INST_ASSIGN_PLUS, \ + &&lbl_BC_INST_ASSIGN_MINUS, \ + &&lbl_BC_INST_ASSIGN, \ + &&lbl_BC_INST_ASSIGN_POWER_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MULTIPLY_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_DIVIDE_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MODULUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_PLUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_MINUS_NO_VAL, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_LAST, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_GLOBAL_STACKS, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_PRINT_STR, \ + &&lbl_BC_INST_JUMP, \ + &&lbl_BC_INST_JUMP_ZERO, \ + &&lbl_BC_INST_CALL, \ + &&lbl_BC_INST_RET, \ + &&lbl_BC_INST_RET0, \ + &&lbl_BC_INST_RET_VOID, \ + &&lbl_BC_INST_HALT, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_INVALID, \ + } #endif // BC_ENABLE_EXTRA_MATH @@ -817,141 +860,143 @@ extern const char bc_program_esc_seqs[]; #if BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_TRUNC, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_PLACES, \ - &&lbl_BC_INST_LSHIFT, \ - &&lbl_BC_INST_RSHIFT, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_SEED, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_IRAND, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_RAND, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_MAXRAND, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_POP_EXEC, \ - &&lbl_BC_INST_EXECUTE, \ - &&lbl_BC_INST_EXEC_COND, \ - &&lbl_BC_INST_PRINT_STACK, \ - &&lbl_BC_INST_CLEAR_STACK, \ - &&lbl_BC_INST_REG_STACK_LEN, \ - &&lbl_BC_INST_STACK_LEN, \ - &&lbl_BC_INST_DUPLICATE, \ - &&lbl_BC_INST_LOAD, \ - &&lbl_BC_INST_PUSH_VAR, \ - &&lbl_BC_INST_PUSH_TO_VAR, \ - &&lbl_BC_INST_QUIT, \ - &&lbl_BC_INST_NQUIT, \ - &&lbl_BC_INST_EXEC_STACK_LEN, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_TRUNC, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_PLACES, \ + &&lbl_BC_INST_LSHIFT, \ + &&lbl_BC_INST_RSHIFT, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_SEED, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_IRAND, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_RAND, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_MAXRAND, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_POP_EXEC, \ + &&lbl_BC_INST_EXECUTE, \ + &&lbl_BC_INST_EXEC_COND, \ + &&lbl_BC_INST_PRINT_STACK, \ + &&lbl_BC_INST_CLEAR_STACK, \ + &&lbl_BC_INST_REG_STACK_LEN, \ + &&lbl_BC_INST_STACK_LEN, \ + &&lbl_BC_INST_DUPLICATE, \ + &&lbl_BC_INST_LOAD, \ + &&lbl_BC_INST_PUSH_VAR, \ + &&lbl_BC_INST_PUSH_TO_VAR, \ + &&lbl_BC_INST_QUIT, \ + &&lbl_BC_INST_NQUIT, \ + &&lbl_BC_INST_EXEC_STACK_LEN, \ + &&lbl_BC_INST_INVALID, \ + } #else // BC_ENABLE_EXTRA_MATH -#define BC_PROG_LBLS static const void* const bc_program_inst_lbls[] = { \ - &&lbl_BC_INST_NEG, \ - &&lbl_BC_INST_BOOL_NOT, \ - &&lbl_BC_INST_POWER, \ - &&lbl_BC_INST_MULTIPLY, \ - &&lbl_BC_INST_DIVIDE, \ - &&lbl_BC_INST_MODULUS, \ - &&lbl_BC_INST_PLUS, \ - &&lbl_BC_INST_MINUS, \ - &&lbl_BC_INST_REL_EQ, \ - &&lbl_BC_INST_REL_LE, \ - &&lbl_BC_INST_REL_GE, \ - &&lbl_BC_INST_REL_NE, \ - &&lbl_BC_INST_REL_LT, \ - &&lbl_BC_INST_REL_GT, \ - &&lbl_BC_INST_BOOL_OR, \ - &&lbl_BC_INST_BOOL_AND, \ - &&lbl_BC_INST_ASSIGN_NO_VAL, \ - &&lbl_BC_INST_NUM, \ - &&lbl_BC_INST_VAR, \ - &&lbl_BC_INST_ARRAY_ELEM, \ - &&lbl_BC_INST_ARRAY, \ - &&lbl_BC_INST_ZERO, \ - &&lbl_BC_INST_ONE, \ - &&lbl_BC_INST_IBASE, \ - &&lbl_BC_INST_OBASE, \ - &&lbl_BC_INST_SCALE, \ - &&lbl_BC_INST_LENGTH, \ - &&lbl_BC_INST_SCALE_FUNC, \ - &&lbl_BC_INST_SQRT, \ - &&lbl_BC_INST_ABS, \ - &&lbl_BC_INST_ASCIIFY, \ - &&lbl_BC_INST_READ, \ - &&lbl_BC_INST_MAXIBASE, \ - &&lbl_BC_INST_MAXOBASE, \ - &&lbl_BC_INST_MAXSCALE, \ - &&lbl_BC_INST_LINE_LENGTH, \ - &&lbl_BC_INST_LEADING_ZERO, \ - &&lbl_BC_INST_PRINT, \ - &&lbl_BC_INST_PRINT_POP, \ - &&lbl_BC_INST_STR, \ - &&lbl_BC_INST_POP, \ - &&lbl_BC_INST_SWAP, \ - &&lbl_BC_INST_MODEXP, \ - &&lbl_BC_INST_DIVMOD, \ - &&lbl_BC_INST_PRINT_STREAM, \ - &&lbl_BC_INST_POP_EXEC, \ - &&lbl_BC_INST_EXECUTE, \ - &&lbl_BC_INST_EXEC_COND, \ - &&lbl_BC_INST_PRINT_STACK, \ - &&lbl_BC_INST_CLEAR_STACK, \ - &&lbl_BC_INST_REG_STACK_LEN, \ - &&lbl_BC_INST_STACK_LEN, \ - &&lbl_BC_INST_DUPLICATE, \ - &&lbl_BC_INST_LOAD, \ - &&lbl_BC_INST_PUSH_VAR, \ - &&lbl_BC_INST_PUSH_TO_VAR, \ - &&lbl_BC_INST_QUIT, \ - &&lbl_BC_INST_NQUIT, \ - &&lbl_BC_INST_EXEC_STACK_LEN, \ - &&lbl_BC_INST_INVALID, \ -} +#define BC_PROG_LBLS \ + static const void* const bc_program_inst_lbls[] = { \ + &&lbl_BC_INST_NEG, \ + &&lbl_BC_INST_BOOL_NOT, \ + &&lbl_BC_INST_POWER, \ + &&lbl_BC_INST_MULTIPLY, \ + &&lbl_BC_INST_DIVIDE, \ + &&lbl_BC_INST_MODULUS, \ + &&lbl_BC_INST_PLUS, \ + &&lbl_BC_INST_MINUS, \ + &&lbl_BC_INST_REL_EQ, \ + &&lbl_BC_INST_REL_LE, \ + &&lbl_BC_INST_REL_GE, \ + &&lbl_BC_INST_REL_NE, \ + &&lbl_BC_INST_REL_LT, \ + &&lbl_BC_INST_REL_GT, \ + &&lbl_BC_INST_BOOL_OR, \ + &&lbl_BC_INST_BOOL_AND, \ + &&lbl_BC_INST_ASSIGN_NO_VAL, \ + &&lbl_BC_INST_NUM, \ + &&lbl_BC_INST_VAR, \ + &&lbl_BC_INST_ARRAY_ELEM, \ + &&lbl_BC_INST_ARRAY, \ + &&lbl_BC_INST_ZERO, \ + &&lbl_BC_INST_ONE, \ + &&lbl_BC_INST_IBASE, \ + &&lbl_BC_INST_OBASE, \ + &&lbl_BC_INST_SCALE, \ + &&lbl_BC_INST_LENGTH, \ + &&lbl_BC_INST_SCALE_FUNC, \ + &&lbl_BC_INST_SQRT, \ + &&lbl_BC_INST_ABS, \ + &&lbl_BC_INST_ASCIIFY, \ + &&lbl_BC_INST_READ, \ + &&lbl_BC_INST_MAXIBASE, \ + &&lbl_BC_INST_MAXOBASE, \ + &&lbl_BC_INST_MAXSCALE, \ + &&lbl_BC_INST_LINE_LENGTH, \ + &&lbl_BC_INST_LEADING_ZERO, \ + &&lbl_BC_INST_PRINT, \ + &&lbl_BC_INST_PRINT_POP, \ + &&lbl_BC_INST_STR, \ + &&lbl_BC_INST_POP, \ + &&lbl_BC_INST_SWAP, \ + &&lbl_BC_INST_MODEXP, \ + &&lbl_BC_INST_DIVMOD, \ + &&lbl_BC_INST_PRINT_STREAM, \ + &&lbl_BC_INST_POP_EXEC, \ + &&lbl_BC_INST_EXECUTE, \ + &&lbl_BC_INST_EXEC_COND, \ + &&lbl_BC_INST_PRINT_STACK, \ + &&lbl_BC_INST_CLEAR_STACK, \ + &&lbl_BC_INST_REG_STACK_LEN, \ + &&lbl_BC_INST_STACK_LEN, \ + &&lbl_BC_INST_DUPLICATE, \ + &&lbl_BC_INST_LOAD, \ + &&lbl_BC_INST_PUSH_VAR, \ + &&lbl_BC_INST_PUSH_TO_VAR, \ + &&lbl_BC_INST_QUIT, \ + &&lbl_BC_INST_NQUIT, \ + &&lbl_BC_INST_EXEC_STACK_LEN, \ + &&lbl_BC_INST_INVALID, \ + } #endif // BC_ENABLE_EXTRA_MATH diff --git a/contrib/bc/include/rand.h b/contrib/bc/include/rand.h index 58eb2cf0e320..7546891dbd64 100644 --- a/contrib/bc/include/rand.h +++ b/contrib/bc/include/rand.h @@ -65,7 +65,7 @@ * @param ptr A void ptr to some data that will help generate the random ulong. * @return The random ulong. */ -typedef ulong (*BcRandUlong)(void *ptr); +typedef ulong (*BcRandUlong)(void* ptr); #if BC_LONG_BIT >= 64 @@ -178,8 +178,8 @@ typedef __uint128_t BcRandState; #else // BC_RAND_BUILTIN /// A typedef for the PCG state. -typedef struct BcRandState { - +typedef struct BcRandState +{ /// The low bits. uint_fast64_t lo; @@ -241,7 +241,10 @@ typedef struct BcRandState { * @param l The low 64 bits. * @return The constant built from @a h and @a l. */ -#define BC_RAND_CONSTANT(h, l) { .lo = (l), .hi = (h) } +#define BC_RAND_CONSTANT(h, l) \ + { \ + .lo = (l), .hi = (h) \ + } /** * Truncates a PCG state to the number of bits in a random integer. @@ -272,7 +275,7 @@ typedef struct BcRandState { * @param n The integer to truncate. * @return The bottom 32 bits of @a n. */ -#define BC_RAND_TRUNC32(n) ((n) & BC_RAND_BOTTOM32) +#define BC_RAND_TRUNC32(n) ((n) & (BC_RAND_BOTTOM32)) /** * Returns the second 32 bits of @a n. @@ -419,8 +422,8 @@ typedef uint_fast64_t BcRandState; #define BC_RAND_SRAND_BITS ((1 << CHAR_BIT) - 1) /// The actual RNG data. These are the actual PRNG's. -typedef struct BcRNGData { - +typedef struct BcRNGData +{ /// The state. BcRandState state; @@ -431,8 +434,8 @@ typedef struct BcRNGData { /// The public PRNG. This is just a stack of PRNG's to maintain the globals /// stack illusion. -typedef struct BcRNG { - +typedef struct BcRNG +{ /// The stack of PRNG's. BcVec v; @@ -442,7 +445,8 @@ typedef struct BcRNG { * Initializes a BcRNG. * @param r The BcRNG to initialize. */ -void bc_rand_init(BcRNG *r); +void +bc_rand_init(BcRNG* r); #if BC_RAND_USE_FREE @@ -451,7 +455,8 @@ void bc_rand_init(BcRNG *r); * exit. * @param r The BcRNG to free. */ -void bc_rand_free(BcRNG *r); +void +bc_rand_free(BcRNG* r); #endif // BC_RAND_USE_FREE @@ -460,7 +465,8 @@ void bc_rand_free(BcRNG *r); * @param r The PRNG. * @return A random integer. */ -BcRand bc_rand_int(BcRNG *r); +BcRand +bc_rand_int(BcRNG* r); /** * Returns a random integer from the PRNG bounded by @a bound. Bias is @@ -469,7 +475,8 @@ BcRand bc_rand_int(BcRNG *r); * @param bound The bound for the random integer. * @return A bounded random integer. */ -BcRand bc_rand_bounded(BcRNG *r, BcRand bound); +BcRand +bc_rand_bounded(BcRNG* r, BcRand bound); /** * Seed the PRNG with the state in two parts and the increment in two parts. @@ -479,13 +486,15 @@ BcRand bc_rand_bounded(BcRNG *r, BcRand bound); * @param inc1 The first part of the increment. * @param inc2 The second part of the increment. */ -void bc_rand_seed(BcRNG *r, ulong state1, ulong state2, ulong inc1, ulong inc2); +void +bc_rand_seed(BcRNG* r, ulong state1, ulong state2, ulong inc1, ulong inc2); /** * Pushes a new PRNG onto the PRNG stack. * @param r The PRNG. */ -void bc_rand_push(BcRNG *r); +void +bc_rand_push(BcRNG* r); /** * Pops one or all but one items off of the PRNG stack. @@ -493,7 +502,8 @@ void bc_rand_push(BcRNG *r); * @param reset True if all but one PRNG should be popped off the stack, false * if only one should be popped. */ -void bc_rand_pop(BcRNG *r, bool reset); +void +bc_rand_pop(BcRNG* r, bool reset); /** * Returns, via pointers, the state of the PRNG in pieces. @@ -503,13 +513,15 @@ void bc_rand_pop(BcRNG *r, bool reset); * @param i1 The return value for the first part of the increment. * @param i2 The return value for the second part of the increment. */ -void bc_rand_getRands(BcRNG *r, BcRand *s1, BcRand *s2, BcRand *i1, BcRand *i2); +void +bc_rand_getRands(BcRNG* r, BcRand* s1, BcRand* s2, BcRand* i1, BcRand* i2); /** * Seed the PRNG with random data. * @param rng The PRNG. */ -void bc_rand_srand(BcRNGData *rng); +void +bc_rand_srand(BcRNGData* rng); /// A reference to a constant multiplier. extern const BcRandState bc_rand_multiplier; diff --git a/contrib/bc/include/read.h b/contrib/bc/include/read.h index 2ebb456e83fe..0e824d941b50 100644 --- a/contrib/bc/include/read.h +++ b/contrib/bc/include/read.h @@ -53,14 +53,16 @@ * @param vec The vector to put the stdin data into. * @param prompt The prompt to print, if desired. */ -BcStatus bc_read_line(BcVec *vec, const char *prompt); +BcStatus +bc_read_line(BcVec* vec, const char* prompt); /** * Read a file and return a buffer with the data. The buffer must be freed by * the caller. * @param path The path to the file to read. */ -char* bc_read_file(const char *path); +char* +bc_read_file(const char* path); /** * Helper function for reading characters from stdin. This takes care of a bunch @@ -69,7 +71,8 @@ char* bc_read_file(const char *path); * @param vec The vec to put the stdin into. * @param prompt The prompt to print, if desired. */ -BcStatus bc_read_chars(BcVec *vec, const char *prompt); +BcStatus +bc_read_chars(BcVec* vec, const char* prompt); /** * Read a line from buf into vec. @@ -77,6 +80,7 @@ BcStatus bc_read_chars(BcVec *vec, const char *prompt); * @param buf The buffer to read from. * @param buf_len The length of the buffer. */ -bool bc_read_buf(BcVec *vec, char *buf, size_t *buf_len); +bool +bc_read_buf(BcVec* vec, char* buf, size_t* buf_len); #endif // BC_READ_H diff --git a/contrib/bc/include/status.h b/contrib/bc/include/status.h index df084c70c1b5..d038944d40c9 100644 --- a/contrib/bc/include/status.h +++ b/contrib/bc/include/status.h @@ -45,6 +45,13 @@ #endif // __OpenBSD__ #endif // BC_TEST_OPENBSD +// This is used by configure.sh to test for FreeBSD. +#ifdef BC_TEST_FREEBSD +#ifdef __FreeBSD__ +#error On FreeBSD with _POSIX_C_SOURCE +#endif // __FreeBSD__ +#endif // BC_TEST_FREEBSD + #ifndef BC_ENABLED #define BC_ENABLED (1) #endif // BC_ENABLED @@ -295,8 +302,8 @@ /// Statuses, which mark either which category of error happened, or some other /// status that matters. -typedef enum BcStatus { - +typedef enum BcStatus +{ /// Normal status. BC_STATUS_SUCCESS = 0, @@ -321,8 +328,8 @@ typedef enum BcStatus { } BcStatus; /// Errors, which are more specific errors. -typedef enum BcErr { - +typedef enum BcErr +{ // Math errors. /// Negative number used when not allowed. @@ -565,13 +572,23 @@ typedef enum BcErr { /// bc, and they *must* have signals locked. Other functions are expected to /// *not* have signals locked, for reasons. So this is a pre-built assert /// (no-op in non-debug mode) that check that signals are locked. -#define BC_SIG_ASSERT_LOCKED do { assert(vm.sig_lock); } while (0) +#define BC_SIG_ASSERT_LOCKED \ + do \ + { \ + assert(vm.sig_lock); \ + } \ + while (0) /// Assert that signals are unlocked. There are non-async-signal-safe functions /// in bc, and they *must* have signals locked. Other functions are expected to /// *not* have signals locked, for reasons. So this is a pre-built assert /// (no-op in non-debug mode) that check that signals are unlocked. -#define BC_SIG_ASSERT_NOT_LOCKED do { assert(vm.sig_lock == 0); } while (0) +#define BC_SIG_ASSERT_NOT_LOCKED \ + do \ + { \ + assert(vm.sig_lock == 0); \ + } \ + while (0) #else // NDEBUG @@ -591,35 +608,43 @@ typedef enum BcErr { /// Locks signals. #define BC_SIG_LOCK \ - do { \ + do \ + { \ BC_SIG_ASSERT_NOT_LOCKED; \ vm.sig_lock = 1; \ - } while (0) + } \ + while (0) /// Unlocks signals. If a signal happened, then this will cause a jump. #define BC_SIG_UNLOCK \ - do { \ + do \ + { \ BC_SIG_ASSERT_LOCKED; \ vm.sig_lock = 0; \ if (vm.sig) BC_JMP; \ - } while (0) + } \ + while (0) /// Locks signals, regardless of if they are already locked. This is really only /// used after labels that longjmp() goes to after the jump because the cleanup /// code must have signals locked, and BC_LONGJMP_CONT will unlock signals if it /// doesn't jump. #define BC_SIG_MAYLOCK \ - do { \ + do \ + { \ vm.sig_lock = 1; \ - } while (0) + } \ + while (0) /// Unlocks signals, regardless of if they were already unlocked. If a signal /// happened, then this will cause a jump. #define BC_SIG_MAYUNLOCK \ - do { \ + do \ + { \ vm.sig_lock = 0; \ if (vm.sig) BC_JMP; \ - } while (0) + } \ + while (0) /* * Locks signals, but stores the old lock state, to be restored later by @@ -627,20 +652,24 @@ typedef enum BcErr { * @param v The variable to store the old lock state to. */ #define BC_SIG_TRYLOCK(v) \ - do { \ + do \ + { \ v = vm.sig_lock; \ vm.sig_lock = 1; \ - } while (0) + } \ + while (0) /* Restores the previous state of a signal lock, and if it is now unlocked, * initiates an exception/jump. * @param v The old lock state. */ #define BC_SIG_TRYUNLOCK(v) \ - do { \ + do \ + { \ vm.sig_lock = (v); \ if (!(v) && vm.sig) BC_JMP; \ - } while (0) + } \ + while (0) /** * Sets a jump, and sets it up as well so that if a longjmp() happens, bc will @@ -653,17 +682,20 @@ typedef enum BcErr { * param l The label to jump to on a longjmp(). */ #define BC_SETJMP(l) \ - do { \ + do \ + { \ sigjmp_buf sjb; \ BC_SIG_LOCK; \ bc_vec_grow(&vm.jmp_bufs, 1); \ - if (sigsetjmp(sjb, 0)) { \ + if (sigsetjmp(sjb, 0)) \ + { \ assert(BC_SIG_EXC); \ goto l; \ } \ bc_vec_push(&vm.jmp_bufs, &sjb); \ BC_SIG_UNLOCK; \ - } while (0) + } \ + while (0) /** * Sets a jump like BC_SETJMP, but unlike BC_SETJMP, it assumes signals are @@ -673,46 +705,55 @@ typedef enum BcErr { * param l The label to jump to on a longjmp(). */ #define BC_SETJMP_LOCKED(l) \ - do { \ + do \ + { \ sigjmp_buf sjb; \ BC_SIG_ASSERT_LOCKED; \ - if (sigsetjmp(sjb, 0)) { \ + if (sigsetjmp(sjb, 0)) \ + { \ assert(BC_SIG_EXC); \ goto l; \ } \ bc_vec_push(&vm.jmp_bufs, &sjb); \ - } while (0) + } \ + while (0) /// Used after cleanup labels set by BC_SETJMP and BC_SETJMP_LOCKED to jump to /// the next place. This is what continues the stack unwinding. This basically /// copies BC_SIG_UNLOCK into itself, but that is because its condition for /// jumping is BC_SIG_EXC, not just that a signal happened. #define BC_LONGJMP_CONT \ - do { \ + do \ + { \ BC_SIG_ASSERT_LOCKED; \ if (!vm.sig_pop) bc_vec_pop(&vm.jmp_bufs); \ vm.sig_lock = 0; \ if (BC_SIG_EXC) BC_JMP; \ - } while (0) + } \ + while (0) /// Unsets a jump. It always assumes signals are locked. This basically just /// pops a jmp_buf off of the stack of jmp_bufs, and since the jump mechanism /// always jumps to the location at the top of the stack, this effectively /// undoes a setjmp(). #define BC_UNSETJMP \ - do { \ + do \ + { \ BC_SIG_ASSERT_LOCKED; \ bc_vec_pop(&vm.jmp_bufs); \ - } while (0) + } \ + while (0) /// Stops a stack unwinding. Technically, a stack unwinding needs to be done /// manually, but it will always be done unless certain flags are cleared. This /// clears the flags. #define BC_LONGJMP_STOP \ - do { \ + do \ + { \ vm.sig_pop = 0; \ vm.sig = 0; \ - } while (0) + } \ + while (0) // Various convenience macros for calling the bc's error handling routine. #if BC_ENABLE_LIBRARY @@ -773,7 +814,8 @@ typedef enum BcErr { // for easy marking of where functions are entered and exited. #if BC_DEBUG_CODE #define BC_FUNC_ENTER \ - do { \ + do \ + { \ size_t bc_func_enter_i; \ for (bc_func_enter_i = 0; bc_func_enter_i < vm.func_depth; \ ++bc_func_enter_i) \ @@ -783,10 +825,12 @@ typedef enum BcErr { vm.func_depth += 1; \ bc_file_printf(&vm.ferr, "Entering %s\n", __func__); \ bc_file_flush(&vm.ferr, bc_flush_none); \ - } while (0); + } \ + while (0); #define BC_FUNC_EXIT \ - do { \ + do \ + { \ size_t bc_func_enter_i; \ vm.func_depth -= 1; \ for (bc_func_enter_i = 0; bc_func_enter_i < vm.func_depth; \ @@ -796,7 +840,8 @@ typedef enum BcErr { } \ bc_file_printf(&vm.ferr, "Leaving %s\n", __func__); \ bc_file_flush(&vm.ferr, bc_flush_none); \ - } while (0); + } \ + while (0); #else // BC_DEBUG_CODE #define BC_FUNC_ENTER #define BC_FUNC_EXIT diff --git a/contrib/bc/include/vector.h b/contrib/bc/include/vector.h index c35d22c9eff7..43158ef4ba63 100644 --- a/contrib/bc/include/vector.h +++ b/contrib/bc/include/vector.h @@ -47,7 +47,7 @@ /// The starting capacity for vectors. This is based on the minimum allocation /// for 64-bit systems. -#define BC_VEC_START_CAP (UINTMAX_C(1)<<5) +#define BC_VEC_START_CAP (UINTMAX_C(1) << 5) /// An alias. typedef unsigned char uchar; @@ -57,7 +57,7 @@ typedef unsigned char uchar; * to free the memory they own. * @param ptr Pointer to the data to free. */ -typedef void (*BcVecFree)(void *ptr); +typedef void (*BcVecFree)(void* ptr); // Forward declaration. struct BcId; @@ -75,8 +75,8 @@ typedef uint16_t BcSize; #endif // BC_LONG_BIT >= 64 /// An enum of all of the destructors. We use an enum to save space. -typedef enum BcDtorType { - +typedef enum BcDtorType +{ /// No destructor needed. BC_DTOR_NONE, @@ -120,11 +120,11 @@ typedef enum BcDtorType { } BcDtorType; /// The actual vector struct. -typedef struct BcVec { - +typedef struct BcVec +{ /// The vector array itself. This uses a char* because it is compatible with /// pointers of all other types, and I can do pointer arithmetic on it. - char *restrict v; + char* restrict v; /// The length of the vector, which is how many items actually exist. size_t len; @@ -147,7 +147,8 @@ typedef struct BcVec { * @param esize The size of the elements, as returned by sizeof(). * @param dtor The destructor of the elements, as a BcDtorType enum. */ -void bc_vec_init(BcVec *restrict v, size_t esize, BcDtorType dtor); +void +bc_vec_init(BcVec* restrict v, size_t esize, BcDtorType dtor); /** * Expands the vector to have a capacity of @a req items, if it doesn't have @@ -155,14 +156,16 @@ void bc_vec_init(BcVec *restrict v, size_t esize, BcDtorType dtor); * @param v The vector to expand. * @param req The requested capacity. */ -void bc_vec_expand(BcVec *restrict v, size_t req); +void +bc_vec_expand(BcVec* restrict v, size_t req); /** * Grow a vector by at least @a n elements. * @param v The vector to grow. * @param n The number of elements to grow the vector by. */ -void bc_vec_grow(BcVec *restrict v, size_t n); +void +bc_vec_grow(BcVec* restrict v, size_t n); /** * Pops @a n items off the back of the vector. The vector must have at least @@ -170,7 +173,8 @@ void bc_vec_grow(BcVec *restrict v, size_t n); * @param v The vector to pop off of. * @param n The number of elements to pop off. */ -void bc_vec_npop(BcVec *restrict v, size_t n); +void +bc_vec_npop(BcVec* restrict v, size_t n); /** * Pops @a n items, starting at index @a idx, off the vector. The vector must @@ -180,7 +184,8 @@ void bc_vec_npop(BcVec *restrict v, size_t n); * @param n The number of elements to pop off. * @param idx The index to start popping at. */ -void bc_vec_npopAt(BcVec *restrict v, size_t n, size_t idx); +void +bc_vec_npopAt(BcVec* restrict v, size_t n, size_t idx); /** * Pushes one item on the back of the vector. It does a memcpy(), but it assumes @@ -188,7 +193,8 @@ void bc_vec_npopAt(BcVec *restrict v, size_t n, size_t idx); * @param v The vector to push onto. * @param data A pointer to the data to push. */ -void bc_vec_push(BcVec *restrict v, const void *data); +void +bc_vec_push(BcVec* restrict v, const void* data); /** * Pushes @a n items on the back of the vector. It does a memcpy(), but it @@ -196,7 +202,8 @@ void bc_vec_push(BcVec *restrict v, const void *data); * @param v The vector to push onto. * @param data A pointer to the elements of data to push. */ -void bc_vec_npush(BcVec *restrict v, size_t n, const void *data); +void +bc_vec_npush(BcVec* restrict v, size_t n, const void* data); /** * Push an empty element and return a pointer to it. This is done as an @@ -205,7 +212,8 @@ void bc_vec_npush(BcVec *restrict v, size_t n, const void *data); * @param v The vector to push onto. * @return A pointer to the newly-pushed element. */ -void* bc_vec_pushEmpty(BcVec *restrict v); +void* +bc_vec_pushEmpty(BcVec* restrict v); /** * Pushes a byte onto a bytecode vector. This is a convenience function for the @@ -213,7 +221,8 @@ void* bc_vec_pushEmpty(BcVec *restrict v); * @param v The vector to push onto. * @param data The byte to push. */ -void bc_vec_pushByte(BcVec *restrict v, uchar data); +void +bc_vec_pushByte(BcVec* restrict v, uchar data); /** * Pushes and index onto a bytecode vector. The vector must be a bytecode @@ -222,7 +231,8 @@ void bc_vec_pushByte(BcVec *restrict v, uchar data); * @param v The vector to push onto. * @param idx The index to push. */ -void bc_vec_pushIndex(BcVec *restrict v, size_t idx); +void +bc_vec_pushIndex(BcVec* restrict v, size_t idx); /** * Push an item onto the vector at a certain index. The index must be valid @@ -233,7 +243,8 @@ void bc_vec_pushIndex(BcVec *restrict v, size_t idx); * @param data A pointer to the data to push. * @param idx The index to push at. */ -void bc_vec_pushAt(BcVec *restrict v, const void *data, size_t idx); +void +bc_vec_pushAt(BcVec* restrict v, const void* data, size_t idx); /** * Empties the vector and sets it to the string. The vector must be a valid @@ -243,7 +254,8 @@ void bc_vec_pushAt(BcVec *restrict v, const void *data, size_t idx); * of the string, but must never be more. * @param str The string to push. */ -void bc_vec_string(BcVec *restrict v, size_t len, const char *restrict str); +void +bc_vec_string(BcVec* restrict v, size_t len, const char* restrict str); /** * Appends the string to the end of the vector, which must be holding a string @@ -251,13 +263,15 @@ void bc_vec_string(BcVec *restrict v, size_t len, const char *restrict str); * @param v The vector to append to. * @param str The string to append (by copying). */ -void bc_vec_concat(BcVec *restrict v, const char *restrict str); +void +bc_vec_concat(BcVec* restrict v, const char* restrict str); /** * Empties a vector and pushes a nul-byte at the first index. The vector must be * a char vector. */ -void bc_vec_empty(BcVec *restrict v); +void +bc_vec_empty(BcVec* restrict v); #if BC_ENABLE_HISTORY @@ -268,7 +282,8 @@ void bc_vec_empty(BcVec *restrict v); * @param idx The index of the item to replace. * @param data The data to replace the item with. */ -void bc_vec_replaceAt(BcVec *restrict v, size_t idx, const void *data); +void +bc_vec_replaceAt(BcVec* restrict v, size_t idx, const void* data); #endif // BC_ENABLE_HISTORY @@ -279,7 +294,8 @@ void bc_vec_replaceAt(BcVec *restrict v, size_t idx, const void *data); * @param idx The index to the item to get a pointer to. * @return A pointer to the item at @a idx. */ -void* bc_vec_item(const BcVec *restrict v, size_t idx); +void* +bc_vec_item(const BcVec* restrict v, size_t idx); /** * Returns a pointer to the item in the vector at the index, reversed. This is @@ -288,19 +304,22 @@ void* bc_vec_item(const BcVec *restrict v, size_t idx); * @param idx The index to the item to get a pointer to. * @return A pointer to the item at len - @a idx - 1. */ -void* bc_vec_item_rev(const BcVec *restrict v, size_t idx); +void* +bc_vec_item_rev(const BcVec* restrict v, size_t idx); /** * Zeros a vector. The vector must not be allocated. * @param v The vector to clear. */ -void bc_vec_clear(BcVec *restrict v); +void +bc_vec_clear(BcVec* restrict v); /** * Frees a vector and its elements. This is a destructor. * @param vec A vector as a void pointer. */ -void bc_vec_free(void *vec); +void +bc_vec_free(void* vec); /** * Attempts to insert an item into a map and returns true if it succeeded, false @@ -313,8 +332,9 @@ void bc_vec_free(void *vec); * in the map. * @return True if the item was inserted, false if the item already exists. */ -bool bc_map_insert(BcVec *restrict v, const char *name, - size_t idx, size_t *restrict i); +bool +bc_map_insert(BcVec* restrict v, const char* name, size_t idx, + size_t* restrict i); /** * Returns the index of the item with @a name in the map, or BC_VEC_INVALID_IDX @@ -324,7 +344,8 @@ bool bc_map_insert(BcVec *restrict v, const char *name, * @return The index in the map of the item with @a name, or * BC_VEC_INVALID_IDX if the item does not exist. */ -size_t bc_map_index(const BcVec *restrict v, const char *name); +size_t +bc_map_index(const BcVec* restrict v, const char* name); #if DC_ENABLED @@ -334,7 +355,8 @@ size_t bc_map_index(const BcVec *restrict v, const char *name); * @param idx The index. * @return The name of the item at @a idx. */ -const char* bc_map_name(const BcVec *restrict v, size_t idx); +const char* +bc_map_name(const BcVec* restrict v, size_t idx); #endif // DC_ENABLED @@ -372,10 +394,10 @@ extern const BcVecFree bc_vec_dtors[]; #define BC_SLAB_SIZE (4096) /// A slab for allocating strings. -typedef struct BcSlab { - +typedef struct BcSlab +{ /// The actual allocation. - char *s; + char* s; /// How many bytes of the slab are taken. size_t len; @@ -386,13 +408,15 @@ typedef struct BcSlab { * Frees a slab. This is a destructor. * @param slab The slab as a void pointer. */ -void bc_slab_free(void *slab); +void +bc_slab_free(void* slab); /** * Initializes a slab vector. * @param v The vector to initialize. */ -void bc_slabvec_init(BcVec *restrict v); +void +bc_slabvec_init(BcVec* restrict v); /** * Duplicates the string using slabs in the slab vector. @@ -400,7 +424,8 @@ void bc_slabvec_init(BcVec *restrict v); * @param str The string to duplicate. * @return A pointer to the duplicated string, owned by the slab vector. */ -char* bc_slabvec_strdup(BcVec *restrict v, const char *str); +char* +bc_slabvec_strdup(BcVec* restrict v, const char* str); #if BC_ENABLED @@ -408,7 +433,8 @@ char* bc_slabvec_strdup(BcVec *restrict v, const char *str); * Undoes the last allocation on the slab vector. This allows bc to have a * heap-based stacks for strings. This is used by the bc parser. */ -void bc_slabvec_undo(BcVec *restrict v, size_t len); +void +bc_slabvec_undo(BcVec* restrict v, size_t len); #endif // BC_ENABLED @@ -417,7 +443,8 @@ void bc_slabvec_undo(BcVec *restrict v, size_t len); * first slab. * @param v The slab vector to clear. */ -void bc_slabvec_clear(BcVec *restrict v); +void +bc_slabvec_clear(BcVec* restrict v); #if BC_DEBUG_CODE @@ -425,7 +452,8 @@ void bc_slabvec_clear(BcVec *restrict v); * Prints all of the items in a slab vector, in order. * @param v The vector whose items will be printed. */ -void bc_slabvec_print(BcVec *v, const char *func); +void +bc_slabvec_print(BcVec* v, const char* func); #endif // BC_DEBUG_CODE diff --git a/contrib/bc/include/version.h b/contrib/bc/include/version.h index da98b30bb767..d460ebfa2d10 100644 --- a/contrib/bc/include/version.h +++ b/contrib/bc/include/version.h @@ -37,6 +37,6 @@ #define BC_VERSION_H /// The current version. -#define VERSION 5.2.5 +#define VERSION 5.3.1 #endif // BC_VERSION_H diff --git a/contrib/bc/include/vm.h b/contrib/bc/include/vm.h index cf7eb5238870..dd4577489467 100644 --- a/contrib/bc/include/vm.h +++ b/contrib/bc/include/vm.h @@ -132,52 +132,52 @@ #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) +#define BC_FLAG_EXPR_EXIT (UINTMAX_C(1) << 13) /// A convenience macro for getting the TTYIN flag. #define BC_TTYIN (vm.flags & BC_FLAG_TTYIN) @@ -320,18 +320,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) @@ -360,8 +372,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 @@ -443,7 +455,7 @@ typedef struct BcVm { const char* file; /// The message printed when SIGINT happens. - const char *sigmsg; + const char* sigmsg; #endif // !BC_ENABLE_LIBRARY @@ -515,10 +527,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 @@ -537,17 +549,17 @@ typedef struct BcVm { BcParseExpr expr; /// The text to display to label functions in error messages. - const char *func_header; + 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 @@ -568,7 +580,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; @@ -615,7 +627,7 @@ 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; @@ -653,44 +665,51 @@ 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); /** * Dish out a temp, or NULL if there are none. * @return A temp, or NULL if none exist. */ -BcDig* bc_vm_takeTemp(void); +BcDig* +bc_vm_takeTemp(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 /** * Erases the flush argument if history does not exist because it does not @@ -698,20 +717,22 @@ void bc_vm_freeTemps(void); */ #define bc_vm_putchar(c, t) bc_vm_putchar(c) -#endif // !BC_ENABLE_HISTORY +#endif // !BC_ENABLE_HISTORY || BC_ENABLE_LINE_LIB /** * 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 @@ -720,7 +741,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. @@ -728,14 +750,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 @@ -744,48 +768,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 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); +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 @@ -793,13 +824,15 @@ 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 @@ -811,18 +844,21 @@ 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 @@ -833,7 +869,8 @@ void bc_vm_atexit(void); * @param e The error. * @param line The source line where the error occurred. */ -void bc_vm_handleError(BcErr e, size_t line, ...); +void +bc_vm_handleError(BcErr e, size_t line, ...); /** * Handle a fatal error. @@ -842,13 +879,15 @@ 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. @@ -861,7 +900,7 @@ extern const char* const bc_err_line; 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[]; diff --git a/contrib/bc/locales/en_US.msg b/contrib/bc/locales/en_US.msg index adc1cc4537b9..c6bfe6dc3f6a 100644 --- a/contrib/bc/locales/en_US.msg +++ b/contrib/bc/locales/en_US.msg @@ -77,10 +77,10 @@ $set 4 22 "POSIX does not allow comparison operators outside if statements or loops" 23 "POSIX requires 0 or 1 comparison operators per condition" 24 "POSIX requires all 3 parts of a for loop to be non-empty" -25 "POSIX requires a newline between a semicolon and a function definition", +25 "POSIX requires a newline between a semicolon and a function definition" 26 "POSIX does not allow exponential notation" 27 "POSIX does not allow array references as function parameters" -28 "POSIX does not allow void functions", +28 "POSIX does not allow void functions" 29 "POSIX requires the left brace be on the same line as the function header" 30 "POSIX does not allow strings to be assigned to variables or arrays" diff --git a/contrib/bc/manuals/bc/A.1 b/contrib/bc/manuals/bc/A.1 index 038932d52ada..f19ed3c9ac78 100644 --- a/contrib/bc/manuals/bc/A.1 +++ b/contrib/bc/manuals/bc/A.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -38,13 +40,17 @@ bc - arbitrary-precision decimal arithmetic language and calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -287,26 +293,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -382,13 +394,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -435,8 +491,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -1020,8 +1076,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1328,8 +1384,8 @@ when the \f[B]-s\f[R] option, the \f[B]-w\f[R] option, or equivalents are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1385,7 +1441,8 @@ Functions\f[R] subsection below). The extended library is \f[I]not\f[R] loaded when the \f[B]-s\f[R]/\f[B]--standard\f[R] or \f[B]-w\f[R]/\f[B]--warn\f[R] options are given since they are not part of the library defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). +standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). .PP The extended library is a \f[B]non-portable extension\f[R]. .TP @@ -1404,13 +1461,13 @@ Functions\f[R] subsection below). .TP \f[B]r(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round half away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). +the rounding mode round half away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). .TP \f[B]ceil(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). +the rounding mode round away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). .TP \f[B]f(x)\f[R] Returns the factorial of the truncated absolute value of \f[B]x\f[R]. @@ -2275,11 +2332,11 @@ subsection of the \f[B]FUNCTIONS\f[R] section). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -2558,8 +2615,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -2646,8 +2702,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -2680,8 +2736,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Command-Line History @@ -2776,8 +2832,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/A.1.md b/contrib/bc/manuals/bc/A.1.md index 112e98078cf0..6061260ee087 100644 --- a/contrib/bc/manuals/bc/A.1.md +++ b/contrib/bc/manuals/bc/A.1.md @@ -34,14 +34,15 @@ bc - arbitrary-precision decimal arithmetic language and calculator # SYNOPSIS -**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -223,23 +224,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -299,12 +306,48 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -350,9 +393,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -805,9 +849,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -1054,7 +1099,9 @@ equivalents are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -1102,7 +1149,8 @@ The [standard][1] defines the following functions for the math library: The extended library is *not* loaded when the **-s**/**-\-standard** or **-w**/**-\-warn** options are given since they are not part of the library -defined by the [standard][1]. +defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). The extended library is a **non-portable extension**. @@ -1119,12 +1167,14 @@ The extended library is a **non-portable extension**. **r(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round half away from **0**][3]. + round half away from **0** + (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). **ceil(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round away from **0**][6]. + round away from **0** + (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). **f(x)** @@ -1888,10 +1938,11 @@ The extended library is a **non-portable extension**. ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -2134,8 +2185,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -2215,10 +2266,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -2244,8 +2297,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -2331,9 +2386,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -2349,10 +2405,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/E.1 b/contrib/bc/manuals/bc/E.1 index 6ee1e063ebde..d57b8b50c4af 100644 --- a/contrib/bc/manuals/bc/E.1 +++ b/contrib/bc/manuals/bc/E.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -43,8 +45,8 @@ bc - arbitrary-precision decimal arithmetic language and calculator .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -256,26 +258,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -351,13 +359,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -404,8 +445,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -812,8 +853,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1102,8 +1143,8 @@ All of the functions below are available when the \f[B]-l\f[R] or \f[B]--mathlib\f[R] command-line flags are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1156,11 +1197,11 @@ Functions\f[R] subsection below). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -1406,8 +1447,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1492,8 +1532,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -1526,8 +1566,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Command-Line History @@ -1622,8 +1662,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/E.1.md b/contrib/bc/manuals/bc/E.1.md index ba6e44c248c2..6c562cf69d24 100644 --- a/contrib/bc/manuals/bc/E.1.md +++ b/contrib/bc/manuals/bc/E.1.md @@ -39,9 +39,10 @@ bc - arbitrary-precision decimal arithmetic language and calculator # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -203,23 +204,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -279,12 +286,39 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -330,9 +364,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -648,9 +683,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -883,7 +919,9 @@ command-line flags are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -929,10 +967,11 @@ The [standard][1] defines the following functions for the math library: ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -1154,8 +1193,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1233,10 +1272,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -1262,8 +1303,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1349,9 +1392,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -1367,10 +1411,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/EH.1 b/contrib/bc/manuals/bc/EH.1 index 4509583a0141..95b94ae90e8e 100644 --- a/contrib/bc/manuals/bc/EH.1 +++ b/contrib/bc/manuals/bc/EH.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -43,8 +45,8 @@ bc - arbitrary-precision decimal arithmetic language and calculator .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -256,26 +258,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -351,13 +359,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -404,8 +445,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -812,8 +853,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1102,8 +1143,8 @@ All of the functions below are available when the \f[B]-l\f[R] or \f[B]--mathlib\f[R] command-line flags are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1156,11 +1197,11 @@ Functions\f[R] subsection below). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -1406,8 +1447,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1492,8 +1532,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -1526,8 +1566,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Prompt @@ -1593,8 +1633,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/EH.1.md b/contrib/bc/manuals/bc/EH.1.md index 2178c375cb92..82c3d6c36159 100644 --- a/contrib/bc/manuals/bc/EH.1.md +++ b/contrib/bc/manuals/bc/EH.1.md @@ -39,9 +39,10 @@ bc - arbitrary-precision decimal arithmetic language and calculator # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -203,23 +204,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -279,12 +286,39 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -330,9 +364,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -648,9 +683,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -883,7 +919,9 @@ command-line flags are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -929,10 +967,11 @@ The [standard][1] defines the following functions for the math library: ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -1154,8 +1193,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1233,10 +1272,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -1262,8 +1303,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1323,9 +1366,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -1341,10 +1385,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/EHN.1 b/contrib/bc/manuals/bc/EHN.1 index 6b49f3651d5a..ca88115a5864 100644 --- a/contrib/bc/manuals/bc/EHN.1 +++ b/contrib/bc/manuals/bc/EHN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -43,8 +45,8 @@ bc - arbitrary-precision decimal arithmetic language and calculator .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -256,26 +258,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -351,13 +359,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -404,8 +445,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -812,8 +853,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1102,8 +1143,8 @@ All of the functions below are available when the \f[B]-l\f[R] or \f[B]--mathlib\f[R] command-line flags are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1156,11 +1197,11 @@ Functions\f[R] subsection below). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -1406,8 +1447,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1492,8 +1532,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -1526,8 +1566,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Prompt @@ -1589,8 +1629,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/EHN.1.md b/contrib/bc/manuals/bc/EHN.1.md index 3b60d3d0251b..d3873ba6ac97 100644 --- a/contrib/bc/manuals/bc/EHN.1.md +++ b/contrib/bc/manuals/bc/EHN.1.md @@ -39,9 +39,10 @@ bc - arbitrary-precision decimal arithmetic language and calculator # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -203,23 +204,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -279,12 +286,39 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -330,9 +364,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -648,9 +683,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -883,7 +919,9 @@ command-line flags are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -929,10 +967,11 @@ The [standard][1] defines the following functions for the math library: ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -1154,8 +1193,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1233,10 +1272,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -1262,8 +1303,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1318,9 +1361,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -1333,10 +1377,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/EN.1 b/contrib/bc/manuals/bc/EN.1 index c4704807fac6..1f1e60aad093 100644 --- a/contrib/bc/manuals/bc/EN.1 +++ b/contrib/bc/manuals/bc/EN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -43,8 +45,8 @@ bc - arbitrary-precision decimal arithmetic language and calculator .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -256,26 +258,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -351,13 +359,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -404,8 +445,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -812,8 +853,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1102,8 +1143,8 @@ All of the functions below are available when the \f[B]-l\f[R] or \f[B]--mathlib\f[R] command-line flags are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1156,11 +1197,11 @@ Functions\f[R] subsection below). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -1406,8 +1447,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1492,8 +1532,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -1526,8 +1566,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Command-Line History @@ -1618,8 +1658,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/EN.1.md b/contrib/bc/manuals/bc/EN.1.md index 13ad5f8b570a..3ebd10f8ecb5 100644 --- a/contrib/bc/manuals/bc/EN.1.md +++ b/contrib/bc/manuals/bc/EN.1.md @@ -39,9 +39,10 @@ bc - arbitrary-precision decimal arithmetic language and calculator # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -203,23 +204,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -279,12 +286,39 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -330,9 +364,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -648,9 +683,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -883,7 +919,9 @@ command-line flags are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -929,10 +967,11 @@ The [standard][1] defines the following functions for the math library: ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -1154,8 +1193,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1233,10 +1272,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -1262,8 +1303,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1344,9 +1387,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -1359,10 +1403,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/H.1 b/contrib/bc/manuals/bc/H.1 index f6d555943367..b3e3880b0723 100644 --- a/contrib/bc/manuals/bc/H.1 +++ b/contrib/bc/manuals/bc/H.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -38,13 +40,17 @@ bc - arbitrary-precision decimal arithmetic language and calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -287,26 +293,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -382,13 +394,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -435,8 +491,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -1020,8 +1076,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1328,8 +1384,8 @@ when the \f[B]-s\f[R] option, the \f[B]-w\f[R] option, or equivalents are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1385,7 +1441,8 @@ Functions\f[R] subsection below). The extended library is \f[I]not\f[R] loaded when the \f[B]-s\f[R]/\f[B]--standard\f[R] or \f[B]-w\f[R]/\f[B]--warn\f[R] options are given since they are not part of the library defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). +standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). .PP The extended library is a \f[B]non-portable extension\f[R]. .TP @@ -1404,13 +1461,13 @@ Functions\f[R] subsection below). .TP \f[B]r(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round half away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). +the rounding mode round half away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). .TP \f[B]ceil(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). +the rounding mode round away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). .TP \f[B]f(x)\f[R] Returns the factorial of the truncated absolute value of \f[B]x\f[R]. @@ -2275,11 +2332,11 @@ subsection of the \f[B]FUNCTIONS\f[R] section). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -2558,8 +2615,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -2646,8 +2702,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -2680,8 +2736,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Prompt @@ -2747,8 +2803,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/H.1.md b/contrib/bc/manuals/bc/H.1.md index 47b17f1188e4..f494e5632967 100644 --- a/contrib/bc/manuals/bc/H.1.md +++ b/contrib/bc/manuals/bc/H.1.md @@ -34,14 +34,15 @@ bc - arbitrary-precision decimal arithmetic language and calculator # SYNOPSIS -**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -223,23 +224,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -299,12 +306,48 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -350,9 +393,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -805,9 +849,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -1054,7 +1099,9 @@ equivalents are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -1102,7 +1149,8 @@ The [standard][1] defines the following functions for the math library: The extended library is *not* loaded when the **-s**/**-\-standard** or **-w**/**-\-warn** options are given since they are not part of the library -defined by the [standard][1]. +defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). The extended library is a **non-portable extension**. @@ -1119,12 +1167,14 @@ The extended library is a **non-portable extension**. **r(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round half away from **0**][3]. + round half away from **0** + (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). **ceil(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round away from **0**][6]. + round away from **0** + (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). **f(x)** @@ -1888,10 +1938,11 @@ The extended library is a **non-portable extension**. ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -2134,8 +2185,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -2215,10 +2266,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -2244,8 +2297,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -2305,9 +2360,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -2323,10 +2379,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/HN.1 b/contrib/bc/manuals/bc/HN.1 index 0687cb263b6e..6235a3b9931c 100644 --- a/contrib/bc/manuals/bc/HN.1 +++ b/contrib/bc/manuals/bc/HN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -38,13 +40,17 @@ bc - arbitrary-precision decimal arithmetic language and calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -287,26 +293,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -382,13 +394,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -435,8 +491,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -1020,8 +1076,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1328,8 +1384,8 @@ when the \f[B]-s\f[R] option, the \f[B]-w\f[R] option, or equivalents are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1385,7 +1441,8 @@ Functions\f[R] subsection below). The extended library is \f[I]not\f[R] loaded when the \f[B]-s\f[R]/\f[B]--standard\f[R] or \f[B]-w\f[R]/\f[B]--warn\f[R] options are given since they are not part of the library defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). +standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). .PP The extended library is a \f[B]non-portable extension\f[R]. .TP @@ -1404,13 +1461,13 @@ Functions\f[R] subsection below). .TP \f[B]r(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round half away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). +the rounding mode round half away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). .TP \f[B]ceil(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). +the rounding mode round away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). .TP \f[B]f(x)\f[R] Returns the factorial of the truncated absolute value of \f[B]x\f[R]. @@ -2275,11 +2332,11 @@ subsection of the \f[B]FUNCTIONS\f[R] section). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -2558,8 +2615,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -2646,8 +2702,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -2680,8 +2736,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Prompt @@ -2743,8 +2799,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/HN.1.md b/contrib/bc/manuals/bc/HN.1.md index 12ed1c9c5e74..13f085a5cca7 100644 --- a/contrib/bc/manuals/bc/HN.1.md +++ b/contrib/bc/manuals/bc/HN.1.md @@ -34,14 +34,15 @@ bc - arbitrary-precision decimal arithmetic language and calculator # SYNOPSIS -**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -223,23 +224,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -299,12 +306,48 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -350,9 +393,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -805,9 +849,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -1054,7 +1099,9 @@ equivalents are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -1102,7 +1149,8 @@ The [standard][1] defines the following functions for the math library: The extended library is *not* loaded when the **-s**/**-\-standard** or **-w**/**-\-warn** options are given since they are not part of the library -defined by the [standard][1]. +defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). The extended library is a **non-portable extension**. @@ -1119,12 +1167,14 @@ The extended library is a **non-portable extension**. **r(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round half away from **0**][3]. + round half away from **0** + (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). **ceil(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round away from **0**][6]. + round away from **0** + (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). **f(x)** @@ -1888,10 +1938,11 @@ The extended library is a **non-portable extension**. ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -2134,8 +2185,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -2215,10 +2266,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -2244,8 +2297,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -2300,9 +2355,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -2315,10 +2371,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bc/N.1 b/contrib/bc/manuals/bc/N.1 index 40dbad9bb2f2..def2aee98bbc 100644 --- a/contrib/bc/manuals/bc/N.1 +++ b/contrib/bc/manuals/bc/N.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "BC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH NAME .PP bc - arbitrary-precision decimal arithmetic language and calculator @@ -38,13 +40,17 @@ bc - arbitrary-precision decimal arithmetic language and calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP bc(1) is an interactive processor for a language first standardized in 1991 by POSIX. -(The current standard is -here (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).) +(The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The language provides unlimited precision decimal arithmetic and is somewhat C-like, but there are differences. Such differences will be noted in this document. @@ -287,26 +293,32 @@ multiple times. Keywords are \f[I]not\f[R] redefined when parsing the builtin math library (see the \f[B]LIBRARY\f[R] section). .PP -It is a fatal error to redefine keywords mandated by the POSIX standard. +It is a fatal error to redefine keywords mandated by the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is a fatal error to attempt to redefine words that this bc(1) does not reserve as keywords. .RE .TP \f[B]-q\f[R], \f[B]--quiet\f[R] -This option is for compatibility with the GNU -bc(1) (https://www.gnu.org/software/bc/); it is a no-op. +This option is for compatibility with the GNU bc(1) +(https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU bc(1) prints a copyright header. This bc(1) only prints the copyright header if one or more of the -\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given. +\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given +unless the \f[B]BC_BANNER\f[R] environment variable is set and contains +a non-zero integer or if this bc(1) was built with the header displayed +by default. +If \f[I]any\f[R] of that is the case, then this option \f[I]does\f[R] +prevent bc(1) from printing the header. .RS .PP This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-s\f[R], \f[B]--standard\f[R] -Process exactly the language defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -and error if any extensions are used. +Process exactly the language defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and +error if any extensions are used. .RS .PP This is a \f[B]non-portable extension\f[R]. @@ -382,13 +394,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or \f[B]--expression\f[R] options, then -bc(1) read from \f[B]stdin\f[R]. +bc(1) reads from \f[B]stdin\f[R]. .PP However, there are a few caveats to this. .PP @@ -435,8 +491,8 @@ redirect \f[B]stderr\f[R] to \f[B]/dev/null\f[R]. .SH SYNTAX .PP The syntax for bc(1) programs is mostly C-like, with some differences. -This bc(1) follows the POSIX -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +This bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a much more thorough resource for the language this bc(1) accepts. This section is meant to be a summary and a listing of all the @@ -1020,8 +1076,8 @@ Note that unlike in C, these operators have a lower precedence than the \f[B]assignment\f[R] operators, which means that \f[B]a=b>c\f[R] is interpreted as \f[B](a=b)>c\f[R]. .PP -Also, unlike the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +Also, unlike the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) requires, these operators can appear anywhere any other expressions can be used. This allowance is a \f[B]non-portable extension\f[R]. @@ -1328,8 +1384,8 @@ when the \f[B]-s\f[R] option, the \f[B]-w\f[R] option, or equivalents are given. .SS Standard Library .PP -The -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the following functions for the math library: .TP \f[B]s(x)\f[R] @@ -1385,7 +1441,8 @@ Functions\f[R] subsection below). The extended library is \f[I]not\f[R] loaded when the \f[B]-s\f[R]/\f[B]--standard\f[R] or \f[B]-w\f[R]/\f[B]--warn\f[R] options are given since they are not part of the library defined by the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). +standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). .PP The extended library is a \f[B]non-portable extension\f[R]. .TP @@ -1404,13 +1461,13 @@ Functions\f[R] subsection below). .TP \f[B]r(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round half away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). +the rounding mode round half away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). .TP \f[B]ceil(x, p)\f[R] Returns \f[B]x\f[R] rounded to \f[B]p\f[R] decimal places according to -the rounding mode round away from -\f[B]0\f[R] (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). +the rounding mode round away from \f[B]0\f[R] +(https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). .TP \f[B]f(x)\f[R] Returns the factorial of the truncated absolute value of \f[B]x\f[R]. @@ -2275,11 +2332,11 @@ subsection of the \f[B]FUNCTIONS\f[R] section). .RE .SS Transcendental Functions .PP -All transcendental functions can return slightly inaccurate results (up -to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place)). -This is unavoidable, and this -article (https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT) explains -why it is impossible and unnecessary to calculate exact results for the +All transcendental functions can return slightly inaccurate results, up +to 1 ULP (https://en.wikipedia.org/wiki/Unit_in_the_last_place). +This is unavoidable, and the article at +https://people.eecs.berkeley.edu/\[ti]wkahan/LOG10HAF.TXT explains why +it is impossible and unnecessary to calculate exact results for the transcendental functions. .PP Because of the possible inaccuracy, I recommend that users call those @@ -2558,8 +2615,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit after executing the -expressions and expression files, and a non-zero value makes bc(1) not -exit. +expressions and expression files, and a zero value makes bc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -2646,8 +2702,8 @@ checking, and its normal behavior can be forced by using the \f[B]-i\f[R] flag or \f[B]--interactive\f[R] option. .SH INTERACTIVE MODE .PP -Per the -standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has an interactive mode and a non-interactive mode. Interactive mode is turned on automatically when both \f[B]stdin\f[R] and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag @@ -2680,8 +2736,8 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), +required in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to be connected to a terminal. .SS Command-Line History @@ -2772,8 +2828,8 @@ dc(1) .SH STANDARDS .PP bc(1) is compliant with the IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +(\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The flags \f[B]-efghiqsvVw\f[R], all long options, and the extensions noted above are extensions to that specification. .PP diff --git a/contrib/bc/manuals/bc/N.1.md b/contrib/bc/manuals/bc/N.1.md index 92c239c0b12b..27cc68c8d39a 100644 --- a/contrib/bc/manuals/bc/N.1.md +++ b/contrib/bc/manuals/bc/N.1.md @@ -34,14 +34,15 @@ bc - arbitrary-precision decimal arithmetic language and calculator # SYNOPSIS -**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**bc** [**-ghilPqRsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION bc(1) is an interactive processor for a language first standardized in 1991 by -POSIX. (The current standard is [here][1].) The language provides unlimited -precision decimal arithmetic and is somewhat C-like, but there are differences. -Such differences will be noted in this document. +POSIX. (The current standard is at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html .) The +language provides unlimited precision decimal arithmetic and is somewhat C-like, +but there are differences. Such differences will be noted in this document. After parsing and handling options, this bc(1) reads any files given on the command line and executes them before reading from **stdin**. @@ -223,23 +224,29 @@ The following are the options that bc(1) accepts. Keywords are *not* redefined when parsing the builtin math library (see the **LIBRARY** section). - It is a fatal error to redefine keywords mandated by the POSIX standard. It - is a fatal error to attempt to redefine words that this bc(1) does not - reserve as keywords. + It is a fatal error to redefine keywords mandated by the POSIX standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). It is + a fatal error to attempt to redefine words that this bc(1) does not reserve + as keywords. **-q**, **-\-quiet** -: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op. - Without this option, GNU bc(1) prints a copyright header. This bc(1) only - prints the copyright header if one or more of the **-v**, **-V**, or - **-\-version** options are given. +: This option is for compatibility with the GNU bc(1) + (https://www.gnu.org/software/bc/); it is a no-op. Without this option, GNU + bc(1) prints a copyright header. This bc(1) only prints the copyright header + if one or more of the **-v**, **-V**, or **-\-version** options are given + unless the **BC_BANNER** environment variable is set and contains a non-zero + integer or if this bc(1) was built with the header displayed by default. If + *any* of that is the case, then this option *does* prevent bc(1) from + printing the header. This is a **non-portable extension**. **-s**, **-\-standard** -: Process exactly the language defined by the [standard][1] and error if any - extensions are used. +: Process exactly the language defined by the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) and + error if any extensions are used. This is a **non-portable extension**. @@ -299,12 +306,48 @@ The following are the options that bc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files or expressions are given by the **-f**, **-\-file**, **-e**, or -**-\-expression** options, then bc(1) read from **stdin**. +**-\-expression** options, then bc(1) reads from **stdin**. However, there are a few caveats to this. @@ -350,9 +393,10 @@ it is recommended that those scripts be changed to redirect **stderr** to # SYNTAX The syntax for bc(1) programs is mostly C-like, with some differences. This -bc(1) follows the [POSIX standard][1], which is a much more thorough resource -for the language this bc(1) accepts. This section is meant to be a summary and a -listing of all the extensions to the standard. +bc(1) follows the POSIX standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), which is a +much more thorough resource for the language this bc(1) accepts. This section is +meant to be a summary and a listing of all the extensions to the standard. In the sections below, **E** means expression, **S** means statement, and **I** means identifier. @@ -805,9 +849,10 @@ The operators will be described in more detail below. **assignment** operators, which means that **a=b\>c** is interpreted as **(a=b)\>c**. - Also, unlike the [standard][1] requires, these operators can appear anywhere - any other expressions can be used. This allowance is a - **non-portable extension**. + Also, unlike the standard + (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) + requires, these operators can appear anywhere any other expressions can be + used. This allowance is a **non-portable extension**. **&&** @@ -1054,7 +1099,9 @@ equivalents are given. ## Standard Library -The [standard][1] defines the following functions for the math library: +The standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) defines the +following functions for the math library: **s(x)** @@ -1102,7 +1149,8 @@ The [standard][1] defines the following functions for the math library: The extended library is *not* loaded when the **-s**/**-\-standard** or **-w**/**-\-warn** options are given since they are not part of the library -defined by the [standard][1]. +defined by the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html). The extended library is a **non-portable extension**. @@ -1119,12 +1167,14 @@ The extended library is a **non-portable extension**. **r(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round half away from **0**][3]. + round half away from **0** + (https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero). **ceil(x, p)** : Returns **x** rounded to **p** decimal places according to the rounding mode - [round away from **0**][6]. + round away from **0** + (https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero). **f(x)** @@ -1888,10 +1938,11 @@ The extended library is a **non-portable extension**. ## Transcendental Functions -All transcendental functions can return slightly inaccurate results (up to 1 -[ULP][4]). This is unavoidable, and [this article][5] explains why it is -impossible and unnecessary to calculate exact results for the transcendental -functions. +All transcendental functions can return slightly inaccurate results, up to 1 ULP +(https://en.wikipedia.org/wiki/Unit_in_the_last_place). This is unavoidable, and +the article at https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT explains +why it is impossible and unnecessary to calculate exact results for the +transcendental functions. Because of the possible inaccuracy, I recommend that users call those functions with the precision (**scale**) set to at least 1 higher than is necessary. If @@ -2134,8 +2185,8 @@ bc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes bc(1) exit - after executing the expressions and expression files, and a non-zero value - makes bc(1) not exit. + after executing the expressions and expression files, and a zero value makes + bc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -2215,10 +2266,12 @@ checking, and its normal behavior can be forced by using the **-i** flag or # INTERACTIVE MODE -Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode. -Interactive mode is turned on automatically when both **stdin** and **stdout** -are hooked to a terminal, but the **-i** flag and **-\-interactive** option can -turn it on in other situations. +Per the standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), bc(1) has +an interactive mode and a non-interactive mode. Interactive mode is turned on +automatically when both **stdin** and **stdout** are hooked to a terminal, but +the **-i** flag and **-\-interactive** option can turn it on in other +situations. In interactive mode, bc(1) attempts to recover from errors (see the **RESET** section), and in normal execution, flushes **stdout** as soon as execution is @@ -2244,8 +2297,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) standard +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -2326,9 +2381,10 @@ dc(1) # STANDARDS -bc(1) is compliant with the [IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] -specification. The flags **-efghiqsvVw**, all long options, and the extensions -noted above are extensions to that specification. +bc(1) is compliant with the IEEE Std 1003.1-2017 (“POSIX.1-2017”) specification +at https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html . The +flags **-efghiqsvVw**, all long options, and the extensions noted above are +extensions to that specification. Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -2341,10 +2397,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html -[2]: https://www.gnu.org/software/bc/ -[3]: https://en.wikipedia.org/wiki/Rounding#Round_half_away_from_zero -[4]: https://en.wikipedia.org/wiki/Unit_in_the_last_place -[5]: https://people.eecs.berkeley.edu/~wkahan/LOG10HAF.TXT -[6]: https://en.wikipedia.org/wiki/Rounding#Rounding_away_from_zero diff --git a/contrib/bc/manuals/bcl.3 b/contrib/bc/manuals/bcl.3 index 9370417dcfef..c0678722db0c 100644 --- a/contrib/bc/manuals/bcl.3 +++ b/contrib/bc/manuals/bcl.3 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "BCL" "3" "June 2021" "Gavin D. Howard" "Libraries Manual" +.TH "BCL" "3" "June 2022" "Gavin D. Howard" "Libraries Manual" +.nh +.ad l .SH NAME .PP bcl - library of arbitrary precision decimal arithmetic @@ -228,9 +230,9 @@ generator in bcl(3). .SH DESCRIPTION .PP bcl(3) is a library that implements arbitrary-precision decimal math, as -standardized by -POSIX (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -in bc(1). +standardized by POSIX +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) in +bc(1). .PP bcl(3) is async-signal-safe if \f[B]bcl_handleSignal(\f[R]\f[I]void\f[R]\f[B])\f[R] is used properly. @@ -1376,9 +1378,9 @@ bc(1) and dc(1) .SH STANDARDS .PP bcl(3) is compliant with the arithmetic defined in the IEEE Std -1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification for bc(1). +1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .PP Note that the specification explicitly says that bc(1) only accepts numbers that use a period (\f[B].\f[R]) as a radix point, regardless of diff --git a/contrib/bc/manuals/bcl.3.md b/contrib/bc/manuals/bcl.3.md index fa630fc79f1a..1f694413f7d6 100644 --- a/contrib/bc/manuals/bcl.3.md +++ b/contrib/bc/manuals/bcl.3.md @@ -215,7 +215,8 @@ generator in bcl(3). # DESCRIPTION bcl(3) is a library that implements arbitrary-precision decimal math, as -[standardized by POSIX][1] in bc(1). +standardized by POSIX +(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) in bc(1). bcl(3) is async-signal-safe if **bcl_handleSignal(**_void_**)** is used properly. (See the **SIGNAL HANDLING** section.) @@ -1184,8 +1185,9 @@ bc(1) and dc(1) # STANDARDS -bcl(3) is compliant with the arithmetic defined in the -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification for bc(1). +bcl(3) is compliant with the arithmetic defined in the IEEE Std 1003.1-2017 +(“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). Note that the specification explicitly says that bc(1) only accepts numbers that use a period (**.**) as a radix point, regardless of the value of @@ -1198,5 +1200,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHORS Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/build.md b/contrib/bc/manuals/build.md index aa0ed78e2d72..af0b7c15e0c3 100644 --- a/contrib/bc/manuals/build.md +++ b/contrib/bc/manuals/build.md @@ -46,7 +46,7 @@ However, if you wish to build it yourself, this `bc` can be built using Visual Studio or MSBuild. Unfortunately, only one build configuration (besides Debug or Release) is -supported: extra math enabled, history and NLS (locale support) disabled, with +supported: extra math and history enabled, NLS (locale support) disabled, with both calculators built. The default [settings][11] are `BC_BANNER=1`, `{BC,DC}_SIGINT_RESET=0`, `{BC,DC}_TTY_MODE=1`, `{BC,DC}_PROMPT=1`. @@ -424,15 +424,46 @@ to `configure.sh`, as follows: Both commands are equivalent. -History is automatically disabled when building for Windows or on another -platform that does not support the terminal handling that is required. - ***WARNING***: Of all of the code in the `bc`, this is the only code that is not completely portable. If the `bc` does not work on your platform, your first step should be to retry with history disabled. This option affects the [build type][7]. +##### Editline + +History support can be provided by editline, in order to implement `vi`-like +keybindings and other features. + +To enable editline support pass either the `-e` flag or the `--enable-editline` +option to `configure.sh`, as follows: + +``` +./configure.sh -e +./configure.sh --enable-editline +``` + +Both commands are equivalent. + +This is ignored if history is disabled. + +##### Readline + +History support can be provided by readline, in order to implement `vi`-like +keybindings and other features. + +To enable readline support pass either the `-r` flag or the `--enable-readline` +option to `configure.sh`, as follows: + +``` +./configure.sh -r +./configure.sh --enable-readline +``` + +Both commands are equivalent. + +This is ignored if history is disabled. + #### NLS (Locale Support) To disable locale support (use only English), pass either the `-N` flag or the diff --git a/contrib/bc/manuals/dc/A.1 b/contrib/bc/manuals/dc/A.1 index 3dff3b16d080..cc1ad0e7bb75 100644 --- a/contrib/bc/manuals/dc/A.1 +++ b/contrib/bc/manuals/dc/A.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -37,7 +39,11 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP dc(1) is an arbitrary-precision calculator. @@ -129,7 +135,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +188,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1346,8 +1396,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1456,10 +1505,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Command-Line History .PP Command-line history is only enabled if TTY mode is, i.e., that @@ -1548,10 +1597,10 @@ locales and thus, supports \f[B]LC_MESSAGES\f[R]. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/A.1.md b/contrib/bc/manuals/dc/A.1.md index 618543d7f397..f678c5f5a869 100644 --- a/contrib/bc/manuals/dc/A.1.md +++ b/contrib/bc/manuals/dc/A.1.md @@ -34,7 +34,7 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator # SYNOPSIS -**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,49 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1195,8 +1231,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1297,8 +1333,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1381,8 +1419,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1391,5 +1430,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/E.1 b/contrib/bc/manuals/dc/E.1 index a677bcea0c0c..7f90beac6b1c 100644 --- a/contrib/bc/manuals/dc/E.1 +++ b/contrib/bc/manuals/dc/E.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -129,7 +131,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +184,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1141,8 +1176,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1249,10 +1283,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Command-Line History .PP Command-line history is only enabled if TTY mode is, i.e., that @@ -1341,10 +1375,10 @@ locales and thus, supports \f[B]LC_MESSAGES\f[R]. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/E.1.md b/contrib/bc/manuals/dc/E.1.md index a138fdb32158..f854cbba874b 100644 --- a/contrib/bc/manuals/dc/E.1.md +++ b/contrib/bc/manuals/dc/E.1.md @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,40 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1030,8 +1057,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1130,8 +1157,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1214,8 +1243,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1224,5 +1254,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/EH.1 b/contrib/bc/manuals/dc/EH.1 index 97c05ca44094..96cb156e789f 100644 --- a/contrib/bc/manuals/dc/EH.1 +++ b/contrib/bc/manuals/dc/EH.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -129,7 +131,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +184,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1141,8 +1176,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1249,10 +1283,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Prompt .PP If TTY mode is available, then a prompt can be enabled. @@ -1315,10 +1349,10 @@ locales and thus, supports \f[B]LC_MESSAGES\f[R]. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/EH.1.md b/contrib/bc/manuals/dc/EH.1.md index 459f8ac12e7e..50850226ddbe 100644 --- a/contrib/bc/manuals/dc/EH.1.md +++ b/contrib/bc/manuals/dc/EH.1.md @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,40 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1030,8 +1057,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1130,8 +1157,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1191,8 +1220,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1201,5 +1231,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/EHN.1 b/contrib/bc/manuals/dc/EHN.1 index 223bd9f08dfa..31e60102b971 100644 --- a/contrib/bc/manuals/dc/EHN.1 +++ b/contrib/bc/manuals/dc/EHN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -129,7 +131,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +184,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1141,8 +1176,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1249,10 +1283,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Prompt .PP If TTY mode is available, then a prompt can be enabled. @@ -1311,10 +1345,10 @@ exit, and it uses the default handler for all other signals. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/EHN.1.md b/contrib/bc/manuals/dc/EHN.1.md index 56ac39ed599e..e3b42d4453f6 100644 --- a/contrib/bc/manuals/dc/EHN.1.md +++ b/contrib/bc/manuals/dc/EHN.1.md @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,40 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1030,8 +1057,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1130,8 +1157,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1186,8 +1215,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1196,5 +1226,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/EN.1 b/contrib/bc/manuals/dc/EN.1 index 8c2d14f57840..d941c130e847 100644 --- a/contrib/bc/manuals/dc/EN.1 +++ b/contrib/bc/manuals/dc/EN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -129,7 +131,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +184,46 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1141,8 +1176,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1249,10 +1283,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Command-Line History .PP Command-line history is only enabled if TTY mode is, i.e., that @@ -1337,10 +1371,10 @@ section). bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/EN.1.md b/contrib/bc/manuals/dc/EN.1.md index 03836923c00e..fa02ccf4b43f 100644 --- a/contrib/bc/manuals/dc/EN.1.md +++ b/contrib/bc/manuals/dc/EN.1.md @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,40 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1030,8 +1057,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1130,8 +1157,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1209,8 +1238,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1219,5 +1249,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/H.1 b/contrib/bc/manuals/dc/H.1 index f27358fb7f12..58703e03be34 100644 --- a/contrib/bc/manuals/dc/H.1 +++ b/contrib/bc/manuals/dc/H.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -37,7 +39,11 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP dc(1) is an arbitrary-precision calculator. @@ -129,7 +135,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +188,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1346,8 +1396,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1456,10 +1505,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Prompt .PP If TTY mode is available, then a prompt can be enabled. @@ -1522,10 +1571,10 @@ locales and thus, supports \f[B]LC_MESSAGES\f[R]. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/H.1.md b/contrib/bc/manuals/dc/H.1.md index c97cc8b58eef..50111044d265 100644 --- a/contrib/bc/manuals/dc/H.1.md +++ b/contrib/bc/manuals/dc/H.1.md @@ -34,7 +34,7 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator # SYNOPSIS -**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,49 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1195,8 +1231,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1297,8 +1333,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1358,8 +1396,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1368,5 +1407,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/HN.1 b/contrib/bc/manuals/dc/HN.1 index 13a39ef26540..d67e2325817e 100644 --- a/contrib/bc/manuals/dc/HN.1 +++ b/contrib/bc/manuals/dc/HN.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -37,7 +39,11 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP dc(1) is an arbitrary-precision calculator. @@ -129,7 +135,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +188,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1346,8 +1396,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1456,10 +1505,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Prompt .PP If TTY mode is available, then a prompt can be enabled. @@ -1518,10 +1567,10 @@ exit, and it uses the default handler for all other signals. bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/HN.1.md b/contrib/bc/manuals/dc/HN.1.md index 47c2a0330ae9..79292243304c 100644 --- a/contrib/bc/manuals/dc/HN.1.md +++ b/contrib/bc/manuals/dc/HN.1.md @@ -34,7 +34,7 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator # SYNOPSIS -**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,49 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1195,8 +1231,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1297,8 +1333,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Prompt @@ -1353,8 +1391,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1363,5 +1402,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/manuals/dc/N.1 b/contrib/bc/manuals/dc/N.1 index 16f89b7ee2a1..39782bf95e5e 100644 --- a/contrib/bc/manuals/dc/N.1 +++ b/contrib/bc/manuals/dc/N.1 @@ -25,7 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "DC" "1" "June 2021" "Gavin D. Howard" "General Commands Manual" +.TH "DC" "1" "June 2022" "Gavin D. Howard" "General Commands Manual" +.nh +.ad l .SH Name .PP dc - arbitrary-precision decimal reverse-Polish notation calculator @@ -37,7 +39,11 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator [\f[B]-e\f[R] \f[I]expr\f[R]] [\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R] \f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...] -[\f[I]file\f[R]\&...] +[\f[I]file\f[R]\&...] [\f[B]-I\f[R] \f[I]ibase\f[R]] +[\f[B]--ibase\f[R]=\f[I]ibase\f[R]] [\f[B]-O\f[R] \f[I]obase\f[R]] +[\f[B]--obase\f[R]=\f[I]obase\f[R]] [\f[B]-S\f[R] \f[I]scale\f[R]] +[\f[B]--scale\f[R]=\f[I]scale\f[R]] [\f[B]-E\f[R] \f[I]seed\f[R]] +[\f[B]--seed\f[R]=\f[I]seed\f[R]] .SH DESCRIPTION .PP dc(1) is an arbitrary-precision calculator. @@ -129,7 +135,7 @@ This is a \f[B]non-portable extension\f[R]. .RE .TP \f[B]-z\f[R], \f[B]--leading-zeroes\f[R] -Makes bc(1) print all numbers greater than \f[B]-1\f[R] and less than +Makes dc(1) print all numbers greater than \f[B]-1\f[R] and less than \f[B]1\f[R], and not equal to \f[B]0\f[R], with a leading zero. .RS .PP @@ -182,13 +188,57 @@ exit. .PP This is a \f[B]non-portable extension\f[R]. .RE +.TP +\f[B]-I\f[R] \f[I]ibase\f[R], \f[B]--ibase\f[R]=\f[I]ibase\f[R] +Sets the builtin variable \f[B]ibase\f[R] to the value \f[I]ibase\f[R] +assuming that \f[I]ibase\f[R] is in base 10. +It is a fatal error if \f[I]ibase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-O\f[R] \f[I]obase\f[R], \f[B]--obase\f[R]=\f[I]obase\f[R] +Sets the builtin variable \f[B]obase\f[R] to the value \f[I]obase\f[R] +assuming that \f[I]obase\f[R] is in base 10. +It is a fatal error if \f[I]obase\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-S\f[R] \f[I]scale\f[R], \f[B]--scale\f[R]=\f[I]scale\f[R] +Sets the builtin variable \f[B]scale\f[R] to the value \f[I]scale\f[R] +assuming that \f[I]scale\f[R] is in base 10. +It is a fatal error if \f[I]scale\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE +.TP +\f[B]-E\f[R] \f[I]seed\f[R], \f[B]--seed\f[R]=\f[I]seed\f[R] +Sets the builtin variable \f[B]seed\f[R] to the value \f[I]seed\f[R] +assuming that \f[I]seed\f[R] is in base 10. +It is a fatal error if \f[I]seed\f[R] is not a valid number. +.RS +.PP +If multiple instances of this option are given, the last is used. +.PP +This is a \f[B]non-portable extension\f[R]. +.RE .PP All long options are \f[B]non-portable extensions\f[R]. .SH STDIN .PP If no files are given on the command-line and no files or expressions are given by the \f[B]-f\f[R], \f[B]--file\f[R], \f[B]-e\f[R], or -\f[B]--expression\f[R] options, then dc(1) read from \f[B]stdin\f[R]. +\f[B]--expression\f[R] options, then dc(1) reads from \f[B]stdin\f[R]. .PP However, there is a caveat to this. .PP @@ -1346,8 +1396,7 @@ If any expressions or expression files are given on the command-line with \f[B]-e\f[R], \f[B]--expression\f[R], \f[B]-f\f[R], or \f[B]--file\f[R], then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit after executing the -expressions and expression files, and a non-zero value makes dc(1) not -exit. +expressions and expression files, and a zero value makes dc(1) not exit. .RS .PP This environment variable overrides the default, which can be queried @@ -1456,10 +1505,10 @@ The default setting can be queried with the \f[B]-h\f[R] or \f[B]--help\f[R] options. .PP TTY mode is different from interactive mode because interactive mode is -required in the bc(1) -specification (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html), -and interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] -to be connected to a terminal. +required in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only \f[B]stdin\f[R] and \f[B]stdout\f[R] to +be connected to a terminal. .SS Command-Line History .PP Command-line history is only enabled if TTY mode is, i.e., that @@ -1544,10 +1593,10 @@ section). bc(1) .SH STANDARDS .PP -The dc(1) utility operators are compliant with the operators in the -bc(1) IEEE Std 1003.1-2017 -(\[lq]POSIX.1-2017\[rq]) (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html) -specification. +The dc(1) utility operators are compliant with the operators in the IEEE +Std 1003.1-2017 (\[lq]POSIX.1-2017\[rq]) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for +bc(1). .SH BUGS .PP None are known. diff --git a/contrib/bc/manuals/dc/N.1.md b/contrib/bc/manuals/dc/N.1.md index a14c922b4dbc..25c13b7c2fd4 100644 --- a/contrib/bc/manuals/dc/N.1.md +++ b/contrib/bc/manuals/dc/N.1.md @@ -34,7 +34,7 @@ dc - arbitrary-precision decimal reverse-Polish notation calculator # SYNOPSIS -**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] +**dc** [**-hiPRvVx**] [**-\-version**] [**-\-help**] [**-\-interactive**] [**-\-no-prompt**] [**-\-no-read-prompt**] [**-\-extended-register**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...] [**-I** *ibase*] [**-\-ibase**=*ibase*] [**-O** *obase*] [**-\-obase**=*obase*] [**-S** *scale*] [**-\-scale**=*scale*] [**-E** *seed*] [**-\-seed**=*seed*] # DESCRIPTION @@ -116,7 +116,7 @@ The following are the options that dc(1) accepts. **-z**, **-\-leading-zeroes** -: Makes bc(1) print all numbers greater than **-1** and less than **1**, and +: Makes dc(1) print all numbers greater than **-1** and less than **1**, and not equal to **0**, with a leading zero. This can be set for individual numbers with the **plz(x)**, plznl(x)**, @@ -157,13 +157,49 @@ The following are the options that dc(1) accepts. This is a **non-portable extension**. +**-I** *ibase*, **-\-ibase**=*ibase* + +: Sets the builtin variable **ibase** to the value *ibase* assuming that + *ibase* is in base 10. It is a fatal error if *ibase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-O** *obase*, **-\-obase**=*obase* + +: Sets the builtin variable **obase** to the value *obase* assuming that + *obase* is in base 10. It is a fatal error if *obase* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-S** *scale*, **-\-scale**=*scale* + +: Sets the builtin variable **scale** to the value *scale* assuming that + *scale* is in base 10. It is a fatal error if *scale* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + +**-E** *seed*, **-\-seed**=*seed* + +: Sets the builtin variable **seed** to the value *seed* assuming that *seed* + is in base 10. It is a fatal error if *seed* is not a valid number. + + If multiple instances of this option are given, the last is used. + + This is a **non-portable extension**. + All long options are **non-portable extensions**. # STDIN If no files are given on the command-line and no files or expressions are given by the **-f**, **-\-file**, **-e**, or **-\-expression** options, then dc(1) -read from **stdin**. +reads from **stdin**. However, there is a caveat to this. @@ -1195,8 +1231,8 @@ dc(1) recognizes the following environment variables: : If any expressions or expression files are given on the command-line with **-e**, **-\-expression**, **-f**, or **-\-file**, then if this environment variable exists and contains an integer, a non-zero value makes dc(1) exit - after executing the expressions and expression files, and a non-zero value - makes dc(1) not exit. + after executing the expressions and expression files, and a zero value makes + dc(1) not exit. This environment variable overrides the default, which can be queried with the **-h** or **-\-help** options. @@ -1297,8 +1333,10 @@ setting is used. The default setting can be queried with the **-h** or **-\-help** options. TTY mode is different from interactive mode because interactive mode is required -in the [bc(1) specification][1], and interactive mode requires only **stdin** -and **stdout** to be connected to a terminal. +in the bc(1) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html , and +interactive mode requires only **stdin** and **stdout** to be connected to a +terminal. ## Command-Line History @@ -1376,8 +1414,9 @@ bc(1) # STANDARDS -The dc(1) utility operators are compliant with the operators in the bc(1) -[IEEE Std 1003.1-2017 (“POSIX.1-2017”)][1] specification. +The dc(1) utility operators are compliant with the operators in the IEEE Std +1003.1-2017 (“POSIX.1-2017”) specification at +https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html for bc(1). # BUGS @@ -1386,5 +1425,3 @@ None are known. Report bugs at https://git.yzena.com/gavin/bc. # AUTHOR Gavin D. Howard <gavin@yzena.com> and contributors. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html diff --git a/contrib/bc/scripts/format.sh b/contrib/bc/scripts/format.sh new file mode 100755 index 000000000000..3e399da5777c --- /dev/null +++ b/contrib/bc/scripts/format.sh @@ -0,0 +1,49 @@ +#! /bin/sh +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2018-2021 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: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +scriptdir=$(dirname "$0") + +cd "$scriptdir/.." + +if [ "$#" -gt 0 ]; then + files="$@" +else + files=$(find "." -name "*.c" -or -name "*.h") +fi + +for f in $files; do + + case "$f" in + *scripts/ministat.c) continue ;; + esac + + clang-format -i --style=file "$f" + sed -i 's|^#else //|#else //|g' "$f" + +done diff --git a/contrib/bc/scripts/functions.sh b/contrib/bc/scripts/functions.sh index 65ec0a1167fe..53778ad4d16b 100755 --- a/contrib/bc/scripts/functions.sh +++ b/contrib/bc/scripts/functions.sh @@ -326,3 +326,97 @@ gen_nlspath() { # Return the result. printf '%s' "$_gen_nlspath_nlspath" } + +ALL=0 +NOSKIP=1 +SKIP=2 + +# Filters text out of a file according to the build type. +# @param in File to filter. +# @param out File to write the filtered output to. +# @param type Build type. +filter_text() { + + _filter_text_in="$1" + shift + + _filter_text_out="$1" + shift + + _filter_text_buildtype="$1" + shift + + # Set up some local variables. + _filter_text_status="$ALL" + _filter_text_temp="$_filter_text_out.tmp" + + # We need to set IFS, so we store it here for restoration later. + _filter_text_ifs="$IFS" + + # Remove the file- that will be generated. + rm -rf "$_filter_text_out" "$_filter_text_temp" + + # Here is the magic. This loop reads the template line-by-line, and based on + # _filter_text_status, either prints it to the markdown manual or not. + # + # Here is how the template is set up: it is a normal markdown file except + # that there are sections surrounded tags that look like this: + # + # {{ <build_type_list> }} + # ... + # {{ end }} + # + # Those tags mean that whatever build types are found in the + # <build_type_list> get to keep that section. Otherwise, skip. + # + # Obviously, the tag itself and its end are not printed to the markdown + # manual. + while IFS= read -r line; do + + # If we have found an end, reset the status. + if [ "$line" = "{{ end }}" ]; then + + # Some error checking. This helps when editing the templates. + if [ "$_filter_text_status" -eq "$ALL" ]; then + err_exit "{{ end }} tag without corresponding start tag" 2 + fi + + _filter_text_status="$ALL" + + # We have found a tag that allows our build type to use it. + elif [ "${line#\{\{* $_filter_text_buildtype *\}\}}" != "$line" ]; then + + # More error checking. We don't want tags nested. + if [ "$_filter_text_status" -ne "$ALL" ]; then + err_exit "start tag nested in start tag" 3 + fi + + _filter_text_status="$NOSKIP" + + # We have found a tag that is *not* allowed for our build type. + elif [ "${line#\{\{*\}\}}" != "$line" ]; then + + if [ "$_filter_text_status" -ne "$ALL" ]; then + err_exit "start tag nested in start tag" 3 + fi + + _filter_text_status="$SKIP" + + # This is for normal lines. If we are not skipping, print. + else + if [ "$_filter_text_status" -ne "$SKIP" ]; then + printf '%s\n' "$line" >> "$_filter_text_temp" + fi + fi + + done < "$_filter_text_in" + + # Remove multiple blank lines. + uniq "$_filter_text_temp" "$_filter_text_out" + + # Remove the temp file. + #rm -rf "$_filter_text_temp" + + # Reset IFS. + IFS="$_filter_text_ifs" +} diff --git a/contrib/bc/scripts/lint.sh b/contrib/bc/scripts/lint.sh new file mode 100755 index 000000000000..65f81c5f6511 --- /dev/null +++ b/contrib/bc/scripts/lint.sh @@ -0,0 +1,63 @@ +#! /bin/sh +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2018-2021 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: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +scriptdir=$(dirname "$0") + +cd "$scriptdir/.." + +if [ "$#" -gt 0 ]; then + files="$@" +else + files=$(find "." -name "*.c" -or -name "*.h") +fi + +for f in $files; do + + case "$f" in + *scripts/ministat.c) continue ;; + esac + + contents=$(clang-tidy --use-color -p ../build "$f" -- -I./include \ + -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE \ + -D_GNU_SOURCE -D_DEFAULT_SOURCE 2>&1) + + err="$?" + + if [ ! -z "$contents" ] || [ "$err" -ne 0 ]; then + + printf '%s\n' "$f" + printf '%s\n' "$contents" + printf '\n' + + if [ "$err" -ne 0 ]; then + exit "$err" + fi + fi + +done diff --git a/contrib/bc/src/args.c b/contrib/bc/src/args.c index 5eee96f5b559..64fd02c1d7b8 100644 --- a/contrib/bc/src/args.c +++ b/contrib/bc/src/args.c @@ -47,12 +47,15 @@ #include <read.h> #include <args.h> #include <opt.h> +#include <num.h> /** * Adds @a str to the list of expressions to execute later. * @param str The string to add to the list of expressions. */ -static void bc_args_exprs(const char *str) { +static void +bc_args_exprs(const char* str) +{ BC_SIG_ASSERT_LOCKED; if (vm.exprs.v == NULL) bc_vec_init(&vm.exprs, sizeof(uchar), BC_DTOR_NONE); bc_vec_concat(&vm.exprs, str); @@ -64,9 +67,10 @@ static void bc_args_exprs(const char *str) { * @param file The name of the file whose contents should be added to the list * of expressions to execute. */ -static void bc_args_file(const char *file) { - - char *buf; +static void +bc_args_file(const char* file) +{ + char* buf; BC_SIG_ASSERT_LOCKED; @@ -80,6 +84,31 @@ static void bc_args_file(const char *file) { free(buf); } +static BcBigDig +bc_args_builtin(const char* arg) +{ + bool strvalid; + BcNum n; + BcBigDig res; + + strvalid = bc_num_strValid(arg); + + if (BC_ERR(!strvalid)) + { + bc_verr(BC_ERR_FATAL_ARG, arg); + } + + bc_num_init(&n, 0); + + bc_num_parse(&n, arg, 10); + + res = bc_num_bigdig(&n); + + bc_num_free(&n); + + return res; +} + #if BC_ENABLED /** @@ -87,18 +116,19 @@ static void bc_args_file(const char *file) { * throws a fatal error. * @param keyword The keyword to redefine. */ -static void bc_args_redefine(const char *keyword) { - +static void +bc_args_redefine(const char* keyword) +{ size_t i; BC_SIG_ASSERT_LOCKED; - for (i = 0; i < bc_lex_kws_len; ++i) { - - const BcLexKeyword *kw = bc_lex_kws + i; - - if (!strcmp(keyword, kw->name)) { + for (i = 0; i < bc_lex_kws_len; ++i) + { + const BcLexKeyword* kw = bc_lex_kws + i; + if (!strcmp(keyword, kw->name)) + { if (BC_LEX_KW_POSIX(kw)) break; vm.redefined_kws[i] = true; @@ -112,12 +142,17 @@ static void bc_args_redefine(const char *keyword) { #endif // BC_ENABLED -void bc_args(int argc, char *argv[], bool exit_exprs) { - +void +bc_args(int argc, char* argv[], bool exit_exprs, BcBigDig scale) +{ int c; size_t i; bool do_exit = false, version = false; BcOpt opts; + BcBigDig newscale = scale, ibase = BC_BASE, obase = BC_BASE; +#if BC_ENABLE_EXTRA_MATH + char* seed = NULL; +#endif // BC_ENABLE_EXTRA_MATH BC_SIG_ASSERT_LOCKED; @@ -125,15 +160,17 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { // This loop should look familiar to anyone who has used getopt() or // getopt_long() in C. - while ((c = bc_opt_parse(&opts, bc_args_lopt)) != -1) { - - switch (c) { - + while ((c = bc_opt_parse(&opts, bc_args_lopt)) != -1) + { + switch (c) + { case 'e': { // Barf if not allowed. if (vm.no_exprs) + { bc_verr(BC_ERR_FATAL_OPTION, "-e (--expression)"); + } // Add the expressions and set exit. bc_args_exprs(opts.optarg); @@ -146,13 +183,15 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { { // Figure out if exiting on expressions is disabled. if (!strcmp(opts.optarg, "-")) vm.no_exprs = true; - else { - + else + { // Barf if not allowed. if (vm.no_exprs) + { bc_verr(BC_ERR_FATAL_OPTION, "-f (--file)"); + } - // Add the expressions and set exit. + // Add the expressions and set exit. bc_args_file(opts.optarg); vm.exit_exprs = (exit_exprs || vm.exit_exprs); } @@ -173,6 +212,12 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { break; } + case 'I': + { + ibase = bc_args_builtin(opts.optarg); + break; + } + case 'z': { vm.flags |= BC_FLAG_Z; @@ -185,6 +230,12 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { break; } + case 'O': + { + obase = bc_args_builtin(opts.optarg); + break; + } + case 'P': { vm.flags &= ~(BC_FLAG_P); @@ -197,6 +248,26 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { break; } + case 'S': + { + newscale = bc_args_builtin(opts.optarg); + break; + } + +#if BC_ENABLE_EXTRA_MATH + case 'E': + { + if (BC_ERR(!bc_num_strValid(opts.optarg))) + { + bc_verr(BC_ERR_FATAL_ARG, opts.optarg); + } + + seed = opts.optarg; + + break; + } +#endif // BC_ENABLE_EXTRA_MATH + #if BC_ENABLED case 'g': { @@ -271,7 +342,8 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { } if (version) bc_vm_info(NULL); - if (do_exit) { + if (do_exit) + { vm.status = (sig_atomic_t) BC_STATUS_QUIT; BC_JMP; } @@ -282,9 +354,52 @@ void bc_args(int argc, char *argv[], bool exit_exprs) { // We need to make sure the files list is initialized. We don't want to // initialize it if there are no files because it's just a waste of memory. if (opts.optind < (size_t) argc && vm.files.v == NULL) + { bc_vec_init(&vm.files, sizeof(char*), BC_DTOR_NONE); + } // Add all the files to the vector. for (i = opts.optind; i < (size_t) argc; ++i) + { bc_vec_push(&vm.files, argv + i); + } + +#if BC_ENABLE_EXTRA_MATH + if (seed != NULL) + { + BcNum n; + + bc_num_init(&n, strlen(seed)); + + BC_SIG_UNLOCK; + + bc_num_parse(&n, seed, BC_BASE); + + bc_program_assignSeed(&vm.prog, &n); + + BC_SIG_LOCK; + + bc_num_free(&n); + } +#endif // BC_ENABLE_EXTRA_MATH + + BC_SIG_UNLOCK; + + if (newscale != scale) + { + bc_program_assignBuiltin(&vm.prog, true, false, newscale); + } + + if (obase != BC_BASE) + { + bc_program_assignBuiltin(&vm.prog, false, true, obase); + } + + // This is last to avoid it affecting the value of the others. + if (ibase != BC_BASE) + { + bc_program_assignBuiltin(&vm.prog, false, false, ibase); + } + + BC_SIG_LOCK; } diff --git a/contrib/bc/src/bc.c b/contrib/bc/src/bc.c index 4f35cc42b916..77fa06512dda 100644 --- a/contrib/bc/src/bc.c +++ b/contrib/bc/src/bc.c @@ -45,8 +45,9 @@ * @param argc The number of arguments. * @param argv The arguments. */ -void bc_main(int argc, char *argv[]) { - +void +bc_main(int argc, char* argv[]) +{ // All of these just set bc-specific items in BcVm. vm.read_ret = BC_INST_RET; diff --git a/contrib/bc/src/bc_lex.c b/contrib/bc/src/bc_lex.c index 4ab17c824b71..1097b92647a6 100644 --- a/contrib/bc/src/bc_lex.c +++ b/contrib/bc/src/bc_lex.c @@ -46,21 +46,22 @@ * Lexes an identifier, which may be a keyword. * @param l The lexer. */ -static void bc_lex_identifier(BcLex *l) { - +static void +bc_lex_identifier(BcLex* l) +{ // We already passed the first character, so we need to be sure to include // it. - const char *buf = l->buf + l->i - 1; + const char* buf = l->buf + l->i - 1; size_t i; // This loop is simply checking for keywords. - for (i = 0; i < bc_lex_kws_len; ++i) { - - const BcLexKeyword *kw = bc_lex_kws + i; + for (i = 0; i < bc_lex_kws_len; ++i) + { + const BcLexKeyword* kw = bc_lex_kws + i; size_t n = BC_LEX_KW_LEN(kw); - if (!strncmp(buf, kw->name, n) && !isalnum(buf[n]) && buf[n] != '_') { - + if (!strncmp(buf, kw->name, n) && !isalnum(buf[n]) && buf[n] != '_') + { // If the keyword has been redefined, and redefinition is allowed // (it is not allowed for builtin libraries), break out of the loop // and use it as a name. This depends on the argument parser to @@ -87,7 +88,9 @@ static void bc_lex_identifier(BcLex *l) { // POSIX doesn't allow identifiers that are more than one character, so we // might have to warn or error here too. if (BC_ERR(l->str.len - 1 > 1)) + { bc_lex_verr(l, BC_ERR_POSIX_NAME_LEN, l->str.v); + } } /** @@ -95,18 +98,19 @@ static void bc_lex_identifier(BcLex *l) { * to be balanced. * @param l The lexer. */ -static void bc_lex_string(BcLex *l) { - +static void +bc_lex_string(BcLex* l) +{ // We need to keep track of newlines to increment them properly. size_t len, nlines, i; - const char *buf; + const char* buf; char c; bool got_more; l->t = BC_LEX_STR; - do { - + do + { nlines = 0; buf = l->buf; got_more = false; @@ -115,15 +119,21 @@ static void bc_lex_string(BcLex *l) { // Fortunately for us, bc doesn't escape quotes. Instead, the equivalent // is '\q', which makes this loop simpler. - for (i = l->i; (c = buf[i]) && c != '"'; ++i) nlines += (c == '\n'); + for (i = l->i; (c = buf[i]) && c != '"'; ++i) + { + nlines += (c == '\n'); + } if (BC_ERR(c == '\0') && !vm.eof && (l->is_stdin || l->is_exprs)) + { got_more = bc_lex_readLine(l); - - } while (got_more && c != '"'); + } + } + while (got_more && c != '"'); // If the string did not end properly, barf. - if (c != '"') { + if (c != '"') + { l->i = i; bc_lex_err(l, BC_ERR_PARSE_STRING); } @@ -143,16 +153,20 @@ static void bc_lex_string(BcLex *l) { * @param with The token to assign if it is an assignment operator. * @param without The token to assign if it is not an assignment operator. */ -static void bc_lex_assign(BcLex *l, BcLexType with, BcLexType without) { - if (l->buf[l->i] == '=') { +static void +bc_lex_assign(BcLex* l, BcLexType with, BcLexType without) +{ + if (l->buf[l->i] == '=') + { l->i += 1; l->t = with; } else l->t = without; } -void bc_lex_token(BcLex *l) { - +void +bc_lex_token(BcLex* l) +{ // We increment here. This means that all lexing needs to take that into // account, such as when parsing an identifier. If we don't, the first // character of every identifier would be missing. @@ -161,8 +175,8 @@ void bc_lex_token(BcLex *l) { BC_SIG_ASSERT_LOCKED; // This is the workhorse of the lexer. - switch (c) { - + switch (c) + { case '\0': case '\n': case '\t': @@ -182,7 +196,9 @@ void bc_lex_token(BcLex *l) { // POSIX doesn't allow boolean not. if (l->t == BC_LEX_OP_BOOL_NOT) + { bc_lex_verr(l, BC_ERR_POSIX_BOOL, "!"); + } break; } @@ -213,8 +229,8 @@ void bc_lex_token(BcLex *l) { // Either we have boolean and or an error. And boolean and is not // allowed by POSIX. - if (BC_NO_ERR(c2 == '&')) { - + if (BC_NO_ERR(c2 == '&')) + { bc_lex_verr(l, BC_ERR_POSIX_BOOL, "&&"); l->i += 1; @@ -255,7 +271,8 @@ void bc_lex_token(BcLex *l) { c2 = l->buf[l->i]; // Have to check for increment first. - if (c2 == '+') { + if (c2 == '+') + { l->i += 1; l->t = BC_LEX_OP_INC; } @@ -274,7 +291,8 @@ void bc_lex_token(BcLex *l) { c2 = l->buf[l->i]; // Have to check for decrement first. - if (c2 == '-') { + if (c2 == '-') + { l->i += 1; l->t = BC_LEX_OP_DEC; } @@ -288,7 +306,8 @@ void bc_lex_token(BcLex *l) { // If it's alone, it's an alias for last. if (BC_LEX_NUM_CHAR(c2, true, false)) bc_lex_number(l, c); - else { + else + { l->t = BC_LEX_KW_LAST; bc_lex_err(l, BC_ERR_POSIX_DOT); } @@ -299,7 +318,7 @@ void bc_lex_token(BcLex *l) { case '/': { c2 = l->buf[l->i]; - if (c2 =='*') bc_lex_comment(l); + if (c2 == '*') bc_lex_comment(l); else bc_lex_assign(l, BC_LEX_OP_ASSIGN_DIVIDE, BC_LEX_OP_DIVIDE); break; } @@ -361,7 +380,8 @@ void bc_lex_token(BcLex *l) { c2 = l->buf[l->i]; // Check for shift. - if (c2 == '<') { + if (c2 == '<') + { l->i += 1; bc_lex_assign(l, BC_LEX_OP_ASSIGN_LSHIFT, BC_LEX_OP_LSHIFT); break; @@ -383,7 +403,8 @@ void bc_lex_token(BcLex *l) { c2 = l->buf[l->i]; // Check for shift. - if (c2 == '>') { + if (c2 == '>') + { l->i += 1; bc_lex_assign(l, BC_LEX_OP_ASSIGN_RSHIFT, BC_LEX_OP_RSHIFT); break; @@ -403,7 +424,8 @@ void bc_lex_token(BcLex *l) { case '\\': { // In bc, a backslash+newline is whitespace. - if (BC_NO_ERR(l->buf[l->i] == '\n')) { + if (BC_NO_ERR(l->buf[l->i] == '\n')) + { l->i += 1; l->t = BC_LEX_WHITESPACE; } @@ -460,8 +482,8 @@ void bc_lex_token(BcLex *l) { c2 = l->buf[l->i]; // Once again, boolean or is not allowed by POSIX. - if (BC_NO_ERR(c2 == '|')) { - + if (BC_NO_ERR(c2 == '|')) + { bc_lex_verr(l, BC_ERR_POSIX_BOOL, "||"); l->i += 1; diff --git a/contrib/bc/src/bc_parse.c b/contrib/bc/src/bc_parse.c index 8849c1b8e9c7..33f98c896398 100644 --- a/contrib/bc/src/bc_parse.c +++ b/contrib/bc/src/bc_parse.c @@ -55,23 +55,31 @@ // compared to this. This is where dreams go to die, where dragons live, and // from which Ken Thompson himself would flee. -static void bc_parse_else(BcParse *p); -static void bc_parse_stmt(BcParse *p); -static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, - BcParseNext next); -static void bc_parse_expr_status(BcParse *p, uint8_t flags, BcParseNext next); +static void +bc_parse_else(BcParse* p); + +static void +bc_parse_stmt(BcParse* p); + +static BcParseStatus +bc_parse_expr_err(BcParse* p, uint8_t flags, BcParseNext next); + +static void +bc_parse_expr_status(BcParse* p, uint8_t flags, BcParseNext next); /** * Returns true if an instruction could only have come from a "leaf" expression. * For more on what leaf expressions are, read the comment for BC_PARSE_LEAF(). * @param t The instruction to test. */ -static bool bc_parse_inst_isLeaf(BcInst t) { +static bool +bc_parse_inst_isLeaf(BcInst t) +{ return (t >= BC_INST_NUM && t <= BC_INST_MAXSCALE) || #if BC_ENABLE_EXTRA_MATH - t == BC_INST_TRUNC || + t == BC_INST_TRUNC || #endif // BC_ENABLE_EXTRA_MATH - t <= BC_INST_DEC; + t <= BC_INST_DEC; } /** @@ -81,8 +89,9 @@ static bool bc_parse_inst_isLeaf(BcInst t) { * @param p The parser. * @return True if the token is a legal delimiter. */ -static bool bc_parse_isDelimiter(const BcParse *p) { - +static bool +bc_parse_isDelimiter(const BcParse* p) +{ BcLexType t = p->l.t; bool good; @@ -94,33 +103,36 @@ static bool bc_parse_isDelimiter(const BcParse *p) { // If the current token is a keyword, then...beware. That means that we need // to check for a "dangling" else, where there was no brace-delimited block // on the previous if. - if (t == BC_LEX_KW_ELSE) { - + if (t == BC_LEX_KW_ELSE) + { size_t i; uint16_t *fptr = NULL, flags = BC_PARSE_FLAG_ELSE; // As long as going up the stack is valid for a dangling else, keep on. - for (i = 0; i < p->flags.len && BC_PARSE_BLOCK_STMT(flags); ++i) { - + for (i = 0; i < p->flags.len && BC_PARSE_BLOCK_STMT(flags); ++i) + { fptr = bc_vec_item_rev(&p->flags, i); flags = *fptr; // If we need a brace and don't have one, then we don't have a // delimiter. if ((flags & BC_PARSE_FLAG_BRACE) && p->l.last != BC_LEX_RBRACE) + { return false; + } } // Oh, and we had also better have an if statement somewhere. good = ((flags & BC_PARSE_FLAG_IF) != 0); } - else if (t == BC_LEX_RBRACE) { - + else if (t == BC_LEX_RBRACE) + { size_t i; // Since we have a brace, we need to just check if a brace was needed. - for (i = 0; !good && i < p->flags.len; ++i) { - uint16_t *fptr = bc_vec_item_rev(&p->flags, i); + for (i = 0; !good && i < p->flags.len; ++i) + { + uint16_t* fptr = bc_vec_item_rev(&p->flags, i); good = (((*fptr) & BC_PARSE_FLAG_BRACE) != 0); } } @@ -135,8 +147,9 @@ static bool bc_parse_isDelimiter(const BcParse *p) { * @param p The parser. * @return True if we are in the top level of parsing a function body. */ -static bool bc_parse_TopFunc(const BcParse *p) { - +static bool +bc_parse_TopFunc(const BcParse* p) +{ bool good = p->flags.len == 2; uint16_t val = BC_PARSE_FLAG_BRACE | BC_PARSE_FLAG_FUNC_INNER; @@ -150,11 +163,12 @@ static bool bc_parse_TopFunc(const BcParse *p) { * section of the Development manual (manuals/development.md). * @param p The parser. */ -static void bc_parse_setLabel(BcParse *p) { - - BcFunc *func = p->func; - BcInstPtr *ip = bc_vec_top(&p->exits); - size_t *label; +static void +bc_parse_setLabel(BcParse* p) +{ + BcFunc* func = p->func; + BcInstPtr* ip = bc_vec_top(&p->exits); + size_t* label; assert(func == bc_vec_item(&p->prog->fns, p->fidx)); @@ -173,7 +187,9 @@ static void bc_parse_setLabel(BcParse *p) { * @param p The parser. * @param idx The index of the label. */ -static void bc_parse_createLabel(BcParse *p, size_t idx) { +static void +bc_parse_createLabel(BcParse* p, size_t idx) +{ bc_vec_push(&p->func->labels, &idx); } @@ -183,7 +199,9 @@ static void bc_parse_createLabel(BcParse *p, size_t idx) { * @param p The parser. * @param idx The index of the label. */ -static void bc_parse_createCondLabel(BcParse *p, size_t idx) { +static void +bc_parse_createCondLabel(BcParse* p, size_t idx) +{ bc_parse_createLabel(p, p->func->code.len); bc_vec_push(&p->conds, &idx); } @@ -202,8 +220,9 @@ static void bc_parse_createCondLabel(BcParse *p, size_t idx) { * @param idx The index of the label's position. * @param loop True if the exit label is for a loop or not. */ -static void bc_parse_createExitLabel(BcParse *p, size_t idx, bool loop) { - +static void +bc_parse_createExitLabel(BcParse* p, size_t idx, bool loop) +{ BcInstPtr ip; assert(p->func == bc_vec_item(&p->prog->fns, p->fidx)); @@ -228,16 +247,16 @@ static void bc_parse_createExitLabel(BcParse *p, size_t idx, bool loop) { * @param nexprs A pointer to the current number of expressions that have not * been consumed yet. This is an IN and OUT parameter. */ -static void bc_parse_operator(BcParse *p, BcLexType type, - size_t start, size_t *nexprs) +static void +bc_parse_operator(BcParse* p, BcLexType type, size_t start, size_t* nexprs) { BcLexType t; uchar l, r = BC_PARSE_OP_PREC(type); uchar left = BC_PARSE_OP_LEFT(type); // While we haven't hit the stop point yet. - while (p->ops.len > start) { - + while (p->ops.len > start) + { // Get the top operator. t = BC_PARSE_TOP_OP(p); @@ -270,12 +289,14 @@ static void bc_parse_operator(BcParse *p, BcLexType type, * @param nexprs A pointer to the current number of expressions that have not * been consumed yet. This is an IN and OUT parameter. */ -static void bc_parse_rightParen(BcParse *p, size_t *nexprs) { - +static void +bc_parse_rightParen(BcParse* p, size_t* nexprs) +{ BcLexType top; // Consume operators until a left paren. - while ((top = BC_PARSE_TOP_OP(p)) != BC_LEX_LPAREN) { + while ((top = BC_PARSE_TOP_OP(p)) != BC_LEX_LPAREN) + { bc_parse_push(p, BC_PARSE_TOKEN_INST(top)); bc_vec_pop(&p->ops); *nexprs -= !BC_PARSE_OP_PREFIX(top); @@ -294,8 +315,9 @@ static void bc_parse_rightParen(BcParse *p, size_t *nexprs) { * @param flags Flags restricting what kind of expressions the arguments can * be. */ -static void bc_parse_args(BcParse *p, uint8_t flags) { - +static void +bc_parse_args(BcParse* p, uint8_t flags) +{ bool comma = false; size_t nargs; @@ -307,8 +329,8 @@ static void bc_parse_args(BcParse *p, uint8_t flags) { flags |= (BC_PARSE_ARRAY | BC_PARSE_NEEDVAL); // Count the arguments and parse them. - for (nargs = 0; p->l.t != BC_LEX_RPAREN; ++nargs) { - + for (nargs = 0; p->l.t != BC_LEX_RPAREN; ++nargs) + { bc_parse_expr_status(p, flags, bc_parse_next_arg); comma = (p->l.t == BC_LEX_COMMA); @@ -329,8 +351,9 @@ static void bc_parse_args(BcParse *p, uint8_t flags) { * @param flags Flags restricting what kind of expressions the arguments can * be. */ -static void bc_parse_call(BcParse *p, const char *name, uint8_t flags) { - +static void +bc_parse_call(BcParse* p, const char* name, uint8_t flags) +{ size_t idx; bc_parse_args(p, flags); @@ -345,8 +368,8 @@ static void bc_parse_call(BcParse *p, const char *name, uint8_t flags) { // The function does not exist yet. Create a space for it. If the user does // not define it, it's a *runtime* error, not a parse error. - if (idx == BC_VEC_INVALID_IDX) { - + if (idx == BC_VEC_INVALID_IDX) + { idx = bc_program_insertFunc(p->prog, name); assert(idx != BC_VEC_INVALID_IDX); @@ -368,10 +391,10 @@ static void bc_parse_call(BcParse *p, const char *name, uint8_t flags) { * element, an array itself (for function arguments), a function call, etc. * */ -static void bc_parse_name(BcParse *p, BcInst *type, - bool *can_assign, uint8_t flags) +static void +bc_parse_name(BcParse* p, BcInst* type, bool* can_assign, uint8_t flags) { - char *name; + char* name; BC_SIG_ASSERT_LOCKED; @@ -384,22 +407,24 @@ static void bc_parse_name(BcParse *p, BcInst *type, bc_lex_next(&p->l); // Array element or array. - if (p->l.t == BC_LEX_LBRACKET) { - + if (p->l.t == BC_LEX_LBRACKET) + { bc_lex_next(&p->l); // Array only. This has to be a function parameter. - if (p->l.t == BC_LEX_RBRACKET) { - + if (p->l.t == BC_LEX_RBRACKET) + { // Error if arrays are not allowed. if (BC_ERR(!(flags & BC_PARSE_ARRAY))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } *type = BC_INST_ARRAY; *can_assign = false; } - else { - + else + { // If we are here, we have an array element. We need to set the // expression parsing flags. uint8_t flags2 = (flags & ~(BC_PARSE_PRINT | BC_PARSE_REL)) | @@ -409,7 +434,9 @@ static void bc_parse_name(BcParse *p, BcInst *type, // The next token *must* be a right bracket. if (BC_ERR(p->l.t != BC_LEX_RBRACKET)) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } *type = BC_INST_ARRAY_ELEM; *can_assign = true; @@ -422,18 +449,21 @@ static void bc_parse_name(BcParse *p, BcInst *type, bc_parse_push(p, *type); bc_parse_pushName(p, name, false); } - else if (p->l.t == BC_LEX_LPAREN) { - + else if (p->l.t == BC_LEX_LPAREN) + { // We are parsing a function call; error if not allowed. if (BC_ERR(flags & BC_PARSE_NOCALL)) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } *type = BC_INST_CALL; *can_assign = false; bc_parse_call(p, name, flags); } - else { + else + { // Just a variable. *type = BC_INST_VAR; *can_assign = true; @@ -454,8 +484,9 @@ err: * @param p The parser. * @param inst The instruction corresponding to the builtin. */ -static void bc_parse_noArgBuiltin(BcParse *p, BcInst inst) { - +static void +bc_parse_noArgBuiltin(BcParse* p, BcInst inst) +{ // Must have a left paren. bc_lex_next(&p->l); if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); @@ -477,13 +508,12 @@ static void bc_parse_noArgBuiltin(BcParse *p, BcInst inst) { * @param flags The expression parsing flags for parsing the argument. * @param prev An out parameter; the previous instruction pointer. */ -static void bc_parse_builtin(BcParse *p, BcLexType type, - uint8_t flags, BcInst *prev) +static void +bc_parse_builtin(BcParse* p, BcLexType type, uint8_t flags, BcInst* prev) { // Must have a left paren. bc_lex_next(&p->l); - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); @@ -497,8 +527,7 @@ static void bc_parse_builtin(BcParse *p, BcLexType type, bc_parse_expr_status(p, flags, bc_parse_next_rel); // Must have a right paren. - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // Adjust previous based on the token and push it. *prev = type - BC_LEX_KW_LENGTH + BC_INST_LENGTH; @@ -511,15 +540,14 @@ static void bc_parse_builtin(BcParse *p, BcLexType type, * Parses a builtin function that takes 3 arguments. This includes modexp() and * divmod(). */ -static void bc_parse_builtin3(BcParse *p, BcLexType type, - uint8_t flags, BcInst *prev) +static void +bc_parse_builtin3(BcParse* p, BcLexType type, uint8_t flags, BcInst* prev) { assert(type == BC_LEX_KW_MODEXP || type == BC_LEX_KW_DIVMOD); // Must have a left paren. bc_lex_next(&p->l); - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); @@ -530,23 +558,21 @@ static void bc_parse_builtin3(BcParse *p, BcLexType type, bc_parse_expr_status(p, flags, bc_parse_next_builtin); // Must have a comma. - if (BC_ERR(p->l.t != BC_LEX_COMMA)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_COMMA)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); bc_parse_expr_status(p, flags, bc_parse_next_builtin); // Must have a comma. - if (BC_ERR(p->l.t != BC_LEX_COMMA)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_COMMA)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); // If it is a divmod, parse an array name. Otherwise, just parse another // expression. - if (type == BC_LEX_KW_DIVMOD) { - + if (type == BC_LEX_KW_DIVMOD) + { // Must have a name. if (BC_ERR(p->l.t != BC_LEX_NAME)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); @@ -555,14 +581,18 @@ static void bc_parse_builtin3(BcParse *p, BcLexType type, // Must have a left bracket. if (BC_ERR(p->l.t != BC_LEX_LBRACKET)) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } // This is safe because the next token should not overwrite the name. bc_lex_next(&p->l); // Must have a right bracket. if (BC_ERR(p->l.t != BC_LEX_RBRACKET)) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } // This is safe because the next token should not overwrite the name. bc_lex_next(&p->l); @@ -570,8 +600,7 @@ static void bc_parse_builtin3(BcParse *p, BcLexType type, else bc_parse_expr_status(p, flags, bc_parse_next_rel); // Must have a right paren. - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // Adjust previous based on the token and push it. *prev = type - BC_LEX_KW_MODEXP + BC_INST_MODEXP; @@ -579,8 +608,8 @@ static void bc_parse_builtin3(BcParse *p, BcLexType type, // If we have divmod, we need to assign the modulus to the array element, so // we need to push the instructions for doing so. - if (type == BC_LEX_KW_DIVMOD) { - + if (type == BC_LEX_KW_DIVMOD) + { // The zeroth element. bc_parse_push(p, BC_INST_ZERO); bc_parse_push(p, BC_INST_ARRAY_ELEM); @@ -606,14 +635,14 @@ static void bc_parse_builtin3(BcParse *p, BcLexType type, * to. * @param flags The expression parsing flags for parsing a scale() arg. */ -static void bc_parse_scale(BcParse *p, BcInst *type, - bool *can_assign, uint8_t flags) +static void +bc_parse_scale(BcParse* p, BcInst* type, bool* can_assign, uint8_t flags) { bc_lex_next(&p->l); // Without the left paren, it's just the keyword. - if (p->l.t != BC_LEX_LPAREN) { - + if (p->l.t != BC_LEX_LPAREN) + { // Set, push, and return. *type = BC_INST_SCALE; *can_assign = true; @@ -634,8 +663,7 @@ static void bc_parse_scale(BcParse *p, BcInst *type, bc_parse_expr_status(p, flags, bc_parse_next_rel); // Must have a right paren. - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_parse_push(p, BC_INST_SCALE_FUNC); @@ -652,8 +680,9 @@ static void bc_parse_scale(BcParse *p, BcInst *type, * parse tree that are not used. * @param flags The expression parsing flags for parsing a scale() arg. */ -static void bc_parse_incdec(BcParse *p, BcInst *prev, bool *can_assign, - size_t *nexs, uint8_t flags) +static void +bc_parse_incdec(BcParse* p, BcInst* prev, bool* can_assign, size_t* nexs, + uint8_t flags) { BcLexType type; uchar inst; @@ -670,8 +699,8 @@ static void bc_parse_incdec(BcParse *p, BcInst *prev, bool *can_assign, } // Is the previous instruction for a variable? - if (BC_PARSE_INST_VAR(etype)) { - + if (BC_PARSE_INST_VAR(etype)) + { // If so, this is a postfix operator. if (!*can_assign) bc_parse_err(p, BC_ERR_PARSE_ASSIGN); @@ -681,8 +710,8 @@ static void bc_parse_incdec(BcParse *p, BcInst *prev, bool *can_assign, bc_lex_next(&p->l); *can_assign = false; } - else { - + else + { // This is a prefix operator. In that case, we just convert it to // an assignment instruction. *prev = inst = BC_INST_ASSIGN_PLUS + (p->l.t != BC_LEX_OP_INC); @@ -695,25 +724,28 @@ static void bc_parse_incdec(BcParse *p, BcInst *prev, bool *can_assign, *nexs = *nexs + 1; // Is the next token a normal identifier? - if (type == BC_LEX_NAME) { - + if (type == BC_LEX_NAME) + { // Parse the name. uint8_t flags2 = flags & ~BC_PARSE_ARRAY; bc_parse_name(p, prev, can_assign, flags2 | BC_PARSE_NOCALL); } // Is the next token a global? - else if (type >= BC_LEX_KW_LAST && type <= BC_LEX_KW_OBASE) { + else if (type >= BC_LEX_KW_LAST && type <= BC_LEX_KW_OBASE) + { bc_parse_push(p, type - BC_LEX_KW_LAST + BC_INST_LAST); bc_lex_next(&p->l); } // Is the next token specifically scale, which needs special treatment? - else if (BC_NO_ERR(type == BC_LEX_KW_SCALE)) { - + else if (BC_NO_ERR(type == BC_LEX_KW_SCALE)) + { bc_lex_next(&p->l); // Check that scale() was not used. if (BC_ERR(p->l.t == BC_LEX_LPAREN)) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } else bc_parse_push(p, BC_INST_SCALE); } // Now we know we have an error. @@ -736,8 +768,9 @@ static void bc_parse_incdec(BcParse *p, BcInst *prev, bool *can_assign, * @param binlast True if the last token was a binary operator. * @param nexprs An in/out parameter; the number of unused expressions. */ -static void bc_parse_minus(BcParse *p, BcInst *prev, size_t ops_bgn, - bool rparen, bool binlast, size_t *nexprs) +static void +bc_parse_minus(BcParse* p, BcInst* prev, size_t ops_bgn, bool rparen, + bool binlast, size_t* nexprs) { BcLexType type; @@ -759,7 +792,9 @@ static void bc_parse_minus(BcParse *p, BcInst *prev, size_t ops_bgn, * @param inst The instruction corresponding to how the string was found and * how it should be printed. */ -static void bc_parse_str(BcParse *p, BcInst inst) { +static void +bc_parse_str(BcParse* p, BcInst inst) +{ bc_parse_addString(p); bc_parse_push(p, inst); bc_lex_next(&p->l); @@ -769,12 +804,13 @@ static void bc_parse_str(BcParse *p, BcInst inst) { * Parses a print statement. * @param p The parser. */ -static void bc_parse_print(BcParse *p, BcLexType type) { - +static void +bc_parse_print(BcParse* p, BcLexType type) +{ BcLexType t; bool comma = false; - BcInst inst = type == BC_LEX_KW_STREAM ? - BC_INST_PRINT_STREAM : BC_INST_PRINT_POP; + BcInst inst = type == BC_LEX_KW_STREAM ? BC_INST_PRINT_STREAM : + BC_INST_PRINT_POP; bc_lex_next(&p->l); @@ -783,12 +819,13 @@ static void bc_parse_print(BcParse *p, BcLexType type) { // A print or stream statement has to have *something*. if (bc_parse_isDelimiter(p)) bc_parse_err(p, BC_ERR_PARSE_PRINT); - do { - + do + { // If the token is a string, then print it with escapes. // BC_INST_PRINT_POP plays that role for bc. if (t == BC_LEX_STR) bc_parse_str(p, inst); - else { + else + { // We have an actual number; parse and add a print instruction. bc_parse_expr_status(p, BC_PARSE_NEEDVAL, bc_parse_next_print); bc_parse_push(p, inst); @@ -799,17 +836,16 @@ static void bc_parse_print(BcParse *p, BcLexType type) { // Get the next token if we have a comma. if (comma) bc_lex_next(&p->l); - else { - + else + { // If we don't have a comma, the statement needs to end. - if (!bc_parse_isDelimiter(p)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (!bc_parse_isDelimiter(p)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); else break; } t = p->l.t; - - } while (true); + } + while (true); // If we have a comma but no token, that's bad. if (BC_ERR(comma)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); @@ -819,8 +855,9 @@ static void bc_parse_print(BcParse *p, BcLexType type) { * Parses a return statement. * @param p The parser. */ -static void bc_parse_return(BcParse *p) { - +static void +bc_parse_return(BcParse* p) +{ BcLexType t; bool paren; uchar inst = BC_INST_RET0; @@ -838,28 +875,33 @@ static void bc_parse_return(BcParse *p) { // An empty return statement just needs to push the selected instruction. if (bc_parse_isDelimiter(p)) bc_parse_push(p, inst); - else { - + else + { BcParseStatus s; // Need to parse the expression whose value will be returned. s = bc_parse_expr_err(p, BC_PARSE_NEEDVAL, bc_parse_next_expr); // If the expression was empty, just push the selected instruction. - if (s == BC_PARSE_STATUS_EMPTY_EXPR) { + if (s == BC_PARSE_STATUS_EMPTY_EXPR) + { bc_parse_push(p, inst); bc_lex_next(&p->l); } // POSIX requires parentheses. - if (!paren || p->l.last != BC_LEX_RPAREN) { + if (!paren || p->l.last != BC_LEX_RPAREN) + { bc_parse_err(p, BC_ERR_POSIX_RET); } // Void functions require an empty expression. - if (BC_ERR(p->func->voidfn)) { + if (BC_ERR(p->func->voidfn)) + { if (s != BC_PARSE_STATUS_EMPTY_EXPR) + { bc_parse_verr(p, BC_ERR_PARSE_RET_VOID, p->func->name); + } } // If we got here, we want to be sure to end the function with a real // return instruction, just in case. @@ -872,8 +914,10 @@ static void bc_parse_return(BcParse *p) { * the jump location. * @param p The parser. */ -static void bc_parse_noElse(BcParse *p) { - uint16_t *flag_ptr = BC_PARSE_TOP_FLAG_PTR(p); +static void +bc_parse_noElse(BcParse* p) +{ + uint16_t* flag_ptr = BC_PARSE_TOP_FLAG_PTR(p); *flag_ptr = (*flag_ptr & ~(BC_PARSE_FLAG_IF_END)); bc_parse_setLabel(p); } @@ -883,15 +927,16 @@ static void bc_parse_noElse(BcParse *p) { * @param p The parser. * @param brace True if the body was ended by a brace, false otherwise. */ -static void bc_parse_endBody(BcParse *p, bool brace) { - +static void +bc_parse_endBody(BcParse* p, bool brace) +{ bool has_brace, new_else = false; // We cannot be ending a body if there are no bodies to end. if (BC_ERR(p->flags.len <= 1)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); - if (brace) { - + if (brace) + { // The brace was already gotten; make sure that the caller did not lie. // We check for the requirement of braces later. assert(p->l.t == BC_LEX_RBRACE); @@ -900,13 +945,16 @@ static void bc_parse_endBody(BcParse *p, bool brace) { // If the next token is not a delimiter, that is a problem. if (BC_ERR(!bc_parse_isDelimiter(p) && !bc_parse_TopFunc(p))) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } } // Do we have a brace flag? has_brace = (BC_PARSE_BRACE(p) != 0); - do { + do + { size_t len = p->flags.len; bool loop; @@ -917,12 +965,12 @@ static void bc_parse_endBody(BcParse *p, bool brace) { loop = (BC_PARSE_LOOP_INNER(p) != 0); // If we are ending a loop or an else... - if (loop || BC_PARSE_ELSE(p)) { - + if (loop || BC_PARSE_ELSE(p)) + { // Loops have condition labels that we have to take care of as well. - if (loop) { - - size_t *label = bc_vec_top(&p->conds); + if (loop) + { + size_t* label = bc_vec_top(&p->conds); bc_parse_push(p, BC_INST_JUMP); bc_parse_pushIndex(p, *label); @@ -934,7 +982,8 @@ static void bc_parse_endBody(BcParse *p, bool brace) { bc_vec_pop(&p->flags); } // If we are ending a function... - else if (BC_PARSE_FUNC_INNER(p)) { + else if (BC_PARSE_FUNC_INNER(p)) + { BcInst inst = (p->func->voidfn ? BC_INST_RET_VOID : BC_INST_RET0); bc_parse_push(p, inst); bc_parse_updateFunc(p, BC_PROG_MAIN); @@ -945,17 +994,20 @@ static void bc_parse_endBody(BcParse *p, bool brace) { else if (has_brace && !BC_PARSE_IF(p)) bc_vec_pop(&p->flags); // This needs to be last to parse nested if's properly. - if (BC_PARSE_IF(p) && (len == p->flags.len || !BC_PARSE_BRACE(p))) { - + if (BC_PARSE_IF(p) && (len == p->flags.len || !BC_PARSE_BRACE(p))) + { // Eat newlines. - while (p->l.t == BC_LEX_NLINE) bc_lex_next(&p->l); + while (p->l.t == BC_LEX_NLINE) + { + bc_lex_next(&p->l); + } // *Now* we can pop the flags. bc_vec_pop(&p->flags); // If we are allowed non-POSIX stuff... - if (!BC_S) { - + if (!BC_S) + { // Have we found yet another dangling else? *(BC_PARSE_TOP_FLAG_PTR(p)) |= BC_PARSE_FLAG_IF_END; new_else = (p->l.t == BC_LEX_KW_ELSE); @@ -963,7 +1015,9 @@ static void bc_parse_endBody(BcParse *p, bool brace) { // Parse the else or end the if statement body. if (new_else) bc_parse_else(p); else if (!has_brace && (!BC_PARSE_IF_END(p) || brace)) + { bc_parse_noElse(p); + } } // POSIX requires us to do the bare minimum only. else bc_parse_noElse(p); @@ -971,20 +1025,19 @@ static void bc_parse_endBody(BcParse *p, bool brace) { // If these are both true, we have "used" the braces that we found. if (brace && has_brace) brace = false; - - // This condition was perhaps the hardest single part of the parser. If the - // flags stack does not have enough, we should stop. If we have a new else - // statement, we should stop. If we do have the end of an if statement and - // we have eaten the brace, we should stop. If we do have a brace flag, we - // should stop. - } while (p->flags.len > 1 && !new_else && (!BC_PARSE_IF_END(p) || brace) && - !(has_brace = (BC_PARSE_BRACE(p) != 0))); + } + // This condition was perhaps the hardest single part of the parser. If + // the flags stack does not have enough, we should stop. If we have a + // new else statement, we should stop. If we do have the end of an if + // statement and we have eaten the brace, we should stop. If we do have + // a brace flag, we should stop. + while (p->flags.len > 1 && !new_else && (!BC_PARSE_IF_END(p) || brace) && + !(has_brace = (BC_PARSE_BRACE(p) != 0))); // If we have a brace, yet no body for it, that's a problem. - if (BC_ERR(p->flags.len == 1 && brace)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); - else if (brace && BC_PARSE_BRACE(p)) { - + if (BC_ERR(p->flags.len == 1 && brace)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); + else if (brace && BC_PARSE_BRACE(p)) + { // If we make it here, we have a brace and a flag for it. uint16_t flags = BC_PARSE_TOP_FLAG(p); @@ -1004,15 +1057,18 @@ static void bc_parse_endBody(BcParse *p, bool brace) { * @param p The parser. * @param flags The current flags (will be edited). */ -static void bc_parse_startBody(BcParse *p, uint16_t flags) { +static void +bc_parse_startBody(BcParse* p, uint16_t flags) +{ assert(flags); flags |= (BC_PARSE_TOP_FLAG(p) & (BC_PARSE_FLAG_FUNC | BC_PARSE_FLAG_LOOP)); flags |= BC_PARSE_FLAG_BODY; bc_vec_push(&p->flags, &flags); } -void bc_parse_endif(BcParse *p) { - +void +bc_parse_endif(BcParse* p) +{ size_t i; bool good; @@ -1023,14 +1079,15 @@ void bc_parse_endif(BcParse *p) { // Find an instance of a body that needs closing, i.e., a statement that did // not have a right brace when it should have. - for (i = 0; good && i < p->flags.len; ++i) { + for (i = 0; good && i < p->flags.len; ++i) + { uint16_t flag = *((uint16_t*) bc_vec_item(&p->flags, i)); good = ((flag & BC_PARSE_FLAG_BRACE) != BC_PARSE_FLAG_BRACE); } // If we did not find such an instance... - if (good) { - + if (good) + { // We set this to restore it later. We don't want the parser thinking // that we are on stdin for this one because it will want more. bool is_stdin = vm.is_stdin; @@ -1038,7 +1095,8 @@ void bc_parse_endif(BcParse *p) { vm.is_stdin = false; // End all of the if statements and loops. - while (p->flags.len > 1 || BC_PARSE_IF_END(p)) { + while (p->flags.len > 1 || BC_PARSE_IF_END(p)) + { if (BC_PARSE_IF_END(p)) bc_parse_noElse(p); if (p->flags.len > 1) bc_parse_endBody(p, false); } @@ -1053,24 +1111,23 @@ void bc_parse_endif(BcParse *p) { * Parses an if statement. * @param p The parser. */ -static void bc_parse_if(BcParse *p) { - +static void +bc_parse_if(BcParse* p) +{ // We are allowed relational operators, and we must have a value. size_t idx; uint8_t flags = (BC_PARSE_REL | BC_PARSE_NEEDVAL); // Get the left paren and barf if necessary. bc_lex_next(&p->l); - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // Parse the condition. bc_lex_next(&p->l); bc_parse_expr_status(p, flags, bc_parse_next_rel); // Must have a right paren. - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); @@ -1091,13 +1148,13 @@ static void bc_parse_if(BcParse *p) { * Parses an else statement. * @param p The parser. */ -static void bc_parse_else(BcParse *p) { - +static void +bc_parse_else(BcParse* p) +{ size_t idx = p->func->labels.len; // We must be at the end of an if statement. - if (BC_ERR(!BC_PARSE_IF_END(p))) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(!BC_PARSE_IF_END(p))) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // Push an unconditional jump to make bc jump over the else statement if it // executed the original if statement. @@ -1119,16 +1176,16 @@ static void bc_parse_else(BcParse *p) { * Parse a while loop. * @param p The parser. */ -static void bc_parse_while(BcParse *p) { - +static void +bc_parse_while(BcParse* p) +{ // We are allowed relational operators, and we must have a value. size_t idx; uint8_t flags = (BC_PARSE_REL | BC_PARSE_NEEDVAL); // Get the left paren and barf if necessary. bc_lex_next(&p->l); - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); // Create the labels. Loops need both. @@ -1138,8 +1195,7 @@ static void bc_parse_while(BcParse *p) { // Parse the actual condition and barf on non-right paren. bc_parse_expr_status(p, flags, bc_parse_next_rel); - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); // Now we can push the conditional jump and start the body. @@ -1152,20 +1208,19 @@ static void bc_parse_while(BcParse *p) { * Parse a for loop. * @param p The parser. */ -static void bc_parse_for(BcParse *p) { - +static void +bc_parse_for(BcParse* p) +{ size_t cond_idx, exit_idx, body_idx, update_idx; // Barf on the missing left paren. bc_lex_next(&p->l); - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); // The first statement can be empty, but if it is, check for error in POSIX // mode. Otherwise, parse it. - if (p->l.t != BC_LEX_SCOLON) - bc_parse_expr_status(p, 0, bc_parse_next_for); + if (p->l.t != BC_LEX_SCOLON) bc_parse_expr_status(p, 0, bc_parse_next_for); else bc_parse_err(p, BC_ERR_POSIX_FOR); // Must have a semicolon. @@ -1185,12 +1240,13 @@ static void bc_parse_for(BcParse *p) { bc_parse_createLabel(p, p->func->code.len); // Parse an expression if it exists. - if (p->l.t != BC_LEX_SCOLON) { + if (p->l.t != BC_LEX_SCOLON) + { uint8_t flags = (BC_PARSE_REL | BC_PARSE_NEEDVAL); bc_parse_expr_status(p, flags, bc_parse_next_for); } - else { - + else + { // Set this for the next call to bc_parse_number because an empty // condition means that it is an infinite loop, so the condition must be // non-zero. This is safe to set because the current token is a @@ -1203,8 +1259,7 @@ static void bc_parse_for(BcParse *p) { } // Must have a semicolon. - if (BC_ERR(p->l.t != BC_LEX_SCOLON)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_SCOLON)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); bc_lex_next(&p->l); // Now we can set up the conditional jump to the exit and an unconditional @@ -1220,13 +1275,11 @@ static void bc_parse_for(BcParse *p) { bc_parse_createCondLabel(p, update_idx); // Parse if not empty, and if it is, let POSIX yell if necessary. - if (p->l.t != BC_LEX_RPAREN) - bc_parse_expr_status(p, 0, bc_parse_next_rel); + if (p->l.t != BC_LEX_RPAREN) bc_parse_expr_status(p, 0, bc_parse_next_rel); else bc_parse_err(p, BC_ERR_POSIX_FOR); // Must have a right paren. - if (BC_ERR(p->l.t != BC_LEX_RPAREN)) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(p->l.t != BC_LEX_RPAREN)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // Set up a jump to the condition right after the update code. bc_parse_push(p, BC_INST_JUMP); @@ -1245,17 +1298,18 @@ static void bc_parse_for(BcParse *p) { * @param p The parser. * @param type The type of exit. */ -static void bc_parse_loopExit(BcParse *p, BcLexType type) { - +static void +bc_parse_loopExit(BcParse* p, BcLexType type) +{ size_t i; - BcInstPtr *ip; + BcInstPtr* ip; // Must have a loop. If we don't, that's an error. if (BC_ERR(!BC_PARSE_LOOP(p))) bc_parse_err(p, BC_ERR_PARSE_TOKEN); // If we have a break statement... - if (type == BC_LEX_KW_BREAK) { - + if (type == BC_LEX_KW_BREAK) + { // If there are no exits, something went wrong somewhere. if (BC_ERR(!p->exits.len)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); @@ -1265,7 +1319,11 @@ static void bc_parse_loopExit(BcParse *p, BcLexType type) { // The condition !ip->func is true if the exit is not for a loop, so we // need to find the first actual loop exit. - while (!ip->func && i < p->exits.len) ip = bc_vec_item(&p->exits, i--); + while (!ip->func && i < p->exits.len) + { + ip = bc_vec_item(&p->exits, i); + i -= 1; + } // Make sure everything is hunky dory. assert(ip != NULL && (i < p->exits.len || ip->func)); @@ -1288,8 +1346,9 @@ static void bc_parse_loopExit(BcParse *p, BcLexType type) { * Parse a function (header). * @param p The parser. */ -static void bc_parse_func(BcParse *p) { - +static void +bc_parse_func(BcParse* p) +{ bool comma = false, voidfn; uint16_t flags; size_t idx; @@ -1311,8 +1370,8 @@ static void bc_parse_func(BcParse *p) { voidfn = (voidfn && p->l.t == BC_LEX_NAME); // With a void function, allow POSIX to complain and get a new token. - if (voidfn) { - + if (voidfn) + { bc_parse_err(p, BC_ERR_POSIX_VOID); // We can safely do this because the expected token should not overwrite @@ -1321,8 +1380,7 @@ static void bc_parse_func(BcParse *p) { } // Must have a left paren. - if (BC_ERR(p->l.t != BC_LEX_LPAREN)) - bc_parse_err(p, BC_ERR_PARSE_FUNC); + if (BC_ERR(p->l.t != BC_LEX_LPAREN)) bc_parse_err(p, BC_ERR_PARSE_FUNC); // Make sure the functions map and vector are synchronized. assert(p->prog->fns.len == p->prog->fn_map.len); @@ -1340,13 +1398,13 @@ static void bc_parse_func(BcParse *p) { bc_lex_next(&p->l); // While we do not have a right paren, we are still parsing arguments. - while (p->l.t != BC_LEX_RPAREN) { - + while (p->l.t != BC_LEX_RPAREN) + { BcType t = BC_TYPE_VAR; // If we have an asterisk, we are parsing a reference argument. - if (p->l.t == BC_LEX_OP_MULTIPLY) { - + if (p->l.t == BC_LEX_OP_MULTIPLY) + { t = BC_TYPE_REF; bc_lex_next(&p->l); @@ -1355,8 +1413,7 @@ static void bc_parse_func(BcParse *p) { } // If we don't have a name, the argument will not have a name. Barf. - if (BC_ERR(p->l.t != BC_LEX_NAME)) - bc_parse_err(p, BC_ERR_PARSE_FUNC); + if (BC_ERR(p->l.t != BC_LEX_NAME)) bc_parse_err(p, BC_ERR_PARSE_FUNC); // Increment the number of parameters. p->func->nparams += 1; @@ -1367,8 +1424,8 @@ static void bc_parse_func(BcParse *p) { bc_lex_next(&p->l); // We are parsing an array parameter if this is true. - if (p->l.t == BC_LEX_LBRACKET) { - + if (p->l.t == BC_LEX_LBRACKET) + { // Set the array type, unless we are already parsing a reference. if (t == BC_TYPE_VAR) t = BC_TYPE_ARRAY; @@ -1376,14 +1433,18 @@ static void bc_parse_func(BcParse *p) { // The brackets *must* be empty. if (BC_ERR(p->l.t != BC_LEX_RBRACKET)) + { bc_parse_err(p, BC_ERR_PARSE_FUNC); + } bc_lex_next(&p->l); } // If we did *not* get a bracket, but we are expecting a reference, we // have a problem. else if (BC_ERR(t == BC_TYPE_REF)) + { bc_parse_verr(p, BC_ERR_PARSE_REF_VAR, p->buf.v); + } // Test for comma and get the next token if it exists. comma = (p->l.t == BC_LEX_COMMA); @@ -1411,8 +1472,9 @@ static void bc_parse_func(BcParse *p) { * Parse an auto list. * @param p The parser. */ -static void bc_parse_auto(BcParse *p) { - +static void +bc_parse_auto(BcParse* p) +{ bool comma, one; // Error if the auto keyword appeared in the wrong place. @@ -1425,8 +1487,8 @@ static void bc_parse_auto(BcParse *p) { one = (p->l.t == BC_LEX_NAME); // While we have a variable or array. - while (p->l.t == BC_LEX_NAME) { - + while (p->l.t == BC_LEX_NAME) + { BcType t; // Copy the name from the lexer, so we can use it again. @@ -1435,15 +1497,17 @@ static void bc_parse_auto(BcParse *p) { bc_lex_next(&p->l); // If we are parsing an array... - if (p->l.t == BC_LEX_LBRACKET) { - + if (p->l.t == BC_LEX_LBRACKET) + { t = BC_TYPE_ARRAY; bc_lex_next(&p->l); // The brackets *must* be empty. if (BC_ERR(p->l.t != BC_LEX_RBRACKET)) + { bc_parse_err(p, BC_ERR_PARSE_FUNC); + } bc_lex_next(&p->l); } @@ -1464,8 +1528,7 @@ static void bc_parse_auto(BcParse *p) { if (BC_ERR(!one)) bc_parse_err(p, BC_ERR_PARSE_NO_AUTO); // The auto statement should be all that's in the statement. - if (BC_ERR(!bc_parse_isDelimiter(p))) - bc_parse_err(p, BC_ERR_PARSE_TOKEN); + if (BC_ERR(!bc_parse_isDelimiter(p))) bc_parse_err(p, BC_ERR_PARSE_TOKEN); } /** @@ -1473,9 +1536,10 @@ static void bc_parse_auto(BcParse *p) { * @param p The parser. * @param brace True if a brace was encountered, false otherwise. */ -static void bc_parse_body(BcParse *p, bool brace) { - - uint16_t *flag_ptr = BC_PARSE_TOP_FLAG_PTR(p); +static void +bc_parse_body(BcParse* p, bool brace) +{ + uint16_t* flag_ptr = BC_PARSE_TOP_FLAG_PTR(p); assert(flag_ptr != NULL); assert(p->flags.len >= 2); @@ -1486,15 +1550,15 @@ static void bc_parse_body(BcParse *p, bool brace) { // If we are inside a function, that means we just barely entered it, and // we can expect an auto list. - if (*flag_ptr & BC_PARSE_FLAG_FUNC_INNER) { - + if (*flag_ptr & BC_PARSE_FLAG_FUNC_INNER) + { // We *must* have a brace in this case. if (BC_ERR(!brace)) bc_parse_err(p, BC_ERR_PARSE_TOKEN); p->auto_part = (p->l.t != BC_LEX_KW_AUTO); - if (!p->auto_part) { - + if (!p->auto_part) + { // Make sure this is true to not get a parse error. p->auto_part = true; @@ -1505,8 +1569,8 @@ static void bc_parse_body(BcParse *p, bool brace) { // Eat a newline. if (p->l.t == BC_LEX_NLINE) bc_lex_next(&p->l); } - else { - + else + { // This is the easy part. size_t len = p->flags.len; @@ -1520,7 +1584,9 @@ static void bc_parse_body(BcParse *p, bool brace) { // have a body that was not delimited by braces, so we need to end it // now, after just one statement. if (!brace && !BC_PARSE_BODY(p) && len <= p->flags.len) + { bc_parse_endBody(p, false); + } } } @@ -1529,20 +1595,23 @@ static void bc_parse_body(BcParse *p, bool brace) { * function definitions. * @param p The parser. */ -static void bc_parse_stmt(BcParse *p) { - +static void +bc_parse_stmt(BcParse* p) +{ size_t len; uint16_t flags; BcLexType type = p->l.t; // Eat newline. - if (type == BC_LEX_NLINE) { + if (type == BC_LEX_NLINE) + { bc_lex_next(&p->l); return; } // Eat auto list. - if (type == BC_LEX_KW_AUTO) { + if (type == BC_LEX_KW_AUTO) + { bc_parse_auto(p); return; } @@ -1552,30 +1621,35 @@ static void bc_parse_stmt(BcParse *p) { // Everything but an else needs to be taken care of here, but else is // special. - if (type != BC_LEX_KW_ELSE) { - + if (type != BC_LEX_KW_ELSE) + { // After an if, no else found. - if (BC_PARSE_IF_END(p)) { - + if (BC_PARSE_IF_END(p)) + { // Clear the expectation for else, end body, and return. Returning // gives us a clean slate for parsing again. bc_parse_noElse(p); if (p->flags.len > 1 && !BC_PARSE_BRACE(p)) + { bc_parse_endBody(p, false); + } + return; } // With a left brace, we are parsing a body. - else if (type == BC_LEX_LBRACE) { - + else if (type == BC_LEX_LBRACE) + { // We need to start a body if we are not expecting one yet. - if (!BC_PARSE_BODY(p)) { + if (!BC_PARSE_BODY(p)) + { bc_parse_startBody(p, BC_PARSE_FLAG_BRACE); bc_lex_next(&p->l); } // If we *are* expecting a body, that body should get a brace. This // takes care of braces being on a different line than if and loop // headers. - else { + else + { *(BC_PARSE_TOP_FLAG_PTR(p)) |= BC_PARSE_FLAG_BRACE; bc_lex_next(&p->l); bc_parse_body(p, true); @@ -1588,7 +1662,8 @@ static void bc_parse_stmt(BcParse *p) { // This happens when we are expecting a body and get a single statement, // i.e., a body with no braces surrounding it. Returns after for a clean // slate. - else if (BC_PARSE_BODY(p) && !BC_PARSE_BRACE(p)) { + else if (BC_PARSE_BODY(p) && !BC_PARSE_BRACE(p)) + { bc_parse_body(p, false); return; } @@ -1597,8 +1672,8 @@ static void bc_parse_stmt(BcParse *p) { len = p->flags.len; flags = BC_PARSE_TOP_FLAG(p); - switch (type) { - + switch (type) + { // All of these are valid for expressions. case BC_LEX_OP_INC: case BC_LEX_OP_DEC: @@ -1752,13 +1827,19 @@ static void bc_parse_stmt(BcParse *p) { } // If the flags did not change, we expect a delimiter. - if (len == p->flags.len && flags == BC_PARSE_TOP_FLAG(p)) { + if (len == p->flags.len && flags == BC_PARSE_TOP_FLAG(p)) + { if (BC_ERR(!bc_parse_isDelimiter(p))) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } } // Make sure semicolons are eaten. - while (p->l.t == BC_LEX_SCOLON) bc_lex_next(&p->l); + while (p->l.t == BC_LEX_SCOLON) + { + bc_lex_next(&p->l); + } // POSIX's grammar does not allow a function definition after a semicolon // without a newline, so check specifically for that case and error if @@ -1769,8 +1850,9 @@ static void bc_parse_stmt(BcParse *p) { } } -void bc_parse_parse(BcParse *p) { - +void +bc_parse_parse(BcParse* p) +{ assert(p); BC_SETJMP_LOCKED(exit); @@ -1780,11 +1862,15 @@ void bc_parse_parse(BcParse *p) { if (BC_ERR(p->l.t == BC_LEX_EOF)) bc_parse_err(p, BC_ERR_PARSE_EOF); // Functions need special parsing. - else if (p->l.t == BC_LEX_KW_DEFINE) { - if (BC_ERR(BC_PARSE_NO_EXEC(p))) { + else if (p->l.t == BC_LEX_KW_DEFINE) + { + if (BC_ERR(BC_PARSE_NO_EXEC(p))) + { bc_parse_endif(p); if (BC_ERR(BC_PARSE_NO_EXEC(p))) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } } bc_parse_func(p); } @@ -1796,7 +1882,9 @@ exit: // We need to reset on error. if (BC_ERR(((vm.status && vm.status != BC_STATUS_QUIT) || vm.sig))) + { bc_parse_reset(p); + } BC_LONGJMP_CONT; BC_SIG_MAYLOCK; @@ -1813,8 +1901,8 @@ exit: * to tell the caller if the expression was empty and let the * caller handle it. */ -static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, - BcParseNext next) +static BcParseStatus +bc_parse_expr_err(BcParse* p, uint8_t flags, BcParseNext next) { BcInst prev = BC_INST_PRINT; uchar inst = BC_INST_INVALID; @@ -1854,15 +1942,19 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // We want to eat newlines if newlines are not a valid ending token. // This is for spacing in things like for loop headers. - if (!(flags & BC_PARSE_NOREAD)) { - while ((t = p->l.t) == BC_LEX_NLINE) bc_lex_next(&p->l); + if (!(flags & BC_PARSE_NOREAD)) + { + while ((t = p->l.t) == BC_LEX_NLINE) + { + bc_lex_next(&p->l); + } } // This is the Shunting-Yard algorithm loop. for (; !done && BC_PARSE_EXPR(t); t = p->l.t) { - switch (t) { - + switch (t) + { case BC_LEX_OP_INC: case BC_LEX_OP_DEC: { @@ -1885,7 +1977,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // The previous token must have been a leaf expression, or the // operator is in the wrong place. if (BC_ERR(!BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_TOKEN); + } // I can just add the instruction because // negative will already be taken care of. @@ -1931,10 +2025,13 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // We need to make sure the assignment is valid. if (!BC_PARSE_INST_VAR(prev)) + { bc_parse_err(p, BC_ERR_PARSE_ASSIGN); + } + + // Fallthrough. + BC_FALLTHROUGH } - // Fallthrough. - BC_FALLTHROUGH case BC_LEX_OP_POWER: case BC_LEX_OP_MULTIPLY: @@ -1958,18 +2055,22 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // This is true if the operator if the token is a prefix // operator. This is only for boolean not. - if (BC_PARSE_OP_PREFIX(t)) { - + if (BC_PARSE_OP_PREFIX(t)) + { // Prefix operators are only allowed after binary operators // or prefix operators. if (BC_ERR(!bin_last && !BC_PARSE_OP_PREFIX(p->l.last))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } } // If we execute the else, that means we have a binary operator. // If the previous operator was a prefix or a binary operator, // then a binary operator is not allowed. else if (BC_ERR(BC_PARSE_PREV_PREFIX(prev) || bin_last)) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } nrelops += (t >= BC_LEX_OP_REL_EQ && t <= BC_LEX_OP_REL_GT); prev = BC_PARSE_TOKEN_INST(t); @@ -1988,7 +2089,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // A left paren is *not* allowed right after a leaf expr. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } nparens += 1; rprn = incdec = can_assign = false; @@ -2005,16 +2108,21 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // This needs to be a status. The error is handled in // bc_parse_expr_status(). if (BC_ERR(p->l.last == BC_LEX_LPAREN)) + { return BC_PARSE_STATUS_EMPTY_EXPR; + } // The right paren must not come after a prefix or binary // operator. if (BC_ERR(bin_last || BC_PARSE_PREV_PREFIX(prev))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } // If there are no parens left, we are done, but we need another // token. - if (!nparens) { + if (!nparens) + { done = true; get_token = false; break; @@ -2036,7 +2144,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // A string is a leaf and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } bc_parse_addString(p); @@ -2051,7 +2161,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // A name is a leaf and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } get_token = bin_last = false; @@ -2068,7 +2180,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // A number is a leaf and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } // The number instruction is pushed in here. bc_parse_number(p); @@ -2091,7 +2205,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // All of these are leaves and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } prev = t - BC_LEX_KW_LAST + BC_INST_LAST; bc_parse_push(p, prev); @@ -2114,7 +2230,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // All of these are leaves and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } bc_parse_builtin(p, t, flags, &prev); @@ -2141,11 +2259,15 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // All of these are leaves and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } // Error if we have read and it's not allowed. else if (t == BC_LEX_KW_READ && BC_ERR(flags & BC_PARSE_NOREAD)) + { bc_parse_err(p, BC_ERR_EXEC_REC_READ); + } prev = t - BC_LEX_KW_READ + BC_INST_READ; bc_parse_noArgBuiltin(p, prev); @@ -2161,7 +2283,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // This is a leaf and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } // Scale needs special work because it can be a variable *or* a // function. @@ -2179,7 +2303,9 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, { // This is a leaf and cannot come right after a leaf. if (BC_ERR(BC_PARSE_LEAF(prev, bin_last, rprn))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } bc_parse_builtin3(p, t, flags, &prev); @@ -2205,14 +2331,16 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // Now that we have parsed the expression, we need to empty the operator // stack. - while (p->ops.len > ops_bgn) { - + while (p->ops.len > ops_bgn) + { top = BC_PARSE_TOP_OP(p); assign = top >= BC_LEX_OP_ASSIGN_POWER && top <= BC_LEX_OP_ASSIGN; // There should not be *any* parens on the stack anymore. if (BC_ERR(top == BC_LEX_LPAREN || top == BC_LEX_RPAREN)) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } bc_parse_push(p, BC_PARSE_TOKEN_INST(top)); @@ -2227,35 +2355,46 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, if (BC_ERR(nexprs != 1)) bc_parse_err(p, BC_ERR_PARSE_EXPR); // Check that the next token is correct. - for (i = 0; i < next.len && t != next.tokens[i]; ++i); + for (i = 0; i < next.len && t != next.tokens[i]; ++i) + { + continue; + } if (BC_ERR(i == next.len && !bc_parse_isDelimiter(p))) + { bc_parse_err(p, BC_ERR_PARSE_EXPR); + } // Check that POSIX would be happy with the number of relational operators. if (!(flags & BC_PARSE_REL) && nrelops) + { bc_parse_err(p, BC_ERR_POSIX_REL_POS); + } else if ((flags & BC_PARSE_REL) && nrelops > 1) + { bc_parse_err(p, BC_ERR_POSIX_MULTIREL); + } // If this is true, then we might be in a situation where we don't print. // We would want to have the increment/decrement operator not make an extra // copy if it's not necessary. - if (!(flags & BC_PARSE_NEEDVAL) && !pfirst) { - + if (!(flags & BC_PARSE_NEEDVAL) && !pfirst) + { // We have the easy case if the last operator was an assignment // operator. - if (assign) { + if (assign) + { inst = *((uchar*) bc_vec_top(&p->func->code)); inst += (BC_INST_ASSIGN_POWER_NO_VAL - BC_INST_ASSIGN_POWER); incdec = false; } // If we have an inc/dec operator and we are *not* printing, implement // the optimization to get rid of the extra copy. - else if (incdec && !(flags & BC_PARSE_PRINT)) { + else if (incdec && !(flags & BC_PARSE_PRINT)) + { inst = *((uchar*) bc_vec_top(&p->func->code)); incdec = (inst <= BC_INST_DEC); - inst = BC_INST_ASSIGN_PLUS_NO_VAL + (inst != BC_INST_INC && - inst != BC_INST_ASSIGN_PLUS); + inst = BC_INST_ASSIGN_PLUS_NO_VAL + + (inst != BC_INST_INC && inst != BC_INST_ASSIGN_PLUS); } // This condition allows us to change the previous assignment @@ -2275,8 +2414,8 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, } // If we might have to print... - if ((flags & BC_PARSE_PRINT)) { - + if ((flags & BC_PARSE_PRINT)) + { // With a paren first or the last operator not being an assignment, we // *do* want to print. if (pfirst || !assign) bc_parse_push(p, BC_INST_PRINT); @@ -2296,9 +2435,15 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, // Yes, this is one case where I reuse a variable for a different purpose; // in this case, incdec being true now means that newlines are not valid. for (incdec = true, i = 0; i < next.len && incdec; ++i) + { incdec = (next.tokens[i] != BC_LEX_NLINE); - if (incdec) { - while (p->l.t == BC_LEX_NLINE) bc_lex_next(&p->l); + } + if (incdec) + { + while (p->l.t == BC_LEX_NLINE) + { + bc_lex_next(&p->l); + } } return BC_PARSE_STATUS_SUCCESS; @@ -2311,15 +2456,20 @@ static BcParseStatus bc_parse_expr_err(BcParse *p, uint8_t flags, * @param flags The flags for what is valid in the expression. * @param next A set of tokens for what is valid *after* the expression. */ -static void bc_parse_expr_status(BcParse *p, uint8_t flags, BcParseNext next) { - +static void +bc_parse_expr_status(BcParse* p, uint8_t flags, BcParseNext next) +{ BcParseStatus s = bc_parse_expr_err(p, flags, next); if (BC_ERR(s == BC_PARSE_STATUS_EMPTY_EXPR)) + { bc_parse_err(p, BC_ERR_PARSE_EMPTY_EXPR); + } } -void bc_parse_expr(BcParse *p, uint8_t flags) { +void +bc_parse_expr(BcParse* p, uint8_t flags) +{ assert(p); bc_parse_expr_status(p, flags, bc_parse_next_read); } diff --git a/contrib/bc/src/data.c b/contrib/bc/src/data.c index 4dc77e7e746c..4009dcc1f0d1 100644 --- a/contrib/bc/src/data.c +++ b/contrib/bc/src/data.c @@ -66,12 +66,16 @@ const uchar dc_sig_msg_len = (uchar) (sizeof(dc_sig_msg) - 1); #endif // DC_ENABLED +// clang-format off + /// The copyright banner. const char bc_copyright[] = "Copyright (c) 2018-2022 Gavin D. Howard and contributors\n" "Report bugs at: https://git.yzena.com/gavin/bc\n\n" "This is free software with ABSOLUTELY NO WARRANTY.\n"; +// clang-format on + #ifdef __OpenBSD__ #if BC_ENABLE_EXTRA_MATH @@ -141,10 +145,16 @@ const BcOptLong bc_args_lopt[] = { { "file", BC_OPT_REQUIRED, 'f' }, { "help", BC_OPT_NONE, 'h' }, { "interactive", BC_OPT_NONE, 'i' }, + { "ibase", BC_OPT_REQUIRED, 'I' }, { "leading-zeroes", BC_OPT_NONE, 'z' }, { "no-line-length", BC_OPT_NONE, 'L' }, + { "obase", BC_OPT_REQUIRED, 'O' }, { "no-prompt", BC_OPT_NONE, 'P' }, { "no-read-prompt", BC_OPT_NONE, 'R' }, + { "scale", BC_OPT_REQUIRED, 'S' }, +#if BC_ENABLE_EXTRA_MATH + { "seed", BC_OPT_REQUIRED, 'E' }, +#endif // BC_ENABLE_EXTRA_MATH #if BC_ENABLED { "global-stacks", BC_OPT_BC_ONLY, 'g' }, { "mathlib", BC_OPT_BC_ONLY, 'l' }, @@ -168,6 +178,8 @@ const char* const bc_err_func_header = "Function:"; /// The line format string for error messages. const char* const bc_err_line = ":%zu"; +// clang-format off + /// The default error category strings. const char *bc_errs[] = { "Math error:", @@ -179,18 +191,20 @@ const char *bc_errs[] = { #endif // BC_ENABLED }; +// clang-format on + /// The error category for each error. const uchar bc_err_ids[] = { - BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, + BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, BC_ERR_IDX_MATH, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, BC_ERR_IDX_FATAL, - BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, - BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, - BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, + BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, + BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, + BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_EXEC, BC_ERR_IDX_PARSE, BC_ERR_IDX_PARSE, BC_ERR_IDX_PARSE, BC_ERR_IDX_PARSE, BC_ERR_IDX_PARSE, @@ -236,14 +250,17 @@ const char* const bc_err_msgs[] = { "stack has too few elements", "stack for register \"%s\" has too few elements", #else // DC_ENABLED - NULL, NULL, + NULL, + NULL, #endif // DC_ENABLED #if BC_ENABLED "wrong number of parameters; need %zu, have %zu", "undefined function: %s()", "cannot use a void value in an expression", #else - NULL, NULL, NULL, + NULL, + NULL, + NULL, #endif // BC_ENABLED "end of file", @@ -257,7 +274,7 @@ const char* const bc_err_msgs[] = { "bad print or stream statement", "bad function definition", ("bad assignment: left side must be scale, ibase, " - "obase, seed, last, var, or array element"), + "obase, seed, last, var, or array element"), "no auto variable found", "function parameter or auto \"%s%s\" already exists", "block end cannot be found", @@ -301,9 +318,9 @@ const BcVecFree bc_vec_dtors[] = { bc_slab_free, bc_const_free, bc_result_free, -#if BC_ENABLE_HISTORY +#if BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB bc_history_string_free, -#endif // BC_ENABLE_HISTORY +#endif // BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB #else // !BC_ENABLE_LIBRARY bcl_num_destruct, #endif // !BC_ENABLE_LIBRARY @@ -311,7 +328,17 @@ const BcVecFree bc_vec_dtors[] = { #if !BC_ENABLE_LIBRARY -#if BC_ENABLE_HISTORY +#if BC_ENABLE_EDITLINE + +/// The normal path to the editrc. +const char bc_history_editrc[] = "/.editrc"; + +/// The length of the normal path to the editrc. +const size_t bc_history_editrc_len = sizeof(bc_history_editrc) - 1; + +#endif // BC_ENABLE_EDITLINE + +#if BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB /// A flush type for not clearing current extras but not saving new ones either. const BcFlushType bc_flush_none = BC_FLUSH_NO_EXTRAS_NO_CLEAR; @@ -321,351 +348,279 @@ const BcFlushType bc_flush_err = BC_FLUSH_NO_EXTRAS_CLEAR; /// A flush type for clearing previous extras and saving new ones. const BcFlushType bc_flush_save = BC_FLUSH_SAVE_EXTRAS_CLEAR; -#endif // BC_ENABLE_HISTORY - -#if BC_ENABLE_HISTORY /// A list of known bad terminals. -const char *bc_history_bad_terms[] = { "dumb", "cons25", "emacs", NULL }; +const char* bc_history_bad_terms[] = { "dumb", "cons25", "emacs", NULL }; /// A constant for tabs and its length. My tab handling is dumb and always /// outputs the entire thing. -const char bc_history_tab[] = " "; +const char bc_history_tab[] = "\t"; const size_t bc_history_tab_len = sizeof(bc_history_tab) - 1; /// A list of wide chars. These are listed in ascending order for efficiency. const uint32_t bc_history_wchars[][2] = { - { 0x1100, 0x115F }, - { 0x231A, 0x231B }, - { 0x2329, 0x232A }, - { 0x23E9, 0x23EC }, - { 0x23F0, 0x23F0 }, - { 0x23F3, 0x23F3 }, - { 0x25FD, 0x25FE }, - { 0x2614, 0x2615 }, - { 0x2648, 0x2653 }, - { 0x267F, 0x267F }, - { 0x2693, 0x2693 }, - { 0x26A1, 0x26A1 }, - { 0x26AA, 0x26AB }, - { 0x26BD, 0x26BE }, - { 0x26C4, 0x26C5 }, - { 0x26CE, 0x26CE }, - { 0x26D4, 0x26D4 }, - { 0x26EA, 0x26EA }, - { 0x26F2, 0x26F3 }, - { 0x26F5, 0x26F5 }, - { 0x26FA, 0x26FA }, - { 0x26FD, 0x26FD }, - { 0x2705, 0x2705 }, - { 0x270A, 0x270B }, - { 0x2728, 0x2728 }, - { 0x274C, 0x274C }, - { 0x274E, 0x274E }, - { 0x2753, 0x2755 }, - { 0x2757, 0x2757 }, - { 0x2795, 0x2797 }, - { 0x27B0, 0x27B0 }, - { 0x27BF, 0x27BF }, - { 0x2B1B, 0x2B1C }, - { 0x2B50, 0x2B50 }, - { 0x2B55, 0x2B55 }, - { 0x2E80, 0x2E99 }, - { 0x2E9B, 0x2EF3 }, - { 0x2F00, 0x2FD5 }, - { 0x2FF0, 0x2FFB }, - { 0x3001, 0x303E }, - { 0x3041, 0x3096 }, - { 0x3099, 0x30FF }, - { 0x3105, 0x312D }, - { 0x3131, 0x318E }, - { 0x3190, 0x31BA }, - { 0x31C0, 0x31E3 }, - { 0x31F0, 0x321E }, - { 0x3220, 0x3247 }, - { 0x3250, 0x32FE }, - { 0x3300, 0x4DBF }, - { 0x4E00, 0xA48C }, - { 0xA490, 0xA4C6 }, - { 0xA960, 0xA97C }, - { 0xAC00, 0xD7A3 }, - { 0xF900, 0xFAFF }, - { 0xFE10, 0xFE19 }, - { 0xFE30, 0xFE52 }, - { 0xFE54, 0xFE66 }, - { 0xFE68, 0xFE6B }, - { 0x16FE0, 0x16FE0 }, - { 0x17000, 0x187EC }, - { 0x18800, 0x18AF2 }, - { 0x1B000, 0x1B001 }, - { 0x1F004, 0x1F004 }, - { 0x1F0CF, 0x1F0CF }, - { 0x1F18E, 0x1F18E }, - { 0x1F191, 0x1F19A }, - { 0x1F200, 0x1F202 }, - { 0x1F210, 0x1F23B }, - { 0x1F240, 0x1F248 }, - { 0x1F250, 0x1F251 }, - { 0x1F300, 0x1F320 }, - { 0x1F32D, 0x1F335 }, - { 0x1F337, 0x1F37C }, - { 0x1F37E, 0x1F393 }, - { 0x1F3A0, 0x1F3CA }, - { 0x1F3CF, 0x1F3D3 }, - { 0x1F3E0, 0x1F3F0 }, - { 0x1F3F4, 0x1F3F4 }, - { 0x1F3F8, 0x1F43E }, - { 0x1F440, 0x1F440 }, - { 0x1F442, 0x1F4FC }, - { 0x1F4FF, 0x1F53D }, - { 0x1F54B, 0x1F54E }, - { 0x1F550, 0x1F567 }, - { 0x1F57A, 0x1F57A }, - { 0x1F595, 0x1F596 }, - { 0x1F5A4, 0x1F5A4 }, - { 0x1F5FB, 0x1F64F }, - { 0x1F680, 0x1F6C5 }, - { 0x1F6CC, 0x1F6CC }, - { 0x1F6D0, 0x1F6D2 }, - { 0x1F6EB, 0x1F6EC }, - { 0x1F6F4, 0x1F6F6 }, - { 0x1F910, 0x1F91E }, - { 0x1F920, 0x1F927 }, - { 0x1F930, 0x1F930 }, - { 0x1F933, 0x1F93E }, - { 0x1F940, 0x1F94B }, - { 0x1F950, 0x1F95E }, - { 0x1F980, 0x1F991 }, - { 0x1F9C0, 0x1F9C0 }, - { 0x20000, 0x2FFFD }, - { 0x30000, 0x3FFFD }, + { 0x1100, 0x115F }, { 0x231A, 0x231B }, { 0x2329, 0x232A }, + { 0x23E9, 0x23EC }, { 0x23F0, 0x23F0 }, { 0x23F3, 0x23F3 }, + { 0x25FD, 0x25FE }, { 0x2614, 0x2615 }, { 0x2648, 0x2653 }, + { 0x267F, 0x267F }, { 0x2693, 0x2693 }, { 0x26A1, 0x26A1 }, + { 0x26AA, 0x26AB }, { 0x26BD, 0x26BE }, { 0x26C4, 0x26C5 }, + { 0x26CE, 0x26CE }, { 0x26D4, 0x26D4 }, { 0x26EA, 0x26EA }, + { 0x26F2, 0x26F3 }, { 0x26F5, 0x26F5 }, { 0x26FA, 0x26FA }, + { 0x26FD, 0x26FD }, { 0x2705, 0x2705 }, { 0x270A, 0x270B }, + { 0x2728, 0x2728 }, { 0x274C, 0x274C }, { 0x274E, 0x274E }, + { 0x2753, 0x2755 }, { 0x2757, 0x2757 }, { 0x2795, 0x2797 }, + { 0x27B0, 0x27B0 }, { 0x27BF, 0x27BF }, { 0x2B1B, 0x2B1C }, + { 0x2B50, 0x2B50 }, { 0x2B55, 0x2B55 }, { 0x2E80, 0x2E99 }, + { 0x2E9B, 0x2EF3 }, { 0x2F00, 0x2FD5 }, { 0x2FF0, 0x2FFB }, + { 0x3001, 0x303E }, { 0x3041, 0x3096 }, { 0x3099, 0x30FF }, + { 0x3105, 0x312D }, { 0x3131, 0x318E }, { 0x3190, 0x31BA }, + { 0x31C0, 0x31E3 }, { 0x31F0, 0x321E }, { 0x3220, 0x3247 }, + { 0x3250, 0x32FE }, { 0x3300, 0x4DBF }, { 0x4E00, 0xA48C }, + { 0xA490, 0xA4C6 }, { 0xA960, 0xA97C }, { 0xAC00, 0xD7A3 }, + { 0xF900, 0xFAFF }, { 0xFE10, 0xFE19 }, { 0xFE30, 0xFE52 }, + { 0xFE54, 0xFE66 }, { 0xFE68, 0xFE6B }, { 0x16FE0, 0x16FE0 }, + { 0x17000, 0x187EC }, { 0x18800, 0x18AF2 }, { 0x1B000, 0x1B001 }, + { 0x1F004, 0x1F004 }, { 0x1F0CF, 0x1F0CF }, { 0x1F18E, 0x1F18E }, + { 0x1F191, 0x1F19A }, { 0x1F200, 0x1F202 }, { 0x1F210, 0x1F23B }, + { 0x1F240, 0x1F248 }, { 0x1F250, 0x1F251 }, { 0x1F300, 0x1F320 }, + { 0x1F32D, 0x1F335 }, { 0x1F337, 0x1F37C }, { 0x1F37E, 0x1F393 }, + { 0x1F3A0, 0x1F3CA }, { 0x1F3CF, 0x1F3D3 }, { 0x1F3E0, 0x1F3F0 }, + { 0x1F3F4, 0x1F3F4 }, { 0x1F3F8, 0x1F43E }, { 0x1F440, 0x1F440 }, + { 0x1F442, 0x1F4FC }, { 0x1F4FF, 0x1F53D }, { 0x1F54B, 0x1F54E }, + { 0x1F550, 0x1F567 }, { 0x1F57A, 0x1F57A }, { 0x1F595, 0x1F596 }, + { 0x1F5A4, 0x1F5A4 }, { 0x1F5FB, 0x1F64F }, { 0x1F680, 0x1F6C5 }, + { 0x1F6CC, 0x1F6CC }, { 0x1F6D0, 0x1F6D2 }, { 0x1F6EB, 0x1F6EC }, + { 0x1F6F4, 0x1F6F6 }, { 0x1F910, 0x1F91E }, { 0x1F920, 0x1F927 }, + { 0x1F930, 0x1F930 }, { 0x1F933, 0x1F93E }, { 0x1F940, 0x1F94B }, + { 0x1F950, 0x1F95E }, { 0x1F980, 0x1F991 }, { 0x1F9C0, 0x1F9C0 }, + { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD }, }; /// The length of the wide chars list. -const size_t bc_history_wchars_len = - sizeof(bc_history_wchars) / sizeof(bc_history_wchars[0]); +const size_t bc_history_wchars_len = sizeof(bc_history_wchars) / + sizeof(bc_history_wchars[0]); /// A list of combining characters in Unicode. These are listed in ascending /// order for efficiency. const uint32_t bc_history_combo_chars[] = { - 0x0300,0x0301,0x0302,0x0303,0x0304,0x0305,0x0306,0x0307, - 0x0308,0x0309,0x030A,0x030B,0x030C,0x030D,0x030E,0x030F, - 0x0310,0x0311,0x0312,0x0313,0x0314,0x0315,0x0316,0x0317, - 0x0318,0x0319,0x031A,0x031B,0x031C,0x031D,0x031E,0x031F, - 0x0320,0x0321,0x0322,0x0323,0x0324,0x0325,0x0326,0x0327, - 0x0328,0x0329,0x032A,0x032B,0x032C,0x032D,0x032E,0x032F, - 0x0330,0x0331,0x0332,0x0333,0x0334,0x0335,0x0336,0x0337, - 0x0338,0x0339,0x033A,0x033B,0x033C,0x033D,0x033E,0x033F, - 0x0340,0x0341,0x0342,0x0343,0x0344,0x0345,0x0346,0x0347, - 0x0348,0x0349,0x034A,0x034B,0x034C,0x034D,0x034E,0x034F, - 0x0350,0x0351,0x0352,0x0353,0x0354,0x0355,0x0356,0x0357, - 0x0358,0x0359,0x035A,0x035B,0x035C,0x035D,0x035E,0x035F, - 0x0360,0x0361,0x0362,0x0363,0x0364,0x0365,0x0366,0x0367, - 0x0368,0x0369,0x036A,0x036B,0x036C,0x036D,0x036E,0x036F, - 0x0483,0x0484,0x0485,0x0486,0x0487,0x0591,0x0592,0x0593, - 0x0594,0x0595,0x0596,0x0597,0x0598,0x0599,0x059A,0x059B, - 0x059C,0x059D,0x059E,0x059F,0x05A0,0x05A1,0x05A2,0x05A3, - 0x05A4,0x05A5,0x05A6,0x05A7,0x05A8,0x05A9,0x05AA,0x05AB, - 0x05AC,0x05AD,0x05AE,0x05AF,0x05B0,0x05B1,0x05B2,0x05B3, - 0x05B4,0x05B5,0x05B6,0x05B7,0x05B8,0x05B9,0x05BA,0x05BB, - 0x05BC,0x05BD,0x05BF,0x05C1,0x05C2,0x05C4,0x05C5,0x05C7, - 0x0610,0x0611,0x0612,0x0613,0x0614,0x0615,0x0616,0x0617, - 0x0618,0x0619,0x061A,0x064B,0x064C,0x064D,0x064E,0x064F, - 0x0650,0x0651,0x0652,0x0653,0x0654,0x0655,0x0656,0x0657, - 0x0658,0x0659,0x065A,0x065B,0x065C,0x065D,0x065E,0x065F, - 0x0670,0x06D6,0x06D7,0x06D8,0x06D9,0x06DA,0x06DB,0x06DC, - 0x06DF,0x06E0,0x06E1,0x06E2,0x06E3,0x06E4,0x06E7,0x06E8, - 0x06EA,0x06EB,0x06EC,0x06ED,0x0711,0x0730,0x0731,0x0732, - 0x0733,0x0734,0x0735,0x0736,0x0737,0x0738,0x0739,0x073A, - 0x073B,0x073C,0x073D,0x073E,0x073F,0x0740,0x0741,0x0742, - 0x0743,0x0744,0x0745,0x0746,0x0747,0x0748,0x0749,0x074A, - 0x07A6,0x07A7,0x07A8,0x07A9,0x07AA,0x07AB,0x07AC,0x07AD, - 0x07AE,0x07AF,0x07B0,0x07EB,0x07EC,0x07ED,0x07EE,0x07EF, - 0x07F0,0x07F1,0x07F2,0x07F3,0x0816,0x0817,0x0818,0x0819, - 0x081B,0x081C,0x081D,0x081E,0x081F,0x0820,0x0821,0x0822, - 0x0823,0x0825,0x0826,0x0827,0x0829,0x082A,0x082B,0x082C, - 0x082D,0x0859,0x085A,0x085B,0x08D4,0x08D5,0x08D6,0x08D7, - 0x08D8,0x08D9,0x08DA,0x08DB,0x08DC,0x08DD,0x08DE,0x08DF, - 0x08E0,0x08E1,0x08E3,0x08E4,0x08E5,0x08E6,0x08E7,0x08E8, - 0x08E9,0x08EA,0x08EB,0x08EC,0x08ED,0x08EE,0x08EF,0x08F0, - 0x08F1,0x08F2,0x08F3,0x08F4,0x08F5,0x08F6,0x08F7,0x08F8, - 0x08F9,0x08FA,0x08FB,0x08FC,0x08FD,0x08FE,0x08FF,0x0900, - 0x0901,0x0902,0x093A,0x093C,0x0941,0x0942,0x0943,0x0944, - 0x0945,0x0946,0x0947,0x0948,0x094D,0x0951,0x0952,0x0953, - 0x0954,0x0955,0x0956,0x0957,0x0962,0x0963,0x0981,0x09BC, - 0x09C1,0x09C2,0x09C3,0x09C4,0x09CD,0x09E2,0x09E3,0x0A01, - 0x0A02,0x0A3C,0x0A41,0x0A42,0x0A47,0x0A48,0x0A4B,0x0A4C, - 0x0A4D,0x0A51,0x0A70,0x0A71,0x0A75,0x0A81,0x0A82,0x0ABC, - 0x0AC1,0x0AC2,0x0AC3,0x0AC4,0x0AC5,0x0AC7,0x0AC8,0x0ACD, - 0x0AE2,0x0AE3,0x0B01,0x0B3C,0x0B3F,0x0B41,0x0B42,0x0B43, - 0x0B44,0x0B4D,0x0B56,0x0B62,0x0B63,0x0B82,0x0BC0,0x0BCD, - 0x0C00,0x0C3E,0x0C3F,0x0C40,0x0C46,0x0C47,0x0C48,0x0C4A, - 0x0C4B,0x0C4C,0x0C4D,0x0C55,0x0C56,0x0C62,0x0C63,0x0C81, - 0x0CBC,0x0CBF,0x0CC6,0x0CCC,0x0CCD,0x0CE2,0x0CE3,0x0D01, - 0x0D41,0x0D42,0x0D43,0x0D44,0x0D4D,0x0D62,0x0D63,0x0DCA, - 0x0DD2,0x0DD3,0x0DD4,0x0DD6,0x0E31,0x0E34,0x0E35,0x0E36, - 0x0E37,0x0E38,0x0E39,0x0E3A,0x0E47,0x0E48,0x0E49,0x0E4A, - 0x0E4B,0x0E4C,0x0E4D,0x0E4E,0x0EB1,0x0EB4,0x0EB5,0x0EB6, - 0x0EB7,0x0EB8,0x0EB9,0x0EBB,0x0EBC,0x0EC8,0x0EC9,0x0ECA, - 0x0ECB,0x0ECC,0x0ECD,0x0F18,0x0F19,0x0F35,0x0F37,0x0F39, - 0x0F71,0x0F72,0x0F73,0x0F74,0x0F75,0x0F76,0x0F77,0x0F78, - 0x0F79,0x0F7A,0x0F7B,0x0F7C,0x0F7D,0x0F7E,0x0F80,0x0F81, - 0x0F82,0x0F83,0x0F84,0x0F86,0x0F87,0x0F8D,0x0F8E,0x0F8F, - 0x0F90,0x0F91,0x0F92,0x0F93,0x0F94,0x0F95,0x0F96,0x0F97, - 0x0F99,0x0F9A,0x0F9B,0x0F9C,0x0F9D,0x0F9E,0x0F9F,0x0FA0, - 0x0FA1,0x0FA2,0x0FA3,0x0FA4,0x0FA5,0x0FA6,0x0FA7,0x0FA8, - 0x0FA9,0x0FAA,0x0FAB,0x0FAC,0x0FAD,0x0FAE,0x0FAF,0x0FB0, - 0x0FB1,0x0FB2,0x0FB3,0x0FB4,0x0FB5,0x0FB6,0x0FB7,0x0FB8, - 0x0FB9,0x0FBA,0x0FBB,0x0FBC,0x0FC6,0x102D,0x102E,0x102F, - 0x1030,0x1032,0x1033,0x1034,0x1035,0x1036,0x1037,0x1039, - 0x103A,0x103D,0x103E,0x1058,0x1059,0x105E,0x105F,0x1060, - 0x1071,0x1072,0x1073,0x1074,0x1082,0x1085,0x1086,0x108D, - 0x109D,0x135D,0x135E,0x135F,0x1712,0x1713,0x1714,0x1732, - 0x1733,0x1734,0x1752,0x1753,0x1772,0x1773,0x17B4,0x17B5, - 0x17B7,0x17B8,0x17B9,0x17BA,0x17BB,0x17BC,0x17BD,0x17C6, - 0x17C9,0x17CA,0x17CB,0x17CC,0x17CD,0x17CE,0x17CF,0x17D0, - 0x17D1,0x17D2,0x17D3,0x17DD,0x180B,0x180C,0x180D,0x1885, - 0x1886,0x18A9,0x1920,0x1921,0x1922,0x1927,0x1928,0x1932, - 0x1939,0x193A,0x193B,0x1A17,0x1A18,0x1A1B,0x1A56,0x1A58, - 0x1A59,0x1A5A,0x1A5B,0x1A5C,0x1A5D,0x1A5E,0x1A60,0x1A62, - 0x1A65,0x1A66,0x1A67,0x1A68,0x1A69,0x1A6A,0x1A6B,0x1A6C, - 0x1A73,0x1A74,0x1A75,0x1A76,0x1A77,0x1A78,0x1A79,0x1A7A, - 0x1A7B,0x1A7C,0x1A7F,0x1AB0,0x1AB1,0x1AB2,0x1AB3,0x1AB4, - 0x1AB5,0x1AB6,0x1AB7,0x1AB8,0x1AB9,0x1ABA,0x1ABB,0x1ABC, - 0x1ABD,0x1B00,0x1B01,0x1B02,0x1B03,0x1B34,0x1B36,0x1B37, - 0x1B38,0x1B39,0x1B3A,0x1B3C,0x1B42,0x1B6B,0x1B6C,0x1B6D, - 0x1B6E,0x1B6F,0x1B70,0x1B71,0x1B72,0x1B73,0x1B80,0x1B81, - 0x1BA2,0x1BA3,0x1BA4,0x1BA5,0x1BA8,0x1BA9,0x1BAB,0x1BAC, - 0x1BAD,0x1BE6,0x1BE8,0x1BE9,0x1BED,0x1BEF,0x1BF0,0x1BF1, - 0x1C2C,0x1C2D,0x1C2E,0x1C2F,0x1C30,0x1C31,0x1C32,0x1C33, - 0x1C36,0x1C37,0x1CD0,0x1CD1,0x1CD2,0x1CD4,0x1CD5,0x1CD6, - 0x1CD7,0x1CD8,0x1CD9,0x1CDA,0x1CDB,0x1CDC,0x1CDD,0x1CDE, - 0x1CDF,0x1CE0,0x1CE2,0x1CE3,0x1CE4,0x1CE5,0x1CE6,0x1CE7, - 0x1CE8,0x1CED,0x1CF4,0x1CF8,0x1CF9,0x1DC0,0x1DC1,0x1DC2, - 0x1DC3,0x1DC4,0x1DC5,0x1DC6,0x1DC7,0x1DC8,0x1DC9,0x1DCA, - 0x1DCB,0x1DCC,0x1DCD,0x1DCE,0x1DCF,0x1DD0,0x1DD1,0x1DD2, - 0x1DD3,0x1DD4,0x1DD5,0x1DD6,0x1DD7,0x1DD8,0x1DD9,0x1DDA, - 0x1DDB,0x1DDC,0x1DDD,0x1DDE,0x1DDF,0x1DE0,0x1DE1,0x1DE2, - 0x1DE3,0x1DE4,0x1DE5,0x1DE6,0x1DE7,0x1DE8,0x1DE9,0x1DEA, - 0x1DEB,0x1DEC,0x1DED,0x1DEE,0x1DEF,0x1DF0,0x1DF1,0x1DF2, - 0x1DF3,0x1DF4,0x1DF5,0x1DFB,0x1DFC,0x1DFD,0x1DFE,0x1DFF, - 0x20D0,0x20D1,0x20D2,0x20D3,0x20D4,0x20D5,0x20D6,0x20D7, - 0x20D8,0x20D9,0x20DA,0x20DB,0x20DC,0x20E1,0x20E5,0x20E6, - 0x20E7,0x20E8,0x20E9,0x20EA,0x20EB,0x20EC,0x20ED,0x20EE, - 0x20EF,0x20F0,0x2CEF,0x2CF0,0x2CF1,0x2D7F,0x2DE0,0x2DE1, - 0x2DE2,0x2DE3,0x2DE4,0x2DE5,0x2DE6,0x2DE7,0x2DE8,0x2DE9, - 0x2DEA,0x2DEB,0x2DEC,0x2DED,0x2DEE,0x2DEF,0x2DF0,0x2DF1, - 0x2DF2,0x2DF3,0x2DF4,0x2DF5,0x2DF6,0x2DF7,0x2DF8,0x2DF9, - 0x2DFA,0x2DFB,0x2DFC,0x2DFD,0x2DFE,0x2DFF,0x302A,0x302B, - 0x302C,0x302D,0x3099,0x309A,0xA66F,0xA674,0xA675,0xA676, - 0xA677,0xA678,0xA679,0xA67A,0xA67B,0xA67C,0xA67D,0xA69E, - 0xA69F,0xA6F0,0xA6F1,0xA802,0xA806,0xA80B,0xA825,0xA826, - 0xA8C4,0xA8C5,0xA8E0,0xA8E1,0xA8E2,0xA8E3,0xA8E4,0xA8E5, - 0xA8E6,0xA8E7,0xA8E8,0xA8E9,0xA8EA,0xA8EB,0xA8EC,0xA8ED, - 0xA8EE,0xA8EF,0xA8F0,0xA8F1,0xA926,0xA927,0xA928,0xA929, - 0xA92A,0xA92B,0xA92C,0xA92D,0xA947,0xA948,0xA949,0xA94A, - 0xA94B,0xA94C,0xA94D,0xA94E,0xA94F,0xA950,0xA951,0xA980, - 0xA981,0xA982,0xA9B3,0xA9B6,0xA9B7,0xA9B8,0xA9B9,0xA9BC, - 0xA9E5,0xAA29,0xAA2A,0xAA2B,0xAA2C,0xAA2D,0xAA2E,0xAA31, - 0xAA32,0xAA35,0xAA36,0xAA43,0xAA4C,0xAA7C,0xAAB0,0xAAB2, - 0xAAB3,0xAAB4,0xAAB7,0xAAB8,0xAABE,0xAABF,0xAAC1,0xAAEC, - 0xAAED,0xAAF6,0xABE5,0xABE8,0xABED,0xFB1E,0xFE00,0xFE01, - 0xFE02,0xFE03,0xFE04,0xFE05,0xFE06,0xFE07,0xFE08,0xFE09, - 0xFE0A,0xFE0B,0xFE0C,0xFE0D,0xFE0E,0xFE0F,0xFE20,0xFE21, - 0xFE22,0xFE23,0xFE24,0xFE25,0xFE26,0xFE27,0xFE28,0xFE29, - 0xFE2A,0xFE2B,0xFE2C,0xFE2D,0xFE2E,0xFE2F, - 0x101FD,0x102E0,0x10376,0x10377,0x10378,0x10379,0x1037A,0x10A01, - 0x10A02,0x10A03,0x10A05,0x10A06,0x10A0C,0x10A0D,0x10A0E,0x10A0F, - 0x10A38,0x10A39,0x10A3A,0x10A3F,0x10AE5,0x10AE6,0x11001,0x11038, - 0x11039,0x1103A,0x1103B,0x1103C,0x1103D,0x1103E,0x1103F,0x11040, - 0x11041,0x11042,0x11043,0x11044,0x11045,0x11046,0x1107F,0x11080, - 0x11081,0x110B3,0x110B4,0x110B5,0x110B6,0x110B9,0x110BA,0x11100, - 0x11101,0x11102,0x11127,0x11128,0x11129,0x1112A,0x1112B,0x1112D, - 0x1112E,0x1112F,0x11130,0x11131,0x11132,0x11133,0x11134,0x11173, - 0x11180,0x11181,0x111B6,0x111B7,0x111B8,0x111B9,0x111BA,0x111BB, - 0x111BC,0x111BD,0x111BE,0x111CA,0x111CB,0x111CC,0x1122F,0x11230, - 0x11231,0x11234,0x11236,0x11237,0x1123E,0x112DF,0x112E3,0x112E4, - 0x112E5,0x112E6,0x112E7,0x112E8,0x112E9,0x112EA,0x11300,0x11301, - 0x1133C,0x11340,0x11366,0x11367,0x11368,0x11369,0x1136A,0x1136B, - 0x1136C,0x11370,0x11371,0x11372,0x11373,0x11374,0x11438,0x11439, - 0x1143A,0x1143B,0x1143C,0x1143D,0x1143E,0x1143F,0x11442,0x11443, - 0x11444,0x11446,0x114B3,0x114B4,0x114B5,0x114B6,0x114B7,0x114B8, - 0x114BA,0x114BF,0x114C0,0x114C2,0x114C3,0x115B2,0x115B3,0x115B4, - 0x115B5,0x115BC,0x115BD,0x115BF,0x115C0,0x115DC,0x115DD,0x11633, - 0x11634,0x11635,0x11636,0x11637,0x11638,0x11639,0x1163A,0x1163D, - 0x1163F,0x11640,0x116AB,0x116AD,0x116B0,0x116B1,0x116B2,0x116B3, - 0x116B4,0x116B5,0x116B7,0x1171D,0x1171E,0x1171F,0x11722,0x11723, - 0x11724,0x11725,0x11727,0x11728,0x11729,0x1172A,0x1172B,0x11C30, - 0x11C31,0x11C32,0x11C33,0x11C34,0x11C35,0x11C36,0x11C38,0x11C39, - 0x11C3A,0x11C3B,0x11C3C,0x11C3D,0x11C3F,0x11C92,0x11C93,0x11C94, - 0x11C95,0x11C96,0x11C97,0x11C98,0x11C99,0x11C9A,0x11C9B,0x11C9C, - 0x11C9D,0x11C9E,0x11C9F,0x11CA0,0x11CA1,0x11CA2,0x11CA3,0x11CA4, - 0x11CA5,0x11CA6,0x11CA7,0x11CAA,0x11CAB,0x11CAC,0x11CAD,0x11CAE, - 0x11CAF,0x11CB0,0x11CB2,0x11CB3,0x11CB5,0x11CB6,0x16AF0,0x16AF1, - 0x16AF2,0x16AF3,0x16AF4,0x16B30,0x16B31,0x16B32,0x16B33,0x16B34, - 0x16B35,0x16B36,0x16F8F,0x16F90,0x16F91,0x16F92,0x1BC9D,0x1BC9E, - 0x1D167,0x1D168,0x1D169,0x1D17B,0x1D17C,0x1D17D,0x1D17E,0x1D17F, - 0x1D180,0x1D181,0x1D182,0x1D185,0x1D186,0x1D187,0x1D188,0x1D189, - 0x1D18A,0x1D18B,0x1D1AA,0x1D1AB,0x1D1AC,0x1D1AD,0x1D242,0x1D243, - 0x1D244,0x1DA00,0x1DA01,0x1DA02,0x1DA03,0x1DA04,0x1DA05,0x1DA06, - 0x1DA07,0x1DA08,0x1DA09,0x1DA0A,0x1DA0B,0x1DA0C,0x1DA0D,0x1DA0E, - 0x1DA0F,0x1DA10,0x1DA11,0x1DA12,0x1DA13,0x1DA14,0x1DA15,0x1DA16, - 0x1DA17,0x1DA18,0x1DA19,0x1DA1A,0x1DA1B,0x1DA1C,0x1DA1D,0x1DA1E, - 0x1DA1F,0x1DA20,0x1DA21,0x1DA22,0x1DA23,0x1DA24,0x1DA25,0x1DA26, - 0x1DA27,0x1DA28,0x1DA29,0x1DA2A,0x1DA2B,0x1DA2C,0x1DA2D,0x1DA2E, - 0x1DA2F,0x1DA30,0x1DA31,0x1DA32,0x1DA33,0x1DA34,0x1DA35,0x1DA36, - 0x1DA3B,0x1DA3C,0x1DA3D,0x1DA3E,0x1DA3F,0x1DA40,0x1DA41,0x1DA42, - 0x1DA43,0x1DA44,0x1DA45,0x1DA46,0x1DA47,0x1DA48,0x1DA49,0x1DA4A, - 0x1DA4B,0x1DA4C,0x1DA4D,0x1DA4E,0x1DA4F,0x1DA50,0x1DA51,0x1DA52, - 0x1DA53,0x1DA54,0x1DA55,0x1DA56,0x1DA57,0x1DA58,0x1DA59,0x1DA5A, - 0x1DA5B,0x1DA5C,0x1DA5D,0x1DA5E,0x1DA5F,0x1DA60,0x1DA61,0x1DA62, - 0x1DA63,0x1DA64,0x1DA65,0x1DA66,0x1DA67,0x1DA68,0x1DA69,0x1DA6A, - 0x1DA6B,0x1DA6C,0x1DA75,0x1DA84,0x1DA9B,0x1DA9C,0x1DA9D,0x1DA9E, - 0x1DA9F,0x1DAA1,0x1DAA2,0x1DAA3,0x1DAA4,0x1DAA5,0x1DAA6,0x1DAA7, - 0x1DAA8,0x1DAA9,0x1DAAA,0x1DAAB,0x1DAAC,0x1DAAD,0x1DAAE,0x1DAAF, - 0x1E000,0x1E001,0x1E002,0x1E003,0x1E004,0x1E005,0x1E006,0x1E008, - 0x1E009,0x1E00A,0x1E00B,0x1E00C,0x1E00D,0x1E00E,0x1E00F,0x1E010, - 0x1E011,0x1E012,0x1E013,0x1E014,0x1E015,0x1E016,0x1E017,0x1E018, - 0x1E01B,0x1E01C,0x1E01D,0x1E01E,0x1E01F,0x1E020,0x1E021,0x1E023, - 0x1E024,0x1E026,0x1E027,0x1E028,0x1E029,0x1E02A,0x1E8D0,0x1E8D1, - 0x1E8D2,0x1E8D3,0x1E8D4,0x1E8D5,0x1E8D6,0x1E944,0x1E945,0x1E946, - 0x1E947,0x1E948,0x1E949,0x1E94A,0xE0100,0xE0101,0xE0102,0xE0103, - 0xE0104,0xE0105,0xE0106,0xE0107,0xE0108,0xE0109,0xE010A,0xE010B, - 0xE010C,0xE010D,0xE010E,0xE010F,0xE0110,0xE0111,0xE0112,0xE0113, - 0xE0114,0xE0115,0xE0116,0xE0117,0xE0118,0xE0119,0xE011A,0xE011B, - 0xE011C,0xE011D,0xE011E,0xE011F,0xE0120,0xE0121,0xE0122,0xE0123, - 0xE0124,0xE0125,0xE0126,0xE0127,0xE0128,0xE0129,0xE012A,0xE012B, - 0xE012C,0xE012D,0xE012E,0xE012F,0xE0130,0xE0131,0xE0132,0xE0133, - 0xE0134,0xE0135,0xE0136,0xE0137,0xE0138,0xE0139,0xE013A,0xE013B, - 0xE013C,0xE013D,0xE013E,0xE013F,0xE0140,0xE0141,0xE0142,0xE0143, - 0xE0144,0xE0145,0xE0146,0xE0147,0xE0148,0xE0149,0xE014A,0xE014B, - 0xE014C,0xE014D,0xE014E,0xE014F,0xE0150,0xE0151,0xE0152,0xE0153, - 0xE0154,0xE0155,0xE0156,0xE0157,0xE0158,0xE0159,0xE015A,0xE015B, - 0xE015C,0xE015D,0xE015E,0xE015F,0xE0160,0xE0161,0xE0162,0xE0163, - 0xE0164,0xE0165,0xE0166,0xE0167,0xE0168,0xE0169,0xE016A,0xE016B, - 0xE016C,0xE016D,0xE016E,0xE016F,0xE0170,0xE0171,0xE0172,0xE0173, - 0xE0174,0xE0175,0xE0176,0xE0177,0xE0178,0xE0179,0xE017A,0xE017B, - 0xE017C,0xE017D,0xE017E,0xE017F,0xE0180,0xE0181,0xE0182,0xE0183, - 0xE0184,0xE0185,0xE0186,0xE0187,0xE0188,0xE0189,0xE018A,0xE018B, - 0xE018C,0xE018D,0xE018E,0xE018F,0xE0190,0xE0191,0xE0192,0xE0193, - 0xE0194,0xE0195,0xE0196,0xE0197,0xE0198,0xE0199,0xE019A,0xE019B, - 0xE019C,0xE019D,0xE019E,0xE019F,0xE01A0,0xE01A1,0xE01A2,0xE01A3, - 0xE01A4,0xE01A5,0xE01A6,0xE01A7,0xE01A8,0xE01A9,0xE01AA,0xE01AB, - 0xE01AC,0xE01AD,0xE01AE,0xE01AF,0xE01B0,0xE01B1,0xE01B2,0xE01B3, - 0xE01B4,0xE01B5,0xE01B6,0xE01B7,0xE01B8,0xE01B9,0xE01BA,0xE01BB, - 0xE01BC,0xE01BD,0xE01BE,0xE01BF,0xE01C0,0xE01C1,0xE01C2,0xE01C3, - 0xE01C4,0xE01C5,0xE01C6,0xE01C7,0xE01C8,0xE01C9,0xE01CA,0xE01CB, - 0xE01CC,0xE01CD,0xE01CE,0xE01CF,0xE01D0,0xE01D1,0xE01D2,0xE01D3, - 0xE01D4,0xE01D5,0xE01D6,0xE01D7,0xE01D8,0xE01D9,0xE01DA,0xE01DB, - 0xE01DC,0xE01DD,0xE01DE,0xE01DF,0xE01E0,0xE01E1,0xE01E2,0xE01E3, - 0xE01E4,0xE01E5,0xE01E6,0xE01E7,0xE01E8,0xE01E9,0xE01EA,0xE01EB, - 0xE01EC,0xE01ED,0xE01EE,0xE01EF, + 0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0305, 0x0306, 0x0307, + 0x0308, 0x0309, 0x030A, 0x030B, 0x030C, 0x030D, 0x030E, 0x030F, + 0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317, + 0x0318, 0x0319, 0x031A, 0x031B, 0x031C, 0x031D, 0x031E, 0x031F, + 0x0320, 0x0321, 0x0322, 0x0323, 0x0324, 0x0325, 0x0326, 0x0327, + 0x0328, 0x0329, 0x032A, 0x032B, 0x032C, 0x032D, 0x032E, 0x032F, + 0x0330, 0x0331, 0x0332, 0x0333, 0x0334, 0x0335, 0x0336, 0x0337, + 0x0338, 0x0339, 0x033A, 0x033B, 0x033C, 0x033D, 0x033E, 0x033F, + 0x0340, 0x0341, 0x0342, 0x0343, 0x0344, 0x0345, 0x0346, 0x0347, + 0x0348, 0x0349, 0x034A, 0x034B, 0x034C, 0x034D, 0x034E, 0x034F, + 0x0350, 0x0351, 0x0352, 0x0353, 0x0354, 0x0355, 0x0356, 0x0357, + 0x0358, 0x0359, 0x035A, 0x035B, 0x035C, 0x035D, 0x035E, 0x035F, + 0x0360, 0x0361, 0x0362, 0x0363, 0x0364, 0x0365, 0x0366, 0x0367, + 0x0368, 0x0369, 0x036A, 0x036B, 0x036C, 0x036D, 0x036E, 0x036F, + 0x0483, 0x0484, 0x0485, 0x0486, 0x0487, 0x0591, 0x0592, 0x0593, + 0x0594, 0x0595, 0x0596, 0x0597, 0x0598, 0x0599, 0x059A, 0x059B, + 0x059C, 0x059D, 0x059E, 0x059F, 0x05A0, 0x05A1, 0x05A2, 0x05A3, + 0x05A4, 0x05A5, 0x05A6, 0x05A7, 0x05A8, 0x05A9, 0x05AA, 0x05AB, + 0x05AC, 0x05AD, 0x05AE, 0x05AF, 0x05B0, 0x05B1, 0x05B2, 0x05B3, + 0x05B4, 0x05B5, 0x05B6, 0x05B7, 0x05B8, 0x05B9, 0x05BA, 0x05BB, + 0x05BC, 0x05BD, 0x05BF, 0x05C1, 0x05C2, 0x05C4, 0x05C5, 0x05C7, + 0x0610, 0x0611, 0x0612, 0x0613, 0x0614, 0x0615, 0x0616, 0x0617, + 0x0618, 0x0619, 0x061A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, + 0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0656, 0x0657, + 0x0658, 0x0659, 0x065A, 0x065B, 0x065C, 0x065D, 0x065E, 0x065F, + 0x0670, 0x06D6, 0x06D7, 0x06D8, 0x06D9, 0x06DA, 0x06DB, 0x06DC, + 0x06DF, 0x06E0, 0x06E1, 0x06E2, 0x06E3, 0x06E4, 0x06E7, 0x06E8, + 0x06EA, 0x06EB, 0x06EC, 0x06ED, 0x0711, 0x0730, 0x0731, 0x0732, + 0x0733, 0x0734, 0x0735, 0x0736, 0x0737, 0x0738, 0x0739, 0x073A, + 0x073B, 0x073C, 0x073D, 0x073E, 0x073F, 0x0740, 0x0741, 0x0742, + 0x0743, 0x0744, 0x0745, 0x0746, 0x0747, 0x0748, 0x0749, 0x074A, + 0x07A6, 0x07A7, 0x07A8, 0x07A9, 0x07AA, 0x07AB, 0x07AC, 0x07AD, + 0x07AE, 0x07AF, 0x07B0, 0x07EB, 0x07EC, 0x07ED, 0x07EE, 0x07EF, + 0x07F0, 0x07F1, 0x07F2, 0x07F3, 0x0816, 0x0817, 0x0818, 0x0819, + 0x081B, 0x081C, 0x081D, 0x081E, 0x081F, 0x0820, 0x0821, 0x0822, + 0x0823, 0x0825, 0x0826, 0x0827, 0x0829, 0x082A, 0x082B, 0x082C, + 0x082D, 0x0859, 0x085A, 0x085B, 0x08D4, 0x08D5, 0x08D6, 0x08D7, + 0x08D8, 0x08D9, 0x08DA, 0x08DB, 0x08DC, 0x08DD, 0x08DE, 0x08DF, + 0x08E0, 0x08E1, 0x08E3, 0x08E4, 0x08E5, 0x08E6, 0x08E7, 0x08E8, + 0x08E9, 0x08EA, 0x08EB, 0x08EC, 0x08ED, 0x08EE, 0x08EF, 0x08F0, + 0x08F1, 0x08F2, 0x08F3, 0x08F4, 0x08F5, 0x08F6, 0x08F7, 0x08F8, + 0x08F9, 0x08FA, 0x08FB, 0x08FC, 0x08FD, 0x08FE, 0x08FF, 0x0900, + 0x0901, 0x0902, 0x093A, 0x093C, 0x0941, 0x0942, 0x0943, 0x0944, + 0x0945, 0x0946, 0x0947, 0x0948, 0x094D, 0x0951, 0x0952, 0x0953, + 0x0954, 0x0955, 0x0956, 0x0957, 0x0962, 0x0963, 0x0981, 0x09BC, + 0x09C1, 0x09C2, 0x09C3, 0x09C4, 0x09CD, 0x09E2, 0x09E3, 0x0A01, + 0x0A02, 0x0A3C, 0x0A41, 0x0A42, 0x0A47, 0x0A48, 0x0A4B, 0x0A4C, + 0x0A4D, 0x0A51, 0x0A70, 0x0A71, 0x0A75, 0x0A81, 0x0A82, 0x0ABC, + 0x0AC1, 0x0AC2, 0x0AC3, 0x0AC4, 0x0AC5, 0x0AC7, 0x0AC8, 0x0ACD, + 0x0AE2, 0x0AE3, 0x0B01, 0x0B3C, 0x0B3F, 0x0B41, 0x0B42, 0x0B43, + 0x0B44, 0x0B4D, 0x0B56, 0x0B62, 0x0B63, 0x0B82, 0x0BC0, 0x0BCD, + 0x0C00, 0x0C3E, 0x0C3F, 0x0C40, 0x0C46, 0x0C47, 0x0C48, 0x0C4A, + 0x0C4B, 0x0C4C, 0x0C4D, 0x0C55, 0x0C56, 0x0C62, 0x0C63, 0x0C81, + 0x0CBC, 0x0CBF, 0x0CC6, 0x0CCC, 0x0CCD, 0x0CE2, 0x0CE3, 0x0D01, + 0x0D41, 0x0D42, 0x0D43, 0x0D44, 0x0D4D, 0x0D62, 0x0D63, 0x0DCA, + 0x0DD2, 0x0DD3, 0x0DD4, 0x0DD6, 0x0E31, 0x0E34, 0x0E35, 0x0E36, + 0x0E37, 0x0E38, 0x0E39, 0x0E3A, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, + 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0EB1, 0x0EB4, 0x0EB5, 0x0EB6, + 0x0EB7, 0x0EB8, 0x0EB9, 0x0EBB, 0x0EBC, 0x0EC8, 0x0EC9, 0x0ECA, + 0x0ECB, 0x0ECC, 0x0ECD, 0x0F18, 0x0F19, 0x0F35, 0x0F37, 0x0F39, + 0x0F71, 0x0F72, 0x0F73, 0x0F74, 0x0F75, 0x0F76, 0x0F77, 0x0F78, + 0x0F79, 0x0F7A, 0x0F7B, 0x0F7C, 0x0F7D, 0x0F7E, 0x0F80, 0x0F81, + 0x0F82, 0x0F83, 0x0F84, 0x0F86, 0x0F87, 0x0F8D, 0x0F8E, 0x0F8F, + 0x0F90, 0x0F91, 0x0F92, 0x0F93, 0x0F94, 0x0F95, 0x0F96, 0x0F97, + 0x0F99, 0x0F9A, 0x0F9B, 0x0F9C, 0x0F9D, 0x0F9E, 0x0F9F, 0x0FA0, + 0x0FA1, 0x0FA2, 0x0FA3, 0x0FA4, 0x0FA5, 0x0FA6, 0x0FA7, 0x0FA8, + 0x0FA9, 0x0FAA, 0x0FAB, 0x0FAC, 0x0FAD, 0x0FAE, 0x0FAF, 0x0FB0, + 0x0FB1, 0x0FB2, 0x0FB3, 0x0FB4, 0x0FB5, 0x0FB6, 0x0FB7, 0x0FB8, + 0x0FB9, 0x0FBA, 0x0FBB, 0x0FBC, 0x0FC6, 0x102D, 0x102E, 0x102F, + 0x1030, 0x1032, 0x1033, 0x1034, 0x1035, 0x1036, 0x1037, 0x1039, + 0x103A, 0x103D, 0x103E, 0x1058, 0x1059, 0x105E, 0x105F, 0x1060, + 0x1071, 0x1072, 0x1073, 0x1074, 0x1082, 0x1085, 0x1086, 0x108D, + 0x109D, 0x135D, 0x135E, 0x135F, 0x1712, 0x1713, 0x1714, 0x1732, + 0x1733, 0x1734, 0x1752, 0x1753, 0x1772, 0x1773, 0x17B4, 0x17B5, + 0x17B7, 0x17B8, 0x17B9, 0x17BA, 0x17BB, 0x17BC, 0x17BD, 0x17C6, + 0x17C9, 0x17CA, 0x17CB, 0x17CC, 0x17CD, 0x17CE, 0x17CF, 0x17D0, + 0x17D1, 0x17D2, 0x17D3, 0x17DD, 0x180B, 0x180C, 0x180D, 0x1885, + 0x1886, 0x18A9, 0x1920, 0x1921, 0x1922, 0x1927, 0x1928, 0x1932, + 0x1939, 0x193A, 0x193B, 0x1A17, 0x1A18, 0x1A1B, 0x1A56, 0x1A58, + 0x1A59, 0x1A5A, 0x1A5B, 0x1A5C, 0x1A5D, 0x1A5E, 0x1A60, 0x1A62, + 0x1A65, 0x1A66, 0x1A67, 0x1A68, 0x1A69, 0x1A6A, 0x1A6B, 0x1A6C, + 0x1A73, 0x1A74, 0x1A75, 0x1A76, 0x1A77, 0x1A78, 0x1A79, 0x1A7A, + 0x1A7B, 0x1A7C, 0x1A7F, 0x1AB0, 0x1AB1, 0x1AB2, 0x1AB3, 0x1AB4, + 0x1AB5, 0x1AB6, 0x1AB7, 0x1AB8, 0x1AB9, 0x1ABA, 0x1ABB, 0x1ABC, + 0x1ABD, 0x1B00, 0x1B01, 0x1B02, 0x1B03, 0x1B34, 0x1B36, 0x1B37, + 0x1B38, 0x1B39, 0x1B3A, 0x1B3C, 0x1B42, 0x1B6B, 0x1B6C, 0x1B6D, + 0x1B6E, 0x1B6F, 0x1B70, 0x1B71, 0x1B72, 0x1B73, 0x1B80, 0x1B81, + 0x1BA2, 0x1BA3, 0x1BA4, 0x1BA5, 0x1BA8, 0x1BA9, 0x1BAB, 0x1BAC, + 0x1BAD, 0x1BE6, 0x1BE8, 0x1BE9, 0x1BED, 0x1BEF, 0x1BF0, 0x1BF1, + 0x1C2C, 0x1C2D, 0x1C2E, 0x1C2F, 0x1C30, 0x1C31, 0x1C32, 0x1C33, + 0x1C36, 0x1C37, 0x1CD0, 0x1CD1, 0x1CD2, 0x1CD4, 0x1CD5, 0x1CD6, + 0x1CD7, 0x1CD8, 0x1CD9, 0x1CDA, 0x1CDB, 0x1CDC, 0x1CDD, 0x1CDE, + 0x1CDF, 0x1CE0, 0x1CE2, 0x1CE3, 0x1CE4, 0x1CE5, 0x1CE6, 0x1CE7, + 0x1CE8, 0x1CED, 0x1CF4, 0x1CF8, 0x1CF9, 0x1DC0, 0x1DC1, 0x1DC2, + 0x1DC3, 0x1DC4, 0x1DC5, 0x1DC6, 0x1DC7, 0x1DC8, 0x1DC9, 0x1DCA, + 0x1DCB, 0x1DCC, 0x1DCD, 0x1DCE, 0x1DCF, 0x1DD0, 0x1DD1, 0x1DD2, + 0x1DD3, 0x1DD4, 0x1DD5, 0x1DD6, 0x1DD7, 0x1DD8, 0x1DD9, 0x1DDA, + 0x1DDB, 0x1DDC, 0x1DDD, 0x1DDE, 0x1DDF, 0x1DE0, 0x1DE1, 0x1DE2, + 0x1DE3, 0x1DE4, 0x1DE5, 0x1DE6, 0x1DE7, 0x1DE8, 0x1DE9, 0x1DEA, + 0x1DEB, 0x1DEC, 0x1DED, 0x1DEE, 0x1DEF, 0x1DF0, 0x1DF1, 0x1DF2, + 0x1DF3, 0x1DF4, 0x1DF5, 0x1DFB, 0x1DFC, 0x1DFD, 0x1DFE, 0x1DFF, + 0x20D0, 0x20D1, 0x20D2, 0x20D3, 0x20D4, 0x20D5, 0x20D6, 0x20D7, + 0x20D8, 0x20D9, 0x20DA, 0x20DB, 0x20DC, 0x20E1, 0x20E5, 0x20E6, + 0x20E7, 0x20E8, 0x20E9, 0x20EA, 0x20EB, 0x20EC, 0x20ED, 0x20EE, + 0x20EF, 0x20F0, 0x2CEF, 0x2CF0, 0x2CF1, 0x2D7F, 0x2DE0, 0x2DE1, + 0x2DE2, 0x2DE3, 0x2DE4, 0x2DE5, 0x2DE6, 0x2DE7, 0x2DE8, 0x2DE9, + 0x2DEA, 0x2DEB, 0x2DEC, 0x2DED, 0x2DEE, 0x2DEF, 0x2DF0, 0x2DF1, + 0x2DF2, 0x2DF3, 0x2DF4, 0x2DF5, 0x2DF6, 0x2DF7, 0x2DF8, 0x2DF9, + 0x2DFA, 0x2DFB, 0x2DFC, 0x2DFD, 0x2DFE, 0x2DFF, 0x302A, 0x302B, + 0x302C, 0x302D, 0x3099, 0x309A, 0xA66F, 0xA674, 0xA675, 0xA676, + 0xA677, 0xA678, 0xA679, 0xA67A, 0xA67B, 0xA67C, 0xA67D, 0xA69E, + 0xA69F, 0xA6F0, 0xA6F1, 0xA802, 0xA806, 0xA80B, 0xA825, 0xA826, + 0xA8C4, 0xA8C5, 0xA8E0, 0xA8E1, 0xA8E2, 0xA8E3, 0xA8E4, 0xA8E5, + 0xA8E6, 0xA8E7, 0xA8E8, 0xA8E9, 0xA8EA, 0xA8EB, 0xA8EC, 0xA8ED, + 0xA8EE, 0xA8EF, 0xA8F0, 0xA8F1, 0xA926, 0xA927, 0xA928, 0xA929, + 0xA92A, 0xA92B, 0xA92C, 0xA92D, 0xA947, 0xA948, 0xA949, 0xA94A, + 0xA94B, 0xA94C, 0xA94D, 0xA94E, 0xA94F, 0xA950, 0xA951, 0xA980, + 0xA981, 0xA982, 0xA9B3, 0xA9B6, 0xA9B7, 0xA9B8, 0xA9B9, 0xA9BC, + 0xA9E5, 0xAA29, 0xAA2A, 0xAA2B, 0xAA2C, 0xAA2D, 0xAA2E, 0xAA31, + 0xAA32, 0xAA35, 0xAA36, 0xAA43, 0xAA4C, 0xAA7C, 0xAAB0, 0xAAB2, + 0xAAB3, 0xAAB4, 0xAAB7, 0xAAB8, 0xAABE, 0xAABF, 0xAAC1, 0xAAEC, + 0xAAED, 0xAAF6, 0xABE5, 0xABE8, 0xABED, 0xFB1E, 0xFE00, 0xFE01, + 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07, 0xFE08, 0xFE09, + 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F, 0xFE20, 0xFE21, + 0xFE22, 0xFE23, 0xFE24, 0xFE25, 0xFE26, 0xFE27, 0xFE28, 0xFE29, + 0xFE2A, 0xFE2B, 0xFE2C, 0xFE2D, 0xFE2E, 0xFE2F, 0x101FD, 0x102E0, + 0x10376, 0x10377, 0x10378, 0x10379, 0x1037A, 0x10A01, 0x10A02, 0x10A03, + 0x10A05, 0x10A06, 0x10A0C, 0x10A0D, 0x10A0E, 0x10A0F, 0x10A38, 0x10A39, + 0x10A3A, 0x10A3F, 0x10AE5, 0x10AE6, 0x11001, 0x11038, 0x11039, 0x1103A, + 0x1103B, 0x1103C, 0x1103D, 0x1103E, 0x1103F, 0x11040, 0x11041, 0x11042, + 0x11043, 0x11044, 0x11045, 0x11046, 0x1107F, 0x11080, 0x11081, 0x110B3, + 0x110B4, 0x110B5, 0x110B6, 0x110B9, 0x110BA, 0x11100, 0x11101, 0x11102, + 0x11127, 0x11128, 0x11129, 0x1112A, 0x1112B, 0x1112D, 0x1112E, 0x1112F, + 0x11130, 0x11131, 0x11132, 0x11133, 0x11134, 0x11173, 0x11180, 0x11181, + 0x111B6, 0x111B7, 0x111B8, 0x111B9, 0x111BA, 0x111BB, 0x111BC, 0x111BD, + 0x111BE, 0x111CA, 0x111CB, 0x111CC, 0x1122F, 0x11230, 0x11231, 0x11234, + 0x11236, 0x11237, 0x1123E, 0x112DF, 0x112E3, 0x112E4, 0x112E5, 0x112E6, + 0x112E7, 0x112E8, 0x112E9, 0x112EA, 0x11300, 0x11301, 0x1133C, 0x11340, + 0x11366, 0x11367, 0x11368, 0x11369, 0x1136A, 0x1136B, 0x1136C, 0x11370, + 0x11371, 0x11372, 0x11373, 0x11374, 0x11438, 0x11439, 0x1143A, 0x1143B, + 0x1143C, 0x1143D, 0x1143E, 0x1143F, 0x11442, 0x11443, 0x11444, 0x11446, + 0x114B3, 0x114B4, 0x114B5, 0x114B6, 0x114B7, 0x114B8, 0x114BA, 0x114BF, + 0x114C0, 0x114C2, 0x114C3, 0x115B2, 0x115B3, 0x115B4, 0x115B5, 0x115BC, + 0x115BD, 0x115BF, 0x115C0, 0x115DC, 0x115DD, 0x11633, 0x11634, 0x11635, + 0x11636, 0x11637, 0x11638, 0x11639, 0x1163A, 0x1163D, 0x1163F, 0x11640, + 0x116AB, 0x116AD, 0x116B0, 0x116B1, 0x116B2, 0x116B3, 0x116B4, 0x116B5, + 0x116B7, 0x1171D, 0x1171E, 0x1171F, 0x11722, 0x11723, 0x11724, 0x11725, + 0x11727, 0x11728, 0x11729, 0x1172A, 0x1172B, 0x11C30, 0x11C31, 0x11C32, + 0x11C33, 0x11C34, 0x11C35, 0x11C36, 0x11C38, 0x11C39, 0x11C3A, 0x11C3B, + 0x11C3C, 0x11C3D, 0x11C3F, 0x11C92, 0x11C93, 0x11C94, 0x11C95, 0x11C96, + 0x11C97, 0x11C98, 0x11C99, 0x11C9A, 0x11C9B, 0x11C9C, 0x11C9D, 0x11C9E, + 0x11C9F, 0x11CA0, 0x11CA1, 0x11CA2, 0x11CA3, 0x11CA4, 0x11CA5, 0x11CA6, + 0x11CA7, 0x11CAA, 0x11CAB, 0x11CAC, 0x11CAD, 0x11CAE, 0x11CAF, 0x11CB0, + 0x11CB2, 0x11CB3, 0x11CB5, 0x11CB6, 0x16AF0, 0x16AF1, 0x16AF2, 0x16AF3, + 0x16AF4, 0x16B30, 0x16B31, 0x16B32, 0x16B33, 0x16B34, 0x16B35, 0x16B36, + 0x16F8F, 0x16F90, 0x16F91, 0x16F92, 0x1BC9D, 0x1BC9E, 0x1D167, 0x1D168, + 0x1D169, 0x1D17B, 0x1D17C, 0x1D17D, 0x1D17E, 0x1D17F, 0x1D180, 0x1D181, + 0x1D182, 0x1D185, 0x1D186, 0x1D187, 0x1D188, 0x1D189, 0x1D18A, 0x1D18B, + 0x1D1AA, 0x1D1AB, 0x1D1AC, 0x1D1AD, 0x1D242, 0x1D243, 0x1D244, 0x1DA00, + 0x1DA01, 0x1DA02, 0x1DA03, 0x1DA04, 0x1DA05, 0x1DA06, 0x1DA07, 0x1DA08, + 0x1DA09, 0x1DA0A, 0x1DA0B, 0x1DA0C, 0x1DA0D, 0x1DA0E, 0x1DA0F, 0x1DA10, + 0x1DA11, 0x1DA12, 0x1DA13, 0x1DA14, 0x1DA15, 0x1DA16, 0x1DA17, 0x1DA18, + 0x1DA19, 0x1DA1A, 0x1DA1B, 0x1DA1C, 0x1DA1D, 0x1DA1E, 0x1DA1F, 0x1DA20, + 0x1DA21, 0x1DA22, 0x1DA23, 0x1DA24, 0x1DA25, 0x1DA26, 0x1DA27, 0x1DA28, + 0x1DA29, 0x1DA2A, 0x1DA2B, 0x1DA2C, 0x1DA2D, 0x1DA2E, 0x1DA2F, 0x1DA30, + 0x1DA31, 0x1DA32, 0x1DA33, 0x1DA34, 0x1DA35, 0x1DA36, 0x1DA3B, 0x1DA3C, + 0x1DA3D, 0x1DA3E, 0x1DA3F, 0x1DA40, 0x1DA41, 0x1DA42, 0x1DA43, 0x1DA44, + 0x1DA45, 0x1DA46, 0x1DA47, 0x1DA48, 0x1DA49, 0x1DA4A, 0x1DA4B, 0x1DA4C, + 0x1DA4D, 0x1DA4E, 0x1DA4F, 0x1DA50, 0x1DA51, 0x1DA52, 0x1DA53, 0x1DA54, + 0x1DA55, 0x1DA56, 0x1DA57, 0x1DA58, 0x1DA59, 0x1DA5A, 0x1DA5B, 0x1DA5C, + 0x1DA5D, 0x1DA5E, 0x1DA5F, 0x1DA60, 0x1DA61, 0x1DA62, 0x1DA63, 0x1DA64, + 0x1DA65, 0x1DA66, 0x1DA67, 0x1DA68, 0x1DA69, 0x1DA6A, 0x1DA6B, 0x1DA6C, + 0x1DA75, 0x1DA84, 0x1DA9B, 0x1DA9C, 0x1DA9D, 0x1DA9E, 0x1DA9F, 0x1DAA1, + 0x1DAA2, 0x1DAA3, 0x1DAA4, 0x1DAA5, 0x1DAA6, 0x1DAA7, 0x1DAA8, 0x1DAA9, + 0x1DAAA, 0x1DAAB, 0x1DAAC, 0x1DAAD, 0x1DAAE, 0x1DAAF, 0x1E000, 0x1E001, + 0x1E002, 0x1E003, 0x1E004, 0x1E005, 0x1E006, 0x1E008, 0x1E009, 0x1E00A, + 0x1E00B, 0x1E00C, 0x1E00D, 0x1E00E, 0x1E00F, 0x1E010, 0x1E011, 0x1E012, + 0x1E013, 0x1E014, 0x1E015, 0x1E016, 0x1E017, 0x1E018, 0x1E01B, 0x1E01C, + 0x1E01D, 0x1E01E, 0x1E01F, 0x1E020, 0x1E021, 0x1E023, 0x1E024, 0x1E026, + 0x1E027, 0x1E028, 0x1E029, 0x1E02A, 0x1E8D0, 0x1E8D1, 0x1E8D2, 0x1E8D3, + 0x1E8D4, 0x1E8D5, 0x1E8D6, 0x1E944, 0x1E945, 0x1E946, 0x1E947, 0x1E948, + 0x1E949, 0x1E94A, 0xE0100, 0xE0101, 0xE0102, 0xE0103, 0xE0104, 0xE0105, + 0xE0106, 0xE0107, 0xE0108, 0xE0109, 0xE010A, 0xE010B, 0xE010C, 0xE010D, + 0xE010E, 0xE010F, 0xE0110, 0xE0111, 0xE0112, 0xE0113, 0xE0114, 0xE0115, + 0xE0116, 0xE0117, 0xE0118, 0xE0119, 0xE011A, 0xE011B, 0xE011C, 0xE011D, + 0xE011E, 0xE011F, 0xE0120, 0xE0121, 0xE0122, 0xE0123, 0xE0124, 0xE0125, + 0xE0126, 0xE0127, 0xE0128, 0xE0129, 0xE012A, 0xE012B, 0xE012C, 0xE012D, + 0xE012E, 0xE012F, 0xE0130, 0xE0131, 0xE0132, 0xE0133, 0xE0134, 0xE0135, + 0xE0136, 0xE0137, 0xE0138, 0xE0139, 0xE013A, 0xE013B, 0xE013C, 0xE013D, + 0xE013E, 0xE013F, 0xE0140, 0xE0141, 0xE0142, 0xE0143, 0xE0144, 0xE0145, + 0xE0146, 0xE0147, 0xE0148, 0xE0149, 0xE014A, 0xE014B, 0xE014C, 0xE014D, + 0xE014E, 0xE014F, 0xE0150, 0xE0151, 0xE0152, 0xE0153, 0xE0154, 0xE0155, + 0xE0156, 0xE0157, 0xE0158, 0xE0159, 0xE015A, 0xE015B, 0xE015C, 0xE015D, + 0xE015E, 0xE015F, 0xE0160, 0xE0161, 0xE0162, 0xE0163, 0xE0164, 0xE0165, + 0xE0166, 0xE0167, 0xE0168, 0xE0169, 0xE016A, 0xE016B, 0xE016C, 0xE016D, + 0xE016E, 0xE016F, 0xE0170, 0xE0171, 0xE0172, 0xE0173, 0xE0174, 0xE0175, + 0xE0176, 0xE0177, 0xE0178, 0xE0179, 0xE017A, 0xE017B, 0xE017C, 0xE017D, + 0xE017E, 0xE017F, 0xE0180, 0xE0181, 0xE0182, 0xE0183, 0xE0184, 0xE0185, + 0xE0186, 0xE0187, 0xE0188, 0xE0189, 0xE018A, 0xE018B, 0xE018C, 0xE018D, + 0xE018E, 0xE018F, 0xE0190, 0xE0191, 0xE0192, 0xE0193, 0xE0194, 0xE0195, + 0xE0196, 0xE0197, 0xE0198, 0xE0199, 0xE019A, 0xE019B, 0xE019C, 0xE019D, + 0xE019E, 0xE019F, 0xE01A0, 0xE01A1, 0xE01A2, 0xE01A3, 0xE01A4, 0xE01A5, + 0xE01A6, 0xE01A7, 0xE01A8, 0xE01A9, 0xE01AA, 0xE01AB, 0xE01AC, 0xE01AD, + 0xE01AE, 0xE01AF, 0xE01B0, 0xE01B1, 0xE01B2, 0xE01B3, 0xE01B4, 0xE01B5, + 0xE01B6, 0xE01B7, 0xE01B8, 0xE01B9, 0xE01BA, 0xE01BB, 0xE01BC, 0xE01BD, + 0xE01BE, 0xE01BF, 0xE01C0, 0xE01C1, 0xE01C2, 0xE01C3, 0xE01C4, 0xE01C5, + 0xE01C6, 0xE01C7, 0xE01C8, 0xE01C9, 0xE01CA, 0xE01CB, 0xE01CC, 0xE01CD, + 0xE01CE, 0xE01CF, 0xE01D0, 0xE01D1, 0xE01D2, 0xE01D3, 0xE01D4, 0xE01D5, + 0xE01D6, 0xE01D7, 0xE01D8, 0xE01D9, 0xE01DA, 0xE01DB, 0xE01DC, 0xE01DD, + 0xE01DE, 0xE01DF, 0xE01E0, 0xE01E1, 0xE01E2, 0xE01E3, 0xE01E4, 0xE01E5, + 0xE01E6, 0xE01E7, 0xE01E8, 0xE01E9, 0xE01EA, 0xE01EB, 0xE01EC, 0xE01ED, + 0xE01EE, 0xE01EF, }; /// The length of the combining characters list. -const size_t bc_history_combo_chars_len = - sizeof(bc_history_combo_chars) / sizeof(bc_history_combo_chars[0]); -#endif // BC_ENABLE_HISTORY +const size_t bc_history_combo_chars_len = sizeof(bc_history_combo_chars) / + sizeof(bc_history_combo_chars[0]); +#endif // BC_ENABLE_HISTORY && !BC_ENABLE_LINE_LIB /// The human-readable name of the main function in bc source code. const char bc_func_main[] = "(main)"; @@ -892,8 +847,8 @@ const size_t bc_lex_kws_len = sizeof(bc_lex_kws) / sizeof(BcLexKeyword); // redefined_kws in BcVm, is correct. If it's correct under C11, it will be // correct under C99, and I did not know any other way of ensuring they remained // synchronized. -static_assert(sizeof(bc_lex_kws) / sizeof(BcLexKeyword) == BC_LEX_NKWS, - "BC_LEX_NKWS is wrong."); +_Static_assert(sizeof(bc_lex_kws) / sizeof(BcLexKeyword) == BC_LEX_NKWS, + "BC_LEX_NKWS is wrong."); #endif // BC_C11 @@ -964,23 +919,21 @@ const uint8_t bc_parse_exprs[] = { /// An array of data for operators that correspond to token types. const uchar bc_parse_ops[] = { - BC_PARSE_OP(0, false), BC_PARSE_OP(0, false), - BC_PARSE_OP(1, false), BC_PARSE_OP(1, false), + BC_PARSE_OP(0, false), BC_PARSE_OP(0, false), BC_PARSE_OP(1, false), + BC_PARSE_OP(1, false), #if BC_ENABLE_EXTRA_MATH BC_PARSE_OP(2, false), #endif // BC_ENABLE_EXTRA_MATH - BC_PARSE_OP(4, false), - BC_PARSE_OP(5, true), BC_PARSE_OP(5, true), BC_PARSE_OP(5, true), - BC_PARSE_OP(6, true), BC_PARSE_OP(6, true), + BC_PARSE_OP(4, false), BC_PARSE_OP(5, true), BC_PARSE_OP(5, true), + BC_PARSE_OP(5, true), BC_PARSE_OP(6, true), BC_PARSE_OP(6, true), #if BC_ENABLE_EXTRA_MATH - BC_PARSE_OP(3, false), - BC_PARSE_OP(7, true), BC_PARSE_OP(7, true), + BC_PARSE_OP(3, false), BC_PARSE_OP(7, true), BC_PARSE_OP(7, true), #endif // BC_ENABLE_EXTRA_MATH - BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), - BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), - BC_PARSE_OP(11, true), BC_PARSE_OP(10, true), - BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), + BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), + BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), BC_PARSE_OP(9, true), + BC_PARSE_OP(11, true), BC_PARSE_OP(10, true), BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), + BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), #if BC_ENABLE_EXTRA_MATH BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), BC_PARSE_OP(8, false), #endif // BC_ENABLE_EXTRA_MATH @@ -990,16 +943,19 @@ const uchar bc_parse_ops[] = { // These identify what tokens can come after expressions in certain cases. /// The valid next tokens for normal expressions. -const BcParseNext bc_parse_next_expr = - BC_PARSE_NEXT(4, BC_LEX_NLINE, BC_LEX_SCOLON, BC_LEX_RBRACE, BC_LEX_EOF); +const BcParseNext bc_parse_next_expr = BC_PARSE_NEXT(4, BC_LEX_NLINE, + BC_LEX_SCOLON, + BC_LEX_RBRACE, BC_LEX_EOF); /// The valid next tokens for function argument expressions. -const BcParseNext bc_parse_next_arg = - BC_PARSE_NEXT(2, BC_LEX_RPAREN, BC_LEX_COMMA); +const BcParseNext bc_parse_next_arg = BC_PARSE_NEXT(2, BC_LEX_RPAREN, + BC_LEX_COMMA); /// The valid next tokens for expressions in print statements. -const BcParseNext bc_parse_next_print = - BC_PARSE_NEXT(4, BC_LEX_COMMA, BC_LEX_NLINE, BC_LEX_SCOLON, BC_LEX_EOF); +const BcParseNext bc_parse_next_print = BC_PARSE_NEXT(4, BC_LEX_COMMA, + BC_LEX_NLINE, + BC_LEX_SCOLON, + BC_LEX_EOF); /// The valid next tokens for if statement conditions or loop conditions. This /// is used in for loops for the update expression and for builtin function. @@ -1017,8 +973,8 @@ const BcParseNext bc_parse_next_elem = BC_PARSE_NEXT(1, BC_LEX_RBRACKET); const BcParseNext bc_parse_next_for = BC_PARSE_NEXT(1, BC_LEX_SCOLON); /// The valid next tokens for read expressions. -const BcParseNext bc_parse_next_read = - BC_PARSE_NEXT(2, BC_LEX_NLINE, BC_LEX_EOF); +const BcParseNext bc_parse_next_read = BC_PARSE_NEXT(2, BC_LEX_NLINE, + BC_LEX_EOF); /// The valid next tokens for the arguments of a builtin function with multiple /// arguments. @@ -1030,9 +986,10 @@ const BcParseNext bc_parse_next_builtin = BC_PARSE_NEXT(1, BC_LEX_COMMA); /// A list of instructions that need register arguments in dc. const uint8_t dc_lex_regs[] = { - BC_LEX_OP_REL_EQ, BC_LEX_OP_REL_LE, BC_LEX_OP_REL_GE, BC_LEX_OP_REL_NE, - BC_LEX_OP_REL_LT, BC_LEX_OP_REL_GT, BC_LEX_SCOLON, BC_LEX_COLON, - BC_LEX_KW_ELSE, BC_LEX_LOAD, BC_LEX_LOAD_POP, BC_LEX_OP_ASSIGN, + BC_LEX_OP_REL_EQ, BC_LEX_OP_REL_LE, BC_LEX_OP_REL_GE, + BC_LEX_OP_REL_NE, BC_LEX_OP_REL_LT, BC_LEX_OP_REL_GT, + BC_LEX_SCOLON, BC_LEX_COLON, BC_LEX_KW_ELSE, + BC_LEX_LOAD, BC_LEX_LOAD_POP, BC_LEX_OP_ASSIGN, BC_LEX_STORE_PUSH, BC_LEX_REG_STACK_LEVEL, BC_LEX_ARRAY_LENGTH, }; @@ -1056,26 +1013,49 @@ const uchar dc_lex_tokens[] = { #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_OP_MODULUS, BC_LEX_INVALID, + BC_LEX_OP_MODULUS, + BC_LEX_INVALID, #if BC_ENABLE_EXTRA_MATH BC_LEX_KW_RAND, #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_LPAREN, BC_LEX_RPAREN, BC_LEX_OP_MULTIPLY, BC_LEX_OP_PLUS, - BC_LEX_EXEC_STACK_LENGTH, BC_LEX_OP_MINUS, BC_LEX_INVALID, BC_LEX_OP_DIVIDE, - BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, - BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, - BC_LEX_INVALID, BC_LEX_INVALID, - BC_LEX_COLON, BC_LEX_SCOLON, BC_LEX_OP_REL_GT, BC_LEX_OP_REL_EQ, - BC_LEX_OP_REL_LT, BC_LEX_KW_READ, + BC_LEX_LPAREN, + BC_LEX_RPAREN, + BC_LEX_OP_MULTIPLY, + BC_LEX_OP_PLUS, + BC_LEX_EXEC_STACK_LENGTH, + BC_LEX_OP_MINUS, + BC_LEX_INVALID, + BC_LEX_OP_DIVIDE, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_COLON, + BC_LEX_SCOLON, + BC_LEX_OP_REL_GT, + BC_LEX_OP_REL_EQ, + BC_LEX_OP_REL_LT, + BC_LEX_KW_READ, #if BC_ENABLE_EXTRA_MATH BC_LEX_OP_PLACES, #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, - BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_EQ_NO_REG, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_EQ_NO_REG, #if BC_ENABLE_EXTRA_MATH BC_LEX_OP_LSHIFT, #else // BC_ENABLE_EXTRA_MATH @@ -1087,20 +1067,39 @@ const uchar dc_lex_tokens[] = { #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_KW_SCALE, BC_LEX_LOAD_POP, BC_LEX_OP_BOOL_AND, BC_LEX_OP_BOOL_NOT, - BC_LEX_KW_OBASE, BC_LEX_KW_STREAM, BC_LEX_NQUIT, BC_LEX_POP, - BC_LEX_STORE_PUSH, BC_LEX_KW_MAXIBASE, BC_LEX_KW_MAXOBASE, + BC_LEX_KW_SCALE, + BC_LEX_LOAD_POP, + BC_LEX_OP_BOOL_AND, + BC_LEX_OP_BOOL_NOT, + BC_LEX_KW_OBASE, + BC_LEX_KW_STREAM, + BC_LEX_NQUIT, + BC_LEX_POP, + BC_LEX_STORE_PUSH, + BC_LEX_KW_MAXIBASE, + BC_LEX_KW_MAXOBASE, BC_LEX_KW_MAXSCALE, #if BC_ENABLE_EXTRA_MATH BC_LEX_KW_MAXRAND, #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_SCALE_FACTOR, BC_LEX_ARRAY_LENGTH, BC_LEX_KW_LENGTH, - BC_LEX_INVALID, BC_LEX_INVALID, BC_LEX_INVALID, - BC_LEX_OP_POWER, BC_LEX_NEG, BC_LEX_INVALID, - BC_LEX_KW_ASCIIFY, BC_LEX_KW_ABS, BC_LEX_CLEAR_STACK, BC_LEX_DUPLICATE, - BC_LEX_KW_ELSE, BC_LEX_PRINT_STACK, BC_LEX_INVALID, + BC_LEX_SCALE_FACTOR, + BC_LEX_ARRAY_LENGTH, + BC_LEX_KW_LENGTH, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_OP_POWER, + BC_LEX_NEG, + BC_LEX_INVALID, + BC_LEX_KW_ASCIIFY, + BC_LEX_KW_ABS, + BC_LEX_CLEAR_STACK, + BC_LEX_DUPLICATE, + BC_LEX_KW_ELSE, + BC_LEX_PRINT_STACK, + BC_LEX_INVALID, #if BC_ENABLE_EXTRA_MATH BC_LEX_OP_RSHIFT, #else // BC_ENABLE_EXTRA_MATH @@ -1112,12 +1111,26 @@ const uchar dc_lex_tokens[] = { #else // BC_ENABLE_EXTRA_MATH BC_LEX_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_LEX_STORE_SCALE, BC_LEX_LOAD, - BC_LEX_OP_BOOL_OR, BC_LEX_PRINT_POP, BC_LEX_STORE_OBASE, BC_LEX_KW_PRINT, - BC_LEX_KW_QUIT, BC_LEX_SWAP, BC_LEX_OP_ASSIGN, BC_LEX_INVALID, - BC_LEX_INVALID, BC_LEX_KW_SQRT, BC_LEX_INVALID, BC_LEX_EXECUTE, - BC_LEX_REG_STACK_LEVEL, BC_LEX_STACK_LEVEL, - BC_LEX_LBRACE, BC_LEX_KW_MODEXP, BC_LEX_RBRACE, BC_LEX_KW_DIVMOD, + BC_LEX_STORE_SCALE, + BC_LEX_LOAD, + BC_LEX_OP_BOOL_OR, + BC_LEX_PRINT_POP, + BC_LEX_STORE_OBASE, + BC_LEX_KW_PRINT, + BC_LEX_KW_QUIT, + BC_LEX_SWAP, + BC_LEX_OP_ASSIGN, + BC_LEX_INVALID, + BC_LEX_INVALID, + BC_LEX_KW_SQRT, + BC_LEX_INVALID, + BC_LEX_EXECUTE, + BC_LEX_REG_STACK_LEVEL, + BC_LEX_STACK_LEVEL, + BC_LEX_LBRACE, + BC_LEX_KW_MODEXP, + BC_LEX_RBRACE, + BC_LEX_KW_DIVMOD, BC_LEX_INVALID }; @@ -1126,56 +1139,55 @@ const uchar dc_lex_tokens[] = { /// Otherwise, the token can trivially be replaced by the entry. This needs to /// be updated if the tokens change. const uchar dc_parse_insts[] = { - BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, #if BC_ENABLED - BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, #endif // BC_ENABLED - BC_INST_INVALID, BC_INST_BOOL_NOT, + BC_INST_INVALID, BC_INST_BOOL_NOT, #if BC_ENABLE_EXTRA_MATH BC_INST_TRUNC, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_POWER, BC_INST_MULTIPLY, BC_INST_DIVIDE, BC_INST_MODULUS, - BC_INST_PLUS, BC_INST_MINUS, + BC_INST_POWER, BC_INST_MULTIPLY, BC_INST_DIVIDE, + BC_INST_MODULUS, BC_INST_PLUS, BC_INST_MINUS, #if BC_ENABLE_EXTRA_MATH - BC_INST_PLACES, - BC_INST_LSHIFT, BC_INST_RSHIFT, + BC_INST_PLACES, BC_INST_LSHIFT, BC_INST_RSHIFT, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, - BC_INST_INVALID, BC_INST_INVALID, - BC_INST_BOOL_OR, BC_INST_BOOL_AND, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_BOOL_OR, BC_INST_BOOL_AND, #if BC_ENABLED - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, - BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, #if BC_ENABLE_EXTRA_MATH - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, #endif // BC_ENABLE_EXTRA_MATH #endif // BC_ENABLED - BC_INST_INVALID, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_REL_GT, BC_INST_REL_LT, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, BC_INST_REL_GE, - BC_INST_INVALID, BC_INST_REL_LE, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_REL_GT, BC_INST_REL_LT, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_REL_GE, + BC_INST_INVALID, BC_INST_REL_LE, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, #if BC_ENABLED - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, #endif // BC_ENABLED - BC_INST_IBASE, BC_INST_OBASE, BC_INST_SCALE, + BC_INST_IBASE, BC_INST_OBASE, BC_INST_SCALE, #if BC_ENABLE_EXTRA_MATH BC_INST_SEED, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_LENGTH, BC_INST_PRINT, - BC_INST_SQRT, BC_INST_ABS, + BC_INST_LENGTH, BC_INST_PRINT, BC_INST_SQRT, + BC_INST_ABS, #if BC_ENABLE_EXTRA_MATH BC_INST_IRAND, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_ASCIIFY, BC_INST_MODEXP, BC_INST_DIVMOD, - BC_INST_QUIT, BC_INST_INVALID, + BC_INST_ASCIIFY, BC_INST_MODEXP, BC_INST_DIVMOD, + BC_INST_QUIT, BC_INST_INVALID, #if BC_ENABLE_EXTRA_MATH BC_INST_RAND, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_MAXIBASE, - BC_INST_MAXOBASE, BC_INST_MAXSCALE, + BC_INST_MAXIBASE, BC_INST_MAXOBASE, BC_INST_MAXSCALE, #if BC_ENABLE_EXTRA_MATH BC_INST_MAXRAND, #endif // BC_ENABLE_EXTRA_MATH @@ -1184,17 +1196,17 @@ const uchar dc_parse_insts[] = { BC_INST_INVALID, #endif // BC_ENABLED BC_INST_LEADING_ZERO, BC_INST_PRINT_STREAM, BC_INST_INVALID, - BC_INST_REL_EQ, BC_INST_INVALID, - BC_INST_EXECUTE, BC_INST_PRINT_STACK, BC_INST_CLEAR_STACK, - BC_INST_INVALID, BC_INST_STACK_LEN, BC_INST_DUPLICATE, BC_INST_SWAP, - BC_INST_POP, - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_REL_EQ, BC_INST_INVALID, BC_INST_EXECUTE, + BC_INST_PRINT_STACK, BC_INST_CLEAR_STACK, BC_INST_INVALID, + BC_INST_STACK_LEN, BC_INST_DUPLICATE, BC_INST_SWAP, + BC_INST_POP, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_INVALID, #if BC_ENABLE_EXTRA_MATH BC_INST_INVALID, #endif // BC_ENABLE_EXTRA_MATH - BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, - BC_INST_PRINT_POP, BC_INST_NQUIT, BC_INST_EXEC_STACK_LEN, - BC_INST_SCALE_FUNC, BC_INST_INVALID, + BC_INST_INVALID, BC_INST_INVALID, BC_INST_INVALID, + BC_INST_PRINT_POP, BC_INST_NQUIT, BC_INST_EXEC_STACK_LEN, + BC_INST_SCALE_FUNC, BC_INST_INVALID, }; #endif // DC_ENABLED @@ -1207,6 +1219,8 @@ const BcRandState bc_rand_multiplier = BC_RAND_MULTIPLIER; #endif // BC_ENABLE_EXTRA_MATH +// clang-format off + #if BC_LONG_BIT >= 64 /// A constant array for the max of a bigdig number as a BcDig array. @@ -1245,6 +1259,8 @@ const BcDig bc_num_bigdigMax2[] = { #endif // BC_LONG_BIT >= 64 +// clang-format on + /// The size of the bigdig max array. const size_t bc_num_bigdigMax_size = sizeof(bc_num_bigdigMax) / sizeof(BcDig); @@ -1254,6 +1270,8 @@ const size_t bc_num_bigdigMax2_size = sizeof(bc_num_bigdigMax2) / sizeof(BcDig); /// A string of digits for easy conversion from characters to digits. const char bc_num_hex_digits[] = "0123456789ABCDEF"; +// clang-format off + /// An array for easy conversion from exponent to power of 10. const BcBigDig bc_num_pow10[BC_BASE_DIGS + 1] = { 1, @@ -1270,12 +1288,15 @@ const BcBigDig bc_num_pow10[BC_BASE_DIGS + 1] = { #endif // BC_BASE_DIGS > 4 }; +// clang-format on + #if !BC_ENABLE_LIBRARY /// An array of functions for binary operators corresponding to the order of /// the instructions for the operators. const BcNumBinaryOp bc_program_ops[] = { - bc_num_pow, bc_num_mul, bc_num_div, bc_num_mod, bc_num_add, bc_num_sub, + bc_num_pow, bc_num_mul, bc_num_div, + bc_num_mod, bc_num_add, bc_num_sub, #if BC_ENABLE_EXTRA_MATH bc_num_places, bc_num_lshift, bc_num_rshift, #endif // BC_ENABLE_EXTRA_MATH @@ -1284,8 +1305,8 @@ const BcNumBinaryOp bc_program_ops[] = { /// An array of functions for binary operators allocation requests corresponding /// to the order of the instructions for the operators. const BcNumBinaryOpReq bc_program_opReqs[] = { - bc_num_powReq, bc_num_mulReq, bc_num_divReq, bc_num_divReq, - bc_num_addReq, bc_num_addReq, + bc_num_powReq, bc_num_mulReq, bc_num_divReq, + bc_num_divReq, bc_num_addReq, bc_num_addReq, #if BC_ENABLE_EXTRA_MATH bc_num_placesReq, bc_num_placesReq, bc_num_placesReq, #endif // BC_ENABLE_EXTRA_MATH @@ -1294,7 +1315,8 @@ const BcNumBinaryOpReq bc_program_opReqs[] = { /// An array of unary operator functions corresponding to the order of the /// instructions. const BcProgramUnary bc_program_unarys[] = { - bc_program_negate, bc_program_not, + bc_program_negate, + bc_program_not, #if BC_ENABLE_EXTRA_MATH bc_program_trunc, #endif // BC_ENABLE_EXTRA_MATH diff --git a/contrib/bc/src/dc.c b/contrib/bc/src/dc.c index 67bc3e16c3c2..f873241286e0 100644 --- a/contrib/bc/src/dc.c +++ b/contrib/bc/src/dc.c @@ -45,8 +45,9 @@ * @param argc The number of arguments. * @param argv The arguments. */ -void dc_main(int argc, char *argv[]) { - +void +dc_main(int argc, char* argv[]) +{ // All of these just set dc-specific items in BcVm. vm.read_ret = BC_INST_POP_EXEC; diff --git a/contrib/bc/src/dc_lex.c b/contrib/bc/src/dc_lex.c index 7f2f5dedc484..b76c966f6059 100644 --- a/contrib/bc/src/dc_lex.c +++ b/contrib/bc/src/dc_lex.c @@ -40,7 +40,9 @@ #include <dc.h> #include <vm.h> -bool dc_lex_negCommand(BcLex *l) { +bool +dc_lex_negCommand(BcLex* l) +{ char c = l->buf[l->i]; return !BC_LEX_NUM_CHAR(c, false, false); } @@ -50,11 +52,12 @@ bool dc_lex_negCommand(BcLex *l) { * extended-register extension is implemented. * @param l The lexer. */ -static void dc_lex_register(BcLex *l) { - +static void +dc_lex_register(BcLex* l) +{ // If extended register is enabled and the character is whitespace... - if (DC_X && isspace(l->buf[l->i - 1])) { - + if (DC_X && isspace(l->buf[l->i - 1])) + { char c; // Eat the whitespace. @@ -63,18 +66,22 @@ static void dc_lex_register(BcLex *l) { // Check for a letter or underscore. if (BC_ERR(!isalpha(c) && c != '_')) + { bc_lex_verr(l, BC_ERR_PARSE_CHAR, c); + } // Parse a normal identifier. l->i += 1; bc_lex_name(l); } - else { - + else + { // I don't allow newlines because newlines are used for controlling when // execution happens, and allowing newlines would just be complex. if (BC_ERR(l->buf[l->i - 1] == '\n')) + { bc_lex_verr(l, BC_ERR_PARSE_CHAR, l->buf[l->i - 1]); + } // Set the lexer string and token. bc_vec_popAll(&l->str); @@ -90,8 +97,9 @@ static void dc_lex_register(BcLex *l) { * characters. Oh, and dc strings need to check for escaped brackets. * @param l The lexer. */ -static void dc_lex_string(BcLex *l) { - +static void +dc_lex_string(BcLex* l) +{ size_t depth, nls, i; char c; bool got_more; @@ -100,8 +108,8 @@ static void dc_lex_string(BcLex *l) { l->t = BC_LEX_STR; bc_vec_popAll(&l->str); - do { - + do + { depth = 1; nls = 0; got_more = false; @@ -111,14 +119,16 @@ static void dc_lex_string(BcLex *l) { // This is the meat. As long as we don't run into the NUL byte, and we // have "depth", which means we haven't completely balanced brackets // yet, we continue eating the string. - for (i = l->i; (c = l->buf[i]) && depth; ++i) { - + for (i = l->i; (c = l->buf[i]) && depth; ++i) + { // Check for escaped brackets and set the depths as appropriate. - if (c == '\\') { + if (c == '\\') + { c = l->buf[++i]; if (!c) break; } - else { + else + { depth += (c == '['); depth -= (c == ']'); } @@ -129,16 +139,20 @@ static void dc_lex_string(BcLex *l) { if (depth) bc_vec_push(&l->str, &c); } - if (BC_ERR(c == '\0' && depth)) { + if (BC_ERR(c == '\0' && depth)) + { if (!vm.eof && (l->is_stdin || l->is_exprs)) + { got_more = bc_lex_readLine(l); + } if (got_more) bc_vec_popAll(&l->str); } - - } while (got_more && depth); + } + while (got_more && depth); // Obviously, if we didn't balance, that's an error. - if (BC_ERR(c == '\0' && depth)) { + if (BC_ERR(c == '\0' && depth)) + { l->i = i; bc_lex_err(l, BC_ERR_PARSE_STRING); } @@ -153,8 +167,9 @@ static void dc_lex_string(BcLex *l) { * Lexes a dc token. This is the dc implementation of BcLexNext. * @param l The lexer. */ -void dc_lex_token(BcLex *l) { - +void +dc_lex_token(BcLex* l) +{ char c = l->buf[l->i++], c2; size_t i; @@ -162,10 +177,11 @@ void dc_lex_token(BcLex *l) { // If the last token was a command that needs a register, we need to parse a // register, so do so. - for (i = 0; i < dc_lex_regs_len; ++i) { - + for (i = 0; i < dc_lex_regs_len; ++i) + { // If the token is a register token, take care of it and return. - if (l->last == dc_lex_regs[i]) { + if (l->last == dc_lex_regs[i]) + { dc_lex_register(l); return; } @@ -181,8 +197,8 @@ void dc_lex_token(BcLex *l) { // This is the workhorse of the lexer when more complicated things are // needed. - switch (c) { - + switch (c) + { case '\0': case '\n': case '\t': @@ -224,7 +240,9 @@ void dc_lex_token(BcLex *l) { // If the character after is a number, this dot is part of a number. // Otherwise, it's the BSD dot (equivalent to last). if (BC_NO_ERR(BC_LEX_NUM_CHAR(c2, true, false))) + { bc_lex_number(l, c); + } else bc_lex_invalidChar(l, c); break; diff --git a/contrib/bc/src/dc_parse.c b/contrib/bc/src/dc_parse.c index 26aad6796d88..d45f951bad4f 100644 --- a/contrib/bc/src/dc_parse.c +++ b/contrib/bc/src/dc_parse.c @@ -50,8 +50,9 @@ * @param p The parser. * @param var True if the parser is for a variable, false otherwise. */ -static void dc_parse_register(BcParse *p, bool var) { - +static void +dc_parse_register(BcParse* p, bool var) +{ bc_lex_next(&p->l); if (p->l.t != BC_LEX_NAME) bc_parse_err(p, BC_ERR_PARSE_TOKEN); @@ -62,7 +63,9 @@ static void dc_parse_register(BcParse *p, bool var) { * Parses a dc string. * @param p The parser. */ -static inline void dc_parse_string(BcParse *p) { +static inline void +dc_parse_string(BcParse* p) +{ bc_parse_addString(p); bc_lex_next(&p->l); } @@ -75,8 +78,9 @@ static inline void dc_parse_string(BcParse *p) { * a global. * @param store True if the operation is a store, false otherwise. */ -static void dc_parse_mem(BcParse *p, uchar inst, bool name, bool store) { - +static void +dc_parse_mem(BcParse* p, uchar inst, bool name, bool store) +{ // Push the instruction. bc_parse_push(p, inst); @@ -85,7 +89,8 @@ static void dc_parse_mem(BcParse *p, uchar inst, bool name, bool store) { // Stores use the bc assign infrastructure, but they need to do a swap // first. - if (store) { + if (store) + { bc_parse_push(p, BC_INST_SWAP); bc_parse_push(p, BC_INST_ASSIGN_NO_VAL); } @@ -98,8 +103,9 @@ static void dc_parse_mem(BcParse *p, uchar inst, bool name, bool store) { * @param p The parser. * @param inst The instruction for the condition. */ -static void dc_parse_cond(BcParse *p, uchar inst) { - +static void +dc_parse_cond(BcParse* p, uchar inst) +{ // Push the instruction for the condition and the conditional execution. bc_parse_push(p, inst); bc_parse_push(p, BC_INST_EXEC_COND); @@ -110,7 +116,8 @@ static void dc_parse_cond(BcParse *p, uchar inst) { bc_lex_next(&p->l); // If the next token is an else, parse the else. - if (p->l.t == BC_LEX_KW_ELSE) { + if (p->l.t == BC_LEX_KW_ELSE) + { dc_parse_register(p, true); bc_lex_next(&p->l); } @@ -124,13 +131,14 @@ static void dc_parse_cond(BcParse *p, uchar inst) { * @param t The token to parse. * @param flags The flags that say what is allowed or not. */ -static void dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) { - +static void +dc_parse_token(BcParse* p, BcLexType t, uint8_t flags) +{ uchar inst; bool assign, get_token = false; - switch (t) { - + switch (t) + { case BC_LEX_OP_REL_EQ: case BC_LEX_OP_REL_LE: case BC_LEX_OP_REL_GE: @@ -161,16 +169,18 @@ static void dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) { // This tells us whether or not the neg is for a command or at the // beginning of a number. If it's a command, push it. Otherwise, // fallthrough and parse the number. - if (dc_lex_negCommand(&p->l)) { + if (dc_lex_negCommand(&p->l)) + { bc_parse_push(p, BC_INST_NEG); get_token = true; break; } bc_lex_next(&p->l); + + // Fallthrough. + BC_FALLTHROUGH } - // Fallthrough. - BC_FALLTHROUGH case BC_LEX_NUMBER: { @@ -187,7 +197,9 @@ static void dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) { { // Make sure the read is not recursive. if (BC_ERR(flags & BC_PARSE_NOREAD)) + { bc_parse_err(p, BC_ERR_EXEC_REC_READ); + } else bc_parse_push(p, BC_INST_READ); get_token = true; @@ -254,8 +266,9 @@ static void dc_parse_token(BcParse *p, BcLexType t, uint8_t flags) { if (get_token) bc_lex_next(&p->l); } -void dc_parse_expr(BcParse *p, uint8_t flags) { - +void +dc_parse_expr(BcParse* p, uint8_t flags) +{ BcInst inst; BcLexType t; bool need_expr, have_expr = false; @@ -267,10 +280,11 @@ void dc_parse_expr(BcParse *p, uint8_t flags) { // designed. // While we don't have EOF... - while ((t = p->l.t) != BC_LEX_EOF) { - + while ((t = p->l.t) != BC_LEX_EOF) + { // Eat newline. - if (t == BC_LEX_NLINE) { + if (t == BC_LEX_NLINE) + { bc_lex_next(&p->l); continue; } @@ -281,7 +295,8 @@ void dc_parse_expr(BcParse *p, uint8_t flags) { // If the instruction is invalid, that means we have to do some harder // parsing. So if not invalid, just push the instruction; otherwise, // parse the token. - if (inst != BC_INST_INVALID) { + if (inst != BC_INST_INVALID) + { bc_parse_push(p, inst); bc_lex_next(&p->l); } @@ -295,11 +310,14 @@ void dc_parse_expr(BcParse *p, uint8_t flags) { // indicate that it is executing a string. if (BC_ERR(need_expr && !have_expr)) bc_err(BC_ERR_EXEC_READ_EXPR); else if (p->l.t == BC_LEX_EOF && (flags & BC_PARSE_NOCALL)) + { bc_parse_push(p, BC_INST_POP_EXEC); + } } -void dc_parse_parse(BcParse *p) { - +void +dc_parse_parse(BcParse* p) +{ assert(p != NULL); BC_SETJMP_LOCKED(exit); diff --git a/contrib/bc/src/file.c b/contrib/bc/src/file.c index 627664a9c261..e5d2f6ac73d8 100644 --- a/contrib/bc/src/file.c +++ b/contrib/bc/src/file.c @@ -44,22 +44,26 @@ #include <file.h> #include <vm.h> +#if !BC_ENABLE_LINE_LIB + /** * Translates an integer into a string. * @param val The value to translate. * @param buf The return parameter. */ -static void bc_file_ultoa(unsigned long long val, char buf[BC_FILE_ULL_LENGTH]) +static void +bc_file_ultoa(unsigned long long val, char buf[BC_FILE_ULL_LENGTH]) { char buf2[BC_FILE_ULL_LENGTH]; size_t i, len; // We need to make sure the entire thing is zeroed. + // NOLINTNEXTLINE memset(buf2, 0, BC_FILE_ULL_LENGTH); // The i = 1 is to ensure that there is a null byte at the end. - for (i = 1; val; ++i) { - + for (i = 1; val; ++i) + { unsigned long long mod = val % 10; buf2[i] = ((char) mod) + '0'; @@ -69,7 +73,10 @@ static void bc_file_ultoa(unsigned long long val, char buf[BC_FILE_ULL_LENGTH]) len = i; // Since buf2 is reversed, reverse it into buf. - for (i = 0; i < len; ++i) buf[i] = buf2[len - i - 1]; + for (i = 0; i < len; ++i) + { + buf[i] = buf2[len - i - 1]; + } } /** @@ -80,22 +87,23 @@ static void bc_file_ultoa(unsigned long long val, char buf[BC_FILE_ULL_LENGTH]) * @return A status indicating error or success. We could have a fatal I/O * error or EOF. */ -static BcStatus bc_file_output(int fd, const char *buf, size_t n) { - +static BcStatus +bc_file_output(int fd, const char* buf, size_t n) +{ size_t bytes = 0; sig_atomic_t lock; BC_SIG_TRYLOCK(lock); // While the number of bytes written is less than intended... - while (bytes < n) { - + while (bytes < n) + { // Write. ssize_t written = write(fd, buf + bytes, n - bytes); // Check for error and return, if any. - if (BC_ERR(written == -1)) { - + if (BC_ERR(written == -1)) + { BC_SIG_TRYUNLOCK(lock); return errno == EPIPE ? BC_STATUS_EOF : BC_STATUS_ERROR_FATAL; @@ -109,20 +117,31 @@ static BcStatus bc_file_output(int fd, const char *buf, size_t n) { return BC_STATUS_SUCCESS; } -BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type) +#endif // !BC_ENABLE_LINE_LIB + +BcStatus +bc_file_flushErr(BcFile* restrict f, BcFlushType type) { BcStatus s; BC_SIG_ASSERT_LOCKED; - // If there is stuff to output... - if (f->len) { +#if BC_ENABLE_LINE_LIB + + // Just flush and propagate the error. + if (fflush(f->f) == EOF) s = BC_STATUS_ERROR_FATAL; + else s = BC_STATUS_SUCCESS; + +#else // BC_ENABLE_LINE_LIB + // If there is stuff to output... + if (f->len) + { #if BC_ENABLE_HISTORY // If history is enabled... - if (BC_TTY) { - + if (BC_TTY) + { // If we have been told to save the extras, and there *are* // extras... if (f->buf[f->len - 1] != '\n' && @@ -132,7 +151,10 @@ BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type) size_t i; // Look for the last newline. - for (i = f->len - 2; i < f->len && f->buf[i] != '\n'; --i); + for (i = f->len - 2; i < f->len && f->buf[i] != '\n'; --i) + { + continue; + } i += 1; @@ -140,7 +162,8 @@ BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type) bc_vec_string(&vm.history.extras, f->len - i, f->buf + i); } // Else clear the extras if told to. - else if (type >= BC_FLUSH_NO_EXTRAS_CLEAR) { + else if (type >= BC_FLUSH_NO_EXTRAS_CLEAR) + { bc_vec_popAll(&vm.history.extras); } } @@ -152,11 +175,14 @@ BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type) } else s = BC_STATUS_SUCCESS; +#endif // BC_ENABLE_LINE_LIB + return s; } -void bc_file_flush(BcFile *restrict f, BcFlushType type) { - +void +bc_file_flush(BcFile* restrict f, BcFlushType type) +{ BcStatus s; sig_atomic_t lock; @@ -165,10 +191,11 @@ void bc_file_flush(BcFile *restrict f, BcFlushType type) { s = bc_file_flushErr(f, type); // If we have an error... - if (BC_ERR(s)) { - + if (BC_ERR(s)) + { // For EOF, set it and jump. - if (s == BC_STATUS_EOF) { + if (s == BC_STATUS_EOF) + { vm.status = (sig_atomic_t) s; BC_SIG_TRYUNLOCK(lock); BC_JMP; @@ -180,23 +207,44 @@ void bc_file_flush(BcFile *restrict f, BcFlushType type) { BC_SIG_TRYUNLOCK(lock); } -void bc_file_write(BcFile *restrict f, BcFlushType type, - const char *buf, size_t n) +#if !BC_ENABLE_LINE_LIB + +void +bc_file_write(BcFile* restrict f, BcFlushType type, const char* buf, size_t n) { sig_atomic_t lock; BC_SIG_TRYLOCK(lock); // If we have enough to flush, do it. - if (n > f->cap - f->len) { + if (n > f->cap - f->len) + { bc_file_flush(f, type); assert(!f->len); } // If the output is large enough to flush by itself, just output it. // Otherwise, put it into the buffer. - if (BC_UNLIKELY(n > f->cap - f->len)) bc_file_output(f->fd, buf, n); - else { + if (BC_UNLIKELY(n > f->cap - f->len)) + { + BcStatus s = bc_file_output(f->fd, buf, n); + + if (BC_ERR(s)) + { + // For EOF, set it and jump. + if (s == BC_STATUS_EOF) + { + vm.status = (sig_atomic_t) s; + BC_SIG_TRYUNLOCK(lock); + BC_JMP; + } + // Blow up on fatal error. Okay, not blow up, just quit. + else bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } + } + else + { + // NOLINTNEXTLINE memcpy(f->buf + f->len, buf, n); f->len += n; } @@ -204,7 +252,10 @@ void bc_file_write(BcFile *restrict f, BcFlushType type, BC_SIG_TRYUNLOCK(lock); } -void bc_file_printf(BcFile *restrict f, const char *fmt, ...) +#endif // BC_ENABLE_LINE_LIB + +void +bc_file_printf(BcFile* restrict f, const char* fmt, ...) { va_list args; sig_atomic_t lock; @@ -218,13 +269,24 @@ void bc_file_printf(BcFile *restrict f, const char *fmt, ...) BC_SIG_TRYUNLOCK(lock); } -void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args) { +void +bc_file_vprintf(BcFile* restrict f, const char* fmt, va_list args) +{ + BC_SIG_ASSERT_LOCKED; - char *percent; - const char *ptr = fmt; - char buf[BC_FILE_ULL_LENGTH]; +#if BC_ENABLE_LINE_LIB - BC_SIG_ASSERT_LOCKED; + // Just print and propagate the error. + if (BC_ERR(vfprintf(f->f, fmt, args) < 0)) + { + bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } + +#else // BC_ENABLE_LINE_LIB + + char* percent; + const char* ptr = fmt; + char buf[BC_FILE_ULL_LENGTH]; // This is a poor man's printf(). While I could look up algorithms to make // it as fast as possible, and should when I write the standard library for @@ -232,13 +294,14 @@ void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args) { // for now. // Find each percent sign. - while ((percent = strchr(ptr, '%')) != NULL) { - + while ((percent = strchr(ptr, '%')) != NULL) + { char c; // If the percent sign is not where we are, write what's inbetween to // the buffer. - if (percent != ptr) { + if (percent != ptr) + { size_t len = (size_t) (percent - ptr); bc_file_write(f, bc_flush_none, ptr, len); } @@ -247,40 +310,42 @@ void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args) { // We only parse some format specifiers, the ones bc uses. If you add // more, you need to make sure to add them here. - if (c == 'c') { - + if (c == 'c') + { uchar uc = (uchar) va_arg(args, int); bc_file_putchar(f, bc_flush_none, uc); } - else if (c == 's') { - - char *s = va_arg(args, char*); + else if (c == 's') + { + char* s = va_arg(args, char*); bc_file_puts(f, bc_flush_none, s); } #if BC_DEBUG_CODE // We only print signed integers in debug code. - else if (c == 'd') { - + else if (c == 'd') + { int d = va_arg(args, int); // Take care of negative. Let's not worry about overflow. - if (d < 0) { + if (d < 0) + { bc_file_putchar(f, bc_flush_none, '-'); d = -d; } // Either print 0 or translate and print. if (!d) bc_file_putchar(f, bc_flush_none, '0'); - else { + else + { bc_file_ultoa((unsigned long long) d, buf); bc_file_puts(f, bc_flush_none, buf); } } #endif // BC_DEBUG_CODE - else { - + else + { unsigned long long ull; // These are the ones that it expects from here. Fortunately, all of @@ -293,7 +358,8 @@ void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args) { // Either print 0 or translate and print. if (!ull) bc_file_putchar(f, bc_flush_none, '0'); - else { + else + { bc_file_ultoa(ull, buf); bc_file_puts(f, bc_flush_none, buf); } @@ -306,18 +372,42 @@ void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args) { // If we get here, there are no more percent signs, so we just output // whatever is left. if (ptr[0]) bc_file_puts(f, bc_flush_none, ptr); + +#endif // BC_ENABLE_LINE_LIB } -void bc_file_puts(BcFile *restrict f, BcFlushType type, const char *str) { +void +bc_file_puts(BcFile* restrict f, BcFlushType type, const char* str) +{ +#if BC_ENABLE_LINE_LIB + // This is used because of flushing issues with using bc_file_write() when + // bc is using a line library. It's also using printf() because puts() + // writes a newline. + bc_file_printf(f, "%s", str); +#else // BC_ENABLE_LINE_LIB bc_file_write(f, type, str, strlen(str)); +#endif // BC_ENABLE_LINE_LIB } -void bc_file_putchar(BcFile *restrict f, BcFlushType type, uchar c) { - +void +bc_file_putchar(BcFile* restrict f, BcFlushType type, uchar c) +{ sig_atomic_t lock; BC_SIG_TRYLOCK(lock); +#if BC_ENABLE_LINE_LIB + + if (BC_ERR(fputc(c, f->f) == EOF)) + { + // This is here to prevent a stack overflow from unbounded recursion. + if (f->f == stderr) exit(BC_STATUS_ERROR_FATAL); + + bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } + +#else // BC_ENABLE_LINE_LIB + if (f->len == f->cap) bc_file_flush(f, type); assert(f->len < f->cap); @@ -325,11 +415,25 @@ void bc_file_putchar(BcFile *restrict f, BcFlushType type, uchar c) { f->buf[f->len] = (char) c; f->len += 1; +#endif // BC_ENABLE_LINE_LIB + BC_SIG_TRYUNLOCK(lock); } -void bc_file_init(BcFile *f, int fd, char *buf, size_t cap) { +#if BC_ENABLE_LINE_LIB + +void +bc_file_init(BcFile* f, FILE* file) +{ + BC_SIG_ASSERT_LOCKED; + f->f = file; +} + +#else // BC_ENABLE_LINE_LIB +void +bc_file_init(BcFile* f, int fd, char* buf, size_t cap) +{ BC_SIG_ASSERT_LOCKED; f->fd = fd; @@ -338,7 +442,11 @@ void bc_file_init(BcFile *f, int fd, char *buf, size_t cap) { f->cap = cap; } -void bc_file_free(BcFile *f) { +#endif // BC_ENABLE_LINE_LIB + +void +bc_file_free(BcFile* f) +{ BC_SIG_ASSERT_LOCKED; bc_file_flush(f, bc_flush_none); } diff --git a/contrib/bc/src/history.c b/contrib/bc/src/history.c index 74123a7c4918..0b2713857ec6 100644 --- a/contrib/bc/src/history.c +++ b/contrib/bc/src/history.c @@ -144,6 +144,236 @@ #if BC_ENABLE_HISTORY +#if BC_ENABLE_EDITLINE + +#include <string.h> +#include <errno.h> +#include <setjmp.h> + +#include <history.h> +#include <vm.h> + +sigjmp_buf bc_history_jmpbuf; +volatile sig_atomic_t bc_history_inlinelib; + +static char* bc_history_prompt; +static HistEvent bc_history_event; + +static char* +bc_history_promptFunc(EditLine* el) +{ + BC_UNUSED(el); + return bc_history_prompt; +} + +void +bc_history_init(BcHistory* h) +{ + BcVec v; + char* home = getenv("HOME"); + + // This will hold the true path to the editrc. + bc_vec_init(&v, 1, BC_DTOR_NONE); + + // Initialize the path to the editrc. This is done manually because the + // libedit I used to test was failing with a NULL argument for the path, + // which was supposed to automatically do $HOME/.editrc. But it was failing, + // so I set it manually. + if (home == NULL) + { + bc_vec_string(&v, bc_history_editrc_len - 1, bc_history_editrc + 1); + } + else + { + bc_vec_string(&v, strlen(home), home); + bc_vec_concat(&v, bc_history_editrc); + } + + h->hist = history_init(); + if (BC_ERR(h->hist == NULL)) bc_vm_fatalError(BC_ERR_FATAL_ALLOC_ERR); + + h->el = el_init(vm.name, stdin, stdout, stderr); + if (BC_ERR(h->el == NULL)) bc_vm_fatalError(BC_ERR_FATAL_ALLOC_ERR); + + // I want history and a prompt. + history(h->hist, &bc_history_event, H_SETSIZE, 100); + history(h->hist, &bc_history_event, H_SETUNIQUE, 1); + el_set(h->el, EL_EDITOR, "emacs"); + el_set(h->el, EL_HIST, history, h->hist); + el_set(h->el, EL_PROMPT, bc_history_promptFunc); + + // I also want to get the user's .editrc. + el_source(h->el, v.v); + + bc_vec_free(&v); + + h->badTerm = false; + bc_history_prompt = NULL; +} + +void +bc_history_free(BcHistory* h) +{ + if (bc_history_prompt != NULL) free(bc_history_prompt); + el_end(h->el); + history_end(h->hist); +} + +BcStatus +bc_history_line(BcHistory* h, BcVec* vec, const char* prompt) +{ + BcStatus s = BC_STATUS_SUCCESS; + const char* line; + int len; + + BC_SIG_LOCK; + + // If the jump happens here, then a SIGINT occurred. + if (sigsetjmp(bc_history_jmpbuf, 0)) + { + bc_vec_string(vec, 1, "\n"); + goto end; + } + + // This is so the signal handler can handle line libraries properly. + bc_history_inlinelib = 1; + + // Make sure to set the prompt. + if (bc_history_prompt != NULL) + { + if (strcmp(bc_history_prompt, prompt)) + { + free(bc_history_prompt); + bc_history_prompt = bc_vm_strdup(prompt); + } + } + else bc_history_prompt = bc_vm_strdup(prompt); + + // Get the line. + line = el_gets(h->el, &len); + + // If there is no line... + if (BC_ERR(line == NULL)) + { + // If this is true, there was an error. Otherwise, it's just EOF. + if (len == -1) + { + if (errno == ENOMEM) bc_err(BC_ERR_FATAL_ALLOC_ERR); + bc_err(BC_ERR_FATAL_IO_ERR); + } + else s = BC_STATUS_EOF; + } + // If there is a line... + else + { + bc_vec_string(vec, strlen(line), line); + + if (strcmp(line, "") && strcmp(line, "\n")) + { + history(h->hist, &bc_history_event, H_ENTER, line); + } + + s = BC_STATUS_SUCCESS; + } + +end: + + bc_history_inlinelib = 0; + + BC_SIG_UNLOCK; + + return s; +} + +#else // BC_ENABLE_EDITLINE + +#if BC_ENABLE_READLINE + +#include <assert.h> +#include <setjmp.h> +#include <string.h> + +#include <history.h> +#include <vm.h> + +sigjmp_buf bc_history_jmpbuf; +volatile sig_atomic_t bc_history_inlinelib; + +void +bc_history_init(BcHistory* h) +{ + h->line = NULL; + h->badTerm = false; + + // I want no tab completion. + rl_bind_key('\t', rl_insert); +} + +void +bc_history_free(BcHistory* h) +{ + if (h->line != NULL) free(h->line); +} + +BcStatus +bc_history_line(BcHistory* h, BcVec* vec, const char* prompt) +{ + BcStatus s = BC_STATUS_SUCCESS; + size_t len; + + BC_SIG_LOCK; + + // If the jump happens here, then a SIGINT occurred. + if (sigsetjmp(bc_history_jmpbuf, 0)) + { + bc_vec_string(vec, 1, "\n"); + goto end; + } + + // This is so the signal handler can handle line libraries properly. + bc_history_inlinelib = 1; + + // Get rid of the last line. + if (h->line != NULL) + { + free(h->line); + h->line = NULL; + } + + // Get the line. + h->line = readline(prompt); + + // If there was a line, add it to the history. Otherwise, just return an + // empty line. Oh, and NULL actually means EOF. + if (h->line != NULL && h->line[0]) + { + add_history(h->line); + + len = strlen(h->line); + + bc_vec_expand(vec, len + 2); + + bc_vec_string(vec, len, h->line); + bc_vec_concat(vec, "\n"); + } + else if (h->line == NULL) + { + bc_file_printf(&vm.fout, "%s", "^D"); + s = BC_STATUS_EOF; + } + else bc_vec_string(vec, 1, "\n"); + +end: + + bc_history_inlinelib = 0; + + BC_SIG_UNLOCK; + + return s; +} + +#else // BC_ENABLE_READLINE + #include <assert.h> #include <stdlib.h> #include <errno.h> @@ -175,7 +405,7 @@ BcFile bc_history_debug_fp; /// A buffer for the above file. -char *bc_history_debug_buf; +char* bc_history_debug_buf; #endif // BC_DEBUG_CODE @@ -184,12 +414,13 @@ char *bc_history_debug_buf; * @param cp The codepoint to check. * @return True if @a cp is a wide character, false otherwise. */ -static bool bc_history_wchar(uint32_t cp) { - +static bool +bc_history_wchar(uint32_t cp) +{ size_t i; - for (i = 0; i < bc_history_wchars_len; ++i) { - + for (i = 0; i < bc_history_wchars_len; ++i) + { // Ranges are listed in ascending order. Therefore, once the // whole range is higher than the codepoint we're testing, the // codepoint won't be found in any remaining range => bail early. @@ -197,7 +428,9 @@ static bool bc_history_wchar(uint32_t cp) { // Test this range. if (bc_history_wchars[i][0] <= cp && cp <= bc_history_wchars[i][1]) + { return true; + } } return false; @@ -208,12 +441,13 @@ static bool bc_history_wchar(uint32_t cp) { * @param cp The codepoint to check. * @return True if @a cp is a combining character, false otherwise. */ -static bool bc_history_comboChar(uint32_t cp) { - +static bool +bc_history_comboChar(uint32_t cp) +{ size_t i; - for (i = 0; i < bc_history_combo_chars_len; ++i) { - + for (i = 0; i < bc_history_combo_chars_len; ++i) + { // Combining chars are listed in ascending order, so once we pass // the codepoint of interest, we know it's not a combining char. if (bc_history_combo_chars[i] > cp) return false; @@ -228,9 +462,14 @@ static bool bc_history_comboChar(uint32_t cp) { * @param buf The buffer of characters. * @param pos The index into the buffer. */ -static size_t bc_history_prevCharLen(const char *buf, size_t pos) { +static size_t +bc_history_prevCharLen(const char* buf, size_t pos) +{ size_t end = pos; - for (pos -= 1; pos < end && (buf[pos] & 0xC0) == 0x80; --pos); + for (pos -= 1; pos < end && (buf[pos] & 0xC0) == 0x80; --pos) + { + continue; + } return end - (pos >= end ? 0 : pos); } @@ -241,47 +480,53 @@ static size_t bc_history_prevCharLen(const char *buf, size_t pos) { * @param cp An out parameter for the codepoint. * @return The number of bytes eaten by the codepoint. */ -static size_t bc_history_codePoint(const char *s, size_t len, uint32_t *cp) { - - if (len) { - +static size_t +bc_history_codePoint(const char* s, size_t len, uint32_t* cp) +{ + if (len) + { uchar byte = (uchar) s[0]; // This is literally the UTF-8 decoding algorithm. Look that up if you // don't understand this. - if ((byte & 0x80) == 0) { + if ((byte & 0x80) == 0) + { *cp = byte; return 1; } - else if ((byte & 0xE0) == 0xC0) { - - if (len >= 2) { + else if ((byte & 0xE0) == 0xC0) + { + if (len >= 2) + { *cp = (((uint32_t) (s[0] & 0x1F)) << 6) | - ((uint32_t) (s[1] & 0x3F)); + ((uint32_t) (s[1] & 0x3F)); return 2; } } - else if ((byte & 0xF0) == 0xE0) { - - if (len >= 3) { + else if ((byte & 0xF0) == 0xE0) + { + if (len >= 3) + { *cp = (((uint32_t) (s[0] & 0x0F)) << 12) | - (((uint32_t) (s[1] & 0x3F)) << 6) | - ((uint32_t) (s[2] & 0x3F)); + (((uint32_t) (s[1] & 0x3F)) << 6) | + ((uint32_t) (s[2] & 0x3F)); return 3; } } - else if ((byte & 0xF8) == 0xF0) { - - if (len >= 4) { + else if ((byte & 0xF8) == 0xF0) + { + if (len >= 4) + { *cp = (((uint32_t) (s[0] & 0x07)) << 18) | - (((uint32_t) (s[1] & 0x3F)) << 12) | - (((uint32_t) (s[2] & 0x3F)) << 6) | - ((uint32_t) (s[3] & 0x3F)); + (((uint32_t) (s[1] & 0x3F)) << 12) | + (((uint32_t) (s[2] & 0x3F)) << 6) | + ((uint32_t) (s[3] & 0x3F)); return 4; } } - else { + else + { *cp = 0xFFFD; return 1; } @@ -300,15 +545,15 @@ static size_t bc_history_codePoint(const char *s, size_t len, uint32_t *cp) { * @param col_len An out parameter for the length of the grapheme on screen. * @return The number of bytes in the grapheme. */ -static size_t bc_history_nextLen(const char *buf, size_t buf_len, - size_t pos, size_t *col_len) +static size_t +bc_history_nextLen(const char* buf, size_t buf_len, size_t pos, size_t* col_len) { uint32_t cp; size_t beg = pos; size_t len = bc_history_codePoint(buf + pos, buf_len - pos, &cp); - if (bc_history_comboChar(cp)) { - + if (bc_history_comboChar(cp)) + { BC_UNREACHABLE if (col_len != NULL) *col_len = 0; @@ -322,8 +567,8 @@ static size_t bc_history_nextLen(const char *buf, size_t buf_len, pos += len; // Find the first non-combining character. - while (pos < buf_len) { - + while (pos < buf_len) + { len = bc_history_codePoint(buf + pos, buf_len - pos, &cp); if (!bc_history_comboChar(cp)) return pos - beg; @@ -340,13 +585,14 @@ static size_t bc_history_nextLen(const char *buf, size_t buf_len, * @param pos The index into the buffer. * @return The number of bytes in the grapheme. */ -static size_t bc_history_prevLen(const char *buf, size_t pos) { - +static size_t +bc_history_prevLen(const char* buf, size_t pos) +{ size_t end = pos; // Find the first non-combining character. - while (pos > 0) { - + while (pos > 0) + { uint32_t cp; size_t len = bc_history_prevCharLen(buf, pos); @@ -371,18 +617,21 @@ static size_t bc_history_prevLen(const char *buf, size_t pos) { * @param n The number of characters to read. * @return The number of characters read or less than 0 on error. */ -static ssize_t bc_history_read(char *buf, size_t n) { - +static ssize_t +bc_history_read(char* buf, size_t n) +{ ssize_t ret; BC_SIG_ASSERT_LOCKED; #ifndef _WIN32 - do { + do + { // We don't care about being interrupted. ret = read(STDIN_FILENO, buf, n); - } while (ret == EINTR); + } + while (ret == EINTR); #else // _WIN32 @@ -392,7 +641,7 @@ static ssize_t bc_history_read(char *buf, size_t n) { good = ReadConsole(hn, buf, (DWORD) n, &read, NULL); - ret = (read != n) ? -1 : 1; + ret = (read != n || !good) ? -1 : 1; #endif // _WIN32 @@ -407,8 +656,8 @@ static ssize_t bc_history_read(char *buf, size_t n) { * @param nread An out parameter for the number of bytes read. * @return BC_STATUS_EOF or BC_STATUS_SUCCESS. */ -static BcStatus bc_history_readCode(char *buf, size_t buf_len, - uint32_t *cp, size_t *nread) +static BcStatus +bc_history_readCode(char* buf, size_t buf_len, uint32_t* cp, size_t* nread) { ssize_t n; @@ -428,10 +677,10 @@ static BcStatus bc_history_readCode(char *buf, size_t buf_len, // Once again, this is the UTF-8 decoding algorithm, but it has reads // instead of actual decoding. - if ((byte & 0x80) != 0) { - - if ((byte & 0xE0) == 0xC0) { - + if ((byte & 0x80) != 0) + { + if ((byte & 0xE0) == 0xC0) + { assert(buf_len >= 2); BC_SIG_LOCK; @@ -442,8 +691,8 @@ static BcStatus bc_history_readCode(char *buf, size_t buf_len, if (BC_ERR(n <= 0)) goto err; } - else if ((byte & 0xF0) == 0xE0) { - + else if ((byte & 0xF0) == 0xE0) + { assert(buf_len >= 3); BC_SIG_LOCK; @@ -454,8 +703,8 @@ static BcStatus bc_history_readCode(char *buf, size_t buf_len, if (BC_ERR(n <= 0)) goto err; } - else if ((byte & 0xF8) == 0xF0) { - + else if ((byte & 0xF8) == 0xF0) + { assert(buf_len >= 3); BC_SIG_LOCK; @@ -466,7 +715,8 @@ static BcStatus bc_history_readCode(char *buf, size_t buf_len, if (BC_ERR(n <= 0)) goto err; } - else { + else + { n = -1; goto err; } @@ -492,13 +742,14 @@ err: * @return The number of columns between the beginning of @a buffer to * @a pos. */ -static size_t bc_history_colPos(const char *buf, size_t buf_len, size_t pos) { - +static size_t +bc_history_colPos(const char* buf, size_t buf_len, size_t pos) +{ size_t ret = 0, off = 0; // While we haven't reached the offset, get the length of the next grapheme. - while (off < pos && off < buf_len) { - + while (off < pos && off < buf_len) + { size_t col_len, len; len = bc_history_nextLen(buf, buf_len, off, &col_len); @@ -515,16 +766,19 @@ static size_t bc_history_colPos(const char *buf, size_t buf_len, size_t pos) { * not able to understand basic escape sequences. * @return True if the terminal is a bad terminal. */ -static inline bool bc_history_isBadTerm(void) { - +static inline bool +bc_history_isBadTerm(void) +{ size_t i; bool ret = false; - char *term = bc_vm_getenv("TERM"); + char* term = bc_vm_getenv("TERM"); if (term == NULL) return false; for (i = 0; !ret && bc_history_bad_terms[i]; ++i) + { ret = (!strcasecmp(term, bc_history_bad_terms[i])); + } bc_vm_getenvFree(term); @@ -535,8 +789,9 @@ static inline bool bc_history_isBadTerm(void) { * Enables raw mode (1960's black magic). * @param h The history data. */ -static void bc_history_enableRaw(BcHistory *h) { - +static void +bc_history_enableRaw(BcHistory* h) +{ // I don't do anything for Windows because in Windows, you set their // equivalent of raw mode and leave it, so I do it in bc_history_init(). @@ -551,7 +806,9 @@ static void bc_history_enableRaw(BcHistory *h) { BC_SIG_LOCK; if (BC_ERR(tcgetattr(STDIN_FILENO, &h->orig_termios) == -1)) + { bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } BC_SIG_UNLOCK; @@ -577,9 +834,11 @@ static void bc_history_enableRaw(BcHistory *h) { BC_SIG_LOCK; // Put terminal in raw mode after flushing. - do { + do + { err = tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw); - } while (BC_ERR(err < 0) && errno == EINTR); + } + while (BC_ERR(err < 0) && errno == EINTR); BC_SIG_UNLOCK; @@ -593,8 +852,9 @@ static void bc_history_enableRaw(BcHistory *h) { * Disables raw mode. * @param h The history data. */ -static void bc_history_disableRaw(BcHistory *h) { - +static void +bc_history_disableRaw(BcHistory* h) +{ sig_atomic_t lock; if (!h->rawMode) return; @@ -603,7 +863,9 @@ static void bc_history_disableRaw(BcHistory *h) { #ifndef _WIN32 if (BC_ERR(tcsetattr(STDIN_FILENO, TCSAFLUSH, &h->orig_termios) != -1)) + { h->rawMode = false; + } #endif // _WIN32 BC_SIG_TRYUNLOCK(lock); @@ -615,10 +877,12 @@ static void bc_history_disableRaw(BcHistory *h) { * cursor. * @return The horizontal cursor position. */ -static size_t bc_history_cursorPos(void) { - +static size_t +bc_history_cursorPos(void) +{ char buf[BC_HIST_SEQ_SIZE]; - char *ptr, *ptr2; + char* ptr; + char* ptr2; size_t cols, rows, i; BC_SIG_ASSERT_LOCKED; @@ -628,7 +892,8 @@ static size_t bc_history_cursorPos(void) { bc_file_flush(&vm.fout, bc_flush_none); // Read the response: ESC [ rows ; cols R. - for (i = 0; i < sizeof(buf) - 1; ++i) { + for (i = 0; i < sizeof(buf) - 1; ++i) + { if (bc_history_read(buf + i, 1) != 1 || buf[i] == 'R') break; } @@ -658,7 +923,9 @@ static size_t bc_history_cursorPos(void) { * if it fails. * @return The number of columns in the terminal. */ -static size_t bc_history_columns(void) { +static size_t +bc_history_columns(void) +{ #ifndef _WIN32 @@ -667,8 +934,8 @@ static size_t bc_history_columns(void) { ret = ioctl(vm.fout.fd, TIOCGWINSZ, &ws); - if (BC_ERR(ret == -1 || !ws.ws_col)) { - + if (BC_ERR(ret == -1 || !ws.ws_col)) + { // Calling ioctl() failed. Try to query the terminal itself. size_t start, cols; @@ -683,7 +950,8 @@ static size_t bc_history_columns(void) { if (BC_ERR(cols == SIZE_MAX)) return BC_HIST_DEF_COLS; // Restore position. - if (cols > start) { + if (cols > start) + { bc_file_printf(&vm.fout, "\x1b[%zuD", cols - start); bc_file_flush(&vm.fout, bc_flush_none); } @@ -698,7 +966,9 @@ static size_t bc_history_columns(void) { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { return 80; + } return ((size_t) (csbi.srWindow.Right)) - csbi.srWindow.Left + 1; @@ -712,14 +982,18 @@ static size_t bc_history_columns(void) { * @param plen The length of the prompt. * @return The column length of the prompt. */ -static size_t bc_history_promptColLen(const char *prompt, size_t plen) { - +static size_t +bc_history_promptColLen(const char* prompt, size_t plen) +{ char buf[BC_HIST_MAX_LINE + 1]; size_t buf_len = 0, off = 0; // The original linenoise-mob checked for ANSI escapes here on the prompt. I // know the prompts do not have ANSI escapes. I deleted the code. - while (off < plen) buf[buf_len++] = prompt[off++]; + while (off < plen) + { + buf[buf_len++] = prompt[off++]; + } return bc_history_colPos(buf, buf_len, buf_len); } @@ -729,8 +1003,9 @@ static size_t bc_history_promptColLen(const char *prompt, size_t plen) { * cursor position, and number of columns of the terminal. * @param h The history data. */ -static void bc_history_refresh(BcHistory *h) { - +static void +bc_history_refresh(BcHistory* h) +{ char* buf = h->buf.v; size_t colpos, len = BC_HIST_BUF_LEN(h), pos = h->pos, extras_len = 0; @@ -739,8 +1014,8 @@ static void bc_history_refresh(BcHistory *h) { bc_file_flush(&vm.fout, bc_flush_none); // Get to the prompt column position from the left. - while(h->pcol + bc_history_colPos(buf, len, pos) >= h->cols) { - + while (h->pcol + bc_history_colPos(buf, len, pos) >= h->cols) + { size_t chlen = bc_history_nextLen(buf, len, 0, NULL); buf += chlen; @@ -750,15 +1025,17 @@ static void bc_history_refresh(BcHistory *h) { // Get to the prompt column position from the right. while (h->pcol + bc_history_colPos(buf, len, len) > h->cols) + { len -= bc_history_prevLen(buf, len); + } // Cursor to left edge. bc_file_write(&vm.fout, bc_flush_none, "\r", 1); // Take the extra stuff into account. This is where history makes sure to // preserve stuff that was printed without a newline. - if (h->extras.len > 1) { - + if (h->extras.len > 1) + { extras_len = h->extras.len - 1; bc_vec_grow(&h->buf, extras_len); @@ -778,8 +1055,7 @@ static void bc_history_refresh(BcHistory *h) { bc_file_write(&vm.fout, bc_flush_none, "\x1b[0K", 4); // We need to be sure to grow this. - if (pos >= h->buf.len - extras_len) - bc_vec_grow(&h->buf, pos + extras_len); + if (pos >= h->buf.len - extras_len) bc_vec_grow(&h->buf, pos + extras_len); // Move cursor to original position. Do NOT move the putchar of '\r' to the // printf with colpos. That causes a bug where the cursor will go to the end @@ -799,15 +1075,16 @@ static void bc_history_refresh(BcHistory *h) { * @param cbuf The character buffer to copy from. * @param clen The number of characters to copy. */ -static void bc_history_edit_insert(BcHistory *h, const char *cbuf, size_t clen) +static void +bc_history_edit_insert(BcHistory* h, const char* cbuf, size_t clen) { BC_SIG_ASSERT_LOCKED; bc_vec_grow(&h->buf, clen); // If we are at the end of the line... - if (h->pos == BC_HIST_BUF_LEN(h)) { - + if (h->pos == BC_HIST_BUF_LEN(h)) + { size_t colpos = 0, len; // Copy into the buffer. @@ -824,16 +1101,16 @@ static void bc_history_edit_insert(BcHistory *h, const char *cbuf, size_t clen) colpos += bc_history_colPos(h->buf.v, len, len); // Do we have the trivial case? - if (colpos < h->cols) { - + if (colpos < h->cols) + { // Avoid a full update of the line in the trivial case. bc_file_write(&vm.fout, bc_flush_none, cbuf, clen); bc_file_flush(&vm.fout, bc_flush_none); } else bc_history_refresh(h); } - else { - + else + { // Amount that we need to move. size_t amt = BC_HIST_BUF_LEN(h) - h->pos; @@ -854,8 +1131,9 @@ static void bc_history_edit_insert(BcHistory *h, const char *cbuf, size_t clen) * Moves the cursor to the left. * @param h The history data. */ -static void bc_history_edit_left(BcHistory *h) { - +static void +bc_history_edit_left(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; // Stop at the left end. @@ -869,9 +1147,10 @@ static void bc_history_edit_left(BcHistory *h) { /** * Moves the cursor to the right. * @param h The history data. -*/ -static void bc_history_edit_right(BcHistory *h) { - + */ +static void +bc_history_edit_right(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; // Stop at the right end. @@ -886,8 +1165,9 @@ static void bc_history_edit_right(BcHistory *h) { * Moves the cursor to the end of the current word. * @param h The history data. */ -static void bc_history_edit_wordEnd(BcHistory *h) { - +static void +bc_history_edit_wordEnd(BcHistory* h) +{ size_t len = BC_HIST_BUF_LEN(h); BC_SIG_ASSERT_LOCKED; @@ -896,8 +1176,14 @@ static void bc_history_edit_wordEnd(BcHistory *h) { if (!len || h->pos >= len) return; // Find the word, then find the end of it. - while (h->pos < len && isspace(h->buf.v[h->pos])) h->pos += 1; - while (h->pos < len && !isspace(h->buf.v[h->pos])) h->pos += 1; + while (h->pos < len && isspace(h->buf.v[h->pos])) + { + h->pos += 1; + } + while (h->pos < len && !isspace(h->buf.v[h->pos])) + { + h->pos += 1; + } bc_history_refresh(h); } @@ -906,8 +1192,9 @@ static void bc_history_edit_wordEnd(BcHistory *h) { * Moves the cursor to the start of the current word. * @param h The history data. */ -static void bc_history_edit_wordStart(BcHistory *h) { - +static void +bc_history_edit_wordStart(BcHistory* h) +{ size_t len = BC_HIST_BUF_LEN(h); BC_SIG_ASSERT_LOCKED; @@ -916,8 +1203,14 @@ static void bc_history_edit_wordStart(BcHistory *h) { if (!len) return; // Find the word, the find the beginning of the word. - while (h->pos > 0 && isspace(h->buf.v[h->pos - 1])) h->pos -= 1; - while (h->pos > 0 && !isspace(h->buf.v[h->pos - 1])) h->pos -= 1; + while (h->pos > 0 && isspace(h->buf.v[h->pos - 1])) + { + h->pos -= 1; + } + while (h->pos > 0 && !isspace(h->buf.v[h->pos - 1])) + { + h->pos -= 1; + } bc_history_refresh(h); } @@ -926,8 +1219,9 @@ static void bc_history_edit_wordStart(BcHistory *h) { * Moves the cursor to the start of the line. * @param h The history data. */ -static void bc_history_edit_home(BcHistory *h) { - +static void +bc_history_edit_home(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; // Stop at the beginning. @@ -942,8 +1236,9 @@ static void bc_history_edit_home(BcHistory *h) { * Moves the cursor to the end of the line. * @param h The history data. */ -static void bc_history_edit_end(BcHistory *h) { - +static void +bc_history_edit_end(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; // Stop at the end of the line. @@ -960,9 +1255,11 @@ static void bc_history_edit_end(BcHistory *h) { * @param h The history data. * @param dir The direction to substitute; true means previous, false next. */ -static void bc_history_edit_next(BcHistory *h, bool dir) { - - const char *dup, *str; +static void +bc_history_edit_next(BcHistory* h, bool dir) +{ + const char* dup; + const char* str; BC_SIG_ASSERT_LOCKED; @@ -980,11 +1277,13 @@ static void bc_history_edit_next(BcHistory *h, bool dir) { h->idx += (dir == BC_HIST_PREV ? 1 : SIZE_MAX); // Se the index appropriately at the ends. - if (h->idx == SIZE_MAX) { + if (h->idx == SIZE_MAX) + { h->idx = 0; return; } - else if (h->idx >= h->history.len) { + else if (h->idx >= h->history.len) + { h->idx = h->history.len - 1; return; } @@ -1006,8 +1305,9 @@ static void bc_history_edit_next(BcHistory *h, bool dir) { * position. Basically, this is what happens with the "Delete" keyboard key. * @param h The history data. */ -static void bc_history_edit_delete(BcHistory *h) { - +static void +bc_history_edit_delete(BcHistory* h) +{ size_t chlen, len = BC_HIST_BUF_LEN(h); BC_SIG_ASSERT_LOCKED; @@ -1033,8 +1333,9 @@ static void bc_history_edit_delete(BcHistory *h) { * space. Basically, this is what happens with the "Backspace" keyboard key. * @param h The history data. */ -static void bc_history_edit_backspace(BcHistory *h) { - +static void +bc_history_edit_backspace(BcHistory* h) +{ size_t chlen, len = BC_HIST_BUF_LEN(h); BC_SIG_ASSERT_LOCKED; @@ -1061,8 +1362,9 @@ static void bc_history_edit_backspace(BcHistory *h) { * current word. * @param h The history data. */ -static void bc_history_edit_deletePrevWord(BcHistory *h) { - +static void +bc_history_edit_deletePrevWord(BcHistory* h) +{ size_t diff, old_pos = h->pos; BC_SIG_ASSERT_LOCKED; @@ -1071,8 +1373,14 @@ static void bc_history_edit_deletePrevWord(BcHistory *h) { if (!old_pos) return; // Find the word, then the beginning of the word. - while (h->pos > 0 && isspace(h->buf.v[h->pos - 1])) --h->pos; - while (h->pos > 0 && !isspace(h->buf.v[h->pos - 1])) --h->pos; + while (h->pos > 0 && isspace(h->buf.v[h->pos - 1])) + { + h->pos -= 1; + } + while (h->pos > 0 && !isspace(h->buf.v[h->pos - 1])) + { + h->pos -= 1; + } // Get the difference in position. diff = old_pos - h->pos; @@ -1091,8 +1399,9 @@ static void bc_history_edit_deletePrevWord(BcHistory *h) { * Deletes the next word, maintaining the cursor at the same position. * @param h The history data. */ -static void bc_history_edit_deleteNextWord(BcHistory *h) { - +static void +bc_history_edit_deleteNextWord(BcHistory* h) +{ size_t next_end = h->pos, len = BC_HIST_BUF_LEN(h); BC_SIG_ASSERT_LOCKED; @@ -1101,8 +1410,14 @@ static void bc_history_edit_deleteNextWord(BcHistory *h) { if (next_end == len) return; // Find the word, then the end of the word. - while (next_end < len && isspace(h->buf.v[next_end])) ++next_end; - while (next_end < len && !isspace(h->buf.v[next_end])) ++next_end; + while (next_end < len && isspace(h->buf.v[next_end])) + { + next_end += 1; + } + while (next_end < len && !isspace(h->buf.v[next_end])) + { + next_end += 1; + } // Move the stuff into position. memmove(h->buf.v + h->pos, h->buf.v + next_end, len - next_end); @@ -1117,8 +1432,9 @@ static void bc_history_edit_deleteNextWord(BcHistory *h) { * Swaps two characters, the one under the cursor and the one to the left. * @param h The history data. */ -static void bc_history_swap(BcHistory *h) { - +static void +bc_history_swap(BcHistory* h) +{ size_t pcl, ncl; char auxb[5]; @@ -1131,8 +1447,8 @@ static void bc_history_swap(BcHistory *h) { // To perform a swap we need: // * Nonzero char length to the left. // * To not be at the end of the line. - if (pcl && h->pos != BC_HIST_BUF_LEN(h) && pcl < 5 && ncl < 5) { - + if (pcl && h->pos != BC_HIST_BUF_LEN(h) && pcl < 5 && ncl < 5) + { // Swap. memcpy(auxb, h->buf.v + h->pos - pcl, pcl); memcpy(h->buf.v + h->pos - pcl, h->buf.v + h->pos, ncl); @@ -1150,8 +1466,9 @@ static void bc_history_swap(BcHistory *h) { * @param h The history data. * @param sig The signal to raise. */ -static void bc_history_raise(BcHistory *h, int sig) { - +static void +bc_history_raise(BcHistory* h, int sig) +{ // We really don't want to be in raw mode when longjmp()'s are flying. bc_history_disableRaw(h); raise(sig); @@ -1162,8 +1479,9 @@ static void bc_history_raise(BcHistory *h, int sig) { * escape codes; otherwise, it will be confusing. * @param h The history data. */ -static void bc_history_escape(BcHistory *h) { - +static void +bc_history_escape(BcHistory* h) +{ char c, seq[3]; BC_SIG_ASSERT_LOCKED; @@ -1174,32 +1492,37 @@ static void bc_history_escape(BcHistory *h) { c = seq[0]; // ESC ? sequences. - if (c != '[' && c != 'O') { + if (c != '[' && c != 'O') + { if (c == 'f') bc_history_edit_wordEnd(h); else if (c == 'b') bc_history_edit_wordStart(h); else if (c == 'd') bc_history_edit_deleteNextWord(h); } - else { - + else + { // Read a character into seq. if (BC_ERR(BC_HIST_READ(seq + 1, 1))) + { bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } // ESC [ sequences. - if (c == '[') { - + if (c == '[') + { c = seq[1]; - if (c >= '0' && c <= '9') { - + if (c >= '0' && c <= '9') + { // Extended escape, read additional byte. if (BC_ERR(BC_HIST_READ(seq + 2, 1))) + { bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } - if (seq[2] == '~') { - - switch(c) { - + if (seq[2] == '~') + { + switch (c) + { case '1': { bc_history_edit_home(h); @@ -1224,21 +1547,23 @@ static void bc_history_escape(BcHistory *h) { } } } - else if(seq[2] == ';') { - + else if (seq[2] == ';') + { // Read two characters into seq. if (BC_ERR(BC_HIST_READ(seq, 2))) + { bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); + } if (seq[0] != '5') return; else if (seq[1] == 'C') bc_history_edit_wordEnd(h); else if (seq[1] == 'D') bc_history_edit_wordStart(h); } } - else { - - switch(c) { - + else + { + switch (c) + { // Up. case 'A': { @@ -1292,10 +1617,10 @@ static void bc_history_escape(BcHistory *h) { } } // ESC O sequences. - else { - - switch (seq[1]) { - + else + { + switch (seq[1]) + { case 'A': { bc_history_edit_next(h, BC_HIST_PREV); @@ -1341,18 +1666,20 @@ static void bc_history_escape(BcHistory *h) { * @param h The history data. * @param line The line to add. */ -static void bc_history_add(BcHistory *h, char *line) { - +static void +bc_history_add(BcHistory* h, char* line) +{ BC_SIG_ASSERT_LOCKED; // If there is something already there... - if (h->history.len) { - + if (h->history.len) + { // Get the previous. - char *s = *((char**) bc_vec_item_rev(&h->history, 0)); + char* s = *((char**) bc_vec_item_rev(&h->history, 0)); // Check for, and discard, duplicates. - if (!strcmp(s, line)) { + if (!strcmp(s, line)) + { free(line); return; } @@ -1366,17 +1693,18 @@ static void bc_history_add(BcHistory *h, char *line) { * because we don't want it allocating. * @param h The history data. */ -static void bc_history_add_empty(BcHistory *h) { - +static void +bc_history_add_empty(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; - const char *line = ""; + const char* line = ""; // If there is something already there... - if (h->history.len) { - + if (h->history.len) + { // Get the previous. - char *s = *((char**) bc_vec_item_rev(&h->history, 0)); + char* s = *((char**) bc_vec_item_rev(&h->history, 0)); // Check for, and discard, duplicates. if (!s[0]) return; @@ -1389,8 +1717,9 @@ static void bc_history_add_empty(BcHistory *h) { * Resets the history state to nothing. * @param h The history data. */ -static void bc_history_reset(BcHistory *h) { - +static void +bc_history_reset(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; h->oldcolpos = h->pos = h->idx = 0; @@ -1409,10 +1738,11 @@ static void bc_history_reset(BcHistory *h) { * @param h The history data. * @param c The control character to print. */ -static void bc_history_printCtrl(BcHistory *h, unsigned int c) { - - char str[3] = "^A"; - const char newline[2] = "\n"; +static void +bc_history_printCtrl(BcHistory* h, unsigned int c) +{ + char str[3] = { '^', 'A', '\0' }; + const char newline[2] = { '\n', '\0' }; BC_SIG_ASSERT_LOCKED; @@ -1422,15 +1752,14 @@ static void bc_history_printCtrl(BcHistory *h, unsigned int c) { // Concatenate the string. bc_vec_concat(&h->buf, str); + h->pos = BC_HIST_BUF_LEN(h); bc_history_refresh(h); // Pop the string. bc_vec_npop(&h->buf, sizeof(str)); bc_vec_pushByte(&h->buf, '\0'); -#ifndef _WIN32 if (c != BC_ACTION_CTRL_C && c != BC_ACTION_CTRL_D) -#endif // _WIN32 { // We sometimes want to print a newline; for the times we don't; it's // because newlines are taken care of elsewhere. @@ -1447,8 +1776,9 @@ static void bc_history_printCtrl(BcHistory *h, unsigned int c) { * @param prompt The prompt. * @return BC_STATUS_SUCCESS or BC_STATUS_EOF. */ -static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { - +static BcStatus +bc_history_edit(BcHistory* h, const char* prompt) +{ BC_SIG_LOCK; bc_history_reset(h); @@ -1459,8 +1789,8 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { // bc_file_write(&vm.fout, bc_flush_none, h->extras.v, h->extras.len - 1); // Write the prompt if desired. - if (BC_PROMPT) { - + if (BC_PROMPT) + { h->prompt = prompt; h->plen = strlen(prompt); h->pcol = bc_history_promptColLen(prompt, h->plen); @@ -1470,8 +1800,8 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { } // This is the input loop. - for (;;) { - + for (;;) + { BcStatus s; char cbuf[32]; unsigned int c = 0; @@ -1485,8 +1815,8 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { BC_SIG_LOCK; - switch (c) { - + switch (c) + { case BC_ACTION_LINE_FEED: case BC_ACTION_ENTER: { @@ -1504,13 +1834,13 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { break; } -#ifndef _WIN32 case BC_ACTION_CTRL_C: { bc_history_printCtrl(h, c); // Quit if the user wants it. - if (!BC_SIGINT) { + if (!BC_SIGINT) + { vm.status = BC_STATUS_QUIT; BC_SIG_UNLOCK; BC_JMP; @@ -1525,7 +1855,6 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { break; } -#endif // _WIN32 case BC_ACTION_BACKSPACE: case BC_ACTION_CTRL_H: @@ -1534,13 +1863,13 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { break; } -#ifndef _WIN32 // Act as end-of-file or delete-forward-char. case BC_ACTION_CTRL_D: { // Act as EOF if there's no chacters, otherwise emulate Emacs // delete next character to match historical gnu bc behavior. - if (BC_HIST_BUF_LEN(h) == 0) { + if (BC_HIST_BUF_LEN(h) == 0) + { bc_history_printCtrl(h, c); BC_SIG_UNLOCK; return BC_STATUS_EOF; @@ -1550,7 +1879,6 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { break; } -#endif // _WIN32 // Swaps current character with previous. case BC_ACTION_CTRL_T: @@ -1650,7 +1978,9 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { if (c == BC_ACTION_CTRL_Z) bc_history_raise(h, SIGTSTP); if (c == BC_ACTION_CTRL_S) bc_history_raise(h, SIGSTOP); if (c == BC_ACTION_CTRL_BSLASH) + { bc_history_raise(h, SIGQUIT); + } #else // _WIN32 vm.status = BC_STATUS_QUIT; BC_SIG_UNLOCK; @@ -1674,7 +2004,9 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { * does not work on Windows. * @param h The history data. */ -static inline bool bc_history_stdinHasData(BcHistory *h) { +static inline bool +bc_history_stdinHasData(BcHistory* h) +{ #ifndef _WIN32 int n; return pselect(1, &h->rdset, NULL, NULL, &h->ts, &h->sigmask) > 0 || @@ -1684,8 +2016,9 @@ static inline bool bc_history_stdinHasData(BcHistory *h) { #endif // _WIN32 } -BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt) { - +BcStatus +bc_history_line(BcHistory* h, BcVec* vec, const char* prompt) +{ BcStatus s; char* line; @@ -1693,8 +2026,8 @@ BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt) { bc_history_enableRaw(h); - do { - + do + { // Do the edit. s = bc_history_edit(h, prompt); @@ -1705,8 +2038,8 @@ BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt) { BC_SIG_LOCK; // If we actually have data... - if (h->buf.v[0]) { - + if (h->buf.v[0]) + { // Duplicate it. line = bc_vm_strdup(h->buf.v); @@ -1721,8 +2054,8 @@ BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt) { // Concatenate the line to the return vector. bc_vec_concat(vec, h->buf.v); bc_vec_concat(vec, "\n"); - - } while (!s && bc_history_stdinHasData(h)); + } + while (!s && bc_history_stdinHasData(h)); assert(!s || s == BC_STATUS_EOF); @@ -1731,13 +2064,17 @@ BcStatus bc_history_line(BcHistory *h, BcVec *vec, const char *prompt) { return s; } -void bc_history_string_free(void *str) { - char *s = *((char**) str); +void +bc_history_string_free(void* str) +{ + char* s = *((char**) str); BC_SIG_ASSERT_LOCKED; if (s[0]) free(s); } -void bc_history_init(BcHistory *h) { +void +bc_history_init(BcHistory* h) +{ #ifdef _WIN32 HANDLE out, in; @@ -1748,6 +2085,9 @@ void bc_history_init(BcHistory *h) { h->rawMode = false; h->badTerm = bc_history_isBadTerm(); + // Just don't initialize with a bad terminal. + if (h->badTerm) return; + #ifdef _WIN32 h->orig_in = 0; @@ -1756,25 +2096,38 @@ void bc_history_init(BcHistory *h) { in = GetStdHandle(STD_INPUT_HANDLE); out = GetStdHandle(STD_OUTPUT_HANDLE); - if (!h->badTerm) { - SetConsoleCP(CP_UTF8); - SetConsoleOutputCP(CP_UTF8); - if (!GetConsoleMode(in, &h->orig_in) || - !GetConsoleMode(out, &h->orig_out)) + // Set the code pages. + SetConsoleCP(CP_UTF8); + SetConsoleOutputCP(CP_UTF8); + + // Get the original modes. + if (!GetConsoleMode(in, &h->orig_in) || !GetConsoleMode(out, &h->orig_out)) + { + // Just mark it as a bad terminal on error. + h->badTerm = true; + return; + } + else + { + // Set the new modes. + DWORD reqOut = h->orig_out | ENABLE_VIRTUAL_TERMINAL_PROCESSING; + DWORD reqIn = h->orig_in | ENABLE_VIRTUAL_TERMINAL_INPUT; + + // The input handle requires turning *off* some modes. That's why + // history didn't work before; I didn't read the documentation + // closely enough to see that most modes were automaticall enabled, + // and they need to be turned off. + reqOut |= DISABLE_NEWLINE_AUTO_RETURN | ENABLE_PROCESSED_OUTPUT; + reqIn &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + reqIn &= ~(ENABLE_PROCESSED_INPUT); + + // Set the modes; if there was an error, assume a bad terminal and + // quit. + if (!SetConsoleMode(in, reqIn) || !SetConsoleMode(out, reqOut)) { h->badTerm = true; return; } - else { - DWORD reqOut = ENABLE_VIRTUAL_TERMINAL_PROCESSING | - DISABLE_NEWLINE_AUTO_RETURN; - DWORD reqIn = ENABLE_VIRTUAL_TERMINAL_INPUT; - if (!SetConsoleMode(in, h->orig_in | reqIn) || - !SetConsoleMode(out, h->orig_out | reqOut)) - { - h->badTerm = true; - } - } } #endif // _WIN32 @@ -1793,7 +2146,9 @@ void bc_history_init(BcHistory *h) { #endif // _WIN32 } -void bc_history_free(BcHistory *h) { +void +bc_history_free(BcHistory* h) +{ BC_SIG_ASSERT_LOCKED; #ifndef _WIN32 bc_history_disableRaw(h); @@ -1815,8 +2170,9 @@ void bc_history_free(BcHistory *h) { * scan codes on screen for debugging / development purposes. * @param h The history data. */ -void bc_history_printKeyCodes(BcHistory *h) { - +void +bc_history_printKeyCodes(BcHistory* h) +{ char quit[4]; bc_vm_printf("Linenoise key codes debugging mode.\n" @@ -1826,8 +2182,8 @@ void bc_history_printKeyCodes(BcHistory *h) { bc_history_enableRaw(h); memset(quit, ' ', 4); - while(true) { - + while (true) + { char c; ssize_t nread; @@ -1841,8 +2197,8 @@ void bc_history_printKeyCodes(BcHistory *h) { quit[sizeof(quit) - 1] = c; if (!memcmp(quit, "quit", sizeof(quit))) break; - bc_vm_printf("'%c' %lu (type quit to exit)\n", - isprint(c) ? c : '?', (unsigned long) c); + bc_vm_printf("'%c' %lu (type quit to exit)\n", isprint(c) ? c : '?', + (unsigned long) c); // Go left edge manually, we are in raw mode. bc_vm_putchar('\r', bc_flush_none); @@ -1854,3 +2210,7 @@ void bc_history_printKeyCodes(BcHistory *h) { #endif // BC_DEBUG_CODE #endif // BC_ENABLE_HISTORY + +#endif // BC_ENABLE_READLINE + +#endif // BC_ENABLE_EDITLINE diff --git a/contrib/bc/src/lang.c b/contrib/bc/src/lang.c index 8532ebc66d7d..bb028b25631a 100644 --- a/contrib/bc/src/lang.c +++ b/contrib/bc/src/lang.c @@ -41,9 +41,10 @@ #include <program.h> #include <vm.h> -void bc_const_free(void *constant) { - - BcConst *c = constant; +void +bc_const_free(void* constant) +{ + BcConst* c = constant; BC_SIG_ASSERT_LOCKED; @@ -53,8 +54,8 @@ void bc_const_free(void *constant) { } #if BC_ENABLED -void bc_func_insert(BcFunc *f, BcProgram *p, char *name, - BcType type, size_t line) +void +bc_func_insert(BcFunc* f, BcProgram* p, char* name, BcType type, size_t line) { BcAuto a; size_t i, idx; @@ -66,15 +67,15 @@ void bc_func_insert(BcFunc *f, BcProgram *p, char *name, idx = bc_program_search(p, name, type == BC_TYPE_VAR); // Search through all of the other autos/parameters. - for (i = 0; i < f->autos.len; ++i) { - + for (i = 0; i < f->autos.len; ++i) + { // Get the auto. - BcAuto *aptr = bc_vec_item(&f->autos, i); + BcAuto* aptr = bc_vec_item(&f->autos, i); // If they match, barf. - if (BC_ERR(idx == aptr->idx && type == aptr->type)) { - - const char *array = type == BC_TYPE_ARRAY ? "[]" : ""; + if (BC_ERR(idx == aptr->idx && type == aptr->type)) + { + const char* array = type == BC_TYPE_ARRAY ? "[]" : ""; bc_error(BC_ERR_PARSE_DUP_LOCAL, line, name, array); } @@ -89,8 +90,9 @@ void bc_func_insert(BcFunc *f, BcProgram *p, char *name, } #endif // BC_ENABLED -void bc_func_init(BcFunc *f, const char *name) { - +void +bc_func_init(BcFunc* f, const char* name) +{ BC_SIG_ASSERT_LOCKED; assert(f != NULL && name != NULL); @@ -104,8 +106,8 @@ void bc_func_init(BcFunc *f, const char *name) { #if BC_ENABLED // Only bc needs these things. - if (BC_IS_BC) { - + if (BC_IS_BC) + { bc_vec_init(&f->autos, sizeof(BcAuto), BC_DTOR_NONE); bc_vec_init(&f->labels, sizeof(size_t), BC_DTOR_NONE); @@ -118,8 +120,9 @@ void bc_func_init(BcFunc *f, const char *name) { f->name = name; } -void bc_func_reset(BcFunc *f) { - +void +bc_func_reset(BcFunc* f) +{ BC_SIG_ASSERT_LOCKED; assert(f != NULL); @@ -130,8 +133,8 @@ void bc_func_reset(BcFunc *f) { bc_vec_popAll(&f->strs); #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { bc_vec_popAll(&f->autos); bc_vec_popAll(&f->labels); @@ -142,9 +145,10 @@ void bc_func_reset(BcFunc *f) { } #ifndef NDEBUG -void bc_func_free(void *func) { - - BcFunc *f = (BcFunc*) func; +void +bc_func_free(void* func) +{ + BcFunc* f = (BcFunc*) func; BC_SIG_ASSERT_LOCKED; assert(f != NULL); @@ -156,8 +160,8 @@ void bc_func_free(void *func) { bc_vec_free(&f->strs); #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { bc_vec_free(&f->autos); bc_vec_free(&f->labels); } @@ -165,8 +169,9 @@ void bc_func_free(void *func) { } #endif // NDEBUG -void bc_array_init(BcVec *a, bool nums) { - +void +bc_array_init(BcVec* a, bool nums) +{ BC_SIG_ASSERT_LOCKED; // Set the proper vector. @@ -177,8 +182,9 @@ void bc_array_init(BcVec *a, bool nums) { bc_array_expand(a, 1); } -void bc_array_copy(BcVec *d, const BcVec *s) { - +void +bc_array_copy(BcVec* d, const BcVec* s) +{ size_t i; BC_SIG_ASSERT_LOCKED; @@ -196,21 +202,27 @@ void bc_array_copy(BcVec *d, const BcVec *s) { bc_vec_expand(d, s->cap); d->len = s->len; - for (i = 0; i < s->len; ++i) { - - BcNum *dnum, *snum; + for (i = 0; i < s->len; ++i) + { + BcNum* dnum; + BcNum* snum; dnum = bc_vec_item(d, i); snum = bc_vec_item(s, i); // We have to create a copy of the number as well. - if (BC_PROG_STR(snum)) memcpy(dnum, snum, sizeof(BcNum)); + if (BC_PROG_STR(snum)) + { + // NOLINTNEXTLINE + memcpy(dnum, snum, sizeof(BcNum)); + } else bc_num_createCopy(dnum, snum); } } -void bc_array_expand(BcVec *a, size_t len) { - +void +bc_array_expand(BcVec* a, size_t len) +{ assert(a != NULL); BC_SIG_ASSERT_LOCKED; @@ -218,36 +230,41 @@ void bc_array_expand(BcVec *a, size_t len) { bc_vec_expand(a, len); // If this is true, then we have a num array. - if (a->size == sizeof(BcNum) && a->dtor == BC_DTOR_NUM) { - + if (a->size == sizeof(BcNum) && a->dtor == BC_DTOR_NUM) + { // Initialize numbers until we reach the target. - while (len > a->len) { - BcNum *n = bc_vec_pushEmpty(a); + while (len > a->len) + { + BcNum* n = bc_vec_pushEmpty(a); bc_num_init(n, BC_NUM_DEF_SIZE); } } - else { - + else + { assert(a->size == sizeof(BcVec) && a->dtor == BC_DTOR_VEC); // Recursively initialize arrays until we reach the target. Having the // second argument of bc_array_init() be true will activate the base // case, so we're safe. - while (len > a->len) { - BcVec *v = bc_vec_pushEmpty(a); + while (len > a->len) + { + BcVec* v = bc_vec_pushEmpty(a); bc_array_init(v, true); } } } -void bc_result_clear(BcResult *r) { +void +bc_result_clear(BcResult* r) +{ r->t = BC_RESULT_TEMP; bc_num_clear(&r->d.n); } #if DC_ENABLED -void bc_result_copy(BcResult *d, BcResult *src) { - +void +bc_result_copy(BcResult* d, BcResult* src) +{ assert(d != NULL && src != NULL); BC_SIG_ASSERT_LOCKED; @@ -256,8 +273,8 @@ void bc_result_copy(BcResult *d, BcResult *src) { d->t = src->t; // Yes, it depends on what type. - switch (d->t) { - + switch (d->t) + { case BC_RESULT_TEMP: case BC_RESULT_IBASE: case BC_RESULT_SCALE: @@ -274,12 +291,14 @@ void bc_result_copy(BcResult *d, BcResult *src) { case BC_RESULT_ARRAY: case BC_RESULT_ARRAY_ELEM: { + // NOLINTNEXTLINE memcpy(&d->d.loc, &src->d.loc, sizeof(BcLoc)); break; } case BC_RESULT_STR: { + // NOLINTNEXTLINE memcpy(&d->d.n, &src->d.n, sizeof(BcNum)); break; } @@ -305,16 +324,17 @@ void bc_result_copy(BcResult *d, BcResult *src) { } #endif // DC_ENABLED -void bc_result_free(void *result) { - - BcResult *r = (BcResult*) result; +void +bc_result_free(void* result) +{ + BcResult* r = (BcResult*) result; BC_SIG_ASSERT_LOCKED; assert(r != NULL); - switch (r->t) { - + switch (r->t) + { case BC_RESULT_TEMP: case BC_RESULT_IBASE: case BC_RESULT_SCALE: diff --git a/contrib/bc/src/lex.c b/contrib/bc/src/lex.c index 3b84734efc55..0fc405e50f88 100644 --- a/contrib/bc/src/lex.c +++ b/contrib/bc/src/lex.c @@ -42,20 +42,28 @@ #include <vm.h> #include <bc.h> -void bc_lex_invalidChar(BcLex *l, char c) { +void +bc_lex_invalidChar(BcLex* l, char c) +{ l->t = BC_LEX_INVALID; bc_lex_verr(l, BC_ERR_PARSE_CHAR, c); } -void bc_lex_lineComment(BcLex *l) { +void +bc_lex_lineComment(BcLex* l) +{ l->t = BC_LEX_WHITESPACE; - while (l->i < l->len && l->buf[l->i] != '\n') l->i += 1; + while (l->i < l->len && l->buf[l->i] != '\n') + { + l->i += 1; + } } -void bc_lex_comment(BcLex *l) { - +void +bc_lex_comment(BcLex* l) +{ size_t i, nlines = 0; - const char *buf; + const char* buf; bool end = false, got_more; char c; @@ -65,8 +73,8 @@ void bc_lex_comment(BcLex *l) { // This loop is complex because it might need to request more data from // stdin if the comment is not ended. This loop is taken until the comment // is finished or we have EOF. - do { - + do + { buf = l->buf; got_more = false; @@ -74,17 +82,22 @@ void bc_lex_comment(BcLex *l) { assert(!vm.is_stdin || buf == vm.buffer.v); // Find the end of the comment. - for (i = l->i; !end; i += !end) { - + for (i = l->i; !end; i += !end) + { // While we don't have an asterisk, eat, but increment nlines. - for (; (c = buf[i]) && c != '*'; ++i) nlines += (c == '\n'); + for (; (c = buf[i]) && c != '*'; ++i) + { + nlines += (c == '\n'); + } // If this is true, we need to request more data. - if (BC_ERR(!c || buf[i + 1] == '\0')) { - + if (BC_ERR(!c || buf[i + 1] == '\0')) + { // Read more, if possible. if (!vm.eof && (l->is_stdin || l->is_exprs)) + { got_more = bc_lex_readLine(l); + } break; } @@ -92,11 +105,12 @@ void bc_lex_comment(BcLex *l) { // If this turns true, we found the end. Yay! end = (buf[i + 1] == '/'); } - - } while (got_more && !end); + } + while (got_more && !end); // If we didn't find the end, barf. - if (!end) { + if (!end) + { l->i = i; bc_lex_err(l, BC_ERR_PARSE_COMMENT); } @@ -105,17 +119,23 @@ void bc_lex_comment(BcLex *l) { l->line += nlines; } -void bc_lex_whitespace(BcLex *l) { - +void +bc_lex_whitespace(BcLex* l) +{ char c; l->t = BC_LEX_WHITESPACE; // Eat. We don't eat newlines because they can be special. - for (c = l->buf[l->i]; c != '\n' && isspace(c); c = l->buf[++l->i]); + for (c = l->buf[l->i]; c != '\n' && isspace(c); c = l->buf[++l->i]) + { + continue; + } } -void bc_lex_commonTokens(BcLex *l, char c) { +void +bc_lex_commonTokens(BcLex* l, char c) +{ if (!c) l->t = BC_LEX_EOF; else if (c == '\n') l->t = BC_LEX_NLINE; else bc_lex_whitespace(l); @@ -128,9 +148,10 @@ void bc_lex_commonTokens(BcLex *l, char c) { * @param int_only Whether this function should only look for an integer. This * is used to implement the exponent of scientific notation. */ -static size_t bc_lex_num(BcLex *l, char start, bool int_only) { - - const char *buf = l->buf + l->i; +static size_t +bc_lex_num(BcLex* l, char start, bool int_only) +{ + const char* buf = l->buf + l->i; size_t i; char c; bool last_pt, pt = (start == '.'); @@ -140,16 +161,20 @@ static size_t bc_lex_num(BcLex *l, char start, bool int_only) { // thus far, or whether it is a backslash followed by a newline. I can do // i+1 on the buffer because the buffer must have a nul byte. for (i = 0; (c = buf[i]) && (BC_LEX_NUM_CHAR(c, pt, int_only) || - (c == '\\' && buf[i + 1] == '\n')); ++i) + (c == '\\' && buf[i + 1] == '\n')); + ++i) { // I don't need to test that the next character is a newline because // the loop condition above ensures that. - if (c == '\\') { - + if (c == '\\') + { i += 2; // Make sure to eat whitespace at the beginning of the line. - while(isspace(buf[i]) && buf[i] != '\n') i += 1; + while (isspace(buf[i]) && buf[i] != '\n') + { + i += 1; + } c = buf[i]; @@ -173,8 +198,9 @@ static size_t bc_lex_num(BcLex *l, char start, bool int_only) { return i; } -void bc_lex_number(BcLex *l, char start) { - +void +bc_lex_number(BcLex* l, char start) +{ l->t = BC_LEX_NUMBER; // Make sure the string is clear. @@ -189,8 +215,8 @@ void bc_lex_number(BcLex *l, char start) { char c = l->buf[l->i]; // Do we have a number in scientific notation? - if (c == 'e') { - + if (c == 'e') + { #if BC_ENABLED // Barf for POSIX. if (BC_IS_POSIX) bc_lex_err(l, BC_ERR_POSIX_EXP_NUM); @@ -202,7 +228,8 @@ void bc_lex_number(BcLex *l, char start) { c = l->buf[l->i]; // Check for negative specifically because bc_lex_num() does not. - if (c == BC_LEX_NEG_CHAR) { + if (c == BC_LEX_NEG_CHAR) + { bc_vec_push(&l->str, &c); l->i += 1; c = l->buf[l->i]; @@ -210,7 +237,9 @@ void bc_lex_number(BcLex *l, char start) { // We must have a number character, so barf if not. if (BC_ERR(!BC_LEX_NUM_CHAR(c, false, true))) + { bc_lex_verr(l, BC_ERR_PARSE_CHAR, c); + } // Parse the exponent. l->i += bc_lex_num(l, 0, true); @@ -221,16 +250,20 @@ void bc_lex_number(BcLex *l, char start) { bc_vec_pushByte(&l->str, '\0'); } -void bc_lex_name(BcLex *l) { - +void +bc_lex_name(BcLex* l) +{ size_t i = 0; - const char *buf = l->buf + l->i - 1; + const char* buf = l->buf + l->i - 1; char c = buf[i]; l->t = BC_LEX_NAME; // Should be obvious. It's looking for valid characters. - while ((c >= 'a' && c <= 'z') || isdigit(c) || c == '_') c = buf[++i]; + while ((c >= 'a' && c <= 'z') || isdigit(c) || c == '_') + { + c = buf[++i]; + } // Set the string to the identifier. bc_vec_string(&l->str, i, buf); @@ -239,26 +272,33 @@ void bc_lex_name(BcLex *l) { l->i += i - 1; } -void bc_lex_init(BcLex *l) { +void +bc_lex_init(BcLex* l) +{ BC_SIG_ASSERT_LOCKED; assert(l != NULL); bc_vec_init(&l->str, sizeof(char), BC_DTOR_NONE); } -void bc_lex_free(BcLex *l) { +void +bc_lex_free(BcLex* l) +{ BC_SIG_ASSERT_LOCKED; assert(l != NULL); bc_vec_free(&l->str); } -void bc_lex_file(BcLex *l, const char *file) { +void +bc_lex_file(BcLex* l, const char* file) +{ assert(l != NULL && file != NULL); l->line = 1; vm.file = file; } -void bc_lex_next(BcLex *l) { - +void +bc_lex_next(BcLex* l) +{ BC_SIG_ASSERT_LOCKED; assert(l != NULL); @@ -278,9 +318,11 @@ void bc_lex_next(BcLex *l) { // Loop until failure or we don't have whitespace. This // is so the parser doesn't get inundated with whitespace. - do { + do + { vm.next(l); - } while (l->t == BC_LEX_WHITESPACE); + } + while (l->t == BC_LEX_WHITESPACE); } /** @@ -290,13 +332,16 @@ void bc_lex_next(BcLex *l) { * @param text The text. * @param len The length of the text. */ -static void bc_lex_fixText(BcLex *l, const char *text, size_t len) { +static void +bc_lex_fixText(BcLex* l, const char* text, size_t len) +{ l->buf = text; l->len = len; } -bool bc_lex_readLine(BcLex *l) { - +bool +bc_lex_readLine(BcLex* l) +{ bool good; // These are reversed because they should be already locked, but @@ -305,7 +350,8 @@ bool bc_lex_readLine(BcLex *l) { // Make sure we read from the appropriate place. if (l->is_stdin) good = bc_vm_readLine(false); - else { + else + { assert(l->is_exprs); good = bc_vm_readBuf(false); } @@ -317,8 +363,9 @@ bool bc_lex_readLine(BcLex *l) { return good; } -void bc_lex_text(BcLex *l, const char *text, bool is_stdin, bool is_exprs) { - +void +bc_lex_text(BcLex* l, const char* text, bool is_stdin, bool is_exprs) +{ BC_SIG_ASSERT_LOCKED; assert(l != NULL && text != NULL); diff --git a/contrib/bc/src/library.c b/contrib/bc/src/library.c index a9246a025206..b72b83589135 100644 --- a/contrib/bc/src/library.c +++ b/contrib/bc/src/library.c @@ -57,8 +57,9 @@ // have to reset the jumps every time to ensure that the locals will be correct // after jumping. -void bcl_handleSignal(void) { - +void +bcl_handleSignal(void) +{ // Signal already in flight, or bc is not executing. if (vm.sig || !vm.running) return; @@ -69,19 +70,23 @@ void bcl_handleSignal(void) { if (!vm.sig_lock) BC_JMP; } -bool bcl_running(void) { +bool +bcl_running(void) +{ return vm.running != 0; } -BclError bcl_init(void) { - +BclError +bcl_init(void) +{ BclError e = BCL_ERROR_NONE; BC_SIG_LOCK; vm.refs += 1; - if (vm.refs > 1) { + if (vm.refs > 1) + { BC_SIG_UNLOCK; return e; } @@ -110,7 +115,8 @@ BclError bcl_init(void) { err: // This is why we had to set them to NULL. - if (BC_ERR(vm.err)) { + if (BC_ERR(vm.err)) + { if (vm.out.v != NULL) bc_vec_free(&vm.out); if (vm.jmp_bufs.v != NULL) bc_vec_free(&vm.jmp_bufs); if (vm.ctxts.v != NULL) bc_vec_free(&vm.ctxts); @@ -123,8 +129,9 @@ err: return e; } -BclError bcl_pushContext(BclContext ctxt) { - +BclError +bcl_pushContext(BclContext ctxt) +{ BclError e = BCL_ERROR_NONE; BC_FUNC_HEADER_LOCK(err); @@ -136,24 +143,30 @@ err: return e; } -void bcl_popContext(void) { +void +bcl_popContext(void) +{ if (vm.ctxts.len) bc_vec_pop(&vm.ctxts); } -BclContext bcl_context(void) { +BclContext +bcl_context(void) +{ if (!vm.ctxts.len) return NULL; return *((BclContext*) bc_vec_top(&vm.ctxts)); } -void bcl_free(void) { - +void +bcl_free(void) +{ size_t i; BC_SIG_LOCK; vm.refs -= 1; - if (vm.refs) { + if (vm.refs) + { BC_SIG_UNLOCK; return; } @@ -161,7 +174,8 @@ void bcl_free(void) { bc_rand_free(&vm.rng); bc_vec_free(&vm.out); - for (i = 0; i < vm.ctxts.len; ++i) { + for (i = 0; i < vm.ctxts.len; ++i) + { BclContext ctxt = *((BclContext*) bc_vec_item(&vm.ctxts, i)); bcl_ctxt_free(ctxt); } @@ -177,30 +191,41 @@ void bcl_free(void) { assert(!vm.running && !vm.sig && !vm.sig_lock); } -void bcl_gc(void) { +void +bcl_gc(void) +{ BC_SIG_LOCK; bc_vm_freeTemps(); BC_SIG_UNLOCK; } -bool bcl_abortOnFatalError(void) { +bool +bcl_abortOnFatalError(void) +{ return vm.abrt; } -void bcl_setAbortOnFatalError(bool abrt) { +void +bcl_setAbortOnFatalError(bool abrt) +{ vm.abrt = abrt; } -bool bcl_leadingZeroes(void) { +bool +bcl_leadingZeroes(void) +{ return vm.leading_zeroes; } -void bcl_setLeadingZeroes(bool leadingZeroes) { +void +bcl_setLeadingZeroes(bool leadingZeroes) +{ vm.leading_zeroes = leadingZeroes; } -BclContext bcl_ctxt_create(void) { - +BclContext +bcl_ctxt_create(void) +{ BclContext ctxt = NULL; BC_FUNC_HEADER_LOCK(err); @@ -214,10 +239,11 @@ BclContext bcl_ctxt_create(void) { ctxt->scale = 0; ctxt->ibase = 10; - ctxt->obase= 10; + ctxt->obase = 10; err: - if (BC_ERR(vm.err && ctxt != NULL)) { + if (BC_ERR(vm.err && ctxt != NULL)) + { if (ctxt->nums.v != NULL) bc_vec_free(&ctxt->nums); free(ctxt); ctxt = NULL; @@ -230,7 +256,9 @@ err: return ctxt; } -void bcl_ctxt_free(BclContext ctxt) { +void +bcl_ctxt_free(BclContext ctxt) +{ BC_SIG_LOCK; bc_vec_free(&ctxt->free_nums); bc_vec_free(&ctxt->nums); @@ -238,46 +266,62 @@ void bcl_ctxt_free(BclContext ctxt) { BC_SIG_UNLOCK; } -void bcl_ctxt_freeNums(BclContext ctxt) { +void +bcl_ctxt_freeNums(BclContext ctxt) +{ bc_vec_popAll(&ctxt->nums); bc_vec_popAll(&ctxt->free_nums); } -size_t bcl_ctxt_scale(BclContext ctxt) { +size_t +bcl_ctxt_scale(BclContext ctxt) +{ return ctxt->scale; } -void bcl_ctxt_setScale(BclContext ctxt, size_t scale) { +void +bcl_ctxt_setScale(BclContext ctxt, size_t scale) +{ ctxt->scale = scale; } -size_t bcl_ctxt_ibase(BclContext ctxt) { +size_t +bcl_ctxt_ibase(BclContext ctxt) +{ return ctxt->ibase; } -void bcl_ctxt_setIbase(BclContext ctxt, size_t ibase) { +void +bcl_ctxt_setIbase(BclContext ctxt, size_t ibase) +{ if (ibase < BC_NUM_MIN_BASE) ibase = BC_NUM_MIN_BASE; else if (ibase > BC_NUM_MAX_IBASE) ibase = BC_NUM_MAX_IBASE; ctxt->ibase = ibase; } -size_t bcl_ctxt_obase(BclContext ctxt) { +size_t +bcl_ctxt_obase(BclContext ctxt) +{ return ctxt->obase; } -void bcl_ctxt_setObase(BclContext ctxt, size_t obase) { +void +bcl_ctxt_setObase(BclContext ctxt, size_t obase) +{ ctxt->obase = obase; } -BclError bcl_err(BclNumber n) { - +BclError +bcl_err(BclNumber n) +{ BclContext ctxt; BC_CHECK_CTXT_ERR(ctxt); // Errors are encoded as (0 - error_code). If the index is in that range, it // is an encoded error. - if (n.i >= ctxt->nums.len) { + if (n.i >= ctxt->nums.len) + { if (n.i > 0 - (size_t) BCL_ERROR_NELEMS) return (BclError) (0 - n.i); else return BCL_ERROR_INVALID_NUM; } @@ -290,14 +334,15 @@ BclError bcl_err(BclNumber n) { * @param n The BcNum to insert. * @return The resulting BclNumber from the insert. */ -static BclNumber bcl_num_insert(BclContext ctxt, BcNum *restrict n) { - +static BclNumber +bcl_num_insert(BclContext ctxt, BcNum* restrict n) +{ BclNumber idx; // If there is a free spot... - if (ctxt->free_nums.len) { - - BcNum *ptr; + if (ctxt->free_nums.len) + { + BcNum* ptr; // Get the index of the free spot and remove it. idx = *((BclNumber*) bc_vec_top(&ctxt->free_nums)); @@ -307,7 +352,8 @@ static BclNumber bcl_num_insert(BclContext ctxt, BcNum *restrict n) { ptr = bc_vec_item(&ctxt->nums, idx.i); memcpy(ptr, n, sizeof(BcNum)); } - else { + else + { // Just push the number onto the vector. idx.i = ctxt->nums.len; bc_vec_push(&ctxt->nums, n); @@ -318,8 +364,9 @@ static BclNumber bcl_num_insert(BclContext ctxt, BcNum *restrict n) { return idx; } -BclNumber bcl_num_create(void) { - +BclNumber +bcl_num_create(void) +{ BclError e = BCL_ERROR_NONE; BcNum n; BclNumber idx; @@ -348,8 +395,9 @@ err: * @param n The index of the number. * @param num The number to destroy. */ -static void bcl_num_dtor(BclContext ctxt, BclNumber n, BcNum *restrict num) { - +static void +bcl_num_dtor(BclContext ctxt, BclNumber n, BcNum* restrict num) +{ BC_SIG_ASSERT_LOCKED; assert(num != NULL && num->num != NULL); @@ -358,9 +406,10 @@ static void bcl_num_dtor(BclContext ctxt, BclNumber n, BcNum *restrict num) { bc_vec_push(&ctxt->free_nums, &n); } -void bcl_num_free(BclNumber n) { - - BcNum *num; +void +bcl_num_free(BclNumber n) +{ + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -376,10 +425,12 @@ void bcl_num_free(BclNumber n) { BC_SIG_UNLOCK; } -BclError bcl_copy(BclNumber d, BclNumber s) { - +BclError +bcl_copy(BclNumber d, BclNumber s) +{ BclError e = BCL_ERROR_NONE; - BcNum *dest, *src; + BcNum* dest; + BcNum* src; BclContext ctxt; BC_CHECK_CTXT_ERR(ctxt); @@ -404,8 +455,9 @@ err: return e; } -BclNumber bcl_dup(BclNumber s) { - +BclNumber +bcl_dup(BclNumber s) +{ BclError e = BCL_ERROR_NONE; BcNum *src, dest; BclNumber idx; @@ -436,9 +488,10 @@ err: return idx; } -void bcl_num_destruct(void *num) { - - BcNum *n = (BcNum*) num; +void +bcl_num_destruct(void* num) +{ + BcNum* n = (BcNum*) num; assert(n != NULL); @@ -448,9 +501,10 @@ void bcl_num_destruct(void *num) { bc_num_clear(num); } -bool bcl_num_neg(BclNumber n) { - - BcNum *num; +bool +bcl_num_neg(BclNumber n) +{ + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -464,9 +518,10 @@ bool bcl_num_neg(BclNumber n) { return BC_NUM_NEG(num) != 0; } -void bcl_num_setNeg(BclNumber n, bool neg) { - - BcNum *num; +void +bcl_num_setNeg(BclNumber n, bool neg) +{ + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -480,9 +535,10 @@ void bcl_num_setNeg(BclNumber n, bool neg) { num->rdx = BC_NUM_NEG_VAL(num, neg); } -size_t bcl_num_scale(BclNumber n) { - - BcNum *num; +size_t +bcl_num_scale(BclNumber n) +{ + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -496,10 +552,11 @@ size_t bcl_num_scale(BclNumber n) { return bc_num_scale(num); } -BclError bcl_num_setScale(BclNumber n, size_t scale) { - +BclError +bcl_num_setScale(BclNumber n, size_t scale) +{ BclError e = BCL_ERROR_NONE; - BcNum *nptr; + BcNum* nptr; BclContext ctxt; BC_CHECK_CTXT_ERR(ctxt); @@ -526,9 +583,10 @@ err: return e; } -size_t bcl_num_len(BclNumber n) { - - BcNum *num; +size_t +bcl_num_len(BclNumber n) +{ + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -542,10 +600,11 @@ size_t bcl_num_len(BclNumber n) { return bc_num_len(num); } -BclError bcl_bigdig(BclNumber n, BclBigDig *result) { - +BclError +bcl_bigdig(BclNumber n, BclBigDig* result) +{ BclError e = BCL_ERROR_NONE; - BcNum *num; + BcNum* num; BclContext ctxt; BC_CHECK_CTXT_ERR(ctxt); @@ -570,8 +629,9 @@ err: return e; } -BclNumber bcl_bigdig2num(BclBigDig val) { - +BclNumber +bcl_bigdig2num(BclBigDig val) +{ BclError e = BCL_ERROR_NONE; BcNum n; BclNumber idx; @@ -602,11 +662,13 @@ err: * @param req The function to get the size of the result for preallocation. * @return The result of the operation. */ -static BclNumber bcl_binary(BclNumber a, BclNumber b, const BcNumBinaryOp op, - const BcNumBinaryOpReq req) +static BclNumber +bcl_binary(BclNumber a, BclNumber b, const BcNumBinaryOp op, + const BcNumBinaryOpReq req) { BclError e = BCL_ERROR_NONE; - BcNum *aptr, *bptr; + BcNum* aptr; + BcNum* bptr; BcNum c; BclNumber idx; BclContext ctxt; @@ -652,42 +714,59 @@ err: return idx; } -BclNumber bcl_add(BclNumber a, BclNumber b) { +BclNumber +bcl_add(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_add, bc_num_addReq); } -BclNumber bcl_sub(BclNumber a, BclNumber b) { +BclNumber +bcl_sub(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_sub, bc_num_addReq); } -BclNumber bcl_mul(BclNumber a, BclNumber b) { +BclNumber +bcl_mul(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_mul, bc_num_mulReq); } -BclNumber bcl_div(BclNumber a, BclNumber b) { +BclNumber +bcl_div(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_div, bc_num_divReq); } -BclNumber bcl_mod(BclNumber a, BclNumber b) { +BclNumber +bcl_mod(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_mod, bc_num_divReq); } -BclNumber bcl_pow(BclNumber a, BclNumber b) { +BclNumber +bcl_pow(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_pow, bc_num_powReq); } -BclNumber bcl_lshift(BclNumber a, BclNumber b) { +BclNumber +bcl_lshift(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_lshift, bc_num_placesReq); } -BclNumber bcl_rshift(BclNumber a, BclNumber b) { +BclNumber +bcl_rshift(BclNumber a, BclNumber b) +{ return bcl_binary(a, b, bc_num_rshift, bc_num_placesReq); } -BclNumber bcl_sqrt(BclNumber a) { - +BclNumber +bcl_sqrt(BclNumber a) +{ BclError e = BCL_ERROR_NONE; - BcNum *aptr; + BcNum* aptr; BcNum b; BclNumber idx; BclContext ctxt; @@ -717,11 +796,13 @@ err: return idx; } -BclError bcl_divmod(BclNumber a, BclNumber b, BclNumber *c, BclNumber *d) { - +BclError +bcl_divmod(BclNumber a, BclNumber b, BclNumber* c, BclNumber* d) +{ BclError e = BCL_ERROR_NONE; size_t req; - BcNum *aptr, *bptr; + BcNum* aptr; + BcNum* bptr; BcNum cnum, dnum; BclContext ctxt; @@ -765,8 +846,8 @@ err: if (b.i != a.i) bcl_num_dtor(ctxt, b, bptr); // If there was an error... - if (BC_ERR(vm.err)) { - + if (BC_ERR(vm.err)) + { // Free the results. if (cnum.num != NULL) bc_num_free(&cnum); if (dnum.num != NULL) bc_num_free(&dnum); @@ -777,8 +858,8 @@ err: BC_FUNC_FOOTER(e); } - else { - + else + { BC_FUNC_FOOTER(e); // Insert the results into the context. @@ -791,11 +872,14 @@ err: return e; } -BclNumber bcl_modexp(BclNumber a, BclNumber b, BclNumber c) { - +BclNumber +bcl_modexp(BclNumber a, BclNumber b, BclNumber c) +{ BclError e = BCL_ERROR_NONE; size_t req; - BcNum *aptr, *bptr, *cptr; + BcNum* aptr; + BcNum* bptr; + BcNum* cptr; BcNum d; BclNumber idx; BclContext ctxt; @@ -848,9 +932,11 @@ err: return idx; } -ssize_t bcl_cmp(BclNumber a, BclNumber b) { - - BcNum *aptr, *bptr; +ssize_t +bcl_cmp(BclNumber a, BclNumber b) +{ + BcNum* aptr; + BcNum* bptr; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -866,9 +952,10 @@ ssize_t bcl_cmp(BclNumber a, BclNumber b) { return bc_num_cmp(aptr, bptr); } -void bcl_zero(BclNumber n) { - - BcNum *nptr; +void +bcl_zero(BclNumber n) +{ + BcNum* nptr; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -882,9 +969,10 @@ void bcl_zero(BclNumber n) { bc_num_zero(nptr); } -void bcl_one(BclNumber n) { - - BcNum *nptr; +void +bcl_one(BclNumber n) +{ + BcNum* nptr; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -898,8 +986,9 @@ void bcl_one(BclNumber n) { bc_num_one(nptr); } -BclNumber bcl_parse(const char *restrict val) { - +BclNumber +bcl_parse(const char* restrict val) +{ BclError e = BCL_ERROR_NONE; BcNum n; BclNumber idx; @@ -920,7 +1009,8 @@ BclNumber bcl_parse(const char *restrict val) { if (neg) val += 1; - if (!bc_num_strValid(val)) { + if (!bc_num_strValid(val)) + { vm.err = BCL_ERROR_PARSE_INVALID_STR; goto err; } @@ -946,10 +1036,11 @@ err: return idx; } -char* bcl_string(BclNumber n) { - - BcNum *nptr; - char *str = NULL; +char* +bcl_string(BclNumber n) +{ + BcNum* nptr; + char* str = NULL; BclContext ctxt; BC_CHECK_CTXT_ASSERT(ctxt); @@ -988,10 +1079,11 @@ err: return str; } -BclNumber bcl_irand(BclNumber a) { - +BclNumber +bcl_irand(BclNumber a) +{ BclError e = BCL_ERROR_NONE; - BcNum *aptr; + BcNum* aptr; BcNum b; BclNumber idx; BclContext ctxt; @@ -1038,8 +1130,9 @@ err: * @param b The return parameter. * @param places The number of decimal places to generate. */ -static void bcl_frandHelper(BcNum *restrict b, size_t places) { - +static void +bcl_frandHelper(BcNum* restrict b, size_t places) +{ BcNum exp, pow, ten; BcDig exp_digs[BC_NUM_BIGDIG_LOG10]; BcDig ten_digs[BC_NUM_BIGDIG_LOG10]; @@ -1078,8 +1171,9 @@ err: BC_LONGJMP_CONT; } -BclNumber bcl_frand(size_t places) { - +BclNumber +bcl_frand(size_t places) +{ BclError e = BCL_ERROR_NONE; BcNum n; BclNumber idx; @@ -1117,8 +1211,8 @@ err: * @param b The return parameter. * @param places The number of decimal places to generate. */ -static void bcl_ifrandHelper(BcNum *restrict a, BcNum *restrict b, - size_t places) +static void +bcl_ifrandHelper(BcNum* restrict a, BcNum* restrict b, size_t places) { BcNum ir, fr; @@ -1148,10 +1242,11 @@ err: BC_LONGJMP_CONT; } -BclNumber bcl_ifrand(BclNumber a, size_t places) { - +BclNumber +bcl_ifrand(BclNumber a, size_t places) +{ BclError e = BCL_ERROR_NONE; - BcNum *aptr; + BcNum* aptr; BcNum b; BclNumber idx; BclContext ctxt; @@ -1191,10 +1286,11 @@ err: return idx; } -BclError bcl_rand_seedWithNum(BclNumber n) { - +BclError +bcl_rand_seedWithNum(BclNumber n) +{ BclError e = BCL_ERROR_NONE; - BcNum *nptr; + BcNum* nptr; BclContext ctxt; BC_CHECK_CTXT_ERR(ctxt); @@ -1219,8 +1315,9 @@ err: return e; } -BclError bcl_rand_seed(unsigned char seed[BCL_SEED_SIZE]) { - +BclError +bcl_rand_seed(unsigned char seed[BCL_SEED_SIZE]) +{ BclError e = BCL_ERROR_NONE; size_t i; ulong vals[BCL_SEED_ULONGS]; @@ -1228,9 +1325,10 @@ BclError bcl_rand_seed(unsigned char seed[BCL_SEED_SIZE]) { BC_FUNC_HEADER(err); // Fill the array. - for (i = 0; i < BCL_SEED_SIZE; ++i) { - ulong val = ((ulong) seed[i]) << (((ulong) CHAR_BIT) * - (i % sizeof(ulong))); + for (i = 0; i < BCL_SEED_SIZE; ++i) + { + ulong val = ((ulong) seed[i]) + << (((ulong) CHAR_BIT) * (i % sizeof(ulong))); vals[i / sizeof(long)] |= val; } @@ -1242,12 +1340,15 @@ err: return e; } -void bcl_rand_reseed(void) { +void +bcl_rand_reseed(void) +{ bc_rand_srand(bc_vec_top(&vm.rng.v)); } -BclNumber bcl_rand_seed2num(void) { - +BclNumber +bcl_rand_seed2num(void) +{ BclError e = BCL_ERROR_NONE; BcNum n; BclNumber idx; @@ -1275,11 +1376,15 @@ err: return idx; } -BclRandInt bcl_rand_int(void) { +BclRandInt +bcl_rand_int(void) +{ return (BclRandInt) bc_rand_int(&vm.rng); } -BclRandInt bcl_rand_bounded(BclRandInt bound) { +BclRandInt +bcl_rand_bounded(BclRandInt bound) +{ if (bound <= 1) return 0; return (BclRandInt) bc_rand_bounded(&vm.rng, (BcRand) bound); } diff --git a/contrib/bc/src/main.c b/contrib/bc/src/main.c index 3146f983787e..3c86088fcafc 100644 --- a/contrib/bc/src/main.c +++ b/contrib/bc/src/main.c @@ -53,9 +53,10 @@ #include <bc.h> #include <dc.h> -int main(int argc, char *argv[]) { - - char *name; +int +main(int argc, char* argv[]) +{ + char* name; size_t len = strlen(BC_EXECPREFIX); #if BC_ENABLE_NLS @@ -67,8 +68,8 @@ int main(int argc, char *argv[]) { bc_pledge(bc_pledge_start, NULL); // Sometimes, argv[0] can be NULL. Better make sure to be robust against it. - if (argv[0] != NULL) { - + if (argv[0] != NULL) + { // Figure out the name of the calculator we are using. We can't use // basename because it's not portable, but yes, this is stripping off // the directory. diff --git a/contrib/bc/src/num.c b/contrib/bc/src/num.c index dc3f63ab076e..4839a4b87353 100644 --- a/contrib/bc/src/num.c +++ b/contrib/bc/src/num.c @@ -48,7 +48,8 @@ // Before you try to understand this code, see the development manual // (manuals/development.md#numbers). -static void bc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale); +static void +bc_num_m(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale); /** * Multiply two numbers and throw a math error if they overflow. @@ -56,7 +57,9 @@ static void bc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale); * @param b The second operand. * @return The product of the two operands. */ -static inline size_t bc_num_mulOverflow(size_t a, size_t b) { +static inline size_t +bc_num_mulOverflow(size_t a, size_t b) +{ size_t res = a * b; if (BC_ERR(BC_VM_MUL_OVERFLOW(a, b, res))) bc_err(BC_ERR_MATH_OVERFLOW); return res; @@ -68,7 +71,9 @@ static inline size_t bc_num_mulOverflow(size_t a, size_t b) { * @param n The value to turn into a signed value and negate. * @param neg The condition to negate or not. */ -static inline ssize_t bc_num_neg(size_t n, bool neg) { +static inline ssize_t +bc_num_neg(size_t n, bool neg) +{ return (((ssize_t) n) ^ -((ssize_t) neg)) + neg; } @@ -77,7 +82,9 @@ static inline ssize_t bc_num_neg(size_t n, bool neg) { * @param n The number to compare. * @return -1 if the number is less than 0, 1 if greater, and 0 if equal. */ -ssize_t bc_num_cmpZero(const BcNum *n) { +ssize_t +bc_num_cmpZero(const BcNum* n) +{ return bc_num_neg((n)->len != 0, BC_NUM_NEG(n)); } @@ -86,7 +93,9 @@ ssize_t bc_num_cmpZero(const BcNum *n) { * @param n The number to return the amount of integer limbs for. * @return The amount of integer limbs in @a n. */ -static inline size_t bc_num_int(const BcNum *n) { +static inline size_t +bc_num_int(const BcNum* n) +{ return n->len ? n->len - BC_NUM_RDX_VAL(n) : 0; } @@ -95,14 +104,15 @@ static inline size_t bc_num_int(const BcNum *n) { * @param n The number to expand. * @param req The number limbs to expand the allocation capacity to. */ -static void bc_num_expand(BcNum *restrict n, size_t req) { - +static void +bc_num_expand(BcNum* restrict n, size_t req) +{ assert(n != NULL); req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE; - if (req > n->cap) { - + if (req > n->cap) + { BC_SIG_LOCK; n->num = bc_vm_realloc(n->num, BC_NUM_SIZE(req)); @@ -117,17 +127,23 @@ static void bc_num_expand(BcNum *restrict n, size_t req) { * @param n The number to set to zero. * @param scale The scale to set the number to. */ -static void bc_num_setToZero(BcNum *restrict n, size_t scale) { +static void +bc_num_setToZero(BcNum* restrict n, size_t scale) +{ assert(n != NULL); n->scale = scale; n->len = n->rdx = 0; } -void bc_num_zero(BcNum *restrict n) { +void +bc_num_zero(BcNum* restrict n) +{ bc_num_setToZero(n, 0); } -void bc_num_one(BcNum *restrict n) { +void +bc_num_one(BcNum* restrict n) +{ bc_num_zero(n); n->len = 1; n->num[0] = 1; @@ -138,15 +154,19 @@ void bc_num_one(BcNum *restrict n) { * limbs are zero. * @param n The number to clean. */ -static void bc_num_clean(BcNum *restrict n) { - +static void +bc_num_clean(BcNum* restrict n) +{ // Reduce the length. - while (BC_NUM_NONZERO(n) && !n->num[n->len - 1]) n->len -= 1; + while (BC_NUM_NONZERO(n) && !n->num[n->len - 1]) + { + n->len -= 1; + } // Special cases. if (BC_NUM_ZERO(n)) n->rdx = 0; - else { - + else + { // len must be at least as much as rdx. size_t rdx = BC_NUM_RDX_VAL(n); if (n->len < rdx) n->len = rdx; @@ -161,10 +181,18 @@ static void bc_num_clean(BcNum *restrict n) { * @param i The number to return the log base 10 of. * @return The log base 10 of @a i. */ -static size_t bc_num_log10(size_t i) { +static size_t +bc_num_log10(size_t i) +{ size_t len; - for (len = 1; i; i /= BC_BASE, ++len); + + for (len = 1; i; i /= BC_BASE, ++len) + { + continue; + } + assert(len - 1 <= BC_BASE_DIGS + 1); + return len - 1; } @@ -175,7 +203,9 @@ static size_t bc_num_log10(size_t i) { * @return The number of decimal digits that are 0 starting at the most * significant digits. */ -static inline size_t bc_num_zeroDigits(const BcDig *n) { +static inline size_t +bc_num_zeroDigits(const BcDig* n) +{ assert(*n >= 0); assert(((size_t) *n) < BC_BASE_POW); return BC_BASE_DIGS - bc_num_log10((size_t) *n); @@ -187,7 +217,9 @@ static inline size_t bc_num_zeroDigits(const BcDig *n) { * @param n The number. * @return The number of integer digits in @a n. */ -static size_t bc_num_intDigits(const BcNum *n) { +static size_t +bc_num_intDigits(const BcNum* n) +{ size_t digits = bc_num_int(n) * BC_BASE_DIGS; if (digits > 0) digits -= bc_num_zeroDigits(n->num + n->len - 1); return digits; @@ -202,11 +234,20 @@ static size_t bc_num_intDigits(const BcNum *n) { * @param n The number. * @return The number of non-zero limbs after the decimal point. */ -static size_t bc_num_nonZeroLen(const BcNum *restrict n) { +static size_t +bc_num_nonZeroLen(const BcNum* restrict n) +{ size_t i, len = n->len; + assert(len == BC_NUM_RDX_VAL(n)); - for (i = len - 1; i < len && !n->num[i]; --i); + + for (i = len - 1; i < len && !n->num[i]; --i) + { + continue; + } + assert(i + 1 > 0); + return i + 1; } @@ -218,8 +259,9 @@ static size_t bc_num_nonZeroLen(const BcNum *restrict n) { * carry out from this add. * @return The resulting limb sum. */ -static BcDig bc_num_addDigits(BcDig a, BcDig b, bool *carry) { - +static BcDig +bc_num_addDigits(BcDig a, BcDig b, bool* carry) +{ assert(((BcBigDig) BC_BASE_POW) * 2 == ((BcDig) BC_BASE_POW) * 2); assert(a < BC_BASE_POW); assert(b < BC_BASE_POW); @@ -242,8 +284,9 @@ static BcDig bc_num_addDigits(BcDig a, BcDig b, bool *carry) { * and the carry out from this subtract. * @return The resulting limb difference. */ -static BcDig bc_num_subDigits(BcDig a, BcDig b, bool *carry) { - +static BcDig +bc_num_subDigits(BcDig a, BcDig b, bool* carry) +{ assert(a < BC_BASE_POW); assert(b < BC_BASE_POW); @@ -263,16 +306,22 @@ static BcDig bc_num_subDigits(BcDig a, BcDig b, bool *carry) { * @param b The second operand. * @param len The length of @a b. */ -static void bc_num_addArrays(BcDig *restrict a, const BcDig *restrict b, - size_t len) +static void +bc_num_addArrays(BcDig* restrict a, const BcDig* restrict b, size_t len) { size_t i; bool carry = false; - for (i = 0; i < len; ++i) a[i] = bc_num_addDigits(a[i], b[i], &carry); + for (i = 0; i < len; ++i) + { + a[i] = bc_num_addDigits(a[i], b[i], &carry); + } // Take care of the extra limbs in the bigger array. - for (; carry; ++i) a[i] = bc_num_addDigits(a[i], 0, &carry); + for (; carry; ++i) + { + a[i] = bc_num_addDigits(a[i], 0, &carry); + } } /** @@ -281,16 +330,22 @@ static void bc_num_addArrays(BcDig *restrict a, const BcDig *restrict b, * @param b The second operand. * @param len The length of @a b. */ -static void bc_num_subArrays(BcDig *restrict a, const BcDig *restrict b, - size_t len) +static void +bc_num_subArrays(BcDig* restrict a, const BcDig* restrict b, size_t len) { size_t i; bool carry = false; - for (i = 0; i < len; ++i) a[i] = bc_num_subDigits(a[i], b[i], &carry); + for (i = 0; i < len; ++i) + { + a[i] = bc_num_subDigits(a[i], b[i], &carry); + } // Take care of the extra limbs in the bigger array. - for (; carry; ++i) a[i] = bc_num_subDigits(a[i], 0, &carry); + for (; carry; ++i) + { + a[i] = bc_num_subDigits(a[i], 0, &carry); + } } /** @@ -300,8 +355,8 @@ static void bc_num_subArrays(BcDig *restrict a, const BcDig *restrict b, * @param b The one limb of the one-limb number. * @param c The return parameter. */ -static void bc_num_mulArray(const BcNum *restrict a, BcBigDig b, - BcNum *restrict c) +static void +bc_num_mulArray(const BcNum* restrict a, BcBigDig b, BcNum* restrict c) { size_t i; BcBigDig carry = 0; @@ -312,10 +367,12 @@ static void bc_num_mulArray(const BcNum *restrict a, BcBigDig b, if (a->len + 1 > c->cap) bc_num_expand(c, a->len + 1); // We want the entire return parameter to be zero for cleaning later. + // NOLINTNEXTLINE memset(c->num, 0, BC_NUM_SIZE(c->cap)); // Actual multiplication loop. - for (i = 0; i < a->len; ++i) { + for (i = 0; i < a->len; ++i) + { BcBigDig in = ((BcBigDig) a->num[i]) * b + carry; c->num[i] = in % BC_BASE_POW; carry = in / BC_BASE_POW; @@ -344,8 +401,9 @@ static void bc_num_mulArray(const BcNum *restrict a, BcBigDig b, * @param c The return parameter for the quotient. * @param rem The return parameter for the remainder. */ -static void bc_num_divArray(const BcNum *restrict a, BcBigDig b, - BcNum *restrict c, BcBigDig *rem) +static void +bc_num_divArray(const BcNum* restrict a, BcBigDig b, BcNum* restrict c, + BcBigDig* rem) { size_t i; BcBigDig carry = 0; @@ -353,7 +411,8 @@ static void bc_num_divArray(const BcNum *restrict a, BcBigDig b, assert(c->cap >= a->len); // Actual division loop. - for (i = a->len - 1; i < a->len; --i) { + for (i = a->len - 1; i < a->len; --i) + { BcBigDig in = ((BcBigDig) a->num[i]) + carry * BC_BASE_POW; assert(in / b < BC_BASE_POW); c->num[i] = (BcDig) (in / b); @@ -378,19 +437,24 @@ static void bc_num_divArray(const BcNum *restrict a, BcBigDig b, * @param b The second array. * @param len The minimum length of the arrays. */ -static ssize_t bc_num_compare(const BcDig *restrict a, const BcDig *restrict b, - size_t len) +static ssize_t +bc_num_compare(const BcDig* restrict a, const BcDig* restrict b, size_t len) { size_t i; BcDig c = 0; - for (i = len - 1; i < len && !(c = a[i] - b[i]); --i); + for (i = len - 1; i < len && !(c = a[i] - b[i]); --i) + { + continue; + } return bc_num_neg(i + 1, c < 0); } -ssize_t bc_num_cmp(const BcNum *a, const BcNum *b) { - +ssize_t +bc_num_cmp(const BcNum* a, const BcNum* b) +{ size_t i, min, a_int, b_int, diff, ardx, brdx; - BcDig *max_num, *min_num; + BcDig* max_num; + BcDig* min_num; bool a_max, neg = false; ssize_t cmp; @@ -402,7 +466,8 @@ ssize_t bc_num_cmp(const BcNum *a, const BcNum *b) { // Easy cases. if (BC_NUM_ZERO(a)) return bc_num_neg(b->len != 0, !BC_NUM_NEG(b)); if (BC_NUM_ZERO(b)) return bc_num_cmpZero(a); - if (BC_NUM_NEG(a)) { + if (BC_NUM_NEG(a)) + { if (BC_NUM_NEG(b)) neg = true; else return -1; } @@ -422,13 +487,15 @@ ssize_t bc_num_cmp(const BcNum *a, const BcNum *b) { a_max = (ardx > brdx); // Set variables based on the above. - if (a_max) { + if (a_max) + { min = brdx; diff = ardx - brdx; max_num = a->num + diff; min_num = b->num; } - else { + else + { min = ardx; diff = brdx - ardx; max_num = b->num + diff; @@ -443,15 +510,17 @@ ssize_t bc_num_cmp(const BcNum *a, const BcNum *b) { // If there was no difference, then the final step is to check which number // has greater or lesser limbs beyond the other's. - for (max_num -= diff, i = diff - 1; i < diff; --i) { + for (max_num -= diff, i = diff - 1; i < diff; --i) + { if (max_num[i]) return bc_num_neg(1, !a_max == !neg); } return 0; } -void bc_num_truncate(BcNum *restrict n, size_t places) { - +void +bc_num_truncate(BcNum* restrict n, size_t places) +{ size_t nrdx, places_rdx; if (!places) return; @@ -468,8 +537,8 @@ void bc_num_truncate(BcNum *restrict n, size_t places) { BC_NUM_RDX_SET(n, nrdx - places_rdx); // Only when the number is nonzero do we need to do the hard stuff. - if (BC_NUM_NONZERO(n)) { - + if (BC_NUM_NONZERO(n)) + { size_t pow; // This calculates how many decimal digits are in the least significant @@ -482,6 +551,7 @@ void bc_num_truncate(BcNum *restrict n, size_t places) { // We have to move limbs to maintain invariants. The limbs must begin at // the beginning of the BcNum array. + // NOLINTNEXTLINE memmove(n->num, n->num + places_rdx, BC_NUM_SIZE(n->len)); // Clear the lower part of the last digit. @@ -491,14 +561,16 @@ void bc_num_truncate(BcNum *restrict n, size_t places) { } } -void bc_num_extend(BcNum *restrict n, size_t places) { - +void +bc_num_extend(BcNum* restrict n, size_t places) +{ size_t nrdx, places_rdx; if (!places) return; // Easy case with zero; set the scale. - if (BC_NUM_ZERO(n)) { + if (BC_NUM_ZERO(n)) + { n->scale += places; return; } @@ -510,9 +582,12 @@ void bc_num_extend(BcNum *restrict n, size_t places) { // This is the hard case. We need to expand the number, move the limbs, and // set the limbs that were just cleared. - if (places_rdx) { + if (places_rdx) + { bc_num_expand(n, bc_vm_growSize(n->len, places_rdx)); + // NOLINTNEXTLINE memmove(n->num + places_rdx, n->num, BC_NUM_SIZE(n->len)); + // NOLINTNEXTLINE memset(n->num, 0, BC_NUM_SIZE(places_rdx)); } @@ -527,8 +602,8 @@ void bc_num_extend(BcNum *restrict n, size_t places) { /** * Retires (finishes) a multiplication or division operation. */ -static void bc_num_retireMul(BcNum *restrict n, size_t scale, - bool neg1, bool neg2) +static void +bc_num_retireMul(BcNum* restrict n, size_t scale, bool neg1, bool neg2) { // Make sure scale is correct. if (n->scale < scale) bc_num_extend(n, scale - n->scale); @@ -547,16 +622,17 @@ static void bc_num_retireMul(BcNum *restrict n, size_t scale, * @param a An out parameter; the low part of @a n. * @param b An out parameter; the high part of @a n. */ -static void bc_num_split(const BcNum *restrict n, size_t idx, - BcNum *restrict a, BcNum *restrict b) +static void +bc_num_split(const BcNum* restrict n, size_t idx, BcNum* restrict a, + BcNum* restrict b) { // We want a and b to be clear. assert(BC_NUM_ZERO(a)); assert(BC_NUM_ZERO(b)); // The usual case. - if (idx < n->len) { - + if (idx < n->len) + { // Set the fields first. b->len = n->len - idx; a->len = idx; @@ -569,7 +645,9 @@ static void bc_num_split(const BcNum *restrict n, size_t idx, // Copy the arrays. This is not necessary for safety, but it is faster, // for some reason. + // NOLINTNEXTLINE memcpy(b->num, n->num + idx, BC_NUM_SIZE(b->len)); + // NOLINTNEXTLINE memcpy(a->num, n->num, BC_NUM_SIZE(idx)); bc_num_clean(b); @@ -586,8 +664,9 @@ static void bc_num_split(const BcNum *restrict n, size_t idx, * @param n The number to copy. * @param r The result number with a shifted rdx, len, and num. */ -static void bc_num_shiftRdx(const BcNum *restrict n, BcNum *restrict r) { - +static void +bc_num_shiftRdx(const BcNum* restrict n, BcNum* restrict r) +{ size_t rdx = BC_NUM_RDX_VAL(n); r->len = n->len - rdx; @@ -603,15 +682,19 @@ static void bc_num_shiftRdx(const BcNum *restrict n, BcNum *restrict r) { * skipped. This must be undone by bc_num_unshiftZero(). * @param n The number to shift. */ -static size_t bc_num_shiftZero(BcNum *restrict n) { - +static size_t +bc_num_shiftZero(BcNum* restrict n) +{ size_t i; // If we don't have an integer, that is a problem, but it's also a bug // because the caller should have set everything up right. assert(!BC_NUM_RDX_VAL(n) || BC_NUM_ZERO(n)); - for (i = 0; i < n->len && !n->num[i]; ++i); + for (i = 0; i < n->len && !n->num[i]; ++i) + { + continue; + } n->len -= i; n->num += i; @@ -625,7 +708,9 @@ static size_t bc_num_shiftZero(BcNum *restrict n) { * @param n The number to unshift. * @param places_rdx The amount the number was originally shift. */ -static void bc_num_unshiftZero(BcNum *restrict n, size_t places_rdx) { +static void +bc_num_unshiftZero(BcNum* restrict n, size_t places_rdx) +{ n->len += places_rdx; n->num -= places_rdx; } @@ -638,11 +723,12 @@ static void bc_num_unshiftZero(BcNum *restrict n, size_t places_rdx) { * @param n The number to shift digits in. * @param dig The number of places to shift right. */ -static void bc_num_shift(BcNum *restrict n, BcBigDig dig) { - +static void +bc_num_shift(BcNum* restrict n, BcBigDig dig) +{ size_t i, len = n->len; BcBigDig carry = 0, pow; - BcDig *ptr = n->num; + BcDig* ptr = n->num; assert(dig < BC_BASE_DIGS); @@ -652,7 +738,8 @@ static void bc_num_shift(BcNum *restrict n, BcBigDig dig) { // Run a series of divisions and mods with carries across the entire number // array. This effectively shifts everything over. - for (i = len - 1; i < len; --i) { + for (i = len - 1; i < len; --i) + { BcBigDig in, temp; in = ((BcBigDig) ptr[i]); temp = carry * dig; @@ -669,8 +756,9 @@ static void bc_num_shift(BcNum *restrict n, BcBigDig dig) { * @param n The number to shift left. * @param places The amount of places to shift @a n left by. */ -static void bc_num_shiftLeft(BcNum *restrict n, size_t places) { - +static void +bc_num_shiftLeft(BcNum* restrict n, size_t places) +{ BcBigDig dig; size_t places_rdx; bool shift; @@ -678,13 +766,15 @@ static void bc_num_shiftLeft(BcNum *restrict n, size_t places) { if (!places) return; // Make sure to grow the number if necessary. - if (places > n->scale) { + if (places > n->scale) + { size_t size = bc_vm_growSize(BC_NUM_RDX(places - n->scale), n->len); if (size > SIZE_MAX - 1) bc_err(BC_ERR_MATH_OVERFLOW); } // If zero, we can just set the scale and bail. - if (BC_NUM_ZERO(n)) { + if (BC_NUM_ZERO(n)) + { if (n->scale >= places) n->scale -= places; else n->scale = 0; return; @@ -705,13 +795,13 @@ static void bc_num_shiftLeft(BcNum *restrict n, size_t places) { // integer doesn't is because left shift would only extend the integer, // whereas a non-integer might have its fractional part eliminated or only // partially eliminated. - if (n->scale) { - + if (n->scale) + { size_t nrdx = BC_NUM_RDX_VAL(n); // If the number's rdx is bigger, that's the hard case. - if (nrdx >= places_rdx) { - + if (nrdx >= places_rdx) + { size_t mod = n->scale % BC_BASE_DIGS, revdig; // We want mod to be in the range [1, BC_BASE_DIGS], not @@ -729,19 +819,24 @@ static void bc_num_shiftLeft(BcNum *restrict n, size_t places) { } // If this is non-zero, we need an extra place, so expand, move, and set. - if (places_rdx) { + if (places_rdx) + { bc_num_expand(n, bc_vm_growSize(n->len, places_rdx)); + // NOLINTNEXTLINE memmove(n->num + places_rdx, n->num, BC_NUM_SIZE(n->len)); + // NOLINTNEXTLINE memset(n->num, 0, BC_NUM_SIZE(places_rdx)); n->len += places_rdx; } // Set the scale appropriately. - if (places > n->scale) { + if (places > n->scale) + { n->scale = 0; BC_NUM_RDX_SET(n, 0); } - else { + else + { n->scale -= places; BC_NUM_RDX_SET(n, BC_NUM_RDX(n->scale)); } @@ -752,8 +847,9 @@ static void bc_num_shiftLeft(BcNum *restrict n, size_t places) { bc_num_clean(n); } -void bc_num_shiftRight(BcNum *restrict n, size_t places) { - +void +bc_num_shiftRight(BcNum* restrict n, size_t places) +{ BcBigDig dig; size_t places_rdx, scale, scale_mod, int_len, expand; bool shift; @@ -761,7 +857,8 @@ void bc_num_shiftRight(BcNum *restrict n, size_t places) { if (!places) return; // If zero, we can just set the scale and bail. - if (BC_NUM_ZERO(n)) { + if (BC_NUM_ZERO(n)) + { n->scale += places; bc_num_expand(n, BC_NUM_RDX(n->scale)); return; @@ -782,11 +879,13 @@ void bc_num_shiftRight(BcNum *restrict n, size_t places) { places_rdx = BC_NUM_RDX(places); // If we are going to shift past a limb boundary or not, set accordingly. - if (scale_mod + dig > BC_BASE_DIGS) { + if (scale_mod + dig > BC_BASE_DIGS) + { expand = places_rdx - 1; places_rdx = 1; } - else { + else + { expand = places_rdx; places_rdx = 0; } @@ -798,6 +897,7 @@ void bc_num_shiftRight(BcNum *restrict n, size_t places) { // Extend, expand, and zero. bc_num_extend(n, places_rdx * BC_BASE_DIGS); bc_num_expand(n, bc_vm_growSize(expand, n->len)); + // NOLINTNEXTLINE memset(n->num + n->len, 0, BC_NUM_SIZE(expand)); // Set the fields. @@ -823,7 +923,9 @@ void bc_num_shiftRight(BcNum *restrict n, size_t places) { * @param b The return parameter. This must be preallocated. * @param scale The current scale. */ -static inline void bc_num_inv(BcNum *a, BcNum *b, size_t scale) { +static inline void +bc_num_inv(BcNum* a, BcNum* b, size_t scale) +{ assert(BC_NUM_NONZERO(a)); bc_num_div(&vm.one, a, b, scale); } @@ -837,19 +939,25 @@ static inline void bc_num_inv(BcNum *a, BcNum *b, size_t scale) { * *not* be allocated. * @return True if the number is a non-integer, false otherwise. */ -static bool bc_num_nonInt(const BcNum *restrict n, BcNum *restrict r) { - +static bool +bc_num_nonInt(const BcNum* restrict n, BcNum* restrict r) +{ bool zero; size_t i, rdx = BC_NUM_RDX_VAL(n); - if (!rdx) { + if (!rdx) + { + // NOLINTNEXTLINE memcpy(r, n, sizeof(BcNum)); return false; } zero = true; - for (i = 0; zero && i < rdx; ++i) zero = (n->num[i] == 0); + for (i = 0; zero && i < rdx; ++i) + { + zero = (n->num[i] == 0); + } if (BC_ERR(!zero)) return true; @@ -868,7 +976,8 @@ static bool bc_num_nonInt(const BcNum *restrict n, BcNum *restrict r) { * @param c The result operand. * @return The second operand as a hardware integer. */ -static BcBigDig bc_num_intop(const BcNum *a, const BcNum *b, BcNum *restrict c) +static BcBigDig +bc_num_intop(const BcNum* a, const BcNum* b, BcNum* restrict c) { BcNum temp; @@ -890,19 +999,24 @@ static BcBigDig bc_num_intop(const BcNum *a, const BcNum *b, BcNum *restrict c) * @param c The return parameter. * @param sub Non-zero for a subtract, zero for an add. */ -static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { - - BcDig *ptr_c, *ptr_l, *ptr_r; +static void +bc_num_as(BcNum* a, BcNum* b, BcNum* restrict c, size_t sub) +{ + BcDig* ptr_c; + BcDig* ptr_l; + BcDig* ptr_r; size_t i, min_rdx, max_rdx, diff, a_int, b_int, min_len, max_len, max_int; size_t len_l, len_r, ardx, brdx; bool b_neg, do_sub, do_rev_sub, carry, c_neg; - if (BC_NUM_ZERO(b)) { + if (BC_NUM_ZERO(b)) + { bc_num_copy(c, a); return; } - if (BC_NUM_ZERO(a)) { + if (BC_NUM_ZERO(a)) + { bc_num_copy(c, b); c->rdx = BC_NUM_NEG_VAL(c, BC_NUM_NEG(b) != sub); return; @@ -930,17 +1044,18 @@ static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { max_len = max_int + max_rdx; - if (do_sub) { - + if (do_sub) + { // Check whether b has to be subtracted from a or a from b. if (a_int != b_int) do_rev_sub = (a_int < b_int); else if (ardx > brdx) + { do_rev_sub = (bc_num_compare(a->num + diff, b->num, b->len) < 0); - else - do_rev_sub = (bc_num_compare(a->num, b->num + diff, a->len) <= 0); + } + else do_rev_sub = (bc_num_compare(a->num, b->num + diff, a->len) <= 0); } - else { - + else + { // The result array of the addition might come out one element // longer than the bigger of the operand arrays. max_len += 1; @@ -950,13 +1065,15 @@ static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { assert(max_len <= c->cap); // Cache values for simple code later. - if (do_rev_sub) { + if (do_rev_sub) + { ptr_l = b->num; ptr_r = a->num; len_l = b->len; len_r = a->len; } - else { + else + { ptr_l = a->num; ptr_r = b->num; len_l = a->len; @@ -968,34 +1085,38 @@ static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { // This is true if the numbers have a different number of limbs after the // decimal point. - if (diff) { - + if (diff) + { // If the rdx values of the operands do not match, the result will // have low end elements that are the positive or negative trailing // elements of the operand with higher rdx value. - if ((ardx > brdx) != do_rev_sub) { - + if ((ardx > brdx) != do_rev_sub) + { // !do_rev_sub && ardx > brdx || do_rev_sub && brdx > ardx // The left operand has BcDig values that need to be copied, // either from a or from b (in case of a reversed subtraction). + // NOLINTNEXTLINE memcpy(ptr_c, ptr_l, BC_NUM_SIZE(diff)); ptr_l += diff; len_l -= diff; } - else { - + else + { // The right operand has BcDig values that need to be copied // or subtracted from zero (in case of a subtraction). - if (do_sub) { - + if (do_sub) + { // do_sub (do_rev_sub && ardx > brdx || // !do_rev_sub && brdx > ardx) for (i = 0; i < diff; i++) + { ptr_c[i] = bc_num_subDigits(0, ptr_r[i], &carry); + } } - else { - + else + { // !do_sub && brdx > ardx + // NOLINTNEXTLINE memcpy(ptr_c, ptr_r, BC_NUM_SIZE(diff)); } @@ -1018,23 +1139,33 @@ static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { // Inlining takes care of eliminating constant zero arguments to // addDigit/subDigit (checked in disassembly of resulting bc binary // compiled with gcc and clang). - if (do_sub) { - + if (do_sub) + { // Actual subtraction. for (i = 0; i < min_len; ++i) + { ptr_c[i] = bc_num_subDigits(ptr_l[i], ptr_r[i], &carry); + } // Finishing the limbs beyond the direct subtraction. - for (; i < len_l; ++i) ptr_c[i] = bc_num_subDigits(ptr_l[i], 0, &carry); + for (; i < len_l; ++i) + { + ptr_c[i] = bc_num_subDigits(ptr_l[i], 0, &carry); + } } - else { - + else + { // Actual addition. for (i = 0; i < min_len; ++i) + { ptr_c[i] = bc_num_addDigits(ptr_l[i], ptr_r[i], &carry); + } // Finishing the limbs beyond the direct addition. - for (; i < len_l; ++i) ptr_c[i] = bc_num_addDigits(ptr_l[i], 0, &carry); + for (; i < len_l; ++i) + { + ptr_c[i] = bc_num_addDigits(ptr_l[i], 0, &carry); + } // Addition can create an extra limb. We take care of that here. ptr_c[i] = bc_num_addDigits(0, 0, &carry); @@ -1060,10 +1191,13 @@ static void bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) { * @param b The second operand. * @param c The return parameter. */ -static void bc_num_m_simp(const BcNum *a, const BcNum *b, BcNum *restrict c) { - +static void +bc_num_m_simp(const BcNum* a, const BcNum* b, BcNum* restrict c) +{ size_t i, alen = a->len, blen = b->len, clen; - BcDig *ptr_a = a->num, *ptr_b = b->num, *ptr_c; + BcDig* ptr_a = a->num; + BcDig* ptr_b = b->num; + BcDig* ptr_c; BcBigDig sum = 0, carry = 0; assert(sizeof(sum) >= sizeof(BcDig) * 2); @@ -1075,14 +1209,15 @@ static void bc_num_m_simp(const BcNum *a, const BcNum *b, BcNum *restrict c) { // If we don't memset, then we might have uninitialized data use later. ptr_c = c->num; + // NOLINTNEXTLINE memset(ptr_c, 0, BC_NUM_SIZE(c->cap)); // This is the actual multiplication loop. It uses the lattice form of long // multiplication (see the explanation on the web page at // https://knilt.arcc.albany.edu/What_is_Lattice_Multiplication or the // explanation at Wikipedia). - for (i = 0; i < clen; ++i) { - + for (i = 0; i < clen; ++i) + { ssize_t sidx = (ssize_t) (i - blen + 1); size_t j, k; @@ -1092,18 +1227,20 @@ static void bc_num_m_simp(const BcNum *a, const BcNum *b, BcNum *restrict c) { // On every iteration of this loop, a multiplication happens, then the // sum is automatically calculated. - for (; j < alen && k < blen; ++j, --k) { - + for (; j < alen && k < blen; ++j, --k) + { sum += ((BcBigDig) ptr_a[j]) * ((BcBigDig) ptr_b[k]); - if (sum >= ((BcBigDig) BC_BASE_POW) * BC_BASE_POW) { + if (sum >= ((BcBigDig) BC_BASE_POW) * BC_BASE_POW) + { carry += sum / BC_BASE_POW; sum %= BC_BASE_POW; } } // Calculate the carry. - if (sum >= BC_BASE_POW) { + if (sum >= BC_BASE_POW) + { carry += sum / BC_BASE_POW; sum %= BC_BASE_POW; } @@ -1131,8 +1268,9 @@ static void bc_num_m_simp(const BcNum *a, const BcNum *b, BcNum *restrict c) { * @param op The function to call, either bc_num_addArrays() or * bc_num_subArrays(). */ -static void bc_num_shiftAddSub(BcNum *restrict n, const BcNum *restrict a, - size_t shift, BcNumShiftAddOp op) +static void +bc_num_shiftAddSub(BcNum* restrict n, const BcNum* restrict a, size_t shift, + BcNumShiftAddOp op) { assert(n->len >= shift + a->len); assert(!BC_NUM_RDX_VAL(n) && !BC_NUM_RDX_VAL(a)); @@ -1142,11 +1280,13 @@ static void bc_num_shiftAddSub(BcNum *restrict n, const BcNum *restrict a, /** * Implements the Karatsuba algorithm. */ -static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { - +static void +bc_num_k(const BcNum* a, const BcNum* b, BcNum* restrict c) +{ size_t max, max2, total; BcNum l1, h1, l2, h2, m2, m1, z0, z1, z2, temp; - BcDig *digs, *dig_ptr; + BcDig* digs; + BcDig* dig_ptr; BcNumShiftAddOp op; bool aone = BC_NUM_ONE(a); @@ -1154,14 +1294,16 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { if (BC_NUM_ZERO(a) || BC_NUM_ZERO(b)) return; - if (aone || BC_NUM_ONE(b)) { + if (aone || BC_NUM_ONE(b)) + { bc_num_copy(c, aone ? b : a); if ((aone && BC_NUM_NEG(a)) || BC_NUM_NEG(b)) BC_NUM_NEG_TGL(c); return; } // Shell out to the simple algorithm with certain conditions. - if (a->len < BC_NUM_KARATSUBA_LEN || b->len < BC_NUM_KARATSUBA_LEN) { + if (a->len < BC_NUM_KARATSUBA_LEN || b->len < BC_NUM_KARATSUBA_LEN) + { bc_num_m_simp(a, b, c); return; } @@ -1210,6 +1352,7 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { // First, set up c. bc_num_expand(c, max); c->len = max; + // NOLINTNEXTLINE memset(c->num, 0, BC_NUM_SIZE(c->len)); // Split the parameters. @@ -1225,8 +1368,8 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { // the ollocations and splits are done, the algorithm is pretty // straightforward. - if (BC_NUM_NONZERO(&h1) && BC_NUM_NONZERO(&h2)) { - + if (BC_NUM_NONZERO(&h1) && BC_NUM_NONZERO(&h2)) + { assert(BC_NUM_RDX_VALID_NP(h1)); assert(BC_NUM_RDX_VALID_NP(h2)); @@ -1237,8 +1380,8 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { bc_num_shiftAddSub(c, &z2, max2, bc_num_addArrays); } - if (BC_NUM_NONZERO(&l1) && BC_NUM_NONZERO(&l2)) { - + if (BC_NUM_NONZERO(&l1) && BC_NUM_NONZERO(&l2)) + { assert(BC_NUM_RDX_VALID_NP(l1)); assert(BC_NUM_RDX_VALID_NP(l2)); @@ -1249,8 +1392,8 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { bc_num_shiftAddSub(c, &z0, 0, bc_num_addArrays); } - if (BC_NUM_NONZERO(&m1) && BC_NUM_NONZERO(&m2)) { - + if (BC_NUM_NONZERO(&m1) && BC_NUM_NONZERO(&m2)) + { assert(BC_NUM_RDX_VALID_NP(m1)); assert(BC_NUM_RDX_VALID_NP(m1)); @@ -1258,7 +1401,8 @@ static void bc_num_k(const BcNum *a, const BcNum *b, BcNum *restrict c) { bc_num_clean(&z1); op = (BC_NUM_NEG_NP(m1) != BC_NUM_NEG_NP(m2)) ? - bc_num_subArrays : bc_num_addArrays; + bc_num_subArrays : + bc_num_addArrays; bc_num_shiftAddSub(c, &z1, max2, op); } @@ -1281,8 +1425,9 @@ err: * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_m(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcNum cpa, cpb; size_t ascale, bscale, ardx, brdx, azero = 0, bzero = 0, zero, len, rscale; @@ -1302,17 +1447,19 @@ static void bc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // If this condition is true, we can use bc_num_mulArray(), which would be // much faster. - if ((a->len == 1 || b->len == 1) && !a->rdx && !b->rdx) { - - BcNum *operand; + if ((a->len == 1 || b->len == 1) && !a->rdx && !b->rdx) + { + BcNum* operand; BcBigDig dig; // Set the correct operands. - if (a->len == 1) { + if (a->len == 1) + { dig = (BcBigDig) a->num[0]; operand = b; } - else { + else + { dig = (BcBigDig) b->num[0]; operand = a; } @@ -1321,7 +1468,9 @@ static void bc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // Need to make sure the sign is correct. if (BC_NUM_NONZERO(c)) + { c->rdx = BC_NUM_NEG_VAL(c, BC_NUM_NEG(a) != BC_NUM_NEG(b)); + } return; } @@ -1408,10 +1557,18 @@ err: * @param len The length of the array. * @return True if @a has any non-zero limbs, false otherwise. */ -static bool bc_num_nonZeroDig(BcDig *restrict a, size_t len) { +static bool +bc_num_nonZeroDig(BcDig* restrict a, size_t len) +{ size_t i; + bool nonzero = false; - for (i = len - 1; !nonzero && i < len; --i) nonzero = (a[i] != 0); + + for (i = len - 1; !nonzero && i < len; --i) + { + nonzero = (a[i] != 0); + } + return nonzero; } @@ -1424,12 +1581,14 @@ static bool bc_num_nonZeroDig(BcDig *restrict a, size_t len) { * @param len The length to assume the arrays are. This is always less than the * actual length because of how this is implemented. */ -static ssize_t bc_num_divCmp(const BcDig *a, const BcNum *b, size_t len) { - +static ssize_t +bc_num_divCmp(const BcDig* a, const BcNum* b, size_t len) +{ ssize_t cmp; if (b->len > len && a[len]) cmp = bc_num_compare(a, b->num, len + 1); - else if (b->len <= len) { + else if (b->len <= len) + { if (a[len]) cmp = 1; else cmp = bc_num_compare(a, b->num, len); } @@ -1446,8 +1605,8 @@ static ssize_t bc_num_divCmp(const BcDig *a, const BcNum *b, size_t len) { * @param b The second operand. * @param divisor The divisor estimate. */ -static void bc_num_divExtend(BcNum *restrict a, BcNum *restrict b, - BcBigDig divisor) +static void +bc_num_divExtend(BcNum* restrict a, BcNum* restrict b, BcBigDig divisor) { size_t pow; @@ -1467,8 +1626,9 @@ static void bc_num_divExtend(BcNum *restrict a, BcNum *restrict b, * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, - BcNum *restrict c, size_t scale) +static void +bc_num_d_long(BcNum* restrict a, BcNum* restrict b, BcNum* restrict c, + size_t scale) { BcBigDig divisor; size_t len, end, i, rdx; @@ -1485,6 +1645,7 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, // This is a final time to make sure c is big enough and that its array is // properly zeroed. bc_num_expand(c, a->len); + // NOLINTNEXTLINE memset(c->num, 0, c->cap * sizeof(BcDig)); // Setup. @@ -1498,8 +1659,8 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, // The entire bit of code in this if statement is to tighten the estimate of // the divisor. The condition asks if b has any other non-zero limbs. - if (len > 1 && bc_num_nonZeroDig(b->num, len - 1)) { - + if (len > 1 && bc_num_nonZeroDig(b->num, len - 1)) + { // This takes a little bit of understanding. The "10*BC_BASE_DIGS/6+1" // results in either 16 for 64-bit 9-digit limbs or 7 for 32-bit 4-digit // limbs. Then it shifts a 1 by that many, which in both cases, puts the @@ -1509,8 +1670,8 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, nonzero = (divisor > 1 << ((10 * BC_BASE_DIGS) / 6 + 1)); // If the divisor is *not* greater than half the limb... - if (!nonzero) { - + if (!nonzero) + { // Extend the parameters by the number of missing digits in the // divisor. bc_num_divExtend(a, b, divisor); @@ -1539,6 +1700,7 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, // Make sure c can fit the new length. bc_num_expand(c, a->len); + // NOLINTNEXTLINE memset(c->num, 0, BC_NUM_SIZE(c->cap)); assert(c->scale >= scale); @@ -1553,10 +1715,10 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, BC_SIG_UNLOCK; // This is the actual division loop. - for (i = end - 1; i < end && i >= rdx && BC_NUM_NONZERO(a); --i) { - + for (i = end - 1; i < end && i >= rdx && BC_NUM_NONZERO(a); --i) + { ssize_t cmp; - BcDig *n; + BcDig* n; BcBigDig result; n = a->num + i; @@ -1568,8 +1730,8 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, // This is true if n is greater than b, which means that division can // proceed, so this inner loop is the part that implements one instance // of the division. - while (cmp >= 0) { - + while (cmp >= 0) + { BcBigDig n1, dividend, quotient; // These should be named obviously enough. Just imagine that it's a @@ -1581,12 +1743,13 @@ static void bc_num_d_long(BcNum *restrict a, BcNum *restrict b, // If this is true, then we can just subtract. Remember: setting // quotient to 1 is not bad because we already know that n is // greater than b. - if (quotient <= 1) { + if (quotient <= 1) + { quotient = 1; bc_num_subArrays(n, b->num, len); } - else { - + else + { assert(quotient <= BC_BASE_POW); // We need to multiply and subtract for a quotient above 1. @@ -1625,26 +1788,30 @@ err: * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_d(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ size_t len, cpardx; BcNum cpa, cpb; if (BC_NUM_ZERO(b)) bc_err(BC_ERR_MATH_DIVIDE_BY_ZERO); - if (BC_NUM_ZERO(a)) { + if (BC_NUM_ZERO(a)) + { bc_num_setToZero(c, scale); return; } - if (BC_NUM_ONE(b)) { + if (BC_NUM_ONE(b)) + { bc_num_copy(c, a); bc_num_retireMul(c, scale, BC_NUM_NEG(a), BC_NUM_NEG(b)); return; } // If this is true, we can use bc_num_divArray(), which would be faster. - if (!BC_NUM_RDX_VAL(a) && !BC_NUM_RDX_VAL(b) && b->len == 1 && !scale) { + if (!BC_NUM_RDX_VAL(a) && !BC_NUM_RDX_VAL(b) && b->len == 1 && !scale) + { BcBigDig rem; bc_num_divArray(a, (BcBigDig) b->num[0], c, &rem); bc_num_retireMul(c, scale, BC_NUM_NEG(a), BC_NUM_NEG(b)); @@ -1670,7 +1837,8 @@ static void bc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // Like the above comment, we want the copy of the first parameter to be // larger than the second parameter. - if (len > cpa.len) { + if (len > cpa.len) + { bc_num_expand(&cpa, bc_vm_growSize(len, 2)); bc_num_extend(&cpa, (len - cpa.len) * BC_BASE_DIGS); } @@ -1685,7 +1853,8 @@ static void bc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { cpa.scale = cpardx * BC_BASE_DIGS; // Once again, just setting things up, this time to match scale. - if (scale > cpa.scale) { + if (scale > cpa.scale) + { bc_num_extend(&cpa, scale); cpardx = BC_NUM_RDX_VAL_NP(cpa); cpa.scale = cpardx * BC_BASE_DIGS; @@ -1730,15 +1899,17 @@ err: * @param ts The scale that the operation should be done to. Yes, it's not * necessarily the same as scale, per the bc spec. */ -static void bc_num_r(BcNum *a, BcNum *b, BcNum *restrict c, - BcNum *restrict d, size_t scale, size_t ts) +static void +bc_num_r(BcNum* a, BcNum* b, BcNum* restrict c, BcNum* restrict d, size_t scale, + size_t ts) { BcNum temp; bool neg; if (BC_NUM_ZERO(b)) bc_err(BC_ERR_MATH_DIVIDE_BY_ZERO); - if (BC_NUM_ZERO(a)) { + if (BC_NUM_ZERO(a)) + { bc_num_setToZero(c, ts); bc_num_setToZero(d, ts); return; @@ -1786,8 +1957,9 @@ err: * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_rem(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_rem(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcNum c1; size_t ts; @@ -1818,8 +1990,9 @@ err: * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_p(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcNum copy, btemp; BcBigDig exp; size_t powrdx, resrdx; @@ -1827,18 +2000,21 @@ static void bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { if (BC_ERR(bc_num_nonInt(b, &btemp))) bc_err(BC_ERR_MATH_NON_INTEGER); - if (BC_NUM_ZERO(&btemp)) { + if (BC_NUM_ZERO(&btemp)) + { bc_num_one(c); return; } - if (BC_NUM_ZERO(a)) { + if (BC_NUM_ZERO(a)) + { if (BC_NUM_NEG_NP(btemp)) bc_err(BC_ERR_MATH_DIVIDE_BY_ZERO); bc_num_setToZero(c, scale); return; } - if (BC_NUM_ONE(&btemp)) { + if (BC_NUM_ONE(&btemp)) + { if (!BC_NUM_NEG_NP(btemp)) bc_num_copy(c, a); else bc_num_inv(a, c, scale); return; @@ -1859,7 +2035,8 @@ static void bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // If this is true, then we do not have to do a division, and we need to // set scale accordingly. - if (!neg) { + if (!neg) + { size_t max = BC_MAX(scale, a->scale), scalepow; scalepow = bc_num_mulOverflow(a->scale, exp); scale = BC_MIN(scalepow, max); @@ -1867,7 +2044,8 @@ static void bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // This is only implementing the first exponentiation by squaring, until it // reaches the first time where the square is actually used. - for (powrdx = a->scale; !(exp & 1); exp >>= 1) { + for (powrdx = a->scale; !(exp & 1); exp >>= 1) + { powrdx <<= 1; assert(BC_NUM_RDX_VALID_NP(copy)); bc_num_mul(©, ©, ©, powrdx); @@ -1880,15 +2058,16 @@ static void bc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { // Now finish the exponentiation by squaring, this time saving the squares // as necessary. - while (exp >>= 1) { - + while (exp >>= 1) + { powrdx <<= 1; assert(BC_NUM_RDX_VALID_NP(copy)); bc_num_mul(©, ©, ©, powrdx); // If this is true, we want to save that particular square. This does // that by multiplying c with copy. - if (exp & 1) { + if (exp & 1) + { resrdx += powrdx; assert(BC_NUM_RDX_VALID(c)); assert(BC_NUM_RDX_VALID_NP(copy)); @@ -1918,8 +2097,9 @@ err: * @param c The return parameter. * @param scale The current scale. */ -static void bc_num_place(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_place(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcBigDig val; BC_UNUSED(scale); @@ -1934,8 +2114,9 @@ static void bc_num_place(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { /** * Implements the left shift operator. This is a BcNumBinOp function. */ -static void bc_num_left(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_left(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcBigDig val; BC_UNUSED(scale); @@ -1948,8 +2129,9 @@ static void bc_num_left(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { /** * Implements the right shift operator. This is a BcNumBinOp function. */ -static void bc_num_right(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { - +static void +bc_num_right(BcNum* a, BcNum* b, BcNum* restrict c, size_t scale) +{ BcBigDig val; BC_UNUSED(scale); @@ -1980,10 +2162,13 @@ static void bc_num_right(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale) { * @param scale The current scale. * @param req The number of limbs needed to fit the result. */ -static void bc_num_binary(BcNum *a, BcNum *b, BcNum *c, size_t scale, - BcNumBinOp op, size_t req) +static void +bc_num_binary(BcNum* a, BcNum* b, BcNum* c, size_t scale, BcNumBinOp op, + size_t req) { - BcNum *ptr_a, *ptr_b, num2; + BcNum* ptr_a; + BcNum* ptr_b; + BcNum num2; bool init = false; assert(a != NULL && b != NULL && c != NULL && op != NULL); @@ -1994,35 +2179,40 @@ static void bc_num_binary(BcNum *a, BcNum *b, BcNum *c, size_t scale, BC_SIG_LOCK; // Reallocate if c == a. - if (c == a) { - + if (c == a) + { ptr_a = &num2; + // NOLINTNEXTLINE memcpy(ptr_a, c, sizeof(BcNum)); init = true; } - else { + else + { ptr_a = a; } // Also reallocate if c == b. - if (c == b) { - + if (c == b) + { ptr_b = &num2; - if (c != a) { + if (c != a) + { + // NOLINTNEXTLINE memcpy(ptr_b, c, sizeof(BcNum)); init = true; } } - else { + else + { ptr_b = b; } // Actually reallocate. If we don't reallocate, we want to expand at the // very least. - if (init) { - + if (init) + { bc_num_init(c, req); // Must prepare for cleanup. We want this here so that locals that got @@ -2030,7 +2220,8 @@ static void bc_num_binary(BcNum *a, BcNum *b, BcNum *c, size_t scale, BC_SETJMP_LOCKED(err); BC_SIG_UNLOCK; } - else { + else + { BC_SIG_UNLOCK; bc_num_expand(c, req); } @@ -2049,15 +2240,14 @@ static void bc_num_binary(BcNum *a, BcNum *b, BcNum *c, size_t scale, err: // Cleanup only needed if we initialized c to a new number. - if (init) { + if (init) + { BC_SIG_MAYLOCK; bc_num_free(&num2); BC_LONGJMP_CONT; } } -#if !defined(NDEBUG) || BC_ENABLE_LIBRARY - /** * Tests a number string for validity. This function has a history; I originally * wrote it because I did not trust my parser. Over time, however, I came to @@ -2067,8 +2257,9 @@ err: * @param val The string to check to see if it's a valid number string. * @return True if the string is a valid number string, false otherwise. */ -bool bc_num_strValid(const char *restrict val) { - +bool +bc_num_strValid(const char* restrict val) +{ bool radix = false; size_t i, len = strlen(val); @@ -2080,13 +2271,13 @@ bool bc_num_strValid(const char *restrict val) { if (!len) return true; // Loop through the characters. - for (i = 0; i < len; ++i) { - + for (i = 0; i < len; ++i) + { BcDig c = val[i]; // If we have found a radix point... - if (c == '.') { - + if (c == '.') + { // We don't allow two radices. if (radix) return false; @@ -2100,7 +2291,6 @@ bool bc_num_strValid(const char *restrict val) { return true; } -#endif // !defined(NDEBUG) || BC_ENABLE_LIBRARY /** * Parses one character and returns the digit that corresponds to that @@ -2109,13 +2299,14 @@ bool bc_num_strValid(const char *restrict val) { * @param base The base. * @return The character as a digit. */ -static BcBigDig bc_num_parseChar(char c, size_t base) { - +static BcBigDig +bc_num_parseChar(char c, size_t base) +{ assert(isupper(c) || isdigit(c)); // If a letter... - if (isupper(c)) { - + if (isupper(c)) + { // This returns the digit that directly corresponds with the letter. c = BC_NUM_NUM_LETTER(c); @@ -2134,14 +2325,18 @@ static BcBigDig bc_num_parseChar(char c, size_t base) { * @param n The number to parse into and return. Must be preallocated. * @param val The string to parse. */ -static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) { - +static void +bc_num_parseDecimal(BcNum* restrict n, const char* restrict val) +{ size_t len, i, temp, mod; - const char *ptr; + const char* ptr; bool zero = true, rdx; // Eat leading zeroes. - for (i = 0; val[i] == '0'; ++i); + for (i = 0; val[i] == '0'; ++i) + { + continue; + } val += i; assert(!val[0] || isalnum(val[0]) || val[0] == '.'); @@ -2161,13 +2356,16 @@ static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) { // We eat leading zeroes again. These leading zeroes are different because // they will come after the decimal point if they exist, and since that's // the case, they must be preserved. - for (i = 0; i < len && (zero = (val[i] == '0' || val[i] == '.')); ++i); + for (i = 0; i < len && (zero = (val[i] == '0' || val[i] == '.')); ++i) + { + continue; + } // Set the scale of the number based on the location of the decimal point. // The casts to uintptr_t is to ensure that bc does not hit undefined // behavior when doing math on the values. - n->scale = (size_t) (rdx * (((uintptr_t) (val + len)) - - (((uintptr_t) ptr) + 1))); + n->scale = (size_t) (rdx * + (((uintptr_t) (val + len)) - (((uintptr_t) ptr) + 1))); // Set rdx. BC_NUM_RDX_SET(n, BC_NUM_RDX(n->scale)); @@ -2182,15 +2380,17 @@ static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) { // Expand and zero. bc_num_expand(n, n->len); + // NOLINTNEXTLINE memset(n->num, 0, BC_NUM_SIZE(n->len)); - if (zero) { + if (zero) + { // I think I can set rdx directly to zero here because n should be a // new number with sign set to false. n->len = n->rdx = 0; } - else { - + else + { // There is actually stuff to parse if we make it here. Yay... BcBigDig exp, pow; @@ -2202,14 +2402,14 @@ static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) { // Parse loop. We parse backwards because numbers are stored little // endian. - for (i = len - 1; i < len; --i, ++exp) { - + for (i = len - 1; i < len; --i, ++exp) + { char c = val[i]; // Skip the decimal point. if (c == '.') exp -= 1; - else { - + else + { // The index of the limb. size_t idx = exp / BC_BASE_DIGS; @@ -2233,17 +2433,23 @@ static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) { * @param val The string to parse. * @param base The base to parse as. */ -static void bc_num_parseBase(BcNum *restrict n, const char *restrict val, - BcBigDig base) +static void +bc_num_parseBase(BcNum* restrict n, const char* restrict val, BcBigDig base) { - BcNum temp, mult1, mult2, result1, result2, *m1, *m2, *ptr; + BcNum temp, mult1, mult2, result1, result2; + BcNum* m1; + BcNum* m2; + BcNum* ptr; char c = 0; bool zero = true; BcBigDig v; size_t i, digs, len = strlen(val); // If zero, just return because the number should be virgin (already 0). - for (i = 0; zero && i < len; ++i) zero = (val[i] == '.' || val[i] == '0'); + for (i = 0; zero && i < len; ++i) + { + zero = (val[i] == '.' || val[i] == '0'); + } if (zero) return; BC_SIG_LOCK; @@ -2260,8 +2466,8 @@ static void bc_num_parseBase(BcNum *restrict n, const char *restrict val, // Parse the integer part. This is the easy part because we just multiply // the number by the base, then add the digit. - for (i = 0; i < len && (c = val[i]) && c != '.'; ++i) { - + for (i = 0; i < len && (c = val[i]) && c != '.'; ++i) + { // Convert the character to a digit. v = bc_num_parseChar(c, base); @@ -2299,8 +2505,8 @@ static void bc_num_parseBase(BcNum *restrict n, const char *restrict val, m2 = &mult2; // Parse the fractional part. This is the hard part. - for (i += 1, digs = 0; i < len && (c = val[i]); ++i, ++digs) { - + for (i += 1, digs = 0; i < len && (c = val[i]); ++i, ++digs) + { size_t rdx; // Convert the character to a digit. @@ -2343,7 +2549,8 @@ static void bc_num_parseBase(BcNum *restrict n, const char *restrict val, bc_num_add(n, &result2, n, digs); // Basic cleanup. - if (BC_NUM_NONZERO(n)) { + if (BC_NUM_NONZERO(n)) + { if (n->scale < digs) bc_num_extend(n, digs - n->scale); } else bc_num_zero(n); @@ -2364,9 +2571,12 @@ int_err: * Prints a backslash+newline combo if the number of characters needs it. This * is really a convenience function. */ -static inline void bc_num_printNewline(void) { +static inline void +bc_num_printNewline(void) +{ #if !BC_ENABLE_LIBRARY - if (vm.nchars >= vm.line_len - 1 && vm.line_len) { + if (vm.nchars >= vm.line_len - 1 && vm.line_len) + { bc_vm_putchar('\\', bc_flush_none); bc_vm_putchar('\n', bc_flush_err); } @@ -2378,7 +2588,9 @@ static inline void bc_num_printNewline(void) { * @param c The character to print. * @param bslash Whether to print a backslash+newline. */ -static void bc_num_putchar(int c, bool bslash) { +static void +bc_num_putchar(int c, bool bslash) +{ if (c != '\n' && bslash) bc_num_printNewline(); bc_vm_putchar(c, bc_flush_save); } @@ -2396,7 +2608,9 @@ static void bc_num_putchar(int c, bool bslash) { * @param bslash True if a backslash+newline should be printed if the character * limit for the line is reached, false otherwise. */ -static void bc_num_printChar(size_t n, size_t len, bool rdx, bool bslash) { +static void +bc_num_printChar(size_t n, size_t len, bool rdx, bool bslash) +{ BC_UNUSED(rdx); BC_UNUSED(len); BC_UNUSED(bslash); @@ -2416,19 +2630,23 @@ static void bc_num_printChar(size_t n, size_t len, bool rdx, bool bslash) { * @param bslash True if a backslash+newline should be printed if the character * limit for the line is reached, false otherwise. */ -static void bc_num_printDigits(size_t n, size_t len, bool rdx, bool bslash) { - +static void +bc_num_printDigits(size_t n, size_t len, bool rdx, bool bslash) +{ size_t exp, pow; // If needed, print the radix; otherwise, print a space to separate digits. bc_num_putchar(rdx ? '.' : ' ', true); // Calculate the exponent and power. - for (exp = 0, pow = 1; exp < len - 1; ++exp, pow *= BC_BASE); + for (exp = 0, pow = 1; exp < len - 1; ++exp, pow *= BC_BASE) + { + continue; + } // Print each character individually. - for (exp = 0; exp < len; pow /= BC_BASE, ++exp) { - + for (exp = 0; exp < len; pow /= BC_BASE, ++exp) + { // The individual subdigit. size_t dig = n / pow; @@ -2451,8 +2669,9 @@ static void bc_num_printDigits(size_t n, size_t len, bool rdx, bool bslash) { * @param bslash True if a backslash+newline should be printed if the character * limit for the line is reached, false otherwise. */ -static void bc_num_printHex(size_t n, size_t len, bool rdx, bool bslash) { - +static void +bc_num_printHex(size_t n, size_t len, bool rdx, bool bslash) +{ BC_UNUSED(len); BC_UNUSED(bslash); @@ -2469,15 +2688,16 @@ static void bc_num_printHex(size_t n, size_t len, bool rdx, bool bslash) { * @param n The number to print. * @param newline Whether to print backslash+newlines on long enough lines. */ -static void bc_num_printDecimal(const BcNum *restrict n, bool newline) { - +static void +bc_num_printDecimal(const BcNum* restrict n, bool newline) +{ size_t i, j, rdx = BC_NUM_RDX_VAL(n); bool zero = true; size_t buffer[BC_BASE_DIGS]; // Print loop. - for (i = n->len - 1; i < n->len; --i) { - + for (i = n->len - 1; i < n->len; --i) + { BcDig n9 = n->num[i]; size_t temp; bool irdx = (i == rdx - 1); @@ -2487,25 +2707,27 @@ static void bc_num_printDecimal(const BcNum *restrict n, bool newline) { temp = n->scale % BC_BASE_DIGS; temp = i || !temp ? 0 : BC_BASE_DIGS - temp; + // NOLINTNEXTLINE memset(buffer, 0, BC_BASE_DIGS * sizeof(size_t)); // Fill the buffer with individual digits. - for (j = 0; n9 && j < BC_BASE_DIGS; ++j) { + for (j = 0; n9 && j < BC_BASE_DIGS; ++j) + { buffer[j] = ((size_t) n9) % BC_BASE; n9 /= BC_BASE; } // Print the digits in the buffer. - for (j = BC_BASE_DIGS - 1; j < BC_BASE_DIGS && j >= temp; --j) { - + for (j = BC_BASE_DIGS - 1; j < BC_BASE_DIGS && j >= temp; --j) + { // Figure out whether to print the decimal point. bool print_rdx = (irdx & (j == BC_BASE_DIGS - 1)); // The zero variable helps us skip leading zero digits in the limb. zero = (zero && buffer[j] == 0); - if (!zero) { - + if (!zero) + { // While the first three arguments should be self-explanatory, // the last needs explaining. I don't want to print a newline // when the last digit to be printed could take the place of the @@ -2527,8 +2749,8 @@ static void bc_num_printDecimal(const BcNum *restrict n, bool newline) { * @param eng True if we are in engineering mode. * @param newline Whether to print backslash+newlines on long enough lines. */ -static void bc_num_printExponent(const BcNum *restrict n, - bool eng, bool newline) +static void +bc_num_printExponent(const BcNum* restrict n, bool eng, bool newline) { size_t places, mod, nrdx = BC_NUM_RDX_VAL(n); bool neg = (n->len <= nrdx); @@ -2545,15 +2767,16 @@ static void bc_num_printExponent(const BcNum *restrict n, // We need to calculate the exponents, and they change based on whether the // number is all fractional or not, obviously. - if (neg) { - + if (neg) + { // Figure out how many limbs after the decimal point is zero. size_t i, idx = bc_num_nonZeroLen(n) - 1; places = 1; // Figure out how much in the last limb is zero. - for (i = BC_BASE_DIGS - 1; i < BC_BASE_DIGS; --i) { + for (i = BC_BASE_DIGS - 1; i < BC_BASE_DIGS; --i) + { if (bc_num_pow10[i] > (BcBigDig) n->num[idx]) places += 1; else break; } @@ -2569,8 +2792,8 @@ static void bc_num_printExponent(const BcNum *restrict n, // Shift the temp to the right place. bc_num_shiftLeft(&temp, places); } - else { - + else + { // This is the number of digits that we are supposed to put behind the // decimal point. places = bc_num_intDigits(n) - 1; @@ -2591,7 +2814,8 @@ static void bc_num_printExponent(const BcNum *restrict n, bc_num_putchar('e', !newline); // Need to explicitly print a zero exponent. - if (!places) { + if (!places) + { bc_num_printHex(0, 1, false, !newline); goto exit; } @@ -2623,12 +2847,12 @@ exit: * conversion is O(n^2); we have to sweep through starting at the * least significant limb */ -static void bc_num_printFixup(BcNum *restrict n, BcBigDig rem, - BcBigDig pow, size_t idx) +static void +bc_num_printFixup(BcNum* restrict n, BcBigDig rem, BcBigDig pow, size_t idx) { size_t i, len = n->len - idx; BcBigDig acc; - BcDig *a = n->num + idx; + BcDig* a = n->num + idx; // Ignore if there's just one limb left. This is the part that requires the // extra loop after the one calling this function in bc_num_printPrepare(). @@ -2636,8 +2860,8 @@ static void bc_num_printFixup(BcNum *restrict n, BcBigDig rem, // Loop through the remaining limbs and convert. We start at the second limb // because we pull the value from the previous one as well. - for (i = len - 1; i > 0; --i) { - + for (i = len - 1; i > 0; --i) + { // Get the limb and add it to the previous, along with multiplying by // the remainder because that's the proper overflow. "acc" means // "accumulator," by the way. @@ -2651,11 +2875,11 @@ static void bc_num_printFixup(BcNum *restrict n, BcBigDig rem, acc += (BcBigDig) a[i]; // If the accumulator is greater than the base... - if (acc >= BC_BASE_POW) { - + if (acc >= BC_BASE_POW) + { // Do we need to grow? - if (i == len - 1) { - + if (i == len - 1) + { // Grow. len = bc_vm_growSize(len, 1); bc_num_expand(n, bc_vm_growSize(len, idx)); @@ -2690,27 +2914,31 @@ static void bc_num_printFixup(BcNum *restrict n, BcBigDig rem, * @param rem The remainder of BC_BASE_POW when divided by a power of the base. * @param pow The power of the base. */ -static void bc_num_printPrepare(BcNum *restrict n, BcBigDig rem, BcBigDig pow) { - +static void +bc_num_printPrepare(BcNum* restrict n, BcBigDig rem, BcBigDig pow) +{ size_t i; // Loop from the least significant limb to the most significant limb and // convert limbs in each pass. - for (i = 0; i < n->len; ++i) bc_num_printFixup(n, rem, pow, i); + for (i = 0; i < n->len; ++i) + { + bc_num_printFixup(n, rem, pow, i); + } // bc_num_printFixup() does not do everything it is supposed to, so we do // the last bit of cleanup here. That cleanup is to ensure that each limb // is less than pow and to expand the number to fit new limbs as necessary. - for (i = 0; i < n->len; ++i) { - + for (i = 0; i < n->len; ++i) + { assert(pow == ((BcBigDig) ((BcDig) pow))); // If the limb needs fixing... - if (n->num[i] >= (BcDig) pow) { - + if (n->num[i] >= (BcDig) pow) + { // Do we need to grow? - if (i + 1 == n->len) { - + if (i + 1 == n->len) + { // Grow the number. n->len = bc_vm_growSize(n->len, 1); bc_num_expand(n, n->len); @@ -2728,12 +2956,17 @@ static void bc_num_printPrepare(BcNum *restrict n, BcBigDig rem, BcBigDig pow) { } } -static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, - BcNumDigitOp print, bool newline) +static void +bc_num_printNum(BcNum* restrict n, BcBigDig base, size_t len, + BcNumDigitOp print, bool newline) { BcVec stack; - BcNum intp, fracp1, fracp2, digit, flen1, flen2, *n1, *n2, *temp; - BcBigDig dig = 0, *ptr, acc, exp; + BcNum intp, fracp1, fracp2, digit, flen1, flen2; + BcNum* n1; + BcNum* n2; + BcNum* temp; + BcBigDig dig = 0, acc, exp; + BcBigDig* ptr; size_t i, j, nrdx, idigits; bool radix; BcDig digit_digs[BC_NUM_BIGDIG_LOG10 + 1]; @@ -2741,7 +2974,8 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, assert(base > 1); // Easy case. Even with scale, we just print this. - if (BC_NUM_ZERO(n)) { + if (BC_NUM_ZERO(n)) + { print(0, len, false, !newline); return; } @@ -2810,13 +3044,14 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, // exponent and power. That is to prevent us from calculating them every // time because printing will probably happen multiple times on the same // base. - if (base != vm.last_base) { - + if (base != vm.last_base) + { vm.last_pow = 1; vm.last_exp = 0; // Calculate the exponent and power. - while (vm.last_pow * base <= BC_BASE_POW) { + while (vm.last_pow * base <= BC_BASE_POW) + { vm.last_pow *= base; vm.last_exp += 1; } @@ -2838,8 +3073,8 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, // this is basically naive code that I wrote, adjusted for the larger bases. // Fill the stack of digits for the integer part. - for (i = 0; i < intp.len; ++i) { - + for (i = 0; i < intp.len; ++i) + { // Get the limb. acc = (BcBigDig) intp.num[i]; @@ -2847,11 +3082,13 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, for (j = 0; j < exp && (i < intp.len - 1 || acc != 0); ++j) { // This condition is true if we are not at the last digit. - if (j != exp - 1) { + if (j != exp - 1) + { dig = acc % base; acc /= base; } - else { + else + { dig = acc; acc = 0; } @@ -2866,8 +3103,8 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, } // Go through the stack backwards and print each digit. - for (i = 0; i < stack.len; ++i) { - + for (i = 0; i < stack.len; ++i) + { ptr = bc_vec_item_rev(&stack, i); assert(ptr != NULL); @@ -2877,8 +3114,8 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, // to be printed could take the place of the backslash rather than being // pushed, as a single character, to the next line. That's what that // last argument does for bc. - print(*ptr, len, false, !newline || - (n->scale != 0 || i == stack.len - 1)); + print(*ptr, len, false, + !newline || (n->scale != 0 || i == stack.len - 1)); } // We are done if there is no fractional part. @@ -2910,8 +3147,8 @@ static void bc_num_printNum(BcNum *restrict n, BcBigDig base, size_t len, BC_NUM_RDX_SET_NP(fracp2, BC_NUM_RDX(fracp2.scale)); // As long as we have not reached the scale of the number, keep printing. - while ((idigits = bc_num_intDigits(n1)) <= n->scale) { - + while ((idigits = bc_num_intDigits(n1)) <= n->scale) + { // These numbers will keep growing. bc_num_expand(&fracp2, fracp1.len + 1); bc_num_mulArray(&fracp1, base, &fracp2); @@ -2966,8 +3203,9 @@ err: * @param base The base to print in. * @param newline Whether to print backslash+newlines on long enough lines. */ -static void bc_num_printBase(BcNum *restrict n, BcBigDig base, bool newline) { - +static void +bc_num_printBase(BcNum* restrict n, BcBigDig base, bool newline) +{ size_t width; BcNumDigitOp print; bool neg = BC_NUM_NEG(n); @@ -2978,11 +3216,13 @@ static void bc_num_printBase(BcNum *restrict n, BcBigDig base, bool newline) { // Bases at hexadecimal and below are printed as one character, larger bases // are printed as a series of digits separated by spaces. - if (base <= BC_NUM_MAX_POSIX_IBASE) { + if (base <= BC_NUM_MAX_POSIX_IBASE) + { width = 1; print = bc_num_printHex; } - else { + else + { assert(base <= BC_BASE_POW); width = bc_num_log10(base - 1); print = bc_num_printDigits; @@ -2997,22 +3237,27 @@ static void bc_num_printBase(BcNum *restrict n, BcBigDig base, bool newline) { #if !BC_ENABLE_LIBRARY -void bc_num_stream(BcNum *restrict n) { +void +bc_num_stream(BcNum* restrict n) +{ bc_num_printNum(n, BC_NUM_STREAM_BASE, 1, bc_num_printChar, false); } #endif // !BC_ENABLE_LIBRARY -void bc_num_setup(BcNum *restrict n, BcDig *restrict num, size_t cap) { +void +bc_num_setup(BcNum* restrict n, BcDig* restrict num, size_t cap) +{ assert(n != NULL); n->num = num; n->cap = cap; bc_num_zero(n); } -void bc_num_init(BcNum *restrict n, size_t req) { - - BcDig *num; +void +bc_num_init(BcNum* restrict n, size_t req) +{ + BcDig* num; BC_SIG_ASSERT_LOCKED; @@ -3024,19 +3269,24 @@ void bc_num_init(BcNum *restrict n, size_t req) { // If we can't use a temp, allocate. if (req != BC_NUM_DEF_SIZE || (num = bc_vm_takeTemp()) == NULL) + { num = bc_vm_malloc(BC_NUM_SIZE(req)); + } bc_num_setup(n, num, req); } -void bc_num_clear(BcNum *restrict n) { +void +bc_num_clear(BcNum* restrict n) +{ n->num = NULL; n->cap = 0; } -void bc_num_free(void *num) { - - BcNum *n = (BcNum*) num; +void +bc_num_free(void* num) +{ + BcNum* n = (BcNum*) num; BC_SIG_ASSERT_LOCKED; @@ -3046,8 +3296,9 @@ void bc_num_free(void *num) { else free(n->num); } -void bc_num_copy(BcNum *d, const BcNum *s) { - +void +bc_num_copy(BcNum* d, const BcNum* s) +{ assert(d != NULL && s != NULL); if (d == s) return; @@ -3059,35 +3310,43 @@ void bc_num_copy(BcNum *d, const BcNum *s) { // properly preserved. d->rdx = s->rdx; d->scale = s->scale; + // NOLINTNEXTLINE memcpy(d->num, s->num, BC_NUM_SIZE(d->len)); } -void bc_num_createCopy(BcNum *d, const BcNum *s) { +void +bc_num_createCopy(BcNum* d, const BcNum* s) +{ BC_SIG_ASSERT_LOCKED; bc_num_init(d, s->len); bc_num_copy(d, s); } -void bc_num_createFromBigdig(BcNum *restrict n, BcBigDig val) { +void +bc_num_createFromBigdig(BcNum* restrict n, BcBigDig val) +{ BC_SIG_ASSERT_LOCKED; bc_num_init(n, BC_NUM_BIGDIG_LOG10); bc_num_bigdig2num(n, val); } -size_t bc_num_scale(const BcNum *restrict n) { +size_t +bc_num_scale(const BcNum* restrict n) +{ return n->scale; } -size_t bc_num_len(const BcNum *restrict n) { - +size_t +bc_num_len(const BcNum* restrict n) +{ size_t len = n->len; // Always return at least 1. if (BC_NUM_ZERO(n)) return n->scale ? n->scale : 1; // If this is true, there is no integer portion of the number. - if (BC_NUM_RDX_VAL(n) == len) { - + if (BC_NUM_RDX_VAL(n) == len) + { // We have to take into account the fact that some of the digits right // after the decimal could be zero. If that is the case, we need to // ignore them until we hit the first non-zero digit. @@ -3113,15 +3372,17 @@ size_t bc_num_len(const BcNum *restrict n) { return len; } -void bc_num_parse(BcNum *restrict n, const char *restrict val, BcBigDig base) { - +void +bc_num_parse(BcNum* restrict n, const char* restrict val, BcBigDig base) +{ assert(n != NULL && val != NULL && base); assert(base >= BC_NUM_MIN_BASE && base <= vm.maxes[BC_PROG_GLOBALS_IBASE]); assert(bc_num_strValid(val)); // A one character number is *always* parsed as though the base was the // maximum allowed ibase, per the bc spec. - if (!val[1]) { + if (!val[1]) + { BcBigDig dig = bc_num_parseChar(val[0], BC_NUM_MAX_LBASE); bc_num_bigdig2num(n, dig); } @@ -3131,22 +3392,25 @@ void bc_num_parse(BcNum *restrict n, const char *restrict val, BcBigDig base) { assert(BC_NUM_RDX_VALID(n)); } -void bc_num_print(BcNum *restrict n, BcBigDig base, bool newline) { - +void +bc_num_print(BcNum* restrict n, BcBigDig base, bool newline) +{ assert(n != NULL); assert(BC_ENABLE_EXTRA_MATH || base >= BC_NUM_MIN_BASE); // We may need a newline, just to start. bc_num_printNewline(); - if (BC_NUM_NONZERO(n)) { - + if (BC_NUM_NONZERO(n)) + { // Print the sign. if (BC_NUM_NEG(n)) bc_num_putchar('-', true); // Print the leading zero if necessary. if (BC_Z && BC_NUM_RDX_VAL(n) == n->len) + { bc_num_printHex(0, 1, false, !newline); + } } // Short-circuit 0. @@ -3154,15 +3418,18 @@ void bc_num_print(BcNum *restrict n, BcBigDig base, bool newline) { else if (base == BC_BASE) bc_num_printDecimal(n, newline); #if BC_ENABLE_EXTRA_MATH else if (base == 0 || base == 1) + { bc_num_printExponent(n, base != 0, newline); + } #endif // BC_ENABLE_EXTRA_MATH else bc_num_printBase(n, base, newline); if (newline) bc_num_putchar('\n', false); } -BcBigDig bc_num_bigdig2(const BcNum *restrict n) { - +BcBigDig +bc_num_bigdig2(const BcNum* restrict n) +{ // This function returns no errors because it's guaranteed to succeed if // its preconditions are met. Those preconditions include both n needs to // be non-NULL, n being non-negative, and n being less than vm.max. If all @@ -3179,21 +3446,23 @@ BcBigDig bc_num_bigdig2(const BcNum *restrict n) { // There is a small speed win from unrolling the loop here, and since it // only adds 53 bytes, I decided that it was worth it. - switch (n->len - nrdx) { - + switch (n->len - nrdx) + { case 3: { r = (BcBigDig) n->num[nrdx + 2]; + + // Fallthrough. + BC_FALLTHROUGH } - // Fallthrough. - BC_FALLTHROUGH case 2: { r = r * BC_BASE_POW + (BcBigDig) n->num[nrdx + 1]; + + // Fallthrough. + BC_FALLTHROUGH } - // Fallthrough. - BC_FALLTHROUGH case 1: { @@ -3204,8 +3473,9 @@ BcBigDig bc_num_bigdig2(const BcNum *restrict n) { return r; } -BcBigDig bc_num_bigdig(const BcNum *restrict n) { - +BcBigDig +bc_num_bigdig(const BcNum* restrict n) +{ assert(n != NULL); // This error checking is extremely important, and if you do not have a @@ -3219,9 +3489,10 @@ BcBigDig bc_num_bigdig(const BcNum *restrict n) { return bc_num_bigdig2(n); } -void bc_num_bigdig2num(BcNum *restrict n, BcBigDig val) { - - BcDig *ptr; +void +bc_num_bigdig2num(BcNum* restrict n, BcBigDig val) +{ + BcDig* ptr; size_t i; assert(n != NULL); @@ -3238,15 +3509,18 @@ void bc_num_bigdig2num(BcNum *restrict n, BcBigDig val) { // The conversion is easy because numbers are laid out in little-endian // order. for (ptr = n->num, i = 0; val; ++i, val /= BC_BASE_POW) + { ptr[i] = val % BC_BASE_POW; + } n->len = i; } #if BC_ENABLE_EXTRA_MATH -void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { - +void +bc_num_rng(const BcNum* restrict n, BcRNG* rng) +{ BcNum temp, temp2, intn, frac; BcRand state1, state2, inc1, inc2; size_t nrdx = BC_NUM_RDX_VAL(n); @@ -3269,6 +3543,7 @@ void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { assert(BC_NUM_RDX_VALID_NP(vm.max)); + // NOLINTNEXTLINE memcpy(frac.num, n->num, BC_NUM_SIZE(nrdx)); frac.len = nrdx; BC_NUM_RDX_SET_NP(frac, nrdx); @@ -3284,6 +3559,7 @@ void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { bc_num_copy(&frac, &temp); // Get the integer. + // NOLINTNEXTLINE memcpy(intn.num, n->num + nrdx, BC_NUM_SIZE(bc_num_int(n))); intn.len = bc_num_int(n); @@ -3292,8 +3568,8 @@ void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { assert(BC_NUM_NONZERO(&vm.max)); // If there *was* a fractional part... - if (BC_NUM_NONZERO(&frac)) { - + if (BC_NUM_NONZERO(&frac)) + { // This divmod splits frac into the two state parts. bc_num_divmod(&frac, &vm.max, &temp, &temp2, 0); @@ -3308,8 +3584,8 @@ void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { else state1 = state2 = 0; // If there *was* an integer part... - if (BC_NUM_NONZERO(&intn)) { - + if (BC_NUM_NONZERO(&intn)) + { // This divmod splits intn into the two inc parts. bc_num_divmod(&intn, &vm.max, &temp, &temp2, 0); @@ -3318,7 +3594,8 @@ void bc_num_rng(const BcNum *restrict n, BcRNG *rng) { inc1 = (BcRand) bc_num_bigdig2(&temp2); // Clamp the second inc part. - if (bc_num_cmp(&temp, &vm.max) >= 0) { + if (bc_num_cmp(&temp, &vm.max) >= 0) + { bc_num_copy(&temp2, &temp); bc_num_mod(&temp2, &vm.max, &temp, 0); } @@ -3340,8 +3617,9 @@ err: BC_LONGJMP_CONT; } -void bc_num_createFromRNG(BcNum *restrict n, BcRNG *rng) { - +void +bc_num_createFromRNG(BcNum* restrict n, BcRNG* rng) +{ BcRand s1, s2, i1, i2; BcNum conv, temp1, temp2, temp3; BcDig temp1_num[BC_RAND_NUM_SIZE], temp2_num[BC_RAND_NUM_SIZE]; @@ -3408,8 +3686,9 @@ err: BC_LONGJMP_CONT; } -void bc_num_irand(BcNum *restrict a, BcNum *restrict b, BcRNG *restrict rng) { - +void +bc_num_irand(BcNum* restrict a, BcNum* restrict b, BcRNG* restrict rng) +{ BcNum atemp; size_t i, len; @@ -3428,12 +3707,15 @@ void bc_num_irand(BcNum *restrict a, BcNum *restrict b, BcRNG *restrict rng) { // Just generate a random number for each limb. for (i = 0; i < len; ++i) + { b->num[i] = (BcDig) bc_rand_bounded(rng, BC_BASE_POW); + } // Do the last digit explicitly because the bound must be right. But only // do it if the limb does not equal 1. If it does, we have already hit the // limit. - if (atemp.num[i] != 1) { + if (atemp.num[i] != 1) + { b->num[i] = (BcDig) bc_rand_bounded(rng, (BcRand) atemp.num[i]); b->len = atemp.len; } @@ -3446,8 +3728,9 @@ void bc_num_irand(BcNum *restrict a, BcNum *restrict b, BcRNG *restrict rng) { } #endif // BC_ENABLE_EXTRA_MATH -size_t bc_num_addReq(const BcNum *a, const BcNum *b, size_t scale) { - +size_t +bc_num_addReq(const BcNum* a, const BcNum* b, size_t scale) +{ size_t aint, bint, ardx, brdx; // Addition and subtraction require the max of the length of the two numbers @@ -3469,8 +3752,9 @@ size_t bc_num_addReq(const BcNum *a, const BcNum *b, size_t scale) { return bc_vm_growSize(bc_vm_growSize(ardx, aint), 1); } -size_t bc_num_mulReq(const BcNum *a, const BcNum *b, size_t scale) { - +size_t +bc_num_mulReq(const BcNum* a, const BcNum* b, size_t scale) +{ size_t max, rdx; // Multiplication requires the sum of the lengths of the numbers. @@ -3485,8 +3769,9 @@ size_t bc_num_mulReq(const BcNum *a, const BcNum *b, size_t scale) { return rdx; } -size_t bc_num_divReq(const BcNum *a, const BcNum *b, size_t scale) { - +size_t +bc_num_divReq(const BcNum* a, const BcNum* b, size_t scale) +{ size_t max, rdx; // Division requires the length of the dividend plus the scale. @@ -3501,77 +3786,103 @@ size_t bc_num_divReq(const BcNum *a, const BcNum *b, size_t scale) { return rdx; } -size_t bc_num_powReq(const BcNum *a, const BcNum *b, size_t scale) { +size_t +bc_num_powReq(const BcNum* a, const BcNum* b, size_t scale) +{ BC_UNUSED(scale); return bc_vm_growSize(bc_vm_growSize(a->len, b->len), 1); } #if BC_ENABLE_EXTRA_MATH -size_t bc_num_placesReq(const BcNum *a, const BcNum *b, size_t scale) { +size_t +bc_num_placesReq(const BcNum* a, const BcNum* b, size_t scale) +{ BC_UNUSED(scale); return a->len + b->len - BC_NUM_RDX_VAL(a) - BC_NUM_RDX_VAL(b); } #endif // BC_ENABLE_EXTRA_MATH -void bc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_add(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, false, bc_num_as, bc_num_addReq(a, b, scale)); } -void bc_num_sub(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_sub(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, true, bc_num_as, bc_num_addReq(a, b, scale)); } -void bc_num_mul(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_mul(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_m, bc_num_mulReq(a, b, scale)); } -void bc_num_div(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_div(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_d, bc_num_divReq(a, b, scale)); } -void bc_num_mod(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_mod(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_rem, bc_num_divReq(a, b, scale)); } -void bc_num_pow(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_pow(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_p, bc_num_powReq(a, b, scale)); } #if BC_ENABLE_EXTRA_MATH -void bc_num_places(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_places(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_place, bc_num_placesReq(a, b, scale)); } -void bc_num_lshift(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_lshift(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_left, bc_num_placesReq(a, b, scale)); } -void bc_num_rshift(BcNum *a, BcNum *b, BcNum *c, size_t scale) { +void +bc_num_rshift(BcNum* a, BcNum* b, BcNum* c, size_t scale) +{ assert(BC_NUM_RDX_VALID(a)); assert(BC_NUM_RDX_VALID(b)); bc_num_binary(a, b, c, scale, bc_num_right, bc_num_placesReq(a, b, scale)); } #endif // BC_ENABLE_EXTRA_MATH -void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale) { - - BcNum num1, num2, half, f, fprime, *x0, *x1, *temp; +void +bc_num_sqrt(BcNum* restrict a, BcNum* restrict b, size_t scale) +{ + BcNum num1, num2, half, f, fprime; + BcNum* x0; + BcNum* x1; + BcNum* temp; size_t pow, len, rdx, req, resscale; BcDig half_digs[1]; @@ -3603,13 +3914,15 @@ void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale) { assert(a->num != NULL && b->num != NULL); // Easy case. - if (BC_NUM_ZERO(a)) { + if (BC_NUM_ZERO(a)) + { bc_num_setToZero(b, scale); return; } // Another easy case. - if (BC_NUM_ONE(a)) { + if (BC_NUM_ONE(a)) + { bc_num_one(b); bc_num_extend(b, scale); return; @@ -3654,8 +3967,8 @@ void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale) { // The code in this if statement calculates the initial estimate. First, if // a is less than 0, then 0 is a good estimate. Otherwise, we want something // in the same ballpark. That ballpark is pow. - if (pow) { - + if (pow) + { // An odd number is served by starting with 2^((pow-1)/2), and an even // number is served by starting with 6^((pow-2)/2). Why? Because math. if (pow & 1) x0->num[0] = 2; @@ -3671,8 +3984,8 @@ void bc_num_sqrt(BcNum *restrict a, BcNum *restrict b, size_t scale) { // This is the calculation loop. This compare goes to 0 eventually as the // difference between the two numbers gets smaller than resscale. - while (bc_num_cmp(x1, x0)) { - + while (bc_num_cmp(x1, x0)) + { assert(BC_NUM_NONZERO(x0)); // This loop directly corresponds to the iteration in Newton's method. @@ -3710,8 +4023,9 @@ err: BC_LONGJMP_CONT; } -void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale) { - +void +bc_num_divmod(BcNum* a, BcNum* b, BcNum* c, BcNum* d, size_t scale) +{ size_t ts, len; BcNum *ptr_a, num2; bool init = false; @@ -3727,8 +4041,9 @@ void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale) { assert(c != d && a != d && b != d && b != c); // Initialize or expand as necessary. - if (c == a) { - + if (c == a) + { + // NOLINTNEXTLINE memcpy(&num2, c, sizeof(BcNum)); ptr_a = &num2; @@ -3742,14 +4057,15 @@ void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale) { BC_SIG_UNLOCK; } - else { + else + { ptr_a = a; bc_num_expand(c, len); } // Do the quick version if possible. - if (BC_NUM_NONZERO(a) && !BC_NUM_RDX_VAL(a) && - !BC_NUM_RDX_VAL(b) && b->len == 1 && !scale) + if (BC_NUM_NONZERO(a) && !BC_NUM_RDX_VAL(a) && !BC_NUM_RDX_VAL(b) && + b->len == 1 && !scale) { BcBigDig rem; @@ -3774,15 +4090,17 @@ void bc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d, size_t scale) { err: // Only cleanup if we initialized. - if (init) { + if (init) + { BC_SIG_MAYLOCK; bc_num_free(&num2); BC_LONGJMP_CONT; } } -void bc_num_modexp(BcNum *a, BcNum *b, BcNum *c, BcNum *restrict d) { - +void +bc_num_modexp(BcNum* a, BcNum* b, BcNum* c, BcNum* restrict d) +{ BcNum base, exp, two, temp, atemp, btemp, ctemp; BcDig two_digs[2]; @@ -3828,13 +4146,13 @@ void bc_num_modexp(BcNum *a, BcNum *b, BcNum *c, BcNum *restrict d) { // If you know the algorithm I used, the memory-efficient method, then this // loop should be self-explanatory because it is the calculation loop. - while (BC_NUM_NONZERO(&exp)) { - + while (BC_NUM_NONZERO(&exp)) + { // Num two cannot be 0, so no errors. bc_num_divmod(&exp, &two, &exp, &temp, 0); - if (BC_NUM_ONE(&temp) && !BC_NUM_NEG_NP(temp)) { - + if (BC_NUM_ONE(&temp) && !BC_NUM_NEG_NP(temp)) + { assert(BC_NUM_RDX_VALID(d)); assert(BC_NUM_RDX_VALID_NP(base)); @@ -3864,7 +4182,9 @@ err: } #if BC_DEBUG_CODE -void bc_num_printDebug(const BcNum *n, const char *name, bool emptyline) { +void +bc_num_printDebug(const BcNum* n, const char* name, bool emptyline) +{ bc_file_puts(&vm.fout, bc_flush_none, name); bc_file_puts(&vm.fout, bc_flush_none, ": "); bc_num_printDecimal(n, true); @@ -3873,46 +4193,57 @@ void bc_num_printDebug(const BcNum *n, const char *name, bool emptyline) { vm.nchars = 0; } -void bc_num_printDigs(const BcDig *n, size_t len, bool emptyline) { - +void +bc_num_printDigs(const BcDig* n, size_t len, bool emptyline) +{ size_t i; for (i = len - 1; i < len; --i) + { bc_file_printf(&vm.fout, " %lu", (unsigned long) n[i]); + } bc_file_putchar(&vm.fout, bc_flush_err, '\n'); if (emptyline) bc_file_putchar(&vm.fout, bc_flush_err, '\n'); vm.nchars = 0; } -void bc_num_printWithDigs(const BcNum *n, const char *name, bool emptyline) { +void +bc_num_printWithDigs(const BcNum* n, const char* name, bool emptyline) +{ bc_file_puts(&vm.fout, bc_flush_none, name); - bc_file_printf(&vm.fout, " len: %zu, rdx: %zu, scale: %zu\n", - name, n->len, BC_NUM_RDX_VAL(n), n->scale); + bc_file_printf(&vm.fout, " len: %zu, rdx: %zu, scale: %zu\n", name, n->len, + BC_NUM_RDX_VAL(n), n->scale); bc_num_printDigs(n->num, n->len, emptyline); } -void bc_num_dump(const char *varname, const BcNum *n) { - +void +bc_num_dump(const char* varname, const BcNum* n) +{ ulong i, scale = n->scale; bc_file_printf(&vm.ferr, "\n%s = %s", varname, n->len ? (BC_NUM_NEG(n) ? "-" : "+") : "0 "); - for (i = n->len - 1; i < n->len; --i) { - + for (i = n->len - 1; i < n->len; --i) + { if (i + 1 == BC_NUM_RDX_VAL(n)) + { bc_file_puts(&vm.ferr, bc_flush_none, ". "); + } if (scale / BC_BASE_DIGS != BC_NUM_RDX_VAL(n) - i - 1) + { bc_file_printf(&vm.ferr, "%lu ", (unsigned long) n->num[i]); - else { - + } + else + { int mod = scale % BC_BASE_DIGS; int d = BC_BASE_DIGS - mod; BcDig div; - if (mod != 0) { + if (mod != 0) + { div = n->num[i] / ((BcDig) bc_num_pow10[(ulong) d]); bc_file_printf(&vm.ferr, "%lu", (unsigned long) div); } @@ -3922,9 +4253,8 @@ void bc_num_dump(const char *varname, const BcNum *n) { } } - bc_file_printf(&vm.ferr, "(%zu | %zu.%zu / %zu) %lu\n", - n->scale, n->len, BC_NUM_RDX_VAL(n), n->cap, - (unsigned long) (void*) n->num); + bc_file_printf(&vm.ferr, "(%zu | %zu.%zu / %zu) %lu\n", n->scale, n->len, + BC_NUM_RDX_VAL(n), n->cap, (unsigned long) (void*) n->num); bc_file_flush(&vm.ferr, bc_flush_err); } diff --git a/contrib/bc/src/opt.c b/contrib/bc/src/opt.c index 971e7e5f3ca5..9aaafcbfa780 100644 --- a/contrib/bc/src/opt.c +++ b/contrib/bc/src/opt.c @@ -53,7 +53,9 @@ * @param i The index to test. * @return True if @a i is the last index, false otherwise. */ -static inline bool bc_opt_longoptsEnd(const BcOptLong *longopts, size_t i) { +static inline bool +bc_opt_longoptsEnd(const BcOptLong* longopts, size_t i) +{ return !longopts[i].name && !longopts[i].val; } @@ -63,11 +65,13 @@ static inline bool bc_opt_longoptsEnd(const BcOptLong *longopts, size_t i) { * @param c The character to match against. * @return The name of the long option that matches @a c, or "NULL". */ -static const char* bc_opt_longopt(const BcOptLong *longopts, int c) { - +static const char* +bc_opt_longopt(const BcOptLong* longopts, int c) +{ size_t i; - for (i = 0; !bc_opt_longoptsEnd(longopts, i); ++i) { + for (i = 0; !bc_opt_longoptsEnd(longopts, i); ++i) + { if (longopts[i].val == c) return longopts[i].name; } @@ -85,12 +89,13 @@ static const char* bc_opt_longopt(const BcOptLong *longopts, int c) { * @param use_short True if the short option should be used for error printing, * false otherwise. */ -static void bc_opt_error(BcErr err, int c, const char *str, bool use_short) { - - if (err == BC_ERR_FATAL_OPTION) { - - if (use_short) { - +static void +bc_opt_error(BcErr err, int c, const char* str, bool use_short) +{ + if (err == BC_ERR_FATAL_OPTION) + { + if (use_short) + { char short_str[2]; short_str[0] = (char) c; @@ -109,13 +114,17 @@ static void bc_opt_error(BcErr err, int c, const char *str, bool use_short) { * @param c The character to match against. * @return The type of the long option as an integer, or -1 if none. */ -static int bc_opt_type(const BcOptLong *longopts, char c) { - +static int +bc_opt_type(const BcOptLong* longopts, char c) +{ size_t i; if (c == ':') return -1; - for (i = 0; !bc_opt_longoptsEnd(longopts, i) && longopts[i].val != c; ++i); + for (i = 0; !bc_opt_longoptsEnd(longopts, i) && longopts[i].val != c; ++i) + { + continue; + } if (bc_opt_longoptsEnd(longopts, i)) return -1; @@ -128,11 +137,12 @@ static int bc_opt_type(const BcOptLong *longopts, char c) { * @param longopts The long options array. * @return The character for the short option, or -1 if none left. */ -static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { - +static int +bc_opt_parseShort(BcOpt* o, const BcOptLong* longopts) +{ int type; - char *next; - char *option = o->argv[o->optind]; + char* next; + char* option = o->argv[o->optind]; int ret = -1; // Make sure to clear these. @@ -147,8 +157,8 @@ static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { type = bc_opt_type(longopts, option[0]); next = o->argv[o->optind + 1]; - switch (type) { - + switch (type) + { case -1: case BC_OPT_BC_ONLY: case BC_OPT_DC_ONLY: @@ -157,23 +167,24 @@ static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { if (type == -1 || (type == BC_OPT_BC_ONLY && BC_IS_DC) || (type == BC_OPT_DC_ONLY && BC_IS_BC)) { - char str[2] = {0, 0}; + char str[2] = { 0, 0 }; str[0] = option[0]; o->optind += 1; bc_opt_error(BC_ERR_FATAL_OPTION, option[0], str, true); } + + // Fallthrough. + BC_FALLTHROUGH } - // Fallthrough. - BC_FALLTHROUGH case BC_OPT_NONE: { // If there is something else, update the suboption. if (option[1]) o->subopt += 1; - else { - + else + { // Go to the next argument. o->subopt = 0; o->optind += 1; @@ -187,11 +198,14 @@ static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { case BC_OPT_REQUIRED_BC_ONLY: { if (BC_IS_DC) + { bc_opt_error(BC_ERR_FATAL_OPTION, option[0], bc_opt_longopt(longopts, option[0]), true); + } + + // Fallthrough + BC_FALLTHROUGH } - // Fallthrough - BC_FALLTHROUGH case BC_OPT_REQUIRED: { @@ -201,16 +215,18 @@ static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { // Use the next characters, if they exist. if (option[1]) o->optarg = option + 1; - else if (next != NULL) { - + else if (next != NULL) + { // USe the next. o->optarg = next; o->optind += 1; } // No argument, barf. - else bc_opt_error(BC_ERR_FATAL_OPTION_NO_ARG, option[0], - bc_opt_longopt(longopts, option[0]), true); - + else + { + bc_opt_error(BC_ERR_FATAL_OPTION_NO_ARG, option[0], + bc_opt_longopt(longopts, option[0]), true); + } ret = (int) option[0]; @@ -228,15 +244,18 @@ static int bc_opt_parseShort(BcOpt *o, const BcOptLong *longopts) { * @param option The command-line argument. * @return True if @a option matches @a name, false otherwise. */ -static bool bc_opt_longoptsMatch(const char *name, const char *option) { - - const char *a = option, *n = name; +static bool +bc_opt_longoptsMatch(const char* name, const char* option) +{ + const char* a = option; + const char* n = name; // Can never match a NULL name. if (name == NULL) return false; // Loop through. - for (; *a && *n && *a != '='; ++a, ++n) { + for (; *a && *n && *a != '='; ++a, ++n) + { if (*a != *n) return false; } @@ -250,35 +269,40 @@ static bool bc_opt_longoptsMatch(const char *name, const char *option) { * @param option The option to find the argument of. * @return A pointer to the argument of the option, or NULL if none. */ -static char* bc_opt_longoptsArg(char *option) { - +static char* +bc_opt_longoptsArg(char* option) +{ // Find the end or equals sign. - for (; *option && *option != '='; ++option); + for (; *option && *option != '='; ++option) + { + continue; + } if (*option == '=') return option + 1; else return NULL; } -int bc_opt_parse(BcOpt *o, const BcOptLong *longopts) { - +int +bc_opt_parse(BcOpt* o, const BcOptLong* longopts) +{ size_t i; - char *option; + char* option; bool empty; // This just eats empty options. - do { - + do + { option = o->argv[o->optind]; if (option == NULL) return -1; empty = !strcmp(option, ""); o->optind += empty; - - } while (empty); + } + while (empty); // If the option is just a "--". - if (BC_OPT_ISDASHDASH(option)) { - + if (BC_OPT_ISDASHDASH(option)) + { // Consume "--". o->optind += 1; return -1; @@ -297,14 +321,14 @@ int bc_opt_parse(BcOpt *o, const BcOptLong *longopts) { o->optind += 1; // Loop through the valid long options. - for (i = 0; !bc_opt_longoptsEnd(longopts, i); i++) { - - const char *name = longopts[i].name; + for (i = 0; !bc_opt_longoptsEnd(longopts, i); i++) + { + const char* name = longopts[i].name; // If we have a match... - if (bc_opt_longoptsMatch(name, option)) { - - char *arg; + if (bc_opt_longoptsMatch(name, option)) + { + char* arg; // Get the option char and the argument. o->optopt = longopts[i].val; @@ -335,8 +359,11 @@ int bc_opt_parse(BcOpt *o, const BcOptLong *longopts) { // All's good if it exists; otherwise, barf. if (o->optarg != NULL) o->optind += 1; - else bc_opt_error(BC_ERR_FATAL_OPTION_NO_ARG, - o->optopt, name, false); + else + { + bc_opt_error(BC_ERR_FATAL_OPTION_NO_ARG, o->optopt, name, + false); + } } return o->optopt; @@ -351,7 +378,9 @@ int bc_opt_parse(BcOpt *o, const BcOptLong *longopts) { return -1; } -void bc_opt_init(BcOpt *o, char *argv[]) { +void +bc_opt_init(BcOpt* o, char* argv[]) +{ o->argv = argv; o->optind = 1; o->subopt = 0; diff --git a/contrib/bc/src/parse.c b/contrib/bc/src/parse.c index ba139f61ba46..43f4cfdd70f1 100644 --- a/contrib/bc/src/parse.c +++ b/contrib/bc/src/parse.c @@ -44,12 +44,16 @@ #include <program.h> #include <vm.h> -void bc_parse_updateFunc(BcParse *p, size_t fidx) { +void +bc_parse_updateFunc(BcParse* p, size_t fidx) +{ p->fidx = fidx; p->func = bc_vec_item(&p->prog->fns, fidx); } -inline void bc_parse_pushName(const BcParse *p, char *name, bool var) { +inline void +bc_parse_pushName(const BcParse* p, char* name, bool var) +{ bc_parse_pushIndex(p, bc_program_search(p->prog, name, var)); } @@ -60,14 +64,17 @@ inline void bc_parse_pushName(const BcParse *p, char *name, bool var) { * @param inst The instruction to push. * @param idx The index to push. */ -static void bc_parse_update(BcParse *p, uchar inst, size_t idx) { +static void +bc_parse_update(BcParse* p, uchar inst, size_t idx) +{ bc_parse_updateFunc(p, p->fidx); bc_parse_push(p, inst); bc_parse_pushIndex(p, idx); } -void bc_parse_addString(BcParse *p) { - +void +bc_parse_addString(BcParse* p) +{ size_t idx; idx = bc_program_addString(p->prog, p->l.str.v, p->fidx); @@ -77,23 +84,26 @@ void bc_parse_addString(BcParse *p) { bc_parse_pushIndex(p, idx); } -static void bc_parse_addNum(BcParse *p, const char *string) { - - BcVec *consts = &p->func->consts; +static void +bc_parse_addNum(BcParse* p, const char* string) +{ + BcVec* consts = &p->func->consts; size_t idx; - BcConst *c; - BcVec *slabs; + BcConst* c; + BcVec* slabs; BC_SIG_ASSERT_LOCKED; // Special case 0. - if (bc_parse_zero[0] == string[0] && bc_parse_zero[1] == string[1]) { + if (bc_parse_zero[0] == string[0] && bc_parse_zero[1] == string[1]) + { bc_parse_push(p, BC_INST_ZERO); return; } // Special case 1. - if (bc_parse_one[0] == string[0] && bc_parse_one[1] == string[1]) { + if (bc_parse_one[0] == string[0] && bc_parse_one[1] == string[1]) + { bc_parse_push(p, BC_INST_ONE); return; } @@ -103,7 +113,8 @@ static void bc_parse_addNum(BcParse *p, const char *string) { // Get the right slab. slabs = p->fidx == BC_PROG_MAIN || p->fidx == BC_PROG_READ ? - &vm.main_const_slab : &vm.other_slabs; + &vm.main_const_slab : + &vm.other_slabs; // Push an empty constant. c = bc_vec_pushEmpty(consts); @@ -118,15 +129,17 @@ static void bc_parse_addNum(BcParse *p, const char *string) { bc_parse_update(p, BC_INST_NUM, idx); } -void bc_parse_number(BcParse *p) { - +void +bc_parse_number(BcParse* p) +{ #if BC_ENABLE_EXTRA_MATH - char *exp = strchr(p->l.str.v, 'e'); + char* exp = strchr(p->l.str.v, 'e'); size_t idx = SIZE_MAX; // Do we have a number in scientific notation? If so, add a nul byte where // the e is. - if (exp != NULL) { + if (exp != NULL) + { idx = ((size_t) (exp - p->l.str.v)); *exp = 0; } @@ -136,8 +149,8 @@ void bc_parse_number(BcParse *p) { #if BC_ENABLE_EXTRA_MATH // If we have a number in scientific notation... - if (exp != NULL) { - + if (exp != NULL) + { bool neg; // Figure out if the exponent is negative. @@ -150,8 +163,9 @@ void bc_parse_number(BcParse *p) { #endif // BC_ENABLE_EXTRA_MATH } -void bc_parse_text(BcParse *p, const char *text, bool is_stdin, bool is_exprs) { - +void +bc_parse_text(BcParse* p, const char* text, bool is_stdin, bool is_exprs) +{ BC_SIG_LOCK; // Make sure the pointer isn't invalidated. @@ -161,12 +175,14 @@ void bc_parse_text(BcParse *p, const char *text, bool is_stdin, bool is_exprs) { BC_SIG_UNLOCK; } -void bc_parse_reset(BcParse *p) { - +void +bc_parse_reset(BcParse* p) +{ BC_SIG_ASSERT_LOCKED; // Reset the function if it isn't main and switch to main. - if (p->fidx != BC_PROG_MAIN) { + if (p->fidx != BC_PROG_MAIN) + { bc_func_reset(p->func); bc_parse_updateFunc(p, BC_PROG_MAIN); } @@ -176,8 +192,8 @@ void bc_parse_reset(BcParse *p) { p->l.t = BC_LEX_EOF; #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { // Get rid of the bc parser state. p->auto_part = false; bc_vec_npop(&p->flags, p->flags.len - 1); @@ -195,14 +211,16 @@ void bc_parse_reset(BcParse *p) { } #ifndef NDEBUG -void bc_parse_free(BcParse *p) { - +void +bc_parse_free(BcParse* p) +{ BC_SIG_ASSERT_LOCKED; assert(p != NULL); #if BC_ENABLED - if (BC_IS_BC) { + if (BC_IS_BC) + { bc_vec_free(&p->flags); bc_vec_free(&p->exits); bc_vec_free(&p->conds); @@ -215,8 +233,9 @@ void bc_parse_free(BcParse *p) { } #endif // NDEBUG -void bc_parse_init(BcParse *p, BcProgram *prog, size_t func) { - +void +bc_parse_init(BcParse* p, BcProgram* prog, size_t func) +{ #if BC_ENABLED uint16_t flag = 0; #endif // BC_ENABLED @@ -226,8 +245,8 @@ void bc_parse_init(BcParse *p, BcProgram *prog, size_t func) { assert(p != NULL && prog != NULL); #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { // We always want at least one flag set on the flags stack. bc_vec_init(&p->flags, sizeof(uint16_t), BC_DTOR_NONE); bc_vec_push(&p->flags, &flag); diff --git a/contrib/bc/src/program.c b/contrib/bc/src/program.c index 7c38ef547a82..20121828fa92 100644 --- a/contrib/bc/src/program.c +++ b/contrib/bc/src/program.c @@ -54,7 +54,9 @@ * @param p The program. * @param f The new function. */ -static inline void bc_program_setVecs(BcProgram *p, BcFunc *f) { +static inline void +bc_program_setVecs(BcProgram* p, BcFunc* f) +{ BC_SIG_ASSERT_LOCKED; p->consts = &f->consts; p->strs = &f->strs; @@ -65,8 +67,9 @@ static inline void bc_program_setVecs(BcProgram *p, BcFunc *f) { * @param r The result that will be checked. * @param n The result's number. */ -static inline void bc_program_type_num(BcResult *r, BcNum *n) { - +static inline void +bc_program_type_num(BcResult* r, BcNum* n) +{ #if BC_ENABLED // This should have already been taken care of. @@ -84,7 +87,9 @@ static inline void bc_program_type_num(BcResult *r, BcNum *n) { * @param r The result to check. * @param t The type that the result should be. */ -static void bc_program_type_match(BcResult *r, BcType t) { +static void +bc_program_type_match(BcResult* r, BcType t) +{ if (BC_ERR((r->t != BC_RESULT_ARRAY) != (!t))) bc_err(BC_ERR_EXEC_TYPE); } #endif // BC_ENABLED @@ -98,12 +103,14 @@ static void bc_program_type_match(BcResult *r, BcType t) { * updated. * @return The index at @a bgn in the bytecode vector. */ -static size_t bc_program_index(const char *restrict code, size_t *restrict bgn) +static size_t +bc_program_index(const char* restrict code, size_t* restrict bgn) { uchar amt = (uchar) code[(*bgn)++], i = 0; size_t res = 0; - for (; i < amt; ++i, ++(*bgn)) { + for (; i < amt; ++i, ++(*bgn)) + { size_t temp = ((size_t) ((int) (uchar) code[*bgn]) & UCHAR_MAX); res |= (temp << (i * CHAR_BIT)); } @@ -117,8 +124,10 @@ static size_t bc_program_index(const char *restrict code, size_t *restrict bgn) * @param n The number tied to the result. * @return The string corresponding to the result and number. */ -static char* bc_program_string(BcProgram *p, const BcNum *n) { - BcFunc *f = bc_vec_item(&p->fns, n->rdx); +static char* +bc_program_string(BcProgram* p, const BcNum* n) +{ + BcFunc* f = bc_vec_item(&p->fns, n->rdx); return *((char**) bc_vec_item(&f->strs, n->scale)); } @@ -130,12 +139,15 @@ static char* bc_program_string(BcProgram *p, const BcNum *n) { * their respective stacks. * @param p The program. */ -static void bc_program_prepGlobals(BcProgram *p) { - +static void +bc_program_prepGlobals(BcProgram* p) +{ size_t i; for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) + { bc_vec_push(p->globals_v + i, p->globals + i); + } #if BC_ENABLE_EXTRA_MATH bc_rand_push(&p->rng); @@ -149,14 +161,16 @@ static void bc_program_prepGlobals(BcProgram *p) { * @param reset True if all but one item on each stack should be popped, false * otherwise. */ -static void bc_program_popGlobals(BcProgram *p, bool reset) { - +static void +bc_program_popGlobals(BcProgram* p, bool reset) +{ size_t i; BC_SIG_ASSERT_LOCKED; - for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) { - BcVec *v = p->globals_v + i; + for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) + { + BcVec* v = p->globals_v + i; bc_vec_npop(v, reset ? v->len - 1 : 1); p->globals[i] = BC_PROG_GLOBAL(v); } @@ -172,9 +186,10 @@ static void bc_program_popGlobals(BcProgram *p, bool reset) { * @param vec The reference vector. * @return A pointer to the desired array. */ -static BcVec* bc_program_dereference(const BcProgram *p, BcVec *vec) { - - BcVec *v; +static BcVec* +bc_program_dereference(const BcProgram* p, BcVec* vec) +{ + BcVec* v; size_t vidx, nidx, i = 0; // We want to be sure we have a reference vector. @@ -201,7 +216,8 @@ static BcVec* bc_program_dereference(const BcProgram *p, BcVec *vec) { * @param dig The BcBigDig to push onto the results stack. * @param type The type that the pushed result should be. */ -static void bc_program_pushBigdig(BcProgram *p, BcBigDig dig, BcResultType type) +static void +bc_program_pushBigdig(BcProgram* p, BcBigDig dig, BcResultType type) { BcResult res; @@ -215,11 +231,12 @@ static void bc_program_pushBigdig(BcProgram *p, BcBigDig dig, BcResultType type) BC_SIG_UNLOCK; } -size_t bc_program_addString(BcProgram *p, const char *str, size_t fidx) { - - BcFunc *f; - char **str_ptr; - BcVec *slabs; +size_t +bc_program_addString(BcProgram* p, const char* str, size_t fidx) +{ + BcFunc* f; + char** str_ptr; + BcVec* slabs; BC_SIG_ASSERT_LOCKED; @@ -229,16 +246,19 @@ size_t bc_program_addString(BcProgram *p, const char *str, size_t fidx) { // Figure out which slab vector to use. slabs = fidx == BC_PROG_MAIN || fidx == BC_PROG_READ ? - &vm.main_slabs : &vm.other_slabs; + &vm.main_slabs : + &vm.other_slabs; *str_ptr = bc_slabvec_strdup(slabs, str); return f->strs.len - 1; } -size_t bc_program_search(BcProgram *p, const char *id, bool var) { - - BcVec *v, *map; +size_t +bc_program_search(BcProgram* p, const char* id, bool var) +{ + BcVec* v; + BcVec* map; size_t i; BC_SIG_ASSERT_LOCKED; @@ -251,8 +271,9 @@ size_t bc_program_search(BcProgram *p, const char *id, bool var) { // the parser calls this function. If the insert succeeds, we create a stack // for the variable/array. But regardless, bc_map_insert() gives us the // index of the item in i. - if (bc_map_insert(map, id, v->len, &i)) { - BcVec *temp = bc_vec_pushEmpty(v); + if (bc_map_insert(map, id, v->len, &i)) + { + BcVec* temp = bc_vec_pushEmpty(v); bc_array_init(temp, var); } @@ -267,9 +288,10 @@ size_t bc_program_search(BcProgram *p, const char *id, bool var) { * @param type The type of vector to return. * @return A pointer to the variable or array stack. */ -static inline BcVec* bc_program_vec(const BcProgram *p, size_t idx, BcType type) +static inline BcVec* +bc_program_vec(const BcProgram* p, size_t idx, BcType type) { - const BcVec *v = (type == BC_TYPE_VAR) ? &p->vars : &p->arrs; + const BcVec* v = (type == BC_TYPE_VAR) ? &p->vars : &p->arrs; return bc_vec_item(v, idx); } @@ -284,9 +306,10 @@ static inline BcVec* bc_program_vec(const BcProgram *p, size_t idx, BcType type) * @param r The result whose number will be returned. * @return The BcNum corresponding to the result. */ -static BcNum* bc_program_num(BcProgram *p, BcResult *r) { - - BcNum *n; +static BcNum* +bc_program_num(BcProgram* p, BcResult* r) +{ + BcNum* n; #ifdef _WIN32 // Windows made it an error to not initialize this, so shut it up. @@ -296,8 +319,8 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { n = NULL; #endif // _WIN32 - switch (r->t) { - + switch (r->t) + { case BC_RESULT_STR: case BC_RESULT_TEMP: case BC_RESULT_IBASE: @@ -315,7 +338,7 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { case BC_RESULT_ARRAY: case BC_RESULT_ARRAY_ELEM: { - BcVec *v; + BcVec* v; BcType type = (r->t == BC_RESULT_VAR) ? BC_TYPE_VAR : BC_TYPE_ARRAY; // Get the correct variable or array vector. @@ -325,8 +348,8 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { // it's returning an array element. This is because we have to dig // deeper to get *to* the element. That's what the code inside this // if statement does. - if (r->t == BC_RESULT_ARRAY_ELEM) { - + if (r->t == BC_RESULT_ARRAY_ELEM) + { size_t idx = r->d.loc.idx; v = bc_vec_top(v); @@ -349,7 +372,8 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { // an element *way* out there, we have to preinitialize all // elements between the current last element and the actual // accessed element. - if (v->len <= idx) { + if (v->len <= idx) + { BC_SIG_LOCK; bc_array_expand(v, bc_vm_growSize(idx, 1)); BC_SIG_UNLOCK; @@ -385,7 +409,7 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { abort(); } #endif // NDEBUG - // Fallthrough + // Fallthrough case BC_RESULT_LAST: { n = &p->last; @@ -406,8 +430,8 @@ static BcNum* bc_program_num(BcProgram *p, BcResult *r) { * we care about. * @param idx The index of the result from the top of the results stack. */ -static void bc_program_operand(BcProgram *p, BcResult **r, - BcNum **n, size_t idx) +static void +bc_program_operand(BcProgram* p, BcResult** r, BcNum** n, size_t idx) { *r = bc_vec_item_rev(&p->results, idx); @@ -432,8 +456,9 @@ static void bc_program_operand(BcProgram *p, BcResult **r, * @param idx The starting index where the operands are in the results stack, * starting from the top. */ -static void bc_program_binPrep(BcProgram *p, BcResult **l, BcNum **ln, - BcResult **r, BcNum **rn, size_t idx) +static void +bc_program_binPrep(BcProgram* p, BcResult** l, BcNum** ln, BcResult** r, + BcNum** rn, size_t idx) { BcResultType lt; @@ -441,9 +466,12 @@ static void bc_program_binPrep(BcProgram *p, BcResult **l, BcNum **ln, #ifndef BC_PROG_NO_STACK_CHECK // Check the stack for dc. - if (BC_IS_DC) { + if (BC_IS_DC) + { if (BC_ERR(!BC_PROG_STACK(&p->results, idx + 2))) + { bc_err(BC_ERR_EXEC_STACK); + } } #endif // BC_PROG_NO_STACK_CHECK @@ -464,7 +492,9 @@ static void bc_program_binPrep(BcProgram *p, BcResult **l, BcNum **ln, // reallocated out from under the BcNums or arrays we had. In other words, // this is to fix pointer invalidation. if (lt == (*r)->t && (lt == BC_RESULT_VAR || lt == BC_RESULT_ARRAY_ELEM)) + { *ln = bc_program_num(p, *l); + } if (BC_ERR(lt == BC_RESULT_STR)) bc_err(BC_ERR_EXEC_TYPE); } @@ -485,8 +515,9 @@ static void bc_program_binPrep(BcProgram *p, BcResult **l, BcNum **ln, * @param idx The starting index where the operands are in the results stack, * starting from the top. */ -static void bc_program_binOpPrep(BcProgram *p, BcResult **l, BcNum **ln, - BcResult **r, BcNum **rn, size_t idx) +static void +bc_program_binOpPrep(BcProgram* p, BcResult** l, BcNum** ln, BcResult** r, + BcNum** rn, size_t idx) { bc_program_binPrep(p, l, ln, r, rn, idx); bc_program_type_num(*l, *ln); @@ -505,8 +536,9 @@ static void bc_program_binOpPrep(BcProgram *p, BcResult **l, BcNum **ln, * @param rn An out parameter; this is set to the pointer to the number for the * right operand. */ -static void bc_program_assignPrep(BcProgram *p, BcResult **l, BcNum **ln, - BcResult **r, BcNum **rn) +static void +bc_program_assignPrep(BcProgram* p, BcResult** l, BcNum** ln, BcResult** r, + BcNum** rn) { BcResultType lt, min; @@ -541,15 +573,19 @@ static void bc_program_assignPrep(BcProgram *p, BcResult **l, BcNum **ln, * we care about. * @param idx The index of the result from the top of the results stack. */ -static void bc_program_prep(BcProgram *p, BcResult **r, BcNum **n, size_t idx) { - +static void +bc_program_prep(BcProgram* p, BcResult** r, BcNum** n, size_t idx) +{ assert(p != NULL && r != NULL && n != NULL); #ifndef BC_PROG_NO_STACK_CHECK // Check the stack for dc. - if (BC_IS_DC) { + if (BC_IS_DC) + { if (BC_ERR(!BC_PROG_STACK(&p->results, idx + 1))) + { bc_err(BC_ERR_EXEC_STACK); + } } #endif // BC_PROG_NO_STACK_CHECK @@ -566,9 +602,10 @@ static void bc_program_prep(BcProgram *p, BcResult **r, BcNum **n, size_t idx) { * @param p The program. * @return A clean result. */ -static BcResult* bc_program_prepResult(BcProgram *p) { - - BcResult *res = bc_vec_pushEmpty(&p->results); +static BcResult* +bc_program_prepResult(BcProgram* p) +{ + BcResult* res = bc_vec_pushEmpty(&p->results); bc_result_clear(res); @@ -584,19 +621,21 @@ static BcResult* bc_program_prepResult(BcProgram *p) { * @param bgn An in/out parameter; marks the start of the index in the * bytecode vector and will be updated to point to after the index. */ -static void bc_program_const(BcProgram *p, const char *code, size_t *bgn) { - +static void +bc_program_const(BcProgram* p, const char* code, size_t* bgn) +{ // I lied. I actually push the result first. I can do this because the // result will be popped on error. I also get the constant itself. - BcResult *r = bc_program_prepResult(p); - BcConst *c = bc_vec_item(p->consts, bc_program_index(code, bgn)); + BcResult* r = bc_program_prepResult(p); + BcConst* c = bc_vec_item(p->consts, bc_program_index(code, bgn)); BcBigDig base = BC_PROG_IBASE(p); // Only reparse if the base changed. - if (c->base != base) { - + if (c->base != base) + { // Allocate if we haven't yet. - if (c->num.num == NULL) { + if (c->num.num == NULL) + { BC_SIG_LOCK; bc_num_init(&c->num, BC_NUM_RDX(strlen(c->val))); BC_SIG_UNLOCK; @@ -620,10 +659,14 @@ static void bc_program_const(BcProgram *p, const char *code, size_t *bgn) { * @param p The program. * @param inst The instruction corresponding to the binary operator to execute. */ -static void bc_program_op(BcProgram *p, uchar inst) { - - BcResult *opd1, *opd2, *res; - BcNum *n1, *n2; +static void +bc_program_op(BcProgram* p, uchar inst) +{ + BcResult* opd1; + BcResult* opd2; + BcResult* res; + BcNum* n1; + BcNum* n2; size_t idx = inst - BC_INST_POWER; res = bc_program_prepResult(p); @@ -652,19 +695,21 @@ static void bc_program_op(BcProgram *p, uchar inst) { * Executes a read() or ? command. * @param p The program. */ -static void bc_program_read(BcProgram *p) { - +static void +bc_program_read(BcProgram* p) +{ BcStatus s; BcInstPtr ip; size_t i; const char* file; bool is_stdin; - BcFunc *f = bc_vec_item(&p->fns, BC_PROG_READ); + BcFunc* f = bc_vec_item(&p->fns, BC_PROG_READ); // If we are already executing a read, that is an error. So look for a read // and barf. - for (i = 0; i < p->stack.len; ++i) { - BcInstPtr *ip_ptr = bc_vec_item(&p->stack, i); + for (i = 0; i < p->stack.len; ++i) + { + BcInstPtr* ip_ptr = bc_vec_item(&p->stack, i); if (ip_ptr->func == BC_PROG_READ) bc_err(BC_ERR_EXEC_REC_READ); } @@ -678,8 +723,8 @@ static void bc_program_read(BcProgram *p) { // this to tell the lexer to not request more. We set it back later. vm.is_stdin = false; - if (!BC_PARSE_IS_INITED(&vm.read_prs, p)) { - + if (!BC_PARSE_IS_INITED(&vm.read_prs, p)) + { // We need to parse, but we don't want to use the existing parser // because it has state it needs to keep. (It could have a partial parse // state.) So we create a new parser. This parser is in the BcVm struct @@ -746,7 +791,8 @@ static void bc_program_read(BcProgram *p) { #if DC_ENABLED // We need a new tail call entry for dc. - if (BC_IS_DC) { + if (BC_IS_DC) + { size_t temp = 0; bc_vec_push(&p->tail_calls, &temp); } @@ -765,8 +811,9 @@ exec_err: * Execute a rand(). * @param p The program. */ -static void bc_program_rand(BcProgram *p) { - +static void +bc_program_rand(BcProgram* p) +{ BcRand rand = bc_rand_int(&p->rng); bc_program_pushBigdig(p, (BcBigDig) rand, BC_RESULT_TEMP); @@ -775,7 +822,7 @@ static void bc_program_rand(BcProgram *p) { // This is just to ensure that the generated number is correct. I also use // braces because I declare every local at the top of the scope. { - BcResult *r = bc_vec_top(&p->results); + BcResult* r = bc_vec_top(&p->results); assert(BC_NUM_RDX_VALID_NP(r->d.n)); } #endif // NDEBUG @@ -786,9 +833,10 @@ static void bc_program_rand(BcProgram *p) { * Prints a series of characters, without escapes. * @param str The string (series of characters). */ -static void bc_program_printChars(const char *str) { - - const char *nl; +static void +bc_program_printChars(const char* str) +{ + const char* nl; size_t len = vm.nchars + strlen(str); sig_atomic_t lock; @@ -811,37 +859,40 @@ static void bc_program_printChars(const char *str) { * Prints a string with escapes. * @param str The string. */ -static void bc_program_printString(const char *restrict str) { - +static void +bc_program_printString(const char* restrict str) +{ size_t i, len = strlen(str); #if DC_ENABLED // This is to ensure a nul byte is printed for dc's stream operation. - if (!len && BC_IS_DC) { + if (!len && BC_IS_DC) + { bc_vm_putchar('\0', bc_flush_save); return; } #endif // DC_ENABLED // Loop over the characters, processing escapes and printing the rest. - for (i = 0; i < len; ++i) { - + for (i = 0; i < len; ++i) + { int c = str[i]; // If we have an escape... - if (c == '\\' && i != len - 1) { - - const char *ptr; + if (c == '\\' && i != len - 1) + { + const char* ptr; // Get the escape character and its companion. c = str[++i]; ptr = strchr(bc_program_esc_chars, c); // If we have a companion character... - if (ptr != NULL) { - + if (ptr != NULL) + { // We need to specially handle a newline. - if (c == 'n') { + if (c == 'n') + { BC_SIG_LOCK; vm.nchars = UINT16_MAX; BC_SIG_UNLOCK; @@ -850,7 +901,8 @@ static void bc_program_printString(const char *restrict str) { // Grab the actual character. c = bc_program_esc_seqs[(size_t) (ptr - bc_program_esc_chars)]; } - else { + else + { // Just print the backslash if there is no companion character. // The following character will be printed later after the outer // if statement. @@ -868,19 +920,23 @@ static void bc_program_printString(const char *restrict str) { * @param inst The instruction for the type of print we are doing. * @param idx The index of the result that we are printing. */ -static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { - - BcResult *r; - char *str; - BcNum *n; +static void +bc_program_print(BcProgram* p, uchar inst, size_t idx) +{ + BcResult* r; + char* str; + BcNum* n; bool pop = (inst != BC_INST_PRINT); assert(p != NULL); #ifndef BC_PROG_NO_STACK_CHECK - if (BC_IS_DC) { + if (BC_IS_DC) + { if (BC_ERR(!BC_PROG_STACK(&p->results, idx + 1))) + { bc_err(BC_ERR_EXEC_STACK); + } } #endif // BC_PROG_NO_STACK_CHECK @@ -893,7 +949,8 @@ static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { // true because that means that we are executing a print statement, but // attempting to do a print on a lone void value is allowed because that's // exactly how we want void values used. - if (r->t == BC_RESULT_VOID) { + if (r->t == BC_RESULT_VOID) + { if (BC_ERR(pop)) bc_err(BC_ERR_EXEC_VOID_VAL); bc_vec_pop(&p->results); return; @@ -903,8 +960,8 @@ static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { n = bc_program_num(p, r); // If we have a number... - if (BC_PROG_NUM(r, n)) { - + if (BC_PROG_NUM(r, n)) + { #if BC_ENABLED assert(inst != BC_INST_PRINT_STR); #endif // BC_ENABLED @@ -917,8 +974,8 @@ static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { if (BC_IS_BC) bc_num_copy(&p->last, n); #endif // BC_ENABLED } - else { - + else + { // We want to flush any stuff in the stdout buffer first. bc_file_flush(&vm.fout, bc_flush_save); str = bc_program_string(p, n); @@ -931,8 +988,7 @@ static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { bc_program_printString(str); // Need to print a newline only in this case. - if (inst == BC_INST_PRINT) - bc_vm_putchar('\n', bc_flush_err); + if (inst == BC_INST_PRINT) bc_vm_putchar('\n', bc_flush_err); } } @@ -940,17 +996,23 @@ static void bc_program_print(BcProgram *p, uchar inst, size_t idx) { if (BC_IS_BC || pop) bc_vec_pop(&p->results); } -void bc_program_negate(BcResult *r, BcNum *n) { +void +bc_program_negate(BcResult* r, BcNum* n) +{ bc_num_copy(&r->d.n, n); if (BC_NUM_NONZERO(&r->d.n)) BC_NUM_NEG_TGL_NP(r->d.n); } -void bc_program_not(BcResult *r, BcNum *n) { +void +bc_program_not(BcResult* r, BcNum* n) +{ if (!bc_num_cmpZero(n)) bc_num_one(&r->d.n); } #if BC_ENABLE_EXTRA_MATH -void bc_program_trunc(BcResult *r, BcNum *n) { +void +bc_program_trunc(BcResult* r, BcNum* n) +{ bc_num_copy(&r->d.n, n); bc_num_truncate(&r->d.n, n->scale); } @@ -961,10 +1023,12 @@ void bc_program_trunc(BcResult *r, BcNum *n) { * @param p The program. * @param inst The unary operation. */ -static void bc_program_unary(BcProgram *p, uchar inst) { - - BcResult *res, *ptr; - BcNum *num; +static void +bc_program_unary(BcProgram* p, uchar inst) +{ + BcResult* res; + BcResult* ptr; + BcNum* num; res = bc_program_prepResult(p); @@ -986,10 +1050,14 @@ static void bc_program_unary(BcProgram *p, uchar inst) { * @param p The program. * @param inst The operator. */ -static void bc_program_logical(BcProgram *p, uchar inst) { - - BcResult *opd1, *opd2, *res; - BcNum *n1, *n2; +static void +bc_program_logical(BcProgram* p, uchar inst) +{ + BcResult* opd1; + BcResult* opd2; + BcResult* res; + BcNum* n1; + BcNum* n2; bool cond = 0; ssize_t cmp; @@ -1002,16 +1070,20 @@ static void bc_program_logical(BcProgram *p, uchar inst) { // Boolean and and or are not short circuiting. This is why; they can be // implemented much easier this way. if (inst == BC_INST_BOOL_AND) + { cond = (bc_num_cmpZero(n1) && bc_num_cmpZero(n2)); + } else if (inst == BC_INST_BOOL_OR) + { cond = (bc_num_cmpZero(n1) || bc_num_cmpZero(n2)); - else { - + } + else + { // We have a relational operator, so do a comparison. cmp = bc_num_cmp(n1, n2); - switch (inst) { - + switch (inst) + { case BC_INST_REL_EQ: { cond = (cmp == 0); @@ -1077,9 +1149,10 @@ static void bc_program_logical(BcProgram *p, uchar inst) { * string from the results stack and push it onto the variable * stack. */ -static void bc_program_assignStr(BcProgram *p, BcNum *num, BcVec *v, bool push) +static void +bc_program_assignStr(BcProgram* p, BcNum* num, BcVec* v, bool push) { - BcNum *n; + BcNum* n; assert(BC_PROG_STACK(&p->results, 1 + !push)); assert(num != NULL && num->num == NULL && num->cap == 0); @@ -1093,6 +1166,7 @@ static void bc_program_assignStr(BcProgram *p, BcNum *num, BcVec *v, bool push) n = bc_vec_pushEmpty(v); // We can just copy because the num should not have allocated anything. + // NOLINTNEXTLINE memcpy(n, num, sizeof(BcNum)); } @@ -1109,16 +1183,18 @@ static void bc_program_assignStr(BcProgram *p, BcNum *num, BcVec *v, bool push) * named something like "x", and a variable "x" is passed to * another parameter. */ -static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) +static void +bc_program_copyToVar(BcProgram* p, size_t idx, BcType t, bool last) { BcResult *ptr = NULL, r; - BcVec *vec; - BcNum *n = NULL; + BcVec* vec; + BcNum* n = NULL; bool var = (t == BC_TYPE_VAR); #if DC_ENABLED // Check the stack for dc. - if (BC_IS_DC) { + if (BC_IS_DC) + { if (BC_ERR(!BC_PROG_STACK(&p->results, 1))) bc_err(BC_ERR_EXEC_STACK); } #endif @@ -1137,7 +1213,9 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) // Get the variable or array, taking care to get the real item. We take // care of last with arrays later. if (!last && var) + { n = bc_vec_item_rev(bc_program_vec(p, ptr->d.loc.loc, t), 1); + } } #endif // BC_ENABLED @@ -1145,8 +1223,8 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) // We can shortcut in dc if it's assigning a string by using // bc_program_assignStr(). - if (ptr->t == BC_RESULT_STR) { - + if (ptr->t == BC_RESULT_STR) + { assert(BC_PROG_STR(n)); if (BC_ERR(!var)) bc_err(BC_ERR_EXEC_TYPE); @@ -1159,21 +1237,27 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) BC_SIG_LOCK; // Just create and copy for a normal variable. - if (var) { - if (BC_PROG_STR(n)) memcpy(&r.d.n, n, sizeof(BcNum)); + if (var) + { + if (BC_PROG_STR(n)) + { + // NOLINTNEXTLINE + memcpy(&r.d.n, n, sizeof(BcNum)); + } else bc_num_createCopy(&r.d.n, n); } - else { - + else + { // If we get here, we are handling an array. This is one place we need // to cast the number from bc_program_num() to a vector. - BcVec *v = (BcVec*) n, *rv = &r.d.v; + BcVec* v = (BcVec*) n; + BcVec* rv = &r.d.v; #if BC_ENABLED - if (BC_IS_BC) { - - BcVec *parent; + if (BC_IS_BC) + { + BcVec* parent; bool ref, ref_size; // We need to figure out if the parameter is a reference or not and @@ -1197,14 +1281,14 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) ref_size = (v->size == sizeof(uchar)); // If we *should* have a reference. - if (ref || (ref_size && t == BC_TYPE_REF)) { - + if (ref || (ref_size && t == BC_TYPE_REF)) + { // Create a new reference vector. bc_vec_init(rv, sizeof(uchar), BC_DTOR_NONE); // If this is true, then we need to construct a reference. - if (ref) { - + if (ref) + { assert(parent->len >= (size_t) (!last + 1)); // Make sure the pointer was not invalidated. @@ -1233,7 +1317,9 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) // If we get here, we have a reference, but we need an array, so // dereference the array. else if (ref_size && t != BC_TYPE_REF) + { v = bc_program_dereference(p, v); + } } #endif // BC_ENABLED @@ -1250,16 +1336,83 @@ static void bc_program_copyToVar(BcProgram *p, size_t idx, BcType t, bool last) BC_SIG_UNLOCK; } +void +bc_program_assignBuiltin(BcProgram* p, bool scale, bool obase, BcBigDig val) +{ + BcVec* v; + BcBigDig* ptr; + BcBigDig* ptr_t; + BcBigDig max, min; + + assert(!scale || !obase); + + // Scale needs handling separate from ibase and obase. + if (scale) + { + // Set the min and max. + min = 0; + max = vm.maxes[BC_PROG_GLOBALS_SCALE]; + + // Get a pointer to the stack and to the current value. + v = p->globals_v + BC_PROG_GLOBALS_SCALE; + ptr_t = p->globals + BC_PROG_GLOBALS_SCALE; + } + else + { + // Set the min and max. + min = BC_NUM_MIN_BASE; + if (BC_ENABLE_EXTRA_MATH && obase && (BC_IS_DC || !BC_IS_POSIX)) + { + min = 0; + } + max = vm.maxes[obase + BC_PROG_GLOBALS_IBASE]; + + // Get a pointer to the stack and to the current value. + v = p->globals_v + BC_PROG_GLOBALS_IBASE + obase; + ptr_t = p->globals + BC_PROG_GLOBALS_IBASE + obase; + } + + // Check for error. + if (BC_ERR(val > max || val < min)) + { + BcErr e; + + // This grabs the right error. + if (scale) e = BC_ERR_EXEC_SCALE; + else if (obase) e = BC_ERR_EXEC_OBASE; + else e = BC_ERR_EXEC_IBASE; + + bc_verr(e, min, max); + } + + // Set the top of the stack and the actual global value. + ptr = bc_vec_top(v); + *ptr = val; + *ptr_t = val; +} + +#if BC_ENABLE_EXTRA_MATH +void +bc_program_assignSeed(BcProgram* p, BcNum* val) +{ + bc_num_rng(val, &p->rng); +} +#endif // BC_ENABLE_EXTRA_MATH + /** * Executes an assignment operator. * @param p The program. * @param inst The assignment operator to execute. */ -static void bc_program_assign(BcProgram *p, uchar inst) { - +static void +bc_program_assign(BcProgram* p, uchar inst) +{ // The local use_val is true when the assigned value needs to be copied. - BcResult *left, *right, res; - BcNum *l, *r; + BcResult* left; + BcResult* right; + BcResult res; + BcNum* l; + BcNum* r; bool ob, sc, use_val = BC_INST_USE_VAL(inst); bc_program_assignPrep(p, &left, &l, &right, &r); @@ -1268,23 +1421,26 @@ static void bc_program_assign(BcProgram *p, uchar inst) { assert(left->t != BC_RESULT_STR); // If we are assigning a string... - if (right->t == BC_RESULT_STR) { - + if (right->t == BC_RESULT_STR) + { assert(BC_PROG_STR(r)); #if BC_ENABLED if (inst != BC_INST_ASSIGN && inst != BC_INST_ASSIGN_NO_VAL) + { bc_err(BC_ERR_EXEC_TYPE); + } #endif // BC_ENABLED // If we are assigning to an array element... - if (left->t == BC_RESULT_ARRAY_ELEM) { - + if (left->t == BC_RESULT_ARRAY_ELEM) + { BC_SIG_LOCK; // We need to free the number and clear it. bc_num_free(l); + // NOLINTNEXTLINE memcpy(l, r, sizeof(BcNum)); // Now we can pop the results. @@ -1292,11 +1448,11 @@ static void bc_program_assign(BcProgram *p, uchar inst) { BC_SIG_UNLOCK; } - else { - + else + { // If we get here, we are assigning to a variable, which we can use // bc_program_assignStr() for. - BcVec *v = bc_program_vec(p, left->d.loc.loc, BC_TYPE_VAR); + BcVec* v = bc_program_vec(p, left->d.loc.loc, BC_TYPE_VAR); bc_program_assignStr(p, r, v, false); } @@ -1304,8 +1460,10 @@ static void bc_program_assign(BcProgram *p, uchar inst) { // If this is true, the value is going to be used again, so we want to // push a temporary with the string. - if (inst == BC_INST_ASSIGN) { + if (inst == BC_INST_ASSIGN) + { res.t = BC_RESULT_STR; + // NOLINTNEXTLINE memcpy(&res.d.n, r, sizeof(BcNum)); bc_vec_push(&p->results, &res); } @@ -1317,8 +1475,8 @@ static void bc_program_assign(BcProgram *p, uchar inst) { } // If we have a normal assignment operator, not a math one... - if (BC_INST_IS_ASSIGN(inst)) { - + if (BC_INST_IS_ASSIGN(inst)) + { // Assigning to a variable that has a string here is fine because there // is no math done on it. @@ -1328,11 +1486,12 @@ static void bc_program_assign(BcProgram *p, uchar inst) { // type of right to BC_RESULT_ZERO in order to prevent it from being // freed. We also don't have to worry about BC_RESULT_STR because it's // take care of above. - if (right->t == BC_RESULT_TEMP || right->t >= BC_RESULT_IBASE) { - + if (right->t == BC_RESULT_TEMP || right->t >= BC_RESULT_IBASE) + { BC_SIG_LOCK; bc_num_free(l); + // NOLINTNEXTLINE memcpy(l, r, sizeof(BcNum)); right->t = BC_RESULT_ZERO; @@ -1342,8 +1501,8 @@ static void bc_program_assign(BcProgram *p, uchar inst) { else bc_num_copy(l, r); } #if BC_ENABLED - else { - + else + { // If we get here, we are doing a math assignment (+=, -=, etc.). So // we need to prepare for a binary operator. BcBigDig scale = BC_PROG_SCALE(p); @@ -1356,7 +1515,9 @@ static void bc_program_assign(BcProgram *p, uchar inst) { // Get the right type of assignment operator, whether val is used or // NO_VAL for performance. if (!use_val) + { inst -= (BC_INST_ASSIGN_POWER_NO_VAL - BC_INST_ASSIGN_POWER); + } assert(BC_NUM_RDX_VALID(l)); assert(BC_NUM_RDX_VALID(r)); @@ -1372,62 +1533,24 @@ static void bc_program_assign(BcProgram *p, uchar inst) { // The globals need special handling, especially the non-seed ones. The // first part of the if statement handles them. - if (ob || sc || left->t == BC_RESULT_IBASE) { - - BcVec *v; - BcBigDig *ptr, *ptr_t, val, max, min; - + if (ob || sc || left->t == BC_RESULT_IBASE) + { // Get the actual value. - val = bc_num_bigdig(l); - - // Scale needs handling separate from ibase and obase. - if (sc) { + BcBigDig val = bc_num_bigdig(l); - // Set the min and max. - min = 0; - max = vm.maxes[BC_PROG_GLOBALS_SCALE]; - - // Get a pointer to the stack and to the current value. - v = p->globals_v + BC_PROG_GLOBALS_SCALE; - ptr_t = p->globals + BC_PROG_GLOBALS_SCALE; - } - else { - - // Set the min and max. - min = BC_NUM_MIN_BASE; - if (BC_ENABLE_EXTRA_MATH && ob && (BC_IS_DC || !BC_IS_POSIX)) - min = 0; - max = vm.maxes[ob + BC_PROG_GLOBALS_IBASE]; - - // Get a pointer to the stack and to the current value. - v = p->globals_v + BC_PROG_GLOBALS_IBASE + ob; - ptr_t = p->globals + BC_PROG_GLOBALS_IBASE + ob; - } - - // Check for error. - if (BC_ERR(val > max || val < min)) { - - // This grabs the right error. - BcErr e = left->t - BC_RESULT_IBASE + BC_ERR_EXEC_IBASE; - - bc_verr(e, min, max); - } - - // Set the top of the stack and the actual global value. - ptr = bc_vec_top(v); - *ptr = val; - *ptr_t = val; + bc_program_assignBuiltin(p, sc, ob, val); } #if BC_ENABLE_EXTRA_MATH // To assign to steed, let bc_num_rng() do its magic. - else if (left->t == BC_RESULT_SEED) bc_num_rng(l, &p->rng); + else if (left->t == BC_RESULT_SEED) bc_program_assignSeed(p, l); #endif // BC_ENABLE_EXTRA_MATH BC_SIG_LOCK; // If we needed to use the value, then we need to copy it. Otherwise, we can // pop indiscriminately. Oh, and the copy should be a BC_RESULT_TEMP. - if (use_val) { + if (use_val) + { bc_num_createCopy(&res.d.n, l); res.t = BC_RESULT_TEMP; bc_vec_npop(&p->results, 2); @@ -1449,8 +1572,9 @@ static void bc_program_assign(BcProgram *p, uchar inst) { * @param copy True if the variable's value should be copied to the results * stack. This is only used in dc. */ -static void bc_program_pushVar(BcProgram *p, const char *restrict code, - size_t *restrict bgn, bool pop, bool copy) +static void +bc_program_pushVar(BcProgram* p, const char* restrict code, + size_t* restrict bgn, bool pop, bool copy) { BcResult r; size_t idx = bc_program_index(code, bgn); @@ -1462,23 +1586,24 @@ static void bc_program_pushVar(BcProgram *p, const char *restrict code, #if DC_ENABLED // If this condition is true, then we have the hard case, where we have to // adjust dc registers. - if (BC_IS_DC && (pop || copy)) { - + if (BC_IS_DC && (pop || copy)) + { // Get the stack for the variable and the number at the top. - BcVec *v = bc_program_vec(p, idx, BC_TYPE_VAR); - BcNum *num = bc_vec_top(v); + BcVec* v = bc_program_vec(p, idx, BC_TYPE_VAR); + BcNum* num = bc_vec_top(v); // Ensure there are enough elements on the stack. - if (BC_ERR(!BC_PROG_STACK(v, 2 - copy))) { - const char *name = bc_map_name(&p->var_map, idx); + if (BC_ERR(!BC_PROG_STACK(v, 2 - copy))) + { + const char* name = bc_map_name(&p->var_map, idx); bc_verr(BC_ERR_EXEC_STACK_REGISTER, name); } assert(BC_PROG_STACK(v, 2 - copy)); // If the top of the stack is actually a number... - if (!BC_PROG_STR(num)) { - + if (!BC_PROG_STR(num)) + { BC_SIG_LOCK; // Create a copy to go onto the results stack as appropriate. @@ -1494,9 +1619,11 @@ static void bc_program_pushVar(BcProgram *p, const char *restrict code, return; } - else { + else + { // Set the string result. We can just memcpy because all of the // fields in the num should be cleared. + // NOLINTNEXTLINE memcpy(&r.d.n, num, sizeof(BcNum)); r.t = BC_RESULT_STR; } @@ -1517,18 +1644,21 @@ static void bc_program_pushVar(BcProgram *p, const char *restrict code, * vector, and will be updated to point after the index on return. * @param inst The instruction; whether to push an array or an array element. */ -static void bc_program_pushArray(BcProgram *p, const char *restrict code, - size_t *restrict bgn, uchar inst) +static void +bc_program_pushArray(BcProgram* p, const char* restrict code, + size_t* restrict bgn, uchar inst) { - BcResult r, *operand; - BcNum *num; + BcResult r; + BcResult* operand; + BcNum* num; BcBigDig temp; // Get the index of the array. r.d.loc.loc = bc_program_index(code, bgn); // Doing an array is easy; just set the result type and finish. - if (inst == BC_INST_ARRAY) { + if (inst == BC_INST_ARRAY) + { r.t = BC_RESULT_ARRAY; bc_vec_push(&p->results, &r); return; @@ -1560,10 +1690,11 @@ static void bc_program_pushArray(BcProgram *p, const char *restrict code, * @param p The program. * @param inst The instruction; whether to do an increment or decrement. */ -static void bc_program_incdec(BcProgram *p, uchar inst) { - +static void +bc_program_incdec(BcProgram* p, uchar inst) +{ BcResult *ptr, res, copy; - BcNum *num; + BcNum* num; uchar inst2; bc_program_prep(p, &ptr, &num, 0); @@ -1611,15 +1742,15 @@ exit: * vector, and will be updated to point after the indices on * return. */ -static void bc_program_call(BcProgram *p, const char *restrict code, - size_t *restrict bgn) +static void +bc_program_call(BcProgram* p, const char* restrict code, size_t* restrict bgn) { BcInstPtr ip; size_t i, nargs; - BcFunc *f; - BcVec *v; - BcAuto *a; - BcResult *arg; + BcFunc* f; + BcVec* v; + BcAuto* a; + BcResult* arg; // Pull the number of arguments out of the bytecode vector. nargs = bc_program_index(code, bgn); @@ -1632,7 +1763,9 @@ static void bc_program_call(BcProgram *p, const char *restrict code, // Error checking. if (BC_ERR(!f->code.len)) bc_verr(BC_ERR_EXEC_UNDEF_FUNC, f->name); if (BC_ERR(nargs != f->nparams)) + { bc_verr(BC_ERR_EXEC_PARAMS, f->nparams, nargs); + } // Set the length of the results stack. We discount the argument, of course. ip.len = p->results.len - nargs; @@ -1643,8 +1776,8 @@ static void bc_program_call(BcProgram *p, const char *restrict code, if (BC_G) bc_program_prepGlobals(p); // Push the arguments onto the stacks of their respective parameters. - for (i = 0; i < nargs; ++i) { - + for (i = 0; i < nargs; ++i) + { size_t j; bool last = true; @@ -1657,12 +1790,12 @@ static void bc_program_call(BcProgram *p, const char *restrict code, // If I have already pushed to a var, I need to make sure I // get the previous version, not the already pushed one. This condition // must be true for that to even be possible. - if (arg->t == BC_RESULT_VAR || arg->t == BC_RESULT_ARRAY) { - + if (arg->t == BC_RESULT_VAR || arg->t == BC_RESULT_ARRAY) + { // Loop through all of the previous parameters. - for (j = 0; j < i && last; ++j) { - - BcAuto *aptr = bc_vec_item(&f->autos, nargs - 1 - j); + for (j = 0; j < i && last; ++j) + { + BcAuto* aptr = bc_vec_item(&f->autos, nargs - 1 - j); // This condition is true if there is a previous parameter with // the same name *and* type because variables and arrays do not @@ -1679,20 +1812,21 @@ static void bc_program_call(BcProgram *p, const char *restrict code, BC_SIG_LOCK; // Push zeroes onto the stacks of the auto variables. - for (; i < f->autos.len; ++i) { - + for (; i < f->autos.len; ++i) + { // Get the auto and its stack. a = bc_vec_item(&f->autos, i); v = bc_program_vec(p, a->idx, a->type); // If a variable, just push a 0; otherwise, push an array. - if (a->type == BC_TYPE_VAR) { - BcNum *n = bc_vec_pushEmpty(v); + if (a->type == BC_TYPE_VAR) + { + BcNum* n = bc_vec_pushEmpty(v); bc_num_init(n, BC_NUM_DEF_SIZE); } - else { - - BcVec *v2; + else + { + BcVec* v2; assert(a->type == BC_TYPE_ARRAY); @@ -1713,11 +1847,12 @@ static void bc_program_call(BcProgram *p, const char *restrict code, * @param inst The return instruction. bc can return void, and we need to know * if it is. */ -static void bc_program_return(BcProgram *p, uchar inst) { - - BcResult *res; - BcFunc *f; - BcInstPtr *ip; +static void +bc_program_return(BcProgram* p, uchar inst) +{ + BcResult* res; + BcFunc* f; + BcInstPtr* ip; size_t i, nresults; // Get the instruction pointer. @@ -1740,25 +1875,26 @@ static void bc_program_return(BcProgram *p, uchar inst) { res = bc_program_prepResult(p); // If we are returning normally... - if (inst == BC_INST_RET) { - - BcNum *num; - BcResult *operand; + if (inst == BC_INST_RET) + { + BcNum* num; + BcResult* operand; // Prepare and copy the return value. bc_program_operand(p, &operand, &num, 1); - if (BC_PROG_STR(num)) { - + if (BC_PROG_STR(num)) + { // We need to set this because otherwise, it will be a // BC_RESULT_TEMP, and BC_RESULT_TEMP needs an actual number to make // it easier to do type checking. res->t = BC_RESULT_STR; + // NOLINTNEXTLINE memcpy(&res->d.n, num, sizeof(BcNum)); } - else { - + else + { BC_SIG_LOCK; bc_num_createCopy(&res->d.n, num); @@ -1766,8 +1902,8 @@ static void bc_program_return(BcProgram *p, uchar inst) { } // Void is easy; set the result. else if (inst == BC_INST_RET_VOID) res->t = BC_RESULT_VOID; - else { - + else + { BC_SIG_LOCK; // If we get here, the instruction is for returning a zero, so do that. @@ -1777,10 +1913,10 @@ static void bc_program_return(BcProgram *p, uchar inst) { BC_SIG_MAYUNLOCK; // We need to pop items off of the stacks of arguments and autos as well. - for (i = 0; i < f->autos.len; ++i) { - - BcAuto *a = bc_vec_item(&f->autos, i); - BcVec *v = bc_program_vec(p, a->idx, a->type); + for (i = 0; i < f->autos.len; ++i) + { + BcAuto* a = bc_vec_item(&f->autos, i); + BcVec* v = bc_program_vec(p, a->idx, a->type); bc_vec_pop(v); } @@ -1805,10 +1941,12 @@ static void bc_program_return(BcProgram *p, uchar inst) { * @param p The program. * @param inst The builtin to execute. */ -static void bc_program_builtin(BcProgram *p, uchar inst) { - - BcResult *opd, *res; - BcNum *num; +static void +bc_program_builtin(BcProgram* p, uchar inst) +{ + BcResult* opd; + BcResult* res; + BcNum* num; bool len = (inst == BC_INST_LENGTH); // Ensure we have a valid builtin. @@ -1821,7 +1959,9 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { #ifndef BC_PROG_NO_STACK_CHECK // Check stack for dc. if (BC_IS_DC && BC_ERR(!BC_PROG_STACK(&p->results, 1))) + { bc_err(BC_ERR_EXEC_STACK); + } #endif // BC_PROG_NO_STACK_CHECK assert(BC_PROG_STACK(&p->results, 1)); @@ -1835,14 +1975,16 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { // We need to ensure that strings and arrays aren't passed to most builtins. // The scale function can take strings in dc. if (!len && (inst != BC_INST_SCALE_FUNC || BC_IS_BC)) + { bc_program_type_num(opd, num); + } // Square root is easy. if (inst == BC_INST_SQRT) bc_num_sqrt(num, &res->d.n, BC_PROG_SCALE(p)); // Absolute value is easy. - else if (inst == BC_INST_ABS) { - + else if (inst == BC_INST_ABS) + { BC_SIG_LOCK; bc_num_createCopy(&res->d.n, num); @@ -1853,8 +1995,8 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { } #if BC_ENABLE_EXTRA_MATH // irand() is easy. - else if (inst == BC_INST_IRAND) { - + else if (inst == BC_INST_IRAND) + { BC_SIG_LOCK; bc_num_init(&res->d.n, num->len - BC_NUM_RDX_VAL(num)); @@ -1866,36 +2008,38 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { #endif // BC_ENABLE_EXTRA_MATH // Everything else is...not easy. - else { - + else + { BcBigDig val = 0; // Well, scale() is easy, but length() is not. - if (len) { - + if (len) + { // If we are bc and we have an array... - if (opd->t == BC_RESULT_ARRAY) { - + if (opd->t == BC_RESULT_ARRAY) + { // Yes, this is one place where we need to cast the number from // bc_program_num() to a vector. - BcVec *v = (BcVec*) num; + BcVec* v = (BcVec*) num; #if BC_ENABLED // Dereference the array, if necessary. if (BC_IS_BC && v->size == sizeof(uchar)) + { v = bc_program_dereference(p, v); + } #endif // BC_ENABLED assert(v->size == sizeof(BcNum)); val = (BcBigDig) v->len; } - else { - + else + { // If the item is a string... - if (!BC_PROG_NUM(opd, num)) { - - char *str; + if (!BC_PROG_NUM(opd, num)) + { + char* str; // Get the string, then get the length. str = bc_program_string(p, num); @@ -1911,7 +2055,9 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { // Like I said; scale() is actually easy. It just also needs the integer // conversion that length() does. else if (BC_IS_BC || BC_PROG_NUM(opd, num)) + { val = (BcBigDig) bc_num_scale(num); + } BC_SIG_LOCK; @@ -1928,10 +2074,15 @@ static void bc_program_builtin(BcProgram *p, uchar inst) { * Executes a divmod. * @param p The program. */ -static void bc_program_divmod(BcProgram *p) { - - BcResult *opd1, *opd2, *res, *res2; - BcNum *n1, *n2; +static void +bc_program_divmod(BcProgram* p) +{ + BcResult* opd1; + BcResult* opd2; + BcResult* res; + BcResult* res2; + BcNum* n1; + BcNum* n2; size_t req; // We grow first to avoid pointer invalidation. @@ -1965,16 +2116,24 @@ static void bc_program_divmod(BcProgram *p) { * Executes modular exponentiation. * @param p The program. */ -static void bc_program_modexp(BcProgram *p) { - - BcResult *r1, *r2, *r3, *res; - BcNum *n1, *n2, *n3; +static void +bc_program_modexp(BcProgram* p) +{ + BcResult* r1; + BcResult* r2; + BcResult* r3; + BcResult* res; + BcNum* n1; + BcNum* n2; + BcNum* n3; #if DC_ENABLED // Check the stack. if (BC_IS_DC && BC_ERR(!BC_PROG_STACK(&p->results, 3))) + { bc_err(BC_ERR_EXEC_STACK); + } #endif // DC_ENABLED @@ -1992,7 +2151,9 @@ static void bc_program_modexp(BcProgram *p) { // Make sure that the values have their pointers updated, if necessary. // Only array elements are possible because this is dc. if (r1->t == BC_RESULT_ARRAY_ELEM && (r1->t == r2->t || r1->t == r3->t)) + { n1 = bc_program_num(p, r1); + } BC_SIG_LOCK; @@ -2010,8 +2171,9 @@ static void bc_program_modexp(BcProgram *p) { * @param p The program. * @param n The number to asciify. */ -static uchar bc_program_asciifyNum(BcProgram *p, BcNum *n) { - +static uchar +bc_program_asciifyNum(BcProgram* p, BcNum* n) +{ BcNum num; BcBigDig val; @@ -2055,11 +2217,13 @@ num_err: * @param p The program. * @param fidx The index of the current function. */ -static void bc_program_asciify(BcProgram *p, size_t fidx) { - +static void +bc_program_asciify(BcProgram* p, size_t fidx) +{ BcResult *r, res; - BcNum *n; - char str[2], *str2; + BcNum* n; + char str[2]; + char* str2; uchar c; size_t idx; @@ -2075,8 +2239,8 @@ static void bc_program_asciify(BcProgram *p, size_t fidx) { // Asciify. if (BC_PROG_NUM(r, n)) c = bc_program_asciifyNum(p, n); - else { - + else + { // Get the string itself, then the first character. str2 = bc_program_string(p, n); c = (uchar) str2[0]; @@ -2106,10 +2270,11 @@ static void bc_program_asciify(BcProgram *p, size_t fidx) { * Streams a number or a string to stdout. * @param p The program. */ -static void bc_program_printStream(BcProgram *p) { - - BcResult *r; - BcNum *n; +static void +bc_program_printStream(BcProgram* p) +{ + BcResult* r; + BcNum* n; // Check the stack. if (BC_ERR(!BC_PROG_STACK(&p->results, 1))) bc_err(BC_ERR_EXEC_STACK); @@ -2138,11 +2303,12 @@ static void bc_program_printStream(BcProgram *p) { * @param bgn An in/out parameter; the start of the index in the bytecode * vector, and will be updated to point after the index on return. */ -static void bc_program_regStackLen(BcProgram *p, const char *restrict code, - size_t *restrict bgn) +static void +bc_program_regStackLen(BcProgram* p, const char* restrict code, + size_t* restrict bgn) { size_t idx = bc_program_index(code, bgn); - BcVec *v = bc_program_vec(p, idx, BC_TYPE_VAR); + BcVec* v = bc_program_vec(p, idx, BC_TYPE_VAR); bc_program_pushBigdig(p, (BcBigDig) v->len, BC_RESULT_TEMP); } @@ -2151,7 +2317,9 @@ static void bc_program_regStackLen(BcProgram *p, const char *restrict code, * Pushes the length of the results stack onto the results stack. * @param p The program. */ -static void bc_program_stackLen(BcProgram *p) { +static void +bc_program_stackLen(BcProgram* p) +{ bc_program_pushBigdig(p, (BcBigDig) p->results.len, BC_RESULT_TEMP); } @@ -2162,10 +2330,11 @@ static void bc_program_stackLen(BcProgram *p) { * 2, and one to pop the amount equal to the number at the top of * the results stack. */ -static void bc_program_nquit(BcProgram *p, uchar inst) { - - BcResult *opnd; - BcNum *num; +static void +bc_program_nquit(BcProgram* p, uchar inst) +{ + BcResult* opnd; + BcNum* num; BcBigDig val; size_t i; @@ -2174,8 +2343,8 @@ static void bc_program_nquit(BcProgram *p, uchar inst) { // Get the number of executions to pop. if (inst == BC_INST_QUIT) val = 2; - else { - + else + { bc_program_prep(p, &opnd, &num, 0); val = bc_num_bigdig(num); @@ -2183,8 +2352,8 @@ static void bc_program_nquit(BcProgram *p, uchar inst) { } // Loop over the tail call stack and adjust the quit value appropriately. - for (i = 0; val && i < p->tail_calls.len; ++i) { - + for (i = 0; val && i < p->tail_calls.len; ++i) + { // Get the number of tail calls for this one. size_t calls = *((size_t*) bc_vec_item_rev(&p->tail_calls, i)) + 1; @@ -2194,11 +2363,13 @@ static void bc_program_nquit(BcProgram *p, uchar inst) { } // If we don't have enough executions, just quit. - if (i == p->stack.len) { + if (i == p->stack.len) + { vm.status = BC_STATUS_QUIT; BC_JMP; } - else { + else + { // We can always pop the last item we reached on the tail call stack // because these are for tail calls. That means that any executions that // we would not have quit in that position on the stack would have quit @@ -2214,14 +2385,17 @@ static void bc_program_nquit(BcProgram *p, uchar inst) { * Pushes the depth of the execution stack onto the stack. * @param p The program. */ -static void bc_program_execStackLen(BcProgram *p) { - +static void +bc_program_execStackLen(BcProgram* p) +{ size_t i, amt, len = p->tail_calls.len; amt = len; for (i = 0; i < len; ++i) + { amt += *((size_t*) bc_vec_item(&p->tail_calls, i)); + } bc_program_pushBigdig(p, (BcBigDig) amt, BC_RESULT_TEMP); } @@ -2235,15 +2409,16 @@ static void bc_program_execStackLen(BcProgram *p) { * @param cond True if the execution is conditional, false otherwise. * @param len The number of bytes in the bytecode vector. */ -static void bc_program_execStr(BcProgram *p, const char *restrict code, - size_t *restrict bgn, bool cond, size_t len) +static void +bc_program_execStr(BcProgram* p, const char* restrict code, + size_t* restrict bgn, bool cond, size_t len) { - BcResult *r; - char *str; - BcFunc *f; + BcResult* r; + char* str; + BcFunc* f; BcInstPtr ip; size_t fidx; - BcNum *n; + BcNum* n; assert(p->stack.len == p->tail_calls.len); @@ -2256,8 +2431,8 @@ static void bc_program_execStr(BcProgram *p, const char *restrict code, bc_program_operand(p, &r, &n, 0); // If execution is conditional... - if (cond) { - + if (cond) + { bool exec; size_t idx, then_idx, else_idx; @@ -2278,7 +2453,9 @@ static void bc_program_execStr(BcProgram *p, const char *restrict code, // not exist, we don't execute. The goto skips all of the setup for the // execution. if (exec || (else_idx != SIZE_MAX)) + { n = bc_vec_top(bc_program_vec(p, idx, BC_TYPE_VAR)); + } else goto exit; if (BC_ERR(!BC_PROG_STR(n))) bc_err(BC_ERR_EXEC_TYPE); @@ -2286,8 +2463,8 @@ static void bc_program_execStr(BcProgram *p, const char *restrict code, BC_UNSETJMP; BC_SIG_UNLOCK; } - else { - + else + { // In non-conditional situations, only the top of stack can be executed, // and in those cases, variables are not allowed to be "on the stack"; // they are only put on the stack to be assigned to. @@ -2308,12 +2485,12 @@ static void bc_program_execStr(BcProgram *p, const char *restrict code, f = bc_vec_item(&p->fns, fidx); // If the function has not been parsed yet... - if (!f->code.len) { - + if (!f->code.len) + { BC_SIG_LOCK; - if (!BC_PARSE_IS_INITED(&vm.read_prs, p)) { - + if (!BC_PARSE_IS_INITED(&vm.read_prs, p)) + { bc_parse_init(&vm.read_prs, p, fidx); // Initialize this too because bc_vm_shutdown() expects them to be @@ -2358,9 +2535,9 @@ static void bc_program_execStr(BcProgram *p, const char *restrict code, // Tail call processing. This condition means that there is more on the // execution stack, and we are at the end of the bytecode vector, and the // last instruction is just a BC_INST_POP_EXEC, which would return. - if (p->stack.len > 1 && *bgn == len - 1 && code[*bgn] == BC_INST_POP_EXEC) { - - size_t *call_ptr = bc_vec_top(&p->tail_calls); + if (p->stack.len > 1 && *bgn == len - 1 && code[*bgn] == BC_INST_POP_EXEC) + { + size_t* call_ptr = bc_vec_top(&p->tail_calls); // Add one to the tail call. *call_ptr += 1; @@ -2396,12 +2573,15 @@ exit: * Prints every item on the results stack, one per line. * @param p The program. */ -static void bc_program_printStack(BcProgram *p) { - +static void +bc_program_printStack(BcProgram* p) +{ size_t idx; for (idx = 0; idx < p->results.len; ++idx) + { bc_program_print(p, BC_INST_PRINT, idx); + } } #endif // DC_ENABLED @@ -2410,8 +2590,9 @@ static void bc_program_printStack(BcProgram *p) { * @param p The program. * @param inst Which global to push, as an instruction. */ -static void bc_program_pushGlobal(BcProgram *p, uchar inst) { - +static void +bc_program_pushGlobal(BcProgram* p, uchar inst) +{ BcResultType t; // Make sure the instruction is valid. @@ -2427,8 +2608,9 @@ static void bc_program_pushGlobal(BcProgram *p, uchar inst) { * @param p The program. * @param inst Which global setting to push, as an instruction. */ -static void bc_program_globalSetting(BcProgram *p, uchar inst) { - +static void +bc_program_globalSetting(BcProgram* p, uchar inst) +{ BcBigDig val; // Make sure the instruction is valid. @@ -2450,9 +2632,10 @@ static void bc_program_globalSetting(BcProgram *p, uchar inst) { * Pushes the value of seed on the stack. * @param p The program. */ -static void bc_program_pushSeed(BcProgram *p) { - - BcResult *res; +static void +bc_program_pushSeed(BcProgram* p) +{ + BcResult* res; res = bc_program_prepResult(p); res->t = BC_RESULT_SEED; @@ -2475,10 +2658,11 @@ static void bc_program_pushSeed(BcProgram *p) { * @param p The program. * @param id_ptr The ID of the function as inserted into the map. */ -static void bc_program_addFunc(BcProgram *p, BcId *id_ptr) { - - BcInstPtr *ip; - BcFunc *f; +static void +bc_program_addFunc(BcProgram* p, BcId* id_ptr) +{ + BcInstPtr* ip; + BcFunc* f; BC_SIG_ASSERT_LOCKED; @@ -2487,15 +2671,17 @@ static void bc_program_addFunc(BcProgram *p, BcId *id_ptr) { bc_func_init(f, id_ptr->name); // This is to make sure pointers are updated if the array was moved. - if (p->stack.len) { + if (p->stack.len) + { ip = bc_vec_top(&p->stack); bc_program_setVecs(p, (BcFunc*) bc_vec_item(&p->fns, ip->func)); } } -size_t bc_program_insertFunc(BcProgram *p, const char *name) { - - BcId *id_ptr; +size_t +bc_program_insertFunc(BcProgram* p, const char* name) +{ + BcId* id_ptr; bool new; size_t idx; @@ -2509,15 +2695,16 @@ size_t bc_program_insertFunc(BcProgram *p, const char *name) { idx = id_ptr->idx; // If the function is new... - if (new) { - + if (new) + { // Add the function to the fns array. bc_program_addFunc(p, id_ptr); } #if BC_ENABLED // bc has to reset the function because it's about to be redefined. - else if (BC_IS_BC) { - BcFunc *func = bc_vec_item(&p->fns, idx); + else if (BC_IS_BC) + { + BcFunc* func = bc_vec_item(&p->fns, idx); bc_func_reset(func); } #endif // BC_ENABLED @@ -2526,8 +2713,9 @@ size_t bc_program_insertFunc(BcProgram *p, const char *name) { } #ifndef NDEBUG -void bc_program_free(BcProgram *p) { - +void +bc_program_free(BcProgram* p) +{ size_t i; BC_SIG_ASSERT_LOCKED; @@ -2535,7 +2723,10 @@ void bc_program_free(BcProgram *p) { assert(p != NULL); // Free the globals stacks. - for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) bc_vec_free(p->globals_v + i); + for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) + { + bc_vec_free(p->globals_v + i); + } bc_vec_free(&p->fns); bc_vec_free(&p->fn_map); @@ -2560,8 +2751,9 @@ void bc_program_free(BcProgram *p) { } #endif // NDEBUG -void bc_program_init(BcProgram *p) { - +void +bc_program_init(BcProgram* p) +{ BcInstPtr ip; size_t i; @@ -2570,11 +2762,12 @@ void bc_program_init(BcProgram *p) { assert(p != NULL); // We want this clear. + // NOLINTNEXTLINE memset(&ip, 0, sizeof(BcInstPtr)); // Setup the globals stacks and the current values. - for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) { - + for (i = 0; i < BC_PROG_GLOBALS_LEN; ++i) + { BcBigDig val = i == BC_PROG_GLOBALS_SCALE ? 0 : BC_BASE; bc_vec_init(p->globals_v + i, sizeof(BcBigDig), BC_DTOR_NONE); @@ -2585,8 +2778,8 @@ void bc_program_init(BcProgram *p) { #if DC_ENABLED // dc-only setup. - if (BC_IS_DC) { - + if (BC_IS_DC) + { bc_vec_init(&p->tail_calls, sizeof(size_t), BC_DTOR_NONE); // We want an item for the main function on the tail call stack. @@ -2636,10 +2829,11 @@ void bc_program_init(BcProgram *p) { assert(p->consts != NULL && p->strs != NULL); } -void bc_program_reset(BcProgram *p) { - - BcFunc *f; - BcInstPtr *ip; +void +bc_program_reset(BcProgram* p) +{ + BcFunc* f; + BcInstPtr* ip; BC_SIG_ASSERT_LOCKED; @@ -2659,28 +2853,31 @@ void bc_program_reset(BcProgram *p) { // Reset the instruction pointer. ip = bc_vec_top(&p->stack); bc_program_setVecs(p, f); + // NOLINTNEXTLINE memset(ip, 0, sizeof(BcInstPtr)); // Write the ready message for a signal, and clear the signal. - if (vm.sig) { - bc_file_write(&vm.fout, bc_flush_none, bc_program_ready_msg, - bc_program_ready_msg_len); + if (vm.sig) + { + bc_file_printf(&vm.fout, "%s", bc_program_ready_msg); bc_file_flush(&vm.fout, bc_flush_err); vm.sig = 0; } } -void bc_program_exec(BcProgram *p) { - +void +bc_program_exec(BcProgram* p) +{ size_t idx; - BcResult r, *ptr; - BcInstPtr *ip; - BcFunc *func; - char *code; + BcResult r; + BcResult* ptr; + BcInstPtr* ip; + BcFunc* func; + char* code; bool cond = false; uchar inst; #if BC_ENABLED - BcNum *num; + BcNum* num; #endif // BC_ENABLED #if !BC_HAS_COMPUTED_GOTO #ifndef NDEBUG @@ -2740,11 +2937,12 @@ void bc_program_exec(BcProgram *p) { switch (inst) #endif // !BC_HAS_COMPUTED_GOTO { - #if BC_ENABLED // This just sets up the condition for the unconditional jump below, // which checks the condition, if necessary. + // clang-format off BC_PROG_LBL(BC_INST_JUMP_ZERO): + // clang-format on { bc_program_prep(p, &ptr, &num, 0); @@ -2756,15 +2954,17 @@ void bc_program_exec(BcProgram *p) { // Fallthrough. BC_PROG_FALLTHROUGH + // clang-format off BC_PROG_LBL(BC_INST_JUMP): + // clang-format on { idx = bc_program_index(code, &ip->idx); // If a jump is required... - if (inst == BC_INST_JUMP || cond) { - + if (inst == BC_INST_JUMP || cond) + { // Get the address to jump to. - size_t *addr = bc_vec_item(&func->labels, idx); + size_t* addr = bc_vec_item(&func->labels, idx); // If this fails, then the parser failed to set up the // labels correctly. @@ -2777,7 +2977,9 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_CALL): + // clang-format on { assert(BC_IS_BC); @@ -2795,14 +2997,18 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_INC): BC_PROG_LBL(BC_INST_DEC): + // clang-format on { bc_program_incdec(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_HALT): + // clang-format on { vm.status = BC_STATUS_QUIT; @@ -2812,9 +3018,11 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_RET): BC_PROG_LBL(BC_INST_RET0): BC_PROG_LBL(BC_INST_RET_VOID): + // clang-format on { bc_program_return(p, inst); @@ -2831,6 +3039,7 @@ void bc_program_exec(BcProgram *p) { } #endif // BC_ENABLED + // clang-format off BC_PROG_LBL(BC_INST_BOOL_OR): BC_PROG_LBL(BC_INST_BOOL_AND): BC_PROG_LBL(BC_INST_REL_EQ): @@ -2839,12 +3048,15 @@ void bc_program_exec(BcProgram *p) { BC_PROG_LBL(BC_INST_REL_NE): BC_PROG_LBL(BC_INST_REL_LT): BC_PROG_LBL(BC_INST_REL_GT): + // clang-format on { bc_program_logical(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_READ): + // clang-format on { // We want to flush output before // this in case there is a prompt. @@ -2865,64 +3077,79 @@ void bc_program_exec(BcProgram *p) { } #if BC_ENABLE_EXTRA_MATH + // clang-format off BC_PROG_LBL(BC_INST_RAND): + // clang-format on { bc_program_rand(p); BC_PROG_JUMP(inst, code, ip); } #endif // BC_ENABLE_EXTRA_MATH + // clang-format off BC_PROG_LBL(BC_INST_MAXIBASE): BC_PROG_LBL(BC_INST_MAXOBASE): BC_PROG_LBL(BC_INST_MAXSCALE): #if BC_ENABLE_EXTRA_MATH BC_PROG_LBL(BC_INST_MAXRAND): #endif // BC_ENABLE_EXTRA_MATH + // clang-format on { BcBigDig dig = vm.maxes[inst - BC_INST_MAXIBASE]; bc_program_pushBigdig(p, dig, BC_RESULT_TEMP); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_LINE_LENGTH): #if BC_ENABLED BC_PROG_LBL(BC_INST_GLOBAL_STACKS): #endif // BC_ENABLED BC_PROG_LBL(BC_INST_LEADING_ZERO): + // clang-format on { bc_program_globalSetting(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_VAR): + // clang-format on { bc_program_pushVar(p, code, &ip->idx, false, false); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_ARRAY_ELEM): BC_PROG_LBL(BC_INST_ARRAY): + // clang-format on { bc_program_pushArray(p, code, &ip->idx, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_IBASE): BC_PROG_LBL(BC_INST_SCALE): BC_PROG_LBL(BC_INST_OBASE): + // clang-format on { bc_program_pushGlobal(p, inst); BC_PROG_JUMP(inst, code, ip); } #if BC_ENABLE_EXTRA_MATH + // clang-format off BC_PROG_LBL(BC_INST_SEED): + // clang-format on { bc_program_pushSeed(p); BC_PROG_JUMP(inst, code, ip); } #endif // BC_ENABLE_EXTRA_MATH + // clang-format off BC_PROG_LBL(BC_INST_LENGTH): BC_PROG_LBL(BC_INST_SCALE_FUNC): BC_PROG_LBL(BC_INST_SQRT): @@ -2930,12 +3157,15 @@ void bc_program_exec(BcProgram *p) { #if BC_ENABLE_EXTRA_MATH BC_PROG_LBL(BC_INST_IRAND): #endif // BC_ENABLE_EXTRA_MATH + // clang-format on { bc_program_builtin(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_ASCIIFY): + // clang-format on { bc_program_asciify(p, ip->func); @@ -2951,28 +3181,34 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_NUM): + // clang-format on { bc_program_const(p, code, &ip->idx); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_ZERO): BC_PROG_LBL(BC_INST_ONE): #if BC_ENABLED BC_PROG_LBL(BC_INST_LAST): #endif // BC_ENABLED + // clang-format on { r.t = BC_RESULT_ZERO + (inst - BC_INST_ZERO); bc_vec_push(&p->results, &r); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_PRINT): BC_PROG_LBL(BC_INST_PRINT_POP): #if BC_ENABLED BC_PROG_LBL(BC_INST_PRINT_STR): #endif // BC_ENABLED + // clang-format on { bc_program_print(p, inst, 0); @@ -2983,7 +3219,9 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_STR): + // clang-format on { // Set up the result and push. r.t = BC_RESULT_STR; @@ -2994,6 +3232,7 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_POWER): BC_PROG_LBL(BC_INST_MULTIPLY): BC_PROG_LBL(BC_INST_DIVIDE): @@ -3005,21 +3244,25 @@ void bc_program_exec(BcProgram *p) { BC_PROG_LBL(BC_INST_LSHIFT): BC_PROG_LBL(BC_INST_RSHIFT): #endif // BC_ENABLE_EXTRA_MATH + // clang-format on { bc_program_op(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_NEG): BC_PROG_LBL(BC_INST_BOOL_NOT): #if BC_ENABLE_EXTRA_MATH BC_PROG_LBL(BC_INST_TRUNC): #endif // BC_ENABLE_EXTRA_MATH + // clang-format on { bc_program_unary(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off #if BC_ENABLED BC_PROG_LBL(BC_INST_ASSIGN_POWER): BC_PROG_LBL(BC_INST_ASSIGN_MULTIPLY): @@ -3046,18 +3289,24 @@ void bc_program_exec(BcProgram *p) { #endif // BC_ENABLE_EXTRA_MATH #endif // BC_ENABLED BC_PROG_LBL(BC_INST_ASSIGN_NO_VAL): + // clang-format on { bc_program_assign(p, inst); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_POP): + // clang-format on { #ifndef BC_PROG_NO_STACK_CHECK // dc must do a stack check, but bc does not. - if (BC_IS_DC) { + if (BC_IS_DC) + { if (BC_ERR(!BC_PROG_STACK(&p->results, 1))) + { bc_err(BC_ERR_EXEC_STACK); + } } #endif // BC_PROG_NO_STACK_CHECK @@ -3068,13 +3317,17 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_SWAP): + // clang-format on { - BcResult *ptr2; + BcResult* ptr2; // Check the stack. if (BC_ERR(!BC_PROG_STACK(&p->results, 2))) + { bc_err(BC_ERR_EXEC_STACK); + } assert(BC_PROG_STACK(&p->results, 2)); @@ -3083,33 +3336,44 @@ void bc_program_exec(BcProgram *p) { ptr2 = bc_vec_item_rev(&p->results, 1); // Swap. It's just easiest to do it this way. + // NOLINTNEXTLINE memcpy(&r, ptr, sizeof(BcResult)); + // NOLINTNEXTLINE memcpy(ptr, ptr2, sizeof(BcResult)); + // NOLINTNEXTLINE memcpy(ptr2, &r, sizeof(BcResult)); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_MODEXP): + // clang-format on { bc_program_modexp(p); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_DIVMOD): + // clang-format on { bc_program_divmod(p); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_PRINT_STREAM): + // clang-format on { bc_program_printStream(p); BC_PROG_JUMP(inst, code, ip); } #if DC_ENABLED + // clang-format off BC_PROG_LBL(BC_INST_POP_EXEC): + // clang-format on { // If this fails, the dc parser got something wrong. assert(BC_PROG_STACK(&p->stack, 2)); @@ -3130,8 +3394,10 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_EXECUTE): BC_PROG_LBL(BC_INST_EXEC_COND): + // clang-format on { cond = (inst == BC_INST_EXEC_COND); @@ -3149,35 +3415,47 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_PRINT_STACK): + // clang-format on { bc_program_printStack(p); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_CLEAR_STACK): + // clang-format on { bc_vec_popAll(&p->results); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_REG_STACK_LEN): + // clang-format on { bc_program_regStackLen(p, code, &ip->idx); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_STACK_LEN): + // clang-format on { bc_program_stackLen(p); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_DUPLICATE): + // clang-format on { // Check the stack. if (BC_ERR(!BC_PROG_STACK(&p->results, 1))) + { bc_err(BC_ERR_EXEC_STACK); + } assert(BC_PROG_STACK(&p->results, 1)); @@ -3195,23 +3473,29 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_LOAD): BC_PROG_LBL(BC_INST_PUSH_VAR): + // clang-format on { bool copy = (inst == BC_INST_LOAD); bc_program_pushVar(p, code, &ip->idx, true, copy); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_PUSH_TO_VAR): + // clang-format on { idx = bc_program_index(code, &ip->idx); bc_program_copyToVar(p, idx, BC_TYPE_VAR, true); BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_QUIT): BC_PROG_LBL(BC_INST_NQUIT): + // clang-format on { bc_program_nquit(p, inst); @@ -3227,7 +3511,9 @@ void bc_program_exec(BcProgram *p) { BC_PROG_JUMP(inst, code, ip); } + // clang-format off BC_PROG_LBL(BC_INST_EXEC_STACK_LEN): + // clang-format on { bc_program_execStackLen(p); BC_PROG_JUMP(inst, code, ip); @@ -3235,7 +3521,9 @@ void bc_program_exec(BcProgram *p) { #endif // DC_ENABLED #if BC_HAS_COMPUTED_GOTO + // clang-format off BC_PROG_LBL(BC_INST_INVALID): + // clang-format on { return; } @@ -3263,19 +3551,22 @@ void bc_program_exec(BcProgram *p) { #if BC_DEBUG_CODE #if BC_ENABLED && DC_ENABLED -void bc_program_printStackDebug(BcProgram *p) { +void +bc_program_printStackDebug(BcProgram* p) +{ bc_file_puts(&vm.fout, bc_flush_err, "-------------- Stack ----------\n"); bc_program_printStack(p); bc_file_puts(&vm.fout, bc_flush_err, "-------------- Stack End ------\n"); } -static void bc_program_printIndex(const char *restrict code, - size_t *restrict bgn) +static void +bc_program_printIndex(const char* restrict code, size_t* restrict bgn) { uchar byte, i, bytes = (uchar) code[(*bgn)++]; ulong val = 0; - for (byte = 1, i = 0; byte && i < bytes; ++i) { + for (byte = 1, i = 0; byte && i < bytes; ++i) + { byte = (uchar) code[(*bgn)++]; if (byte) val |= ((ulong) byte) << (CHAR_BIT * i); } @@ -3283,24 +3574,26 @@ static void bc_program_printIndex(const char *restrict code, bc_vm_printf(" (%lu) ", val); } -static void bc_program_printStr(const BcProgram *p, const char *restrict code, - size_t *restrict bgn) +static void +bc_program_printStr(const BcProgram* p, const char* restrict code, + size_t* restrict bgn) { size_t idx = bc_program_index(code, bgn); - char *s; + char* s; s = *((char**) bc_vec_item(p->strs, idx)); bc_vm_printf(" (\"%s\") ", s); } -void bc_program_printInst(const BcProgram *p, const char *restrict code, - size_t *restrict bgn) +void +bc_program_printInst(const BcProgram* p, const char* restrict code, + size_t* restrict bgn) { uchar inst = (uchar) code[(*bgn)++]; - bc_vm_printf("Inst[%zu]: %s [%lu]; ", *bgn - 1, - bc_inst_names[inst], (unsigned long) inst); + bc_vm_printf("Inst[%zu]: %s [%lu]; ", *bgn - 1, bc_inst_names[inst], + (unsigned long) inst); if (inst == BC_INST_VAR || inst == BC_INST_ARRAY_ELEM || inst == BC_INST_ARRAY) @@ -3308,9 +3601,10 @@ void bc_program_printInst(const BcProgram *p, const char *restrict code, bc_program_printIndex(code, bgn); } else if (inst == BC_INST_STR) bc_program_printStr(p, code, bgn); - else if (inst == BC_INST_NUM) { + else if (inst == BC_INST_NUM) + { size_t idx = bc_program_index(code, bgn); - BcConst *c = bc_vec_item(p->consts, idx); + BcConst* c = bc_vec_item(p->consts, idx); bc_vm_printf("(%s)", c->val); } else if (inst == BC_INST_CALL || @@ -3323,15 +3617,16 @@ void bc_program_printInst(const BcProgram *p, const char *restrict code, bc_vm_putchar('\n', bc_flush_err); } -void bc_program_code(const BcProgram* p) { - - BcFunc *f; - char *code; +void +bc_program_code(const BcProgram* p) +{ + BcFunc* f; + char* code; BcInstPtr ip; size_t i; - for (i = 0; i < p->fns.len; ++i) { - + for (i = 0; i < p->fns.len; ++i) + { ip.idx = ip.len = 0; ip.func = i; @@ -3339,7 +3634,10 @@ void bc_program_code(const BcProgram* p) { code = f->code.v; bc_vm_printf("func[%zu]:\n", ip.func); - while (ip.idx < f->code.len) bc_program_printInst(p, code, &ip.idx); + while (ip.idx < f->code.len) + { + bc_program_printInst(p, code, &ip.idx); + } bc_file_puts(&vm.fout, bc_flush_err, "\n\n"); } } diff --git a/contrib/bc/src/rand.c b/contrib/bc/src/rand.c index a3b8942a6042..c762f1f36024 100644 --- a/contrib/bc/src/rand.c +++ b/contrib/bc/src/rand.c @@ -66,8 +66,9 @@ * @param b The second operand. * @return The sum, including overflow. */ -static BcRandState bc_rand_addition(uint_fast64_t a, uint_fast64_t b) { - +static BcRandState +bc_rand_addition(uint_fast64_t a, uint_fast64_t b) +{ BcRandState res; res.lo = a + b; @@ -82,8 +83,9 @@ static BcRandState bc_rand_addition(uint_fast64_t a, uint_fast64_t b) { * @param b The second operand. * @return The sum, without overflow. */ -static BcRandState bc_rand_addition2(BcRandState a, BcRandState b) { - +static BcRandState +bc_rand_addition2(BcRandState a, BcRandState b) +{ BcRandState temp, res; res = bc_rand_addition(a.lo, b.lo); @@ -99,8 +101,9 @@ static BcRandState bc_rand_addition2(BcRandState a, BcRandState b) { * @param b The second operand. * @return The product, including overflow. */ -static BcRandState bc_rand_multiply(uint_fast64_t a, uint_fast64_t b) { - +static BcRandState +bc_rand_multiply(uint_fast64_t a, uint_fast64_t b) +{ uint_fast64_t al, ah, bl, bh, c0, c1, c2, c3; BcRandState carry, res; @@ -128,8 +131,9 @@ static BcRandState bc_rand_multiply(uint_fast64_t a, uint_fast64_t b) { * @param b The second operand. * @return The product, without overflow. */ -static BcRandState bc_rand_multiply2(BcRandState a, BcRandState b) { - +static BcRandState +bc_rand_multiply2(BcRandState a, BcRandState b) +{ BcRandState c0, c1, c2, carry; c0 = bc_rand_multiply(a.lo, b.lo); @@ -150,8 +154,9 @@ static BcRandState bc_rand_multiply2(BcRandState a, BcRandState b) { * stack of PRNG's. * @param r The PRNG to mark as modified. */ -static void bc_rand_setModified(BcRNGData *r) { - +static void +bc_rand_setModified(BcRNGData* r) +{ #if BC_RAND_BUILTIN r->inc |= (BcRandState) 1UL; #else // BC_RAND_BUILTIN @@ -164,8 +169,9 @@ static void bc_rand_setModified(BcRNGData *r) { * stack of PRNG's. * @param r The PRNG to mark as not modified. */ -static void bc_rand_clearModified(BcRNGData *r) { - +static void +bc_rand_clearModified(BcRNGData* r) +{ #if BC_RAND_BUILTIN r->inc &= ~((BcRandState) 1UL); #else // BC_RAND_BUILTIN @@ -179,9 +185,14 @@ static void bc_rand_clearModified(BcRNGData *r) { * @param d The destination PRNG. * @param s The source PRNG. */ -static void bc_rand_copy(BcRNGData *d, BcRNGData *s) { +static void +bc_rand_copy(BcRNGData* d, BcRNGData* s) +{ bool unmod = BC_RAND_NOTMODIFIED(d); + + // NOLINTNEXTLINE memcpy(d, s, sizeof(BcRNGData)); + if (!unmod) bc_rand_setModified(d); else if (!BC_RAND_NOTMODIFIED(s)) bc_rand_clearModified(d); } @@ -193,21 +204,22 @@ static void bc_rand_copy(BcRNGData *d, BcRNGData *s) { * @param ptr A pointer to the file, as a void pointer. * @return The random data as an unsigned long. */ -static ulong bc_rand_frand(void* ptr) { - +static ulong +bc_rand_frand(void* ptr) +{ ulong buf[1]; int fd; ssize_t nread; assert(ptr != NULL); - fd = *((int*)ptr); + fd = *((int*) ptr); nread = read(fd, buf, sizeof(ulong)); if (BC_ERR(nread != sizeof(ulong))) bc_vm_fatalError(BC_ERR_FATAL_IO_ERR); - return *((ulong*)buf); + return *((ulong*) buf); } #else // _WIN32 @@ -216,8 +228,9 @@ static ulong bc_rand_frand(void* ptr) { * @param ptr An unused parameter. * @return The random data as an unsigned long. */ -static ulong bc_rand_winrand(void *ptr) { - +static ulong +bc_rand_winrand(void* ptr) +{ ulong buf[1]; NTSTATUS s; @@ -242,8 +255,9 @@ static ulong bc_rand_winrand(void *ptr) { * @param ptr An unused parameter. * @return The random data as an unsigned long. */ -static ulong bc_rand_rand(void *ptr) { - +static ulong +bc_rand_rand(void* ptr) +{ size_t i; ulong res = 0; @@ -251,7 +265,9 @@ static ulong bc_rand_rand(void *ptr) { // Fill up the unsigned long byte-by-byte. for (i = 0; i < sizeof(ulong); ++i) + { res |= ((ulong) (rand() & BC_RAND_SRAND_BITS)) << (i * CHAR_BIT); + } return res; } @@ -262,8 +278,9 @@ static ulong bc_rand_rand(void *ptr) { * @param r The PRNG. * @return The increment of the PRNG, including the last odd bit. */ -static BcRandState bc_rand_inc(BcRNGData *r) { - +static BcRandState +bc_rand_inc(BcRNGData* r) +{ BcRandState inc; #if BC_RAND_BUILTIN @@ -280,8 +297,9 @@ static BcRandState bc_rand_inc(BcRNGData *r) { * Sets up the increment for the PRNG. * @param r The PRNG whose increment will be set up. */ -static void bc_rand_setupInc(BcRNGData *r) { - +static void +bc_rand_setupInc(BcRNGData* r) +{ #if BC_RAND_BUILTIN r->inc <<= 1UL; #else // BC_RAND_BUILTIN @@ -297,8 +315,9 @@ static void bc_rand_setupInc(BcRNGData *r) { * @param val1 The lower half of the state. * @param val2 The upper half of the state. */ -static void bc_rand_seedState(BcRandState *state, ulong val1, ulong val2) { - +static void +bc_rand_seedState(BcRandState* state, ulong val1, ulong val2) +{ #if BC_RAND_BUILTIN *state = ((BcRandState) val1) | ((BcRandState) val2) << (BC_LONG_BIT); #else // BC_RAND_BUILTIN @@ -315,8 +334,9 @@ static void bc_rand_seedState(BcRandState *state, ulong val1, ulong val2) { * @param inc1 The lower half of the increment. * @param inc2 The upper half of the increment. */ -static void bc_rand_seedRNG(BcRNGData *r, ulong state1, ulong state2, - ulong inc1, ulong inc2) +static void +bc_rand_seedRNG(BcRNGData* r, ulong state1, ulong state2, ulong inc1, + ulong inc2) { bc_rand_seedState(&r->state, state1, state2); bc_rand_seedState(&r->inc, inc1, inc2); @@ -329,8 +349,9 @@ static void bc_rand_seedRNG(BcRNGData *r, ulong state1, ulong state2, * @param fulong The function to fill an unsigned long. * @param ptr The parameter to pass to @a fulong. */ -static void bc_rand_fill(BcRNGData *r, BcRandUlong fulong, void *ptr) { - +static void +bc_rand_fill(BcRNGData* r, BcRandUlong fulong, void* ptr) +{ ulong state1, state2, inc1, inc2; state1 = fulong(ptr); @@ -346,7 +367,9 @@ static void bc_rand_fill(BcRNGData *r, BcRandUlong fulong, void *ptr) { * Executes the "step" portion of a PCG udpate. * @param r The PRNG. */ -static void bc_rand_step(BcRNGData *r) { +static void +bc_rand_step(BcRNGData* r) +{ BcRandState temp = bc_rand_mul2(r->state, bc_rand_multiplier); r->state = bc_rand_add2(temp, bc_rand_inc(r)); } @@ -356,7 +379,9 @@ static void bc_rand_step(BcRNGData *r) { * @param r The PRNG. * @return The new output from the PRNG. */ -static BcRand bc_rand_output(BcRNGData *r) { +static BcRand +bc_rand_output(BcRNGData* r) +{ return BC_RAND_ROT(BC_RAND_FOLD(r->state), BC_RAND_ROTAMT(r->state)); } @@ -366,9 +391,10 @@ static BcRand bc_rand_output(BcRNGData *r) { * @param r The PRNG stack. * @param rng The PRNG on the top of the stack. Must have been seeded. */ -static void bc_rand_seedZeroes(BcRNG *r, BcRNGData *rng, size_t idx) { - - BcRNGData *rng2; +static void +bc_rand_seedZeroes(BcRNG* r, BcRNGData* rng, size_t idx) +{ + BcRNGData* rng2; // Just return if there are none to do. if (r->v.len <= idx) return; @@ -377,18 +403,21 @@ static void bc_rand_seedZeroes(BcRNG *r, BcRNGData *rng, size_t idx) { rng2 = bc_vec_item_rev(&r->v, idx); // Does it need seeding? Then it, and maybe more, do. - if (BC_RAND_ZERO(rng2)) { - + if (BC_RAND_ZERO(rng2)) + { size_t i; // Seed the ones that need seeding. for (i = 1; i < r->v.len; ++i) + { bc_rand_copy(bc_vec_item_rev(&r->v, i), rng); + } } } -void bc_rand_srand(BcRNGData *rng) { - +void +bc_rand_srand(BcRNGData* rng) +{ int fd = 0; BC_SIG_LOCK; @@ -398,16 +427,18 @@ void bc_rand_srand(BcRNGData *rng) { // Try /dev/urandom first. fd = open("/dev/urandom", O_RDONLY); - if (BC_NO_ERR(fd >= 0)) { + if (BC_NO_ERR(fd >= 0)) + { bc_rand_fill(rng, bc_rand_frand, &fd); close(fd); } - else { - + else + { // Try /dev/random second. fd = open("/dev/random", O_RDONLY); - if (BC_NO_ERR(fd >= 0)) { + if (BC_NO_ERR(fd >= 0)) + { bc_rand_fill(rng, bc_rand_frand, &fd); close(fd); } @@ -418,7 +449,10 @@ void bc_rand_srand(BcRNGData *rng) { #endif // _WIN32 // Fallback to rand() until the thing is seeded. - while (BC_ERR(BC_RAND_ZERO(rng))) bc_rand_fill(rng, bc_rand_rand, NULL); + while (BC_ERR(BC_RAND_ZERO(rng))) + { + bc_rand_fill(rng, bc_rand_rand, NULL); + } BC_SIG_UNLOCK; } @@ -429,21 +463,22 @@ void bc_rand_srand(BcRNGData *rng) { * @param r The PRNG stack. * @param rng The PRNG that will be used to seed the others. */ -static void bc_rand_propagate(BcRNG *r, BcRNGData *rng) { - +static void +bc_rand_propagate(BcRNG* r, BcRNGData* rng) +{ // Just return if there are none to do. if (r->v.len <= 1) return; // If the PRNG has not been modified... - if (BC_RAND_NOTMODIFIED(rng)) { - + if (BC_RAND_NOTMODIFIED(rng)) + { size_t i; bool go = true; // Find the first PRNG that is modified and seed the others. - for (i = 1; go && i < r->v.len; ++i) { - - BcRNGData *rng2 = bc_vec_item_rev(&r->v, i); + for (i = 1; go && i < r->v.len; ++i) + { + BcRNGData* rng2 = bc_vec_item_rev(&r->v, i); go = BC_RAND_NOTMODIFIED(rng2); @@ -457,10 +492,11 @@ static void bc_rand_propagate(BcRNG *r, BcRNGData *rng) { else bc_rand_seedZeroes(r, rng, 1); } -BcRand bc_rand_int(BcRNG *r) { - +BcRand +bc_rand_int(BcRNG* r) +{ // Get the actual PRNG. - BcRNGData *rng = bc_vec_top(&r->v); + BcRNGData* rng = bc_vec_top(&r->v); BcRand res; // Make sure the PRNG is seeded. @@ -478,22 +514,26 @@ BcRand bc_rand_int(BcRNG *r) { return res; } -BcRand bc_rand_bounded(BcRNG *r, BcRand bound) { - +BcRand +bc_rand_bounded(BcRNG* r, BcRand bound) +{ // Calculate the threshold below which we have to try again. BcRand rand, threshold = (0 - bound) % bound; - do { + do + { rand = bc_rand_int(r); - } while (rand < threshold); + } + while (rand < threshold); return rand % bound; } -void bc_rand_seed(BcRNG *r, ulong state1, ulong state2, ulong inc1, ulong inc2) +void +bc_rand_seed(BcRNG* r, ulong state1, ulong state2, ulong inc1, ulong inc2) { // Get the actual PRNG. - BcRNGData *rng = bc_vec_top(&r->v); + BcRNGData* rng = bc_vec_top(&r->v); // Seed and set up the PRNG's increment. bc_rand_seedState(&rng->inc, inc1, inc2); @@ -502,7 +542,9 @@ void bc_rand_seed(BcRNG *r, ulong state1, ulong state2, ulong inc1, ulong inc2) // If the state is 0, use the increment as the state. Otherwise, seed it // with the state. - if (!state1 && !state2) { + if (!state1 && !state2) + { + // NOLINTNEXTLINE memcpy(&rng->state, &rng->inc, sizeof(BcRandState)); bc_rand_step(rng); } @@ -519,8 +561,9 @@ void bc_rand_seed(BcRNG *r, ulong state1, ulong state2, ulong inc1, ulong inc2) * @return The increment without the odd bit and with being shifted one bit * down. */ -static BcRandState bc_rand_getInc(BcRNGData *r) { - +static BcRandState +bc_rand_getInc(BcRNGData* r) +{ BcRandState res; #if BC_RAND_BUILTIN @@ -535,10 +578,11 @@ static BcRandState bc_rand_getInc(BcRNGData *r) { return res; } -void bc_rand_getRands(BcRNG *r, BcRand *s1, BcRand *s2, BcRand *i1, BcRand *i2) +void +bc_rand_getRands(BcRNG* r, BcRand* s1, BcRand* s2, BcRand* i1, BcRand* i2) { BcRandState inc; - BcRNGData *rng = bc_vec_top(&r->v); + BcRNGData* rng = bc_vec_top(&r->v); if (BC_ERR(BC_RAND_ZERO(rng))) bc_rand_srand(rng); @@ -554,30 +598,38 @@ void bc_rand_getRands(BcRNG *r, BcRand *s1, BcRand *s2, BcRand *i1, BcRand *i2) *i2 = BC_RAND_CHOP(inc); } -void bc_rand_push(BcRNG *r) { - - BcRNGData *rng = bc_vec_pushEmpty(&r->v); +void +bc_rand_push(BcRNG* r) +{ + BcRNGData* rng = bc_vec_pushEmpty(&r->v); // Make sure the PRNG is properly zeroed because that marks it as needing to // be seeded. + // NOLINTNEXTLINE memset(rng, 0, sizeof(BcRNGData)); // If there is another item, copy it too. if (r->v.len > 1) bc_rand_copy(rng, bc_vec_item_rev(&r->v, 1)); } -void bc_rand_pop(BcRNG *r, bool reset) { +void +bc_rand_pop(BcRNG* r, bool reset) +{ bc_vec_npop(&r->v, reset ? r->v.len - 1 : 1); } -void bc_rand_init(BcRNG *r) { +void +bc_rand_init(BcRNG* r) +{ BC_SIG_ASSERT_LOCKED; bc_vec_init(&r->v, sizeof(BcRNGData), BC_DTOR_NONE); bc_rand_push(r); } #if BC_RAND_USE_FREE -void bc_rand_free(BcRNG *r) { +void +bc_rand_free(BcRNG* r) +{ BC_SIG_ASSERT_LOCKED; bc_vec_free(&r->v); } diff --git a/contrib/bc/src/read.c b/contrib/bc/src/read.c index b9cd4db7bb49..13a34fd66e53 100644 --- a/contrib/bc/src/read.c +++ b/contrib/bc/src/read.c @@ -54,12 +54,14 @@ #include <vm.h> /** - * A portability file open function. + * A portability file open function. This is copied to gen/strgen.c. Make sure + * to update that if this changes. * @param path The path to the file to open. * @param mode The mode to open in. */ -static int bc_read_open(const char* path, int mode) { - +static int +bc_read_open(const char* path, int mode) +{ int fd; #ifndef _WIN32 @@ -77,20 +79,23 @@ static int bc_read_open(const char* path, int mode) { * @param buf The buffer to test. * @param size The size of the buffer. */ -static bool bc_read_binary(const char *buf, size_t size) { - +static bool +bc_read_binary(const char* buf, size_t size) +{ size_t i; - for (i = 0; i < size; ++i) { + for (i = 0; i < size; ++i) + { if (BC_ERR(BC_READ_BIN_CHAR(buf[i]))) return true; } return false; } -bool bc_read_buf(BcVec *vec, char *buf, size_t *buf_len) { - - char *nl; +bool +bc_read_buf(BcVec* vec, char* buf, size_t* buf_len) +{ + char* nl; // If nothing there, return. if (!*buf_len) return false; @@ -99,8 +104,8 @@ bool bc_read_buf(BcVec *vec, char *buf, size_t *buf_len) { nl = strchr(buf, '\n'); // If a newline exists... - if (nl != NULL) { - + if (nl != NULL) + { // Get the size of the data up to, and including, the newline. size_t nllen = (size_t) ((nl + 1) - buf); @@ -110,6 +115,7 @@ bool bc_read_buf(BcVec *vec, char *buf, size_t *buf_len) { // buffer up. bc_vec_npush(vec, nllen, buf); *buf_len -= nllen; + // NOLINTNEXTLINE memmove(buf, nl + 1, *buf_len + 1); return true; @@ -122,8 +128,9 @@ bool bc_read_buf(BcVec *vec, char *buf, size_t *buf_len) { return false; } -BcStatus bc_read_chars(BcVec *vec, const char *prompt) { - +BcStatus +bc_read_chars(BcVec* vec, const char* prompt) +{ bool done = false; assert(vec != NULL && vec->size == sizeof(char)); @@ -134,20 +141,22 @@ BcStatus bc_read_chars(BcVec *vec, const char *prompt) { bc_vec_popAll(vec); // Handle the prompt, if desired. - if (BC_PROMPT) { + if (BC_PROMPT) + { bc_file_puts(&vm.fout, bc_flush_none, prompt); bc_file_flush(&vm.fout, bc_flush_none); } // Try reading from the buffer, and if successful, just return. - if (bc_read_buf(vec, vm.buf, &vm.buf_len)) { + if (bc_read_buf(vec, vm.buf, &vm.buf_len)) + { bc_vec_pushByte(vec, '\0'); return BC_STATUS_SUCCESS; } // Loop until we have something. - while (!done) { - + while (!done) + { ssize_t r; BC_SIG_LOCK; @@ -157,11 +166,11 @@ BcStatus bc_read_chars(BcVec *vec, const char *prompt) { BC_VM_STDIN_BUF_SIZE - vm.buf_len); // If there was an error... - if (BC_UNLIKELY(r < 0)) { - + if (BC_UNLIKELY(r < 0)) + { // If interupted... - if (errno == EINTR) { - + if (errno == EINTR) + { // Jump out if we are supposed to quit, which certain signals // will require. if (vm.status == (sig_atomic_t) BC_STATUS_QUIT) BC_JMP; @@ -191,7 +200,8 @@ BcStatus bc_read_chars(BcVec *vec, const char *prompt) { BC_SIG_UNLOCK; // If we read nothing, make sure to terminate the string and return EOF. - if (r == 0) { + if (r == 0) + { bc_vec_pushByte(vec, '\0'); return BC_STATUS_EOF; } @@ -214,27 +224,33 @@ BcStatus bc_read_chars(BcVec *vec, const char *prompt) { return BC_STATUS_SUCCESS; } -BcStatus bc_read_line(BcVec *vec, const char *prompt) { - +BcStatus +bc_read_line(BcVec* vec, const char* prompt) +{ BcStatus s; #if BC_ENABLE_HISTORY // Get a line from either history or manual reading. if (BC_TTY && !vm.history.badTerm) + { s = bc_history_line(&vm.history, vec, prompt); + } else s = bc_read_chars(vec, prompt); #else // BC_ENABLE_HISTORY s = bc_read_chars(vec, prompt); #endif // BC_ENABLE_HISTORY if (BC_ERR(bc_read_binary(vec->v, vec->len - 1))) + { bc_verr(BC_ERR_FATAL_BIN_FILE, bc_program_stdin_name); + } return s; } -char* bc_read_file(const char *path) { - +char* +bc_read_file(const char* path) +{ BcErr e = BC_ERR_FATAL_IO_ERR; size_t size, to_read; struct stat pstat; @@ -242,12 +258,16 @@ char* bc_read_file(const char *path) { char* buf; char* buf2; + // This has been copied to gen/strgen.c. Make sure to change that if this + // changes. + BC_SIG_ASSERT_LOCKED; assert(path != NULL); #ifndef NDEBUG // Need this to quiet MSan. + // NOLINTNEXTLINE memset(&pstat, 0, sizeof(struct stat)); #endif // NDEBUG @@ -261,7 +281,8 @@ char* bc_read_file(const char *path) { if (BC_ERR(fstat(fd, &pstat) == -1)) goto malloc_err; // Make sure it's not a directory. - if (BC_ERR(S_ISDIR(pstat.st_mode))) { + if (BC_ERR(S_ISDIR(pstat.st_mode))) + { e = BC_ERR_FATAL_PATH_DIR; goto malloc_err; } @@ -272,20 +293,22 @@ char* bc_read_file(const char *path) { buf2 = buf; to_read = size; - do { - + do + { // Read the file. We just bail if a signal interrupts. This is so that // users can interrupt the reading of big files if they want. ssize_t r = read(fd, buf2, to_read); if (BC_ERR(r < 0)) goto read_err; to_read -= (size_t) r; buf2 += (size_t) r; - } while (to_read); + } + while (to_read); // Got to have a nul byte. buf[size] = '\0'; - if (BC_ERR(bc_read_binary(buf, size))) { + if (BC_ERR(bc_read_binary(buf, size))) + { e = BC_ERR_FATAL_BIN_FILE; goto read_err; } diff --git a/contrib/bc/src/vector.c b/contrib/bc/src/vector.c index ebc2e76ca8c8..7d492974a48c 100644 --- a/contrib/bc/src/vector.c +++ b/contrib/bc/src/vector.c @@ -42,8 +42,9 @@ #include <lang.h> #include <vm.h> -void bc_vec_grow(BcVec *restrict v, size_t n) { - +void +bc_vec_grow(BcVec* restrict v, size_t n) +{ size_t cap, len; sig_atomic_t lock; @@ -52,9 +53,13 @@ void bc_vec_grow(BcVec *restrict v, size_t n) { // If this is true, we might overflow. if (len > SIZE_MAX / 2) cap = len; - else { + else + { // Keep doubling until larger. - while (cap < len) cap += cap; + while (cap < len) + { + cap += cap; + } } BC_SIG_TRYLOCK(lock); @@ -65,8 +70,9 @@ void bc_vec_grow(BcVec *restrict v, size_t n) { BC_SIG_TRYUNLOCK(lock); } -void bc_vec_init(BcVec *restrict v, size_t esize, BcDtorType dtor) { - +void +bc_vec_init(BcVec* restrict v, size_t esize, BcDtorType dtor) +{ BC_SIG_ASSERT_LOCKED; assert(v != NULL && esize); @@ -79,13 +85,14 @@ void bc_vec_init(BcVec *restrict v, size_t esize, BcDtorType dtor) { v->dtor = (BcSize) dtor; } -void bc_vec_expand(BcVec *restrict v, size_t req) { - +void +bc_vec_expand(BcVec* restrict v, size_t req) +{ assert(v != NULL); // Only expand if necessary. - if (v->cap < req) { - + if (v->cap < req) + { sig_atomic_t lock; BC_SIG_TRYLOCK(lock); @@ -97,8 +104,9 @@ void bc_vec_expand(BcVec *restrict v, size_t req) { } } -void bc_vec_npop(BcVec *restrict v, size_t n) { - +void +bc_vec_npop(BcVec* restrict v, size_t n) +{ sig_atomic_t lock; assert(v != NULL && n <= v->len); @@ -106,22 +114,27 @@ void bc_vec_npop(BcVec *restrict v, size_t n) { BC_SIG_TRYLOCK(lock); if (!v->dtor) v->len -= n; - else { - + else + { const BcVecFree d = bc_vec_dtors[v->dtor]; size_t esize = v->size; size_t len = v->len - n; // Loop through and manually destruct every element. - while (v->len > len) d(v->v + (esize * --v->len)); + while (v->len > len) + { + d(v->v + (esize * --v->len)); + } } BC_SIG_TRYUNLOCK(lock); } -void bc_vec_npopAt(BcVec *restrict v, size_t n, size_t idx) { - - char* ptr, *data; +void +bc_vec_npopAt(BcVec* restrict v, size_t n, size_t idx) +{ + char* ptr; + char* data; sig_atomic_t lock; assert(v != NULL); @@ -133,23 +146,28 @@ void bc_vec_npopAt(BcVec *restrict v, size_t n, size_t idx) { BC_SIG_TRYLOCK(lock); - if (v->dtor) { - + if (v->dtor) + { size_t i; const BcVecFree d = bc_vec_dtors[v->dtor]; // Destroy every popped item. - for (i = 0; i < n; ++i) d(bc_vec_item(v, idx + i)); + for (i = 0; i < n; ++i) + { + d(bc_vec_item(v, idx + i)); + } } v->len -= n; + // NOLINTNEXTLINE memmove(ptr, data, (v->len - idx) * v->size); BC_SIG_TRYUNLOCK(lock); } -void bc_vec_npush(BcVec *restrict v, size_t n, const void *data) { - +void +bc_vec_npush(BcVec* restrict v, size_t n, const void* data) +{ sig_atomic_t lock; size_t esize; @@ -163,20 +181,24 @@ void bc_vec_npush(BcVec *restrict v, size_t n, const void *data) { esize = v->size; // Copy the elements in. + // NOLINTNEXTLINE memcpy(v->v + (esize * v->len), data, esize * n); v->len += n; BC_SIG_TRYUNLOCK(lock); } -inline void bc_vec_push(BcVec *restrict v, const void *data) { +inline void +bc_vec_push(BcVec* restrict v, const void* data) +{ bc_vec_npush(v, 1, data); } -void* bc_vec_pushEmpty(BcVec *restrict v) { - +void* +bc_vec_pushEmpty(BcVec* restrict v) +{ sig_atomic_t lock; - void *ptr; + void* ptr; assert(v != NULL); @@ -193,20 +215,24 @@ void* bc_vec_pushEmpty(BcVec *restrict v) { return ptr; } -inline void bc_vec_pushByte(BcVec *restrict v, uchar data) { +inline void +bc_vec_pushByte(BcVec* restrict v, uchar data) +{ assert(v != NULL && v->size == sizeof(uchar)); bc_vec_npush(v, 1, &data); } -void bc_vec_pushIndex(BcVec *restrict v, size_t idx) { - +void +bc_vec_pushIndex(BcVec* restrict v, size_t idx) +{ uchar amt, nums[sizeof(size_t) + 1]; assert(v != NULL); assert(v->size == sizeof(uchar)); // Encode the index. - for (amt = 0; idx; ++amt) { + for (amt = 0; idx; ++amt) + { nums[amt + 1] = (uchar) idx; idx &= ((size_t) ~(UCHAR_MAX)); idx >>= sizeof(uchar) * CHAR_BIT; @@ -218,17 +244,18 @@ void bc_vec_pushIndex(BcVec *restrict v, size_t idx) { bc_vec_npush(v, amt + 1, nums); } -void bc_vec_pushAt(BcVec *restrict v, const void *data, size_t idx) { - +void +bc_vec_pushAt(BcVec* restrict v, const void* data, size_t idx) +{ assert(v != NULL && data != NULL && idx <= v->len); BC_SIG_ASSERT_LOCKED; // Do the easy case. if (idx == v->len) bc_vec_push(v, data); - else { - - char *ptr; + else + { + char* ptr; size_t esize; // Grow if necessary. @@ -238,13 +265,16 @@ void bc_vec_pushAt(BcVec *restrict v, const void *data, size_t idx) { ptr = v->v + esize * idx; + // NOLINTNEXTLINE memmove(ptr + esize, ptr, esize * (v->len++ - idx)); + // NOLINTNEXTLINE memcpy(ptr, data, esize); } } -void bc_vec_string(BcVec *restrict v, size_t len, const char *restrict str) { - +void +bc_vec_string(BcVec* restrict v, size_t len, const char* restrict str) +{ sig_atomic_t lock; assert(v != NULL && v->size == sizeof(char)); @@ -256,6 +286,7 @@ void bc_vec_string(BcVec *restrict v, size_t len, const char *restrict str) { bc_vec_popAll(v); bc_vec_expand(v, bc_vm_growSize(len, 1)); + // NOLINTNEXTLINE memcpy(v->v, str, len); v->len = len; @@ -264,8 +295,9 @@ void bc_vec_string(BcVec *restrict v, size_t len, const char *restrict str) { BC_SIG_TRYUNLOCK(lock); } -void bc_vec_concat(BcVec *restrict v, const char *restrict str) { - +void +bc_vec_concat(BcVec* restrict v, const char* restrict str) +{ sig_atomic_t lock; assert(v != NULL && v->size == sizeof(char)); @@ -283,8 +315,9 @@ void bc_vec_concat(BcVec *restrict v, const char *restrict str) { BC_SIG_TRYUNLOCK(lock); } -void bc_vec_empty(BcVec *restrict v) { - +void +bc_vec_empty(BcVec* restrict v) +{ sig_atomic_t lock; assert(v != NULL && v->size == sizeof(char)); @@ -299,9 +332,10 @@ void bc_vec_empty(BcVec *restrict v) { } #if BC_ENABLE_HISTORY -void bc_vec_replaceAt(BcVec *restrict v, size_t idx, const void *data) { - - char *ptr; +void +bc_vec_replaceAt(BcVec* restrict v, size_t idx, const void* data) +{ + char* ptr; BC_SIG_ASSERT_LOCKED; @@ -311,29 +345,38 @@ void bc_vec_replaceAt(BcVec *restrict v, size_t idx, const void *data) { if (v->dtor) bc_vec_dtors[v->dtor](ptr); + // NOLINTNEXTLINE memcpy(ptr, data, v->size); } #endif // BC_ENABLE_HISTORY -inline void* bc_vec_item(const BcVec *restrict v, size_t idx) { +inline void* +bc_vec_item(const BcVec* restrict v, size_t idx) +{ assert(v != NULL && v->len && idx < v->len); return v->v + v->size * idx; } -inline void* bc_vec_item_rev(const BcVec *restrict v, size_t idx) { +inline void* +bc_vec_item_rev(const BcVec* restrict v, size_t idx) +{ assert(v != NULL && v->len && idx < v->len); return v->v + v->size * (v->len - idx - 1); } -inline void bc_vec_clear(BcVec *restrict v) { +inline void +bc_vec_clear(BcVec* restrict v) +{ BC_SIG_ASSERT_LOCKED; v->v = NULL; v->len = 0; v->dtor = BC_DTOR_NONE; } -void bc_vec_free(void *vec) { - BcVec *v = (BcVec*) vec; +void +bc_vec_free(void* vec) +{ + BcVec* v = (BcVec*) vec; BC_SIG_ASSERT_LOCKED; bc_vec_popAll(v); free(v->v); @@ -350,14 +393,15 @@ void bc_vec_free(void *vec) { * @return The index of the item with @a name, or where the item would be * if it does not exist. */ -static size_t bc_map_find(const BcVec *restrict v, const char *name) { - +static size_t +bc_map_find(const BcVec* restrict v, const char* name) +{ size_t low = 0, high = v->len; - while (low < high) { - + while (low < high) + { size_t mid = (low + high) / 2; - const BcId *id = bc_vec_item(v, mid); + const BcId* id = bc_vec_item(v, mid); int result = strcmp(name, id->name); if (!result) return mid; @@ -368,11 +412,12 @@ static size_t bc_map_find(const BcVec *restrict v, const char *name) { return low; } -bool bc_map_insert(BcVec *restrict v, const char *name, - size_t idx, size_t *restrict i) +bool +bc_map_insert(BcVec* restrict v, const char* name, size_t idx, + size_t* restrict i) { BcId id; - BcVec *slabs; + BcVec* slabs; BC_SIG_ASSERT_LOCKED; @@ -383,7 +428,9 @@ bool bc_map_insert(BcVec *restrict v, const char *name, assert(*i <= v->len); if (*i != v->len && !strcmp(name, ((BcId*) bc_vec_item(v, *i))->name)) + { return false; + } #if BC_ENABLED slabs = BC_IS_DC ? &vm.main_slabs : &vm.other_slabs; @@ -399,8 +446,9 @@ bool bc_map_insert(BcVec *restrict v, const char *name, return true; } -size_t bc_map_index(const BcVec *restrict v, const char *name) { - +size_t +bc_map_index(const BcVec* restrict v, const char* name) +{ size_t i; assert(v != NULL && name != NULL); @@ -412,15 +460,18 @@ size_t bc_map_index(const BcVec *restrict v, const char *name) { // Make sure the item exists. return strcmp(name, ((BcId*) bc_vec_item(v, i))->name) ? - BC_VEC_INVALID_IDX : i; + BC_VEC_INVALID_IDX : + i; } #if DC_ENABLED -const char* bc_map_name(const BcVec *restrict v, size_t idx) { - +const char* +bc_map_name(const BcVec* restrict v, size_t idx) +{ size_t i, len = v->len; - for (i = 0; i < len; ++i) { + for (i = 0; i < len; ++i) + { BcId* id = (BcId*) bc_vec_item(v, i); if (id->idx == idx) return id->name; } @@ -435,7 +486,9 @@ const char* bc_map_name(const BcVec *restrict v, size_t idx) { * Initializes a single slab. * @param s The slab to initialize. */ -static void bc_slab_init(BcSlab *s) { +static void +bc_slab_init(BcSlab* s) +{ s->s = bc_vm_malloc(BC_SLAB_SIZE); s->len = 0; } @@ -449,9 +502,10 @@ static void bc_slab_init(BcSlab *s) { * @return A pointer to the new string in the slab, or NULL if it could not * be added. */ -static char* bc_slab_add(BcSlab *s, const char *str, size_t len) { - - char *ptr; +static char* +bc_slab_add(BcSlab* s, const char* str, size_t len) +{ + char* ptr; assert(s != NULL); assert(str != NULL); @@ -461,6 +515,7 @@ static char* bc_slab_add(BcSlab *s, const char *str, size_t len) { ptr = (char*) (s->s + s->len); + // NOLINTNEXTLINE bc_strcpy(ptr, len, str); s->len += len; @@ -468,13 +523,16 @@ static char* bc_slab_add(BcSlab *s, const char *str, size_t len) { return ptr; } -void bc_slab_free(void *slab) { +void +bc_slab_free(void* slab) +{ free(((BcSlab*) slab)->s); } -void bc_slabvec_init(BcVec* v) { - - BcSlab *slab; +void +bc_slabvec_init(BcVec* v) +{ + BcSlab* slab; assert(v != NULL); @@ -485,12 +543,13 @@ void bc_slabvec_init(BcVec* v) { bc_slab_init(slab); } -char* bc_slabvec_strdup(BcVec *v, const char *str) { - - char *s; +char* +bc_slabvec_strdup(BcVec* v, const char* str) +{ + char* s; size_t len; BcSlab slab; - BcSlab *slab_ptr; + BcSlab* slab_ptr; BC_SIG_ASSERT_LOCKED; @@ -501,8 +560,8 @@ char* bc_slabvec_strdup(BcVec *v, const char *str) { len = strlen(str) + 1; // If the len is greater than 128, then just allocate it with malloc. - if (BC_UNLIKELY(len >= BC_SLAB_SIZE)) { - + if (BC_UNLIKELY(len >= BC_SLAB_SIZE)) + { // SIZE_MAX is a marker for these standalone allocations. slab.len = SIZE_MAX; slab.s = bc_vm_strdup(str); @@ -518,8 +577,8 @@ char* bc_slabvec_strdup(BcVec *v, const char *str) { s = bc_slab_add(slab_ptr, str, len); // If it couldn't be added, add a slab and try again. - if (BC_UNLIKELY(s == NULL)) { - + if (BC_UNLIKELY(s == NULL)) + { slab_ptr = bc_vec_pushEmpty(v); bc_slab_init(slab_ptr); @@ -531,15 +590,16 @@ char* bc_slabvec_strdup(BcVec *v, const char *str) { return s; } -void bc_slabvec_clear(BcVec *v) { - - BcSlab *s; +void +bc_slabvec_clear(BcVec* v) +{ + BcSlab* s; bool again; // This complicated loop exists because of standalone allocations over 128 // bytes. - do { - + do + { // Get the first slab. s = bc_vec_item(v, 0); @@ -552,8 +612,8 @@ void bc_slabvec_clear(BcVec *v) { // Pop the standalone allocation, not the one after it. if (again) bc_vec_npopAt(v, 1, 0); - - } while(again); + } + while (again); // If we get here, we know that the first slab is a valid slab. We want to // pop all of the other slabs. @@ -566,17 +626,19 @@ void bc_slabvec_clear(BcVec *v) { #if BC_DEBUG_CODE -void bc_slabvec_print(BcVec *v, const char *func) { - +void +bc_slabvec_print(BcVec* v, const char* func) +{ size_t i; - BcSlab *s; + BcSlab* s; bc_file_printf(&vm.ferr, "%s\n", func); - for (i = 0; i < v->len; ++i) { + for (i = 0; i < v->len; ++i) + { s = bc_vec_item(v, i); - bc_file_printf(&vm.ferr, "%zu { s = %zu, len = %zu }\n", - i, (uintptr_t) s->s, s->len); + bc_file_printf(&vm.ferr, "%zu { s = %zu, len = %zu }\n", i, + (uintptr_t) s->s, s->len); } bc_file_puts(&vm.ferr, bc_flush_none, "\n"); diff --git a/contrib/bc/src/vm.c b/contrib/bc/src/vm.c index da8f0e1f4416..0e4a2b1216e9 100644 --- a/contrib/bc/src/vm.c +++ b/contrib/bc/src/vm.c @@ -70,9 +70,13 @@ char output_bufs[BC_VM_BUF_SIZE]; BcVm vm; #if BC_DEBUG_CODE -BC_NORETURN void bc_vm_jmp(const char* f) { +BC_NORETURN void +bc_vm_jmp(const char* f) +{ #else // BC_DEBUG_CODE -BC_NORETURN void bc_vm_jmp(void) { +BC_NORETURN void +bc_vm_jmp(void) +{ #endif assert(BC_SIG_EXC); @@ -103,27 +107,68 @@ BC_NORETURN void bc_vm_jmp(void) { * Handles signals. This is the signal handler. * @param sig The signal to handle. */ -static void bc_vm_sig(int sig) { - +static void +bc_vm_sig(int sig) +{ // There is already a signal in flight. - if (vm.status == (sig_atomic_t) BC_STATUS_QUIT || vm.sig) { + if (vm.status == (sig_atomic_t) BC_STATUS_QUIT || vm.sig) + { if (!BC_I || sig != SIGINT) vm.status = BC_STATUS_QUIT; return; } - // Only reset under these conditions; otherwise, quit. - if (sig == SIGINT && BC_SIGINT && BC_I) { +#if BC_ENABLE_EDITLINE + // Editline needs this to resize the terminal. + if (sig == SIGWINCH) + { + el_resize(vm.history.el); + return; + } +#endif // BC_ENABLE_EDITLINE + // Only reset under these conditions; otherwise, quit. + if (sig == SIGINT && BC_SIGINT && BC_I) + { int err = errno; +#if BC_ENABLE_EDITLINE + // Editline needs this, for some unknown reason. + if (write(STDOUT_FILENO, "^C", 2) != (ssize_t) 2) + { + vm.status = BC_STATUS_ERROR_FATAL; + } +#endif // BC_ENABLE_EDITLINE + // Write the message. if (write(STDOUT_FILENO, vm.sigmsg, vm.siglen) != (ssize_t) vm.siglen) + { vm.status = BC_STATUS_ERROR_FATAL; + } else vm.sig = 1; errno = err; } - else vm.status = BC_STATUS_QUIT; + else + { +#if BC_ENABLE_EDITLINE + if (write(STDOUT_FILENO, "^C", 2) != (ssize_t) 2) + { + vm.status = BC_STATUS_ERROR_FATAL; + return; + } +#endif // BC_ENABLE_EDITLINE + + vm.status = BC_STATUS_QUIT; + } + +#if BC_ENABLE_LINE_LIB + // Readline and Editline need this to actually handle sigints correctly. + if (sig == SIGINT && bc_history_inlinelib) + { + bc_history_inlinelib = 0; + siglongjmp(bc_history_jmpbuf, 1); + } +#endif // BC_ENABLE_LINE_LIB assert(vm.jmp_bufs.len); @@ -135,7 +180,9 @@ static void bc_vm_sig(int sig) { /** * Sets up signal handling. */ -static void bc_vm_sigaction(void) { +static void +bc_vm_sigaction(void) +{ #ifndef _WIN32 struct sigaction sa; @@ -148,6 +195,11 @@ static void bc_vm_sigaction(void) { sigaction(SIGQUIT, &sa, NULL); sigaction(SIGINT, &sa, NULL); +#if BC_ENABLE_EDITLINE + // Editline needs this to resize the terminal. + sigaction(SIGWINCH, &sa, NULL); +#endif // BC_ENABLE_EDITLINE + #if BC_ENABLE_HISTORY if (BC_TTY) sigaction(SIGHUP, &sa, NULL); #endif // BC_ENABLE_HISTORY @@ -160,34 +212,31 @@ static void bc_vm_sigaction(void) { #endif // _WIN32 } -void bc_vm_info(const char* const help) { - +void +bc_vm_info(const char* const help) +{ BC_SIG_ASSERT_LOCKED; // Print the banner. - bc_file_puts(&vm.fout, bc_flush_none, vm.name); - bc_file_putchar(&vm.fout, bc_flush_none, ' '); - bc_file_puts(&vm.fout, bc_flush_none, BC_VERSION); - bc_file_putchar(&vm.fout, bc_flush_none, '\n'); - bc_file_puts(&vm.fout, bc_flush_none, bc_copyright); + bc_file_printf(&vm.fout, "%s %s\n%s", vm.name, BC_VERSION, bc_copyright); // Print the help. - if (help) { - + if (help != NULL) + { bc_file_putchar(&vm.fout, bc_flush_none, '\n'); #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { const char* const banner = BC_DEFAULT_BANNER ? "to" : "to not"; const char* const sigint = BC_DEFAULT_SIGINT_RESET ? "to reset" : - "to exit"; + "to exit"; const char* const tty = BC_DEFAULT_TTY_MODE ? "enabled" : - "disabled"; + "disabled"; const char* const prompt = BC_DEFAULT_PROMPT ? "enabled" : - "disabled"; + "disabled"; const char* const expr = BC_DEFAULT_EXPR_EXIT ? "to exit" : - "to not exit"; + "to not exit"; bc_file_printf(&vm.fout, help, vm.name, vm.name, BC_VERSION, BC_BUILD_TYPE, banner, sigint, tty, prompt, expr); @@ -198,13 +247,13 @@ void bc_vm_info(const char* const help) { if (BC_IS_DC) { const char* const sigint = DC_DEFAULT_SIGINT_RESET ? "to reset" : - "to exit"; + "to exit"; const char* const tty = DC_DEFAULT_TTY_MODE ? "enabled" : - "disabled"; + "disabled"; const char* const prompt = DC_DEFAULT_PROMPT ? "enabled" : - "disabled"; + "disabled"; const char* const expr = DC_DEFAULT_EXPR_EXIT ? "to exit" : - "to not exit"; + "to not exit"; bc_file_printf(&vm.fout, help, vm.name, vm.name, BC_VERSION, BC_BUILD_TYPE, sigint, tty, prompt, expr); @@ -220,7 +269,9 @@ void bc_vm_info(const char* const help) { #if !BC_ENABLE_LIBRARY && !BC_ENABLE_MEMCHECK BC_NORETURN #endif // !BC_ENABLE_LIBRARY && !BC_ENABLE_MEMCHECK -void bc_vm_fatalError(BcErr e) { +void +bc_vm_fatalError(BcErr e) +{ bc_err(e); #if !BC_ENABLE_LIBRARY && !BC_ENABLE_MEMCHECK BC_UNREACHABLE @@ -229,16 +280,17 @@ void bc_vm_fatalError(BcErr e) { } #if BC_ENABLE_LIBRARY -void bc_vm_handleError(BcErr e) { - +void +bc_vm_handleError(BcErr e) +{ assert(e < BC_ERR_NELEMS); assert(!vm.sig_pop); BC_SIG_LOCK; // If we have a normal error... - if (e <= BC_ERR_MATH_DIVIDE_BY_ZERO) { - + if (e <= BC_ERR_MATH_DIVIDE_BY_ZERO) + { // Set the error. vm.err = (BclError) (e - BC_ERR_MATH_NEGATIVE + BCL_ERROR_MATH_NEGATIVE); @@ -251,8 +303,9 @@ void bc_vm_handleError(BcErr e) { BC_JMP; } #else // BC_ENABLE_LIBRARY -void bc_vm_handleError(BcErr e, size_t line, ...) { - +void +bc_vm_handleError(BcErr e, size_t line, ...) +{ BcStatus s; va_list args; uchar id = bc_err_ids[e]; @@ -264,8 +317,10 @@ void bc_vm_handleError(BcErr e, size_t line, ...) { #if BC_ENABLED // Figure out if the POSIX error should be an error, a warning, or nothing. - if (!BC_S && e >= BC_ERR_POSIX_START) { - if (BC_W) { + if (!BC_S && e >= BC_ERR_POSIX_START) + { + if (BC_W) + { // Make sure to not return an error. id = UCHAR_MAX; err_type = vm.err_ids[BC_ERR_IDX_WARN]; @@ -280,7 +335,8 @@ void bc_vm_handleError(BcErr e, size_t line, ...) { s = bc_file_flushErr(&vm.fout, bc_flush_err); // Just jump out if the flush failed; there's nothing we can do. - if (BC_ERR(s == BC_STATUS_ERROR_FATAL)) { + if (BC_ERR(s == BC_STATUS_ERROR_FATAL)) + { vm.status = (sig_atomic_t) s; BC_JMP; } @@ -294,19 +350,20 @@ void bc_vm_handleError(BcErr e, size_t line, ...) { va_end(args); // Print the extra information if we have it. - if (BC_NO_ERR(vm.file != NULL)) { - + if (BC_NO_ERR(vm.file != NULL)) + { // This is the condition for parsing vs runtime. // If line is not 0, it is parsing. - if (line) { + if (line) + { bc_file_puts(&vm.ferr, bc_flush_none, "\n "); bc_file_puts(&vm.ferr, bc_flush_none, vm.file); bc_file_printf(&vm.ferr, bc_err_line, line); } - else { - - BcInstPtr *ip = bc_vec_item_rev(&vm.prog.stack, 0); - BcFunc *f = bc_vec_item(&vm.prog.fns, ip->func); + else + { + BcInstPtr* ip = bc_vec_item_rev(&vm.prog.stack, 0); + BcFunc* f = bc_vec_item(&vm.prog.fns, ip->func); bc_file_puts(&vm.ferr, bc_flush_none, "\n "); bc_file_puts(&vm.ferr, bc_flush_none, vm.func_header); @@ -332,7 +389,9 @@ void bc_vm_handleError(BcErr e, size_t line, ...) { // errors happen, we need to make sure to exit on fatal errors. This will // be faster anyway. This function *cannot jump when a fatal error occurs!* if (BC_ERR(id == BC_ERR_IDX_FATAL || s == BC_STATUS_ERROR_FATAL)) + { exit(bc_vm_atexit((int) BC_STATUS_ERROR_FATAL)); + } #else // !BC_ENABLE_MEMCHECK if (BC_ERR(s == BC_STATUS_ERROR_FATAL)) vm.status = (sig_atomic_t) s; else @@ -347,8 +406,9 @@ void bc_vm_handleError(BcErr e, size_t line, ...) { BC_SIG_TRYUNLOCK(lock); } -char* bc_vm_getenv(const char* var) { - +char* +bc_vm_getenv(const char* var) +{ char* ret; #ifndef _WIN32 @@ -360,7 +420,9 @@ char* bc_vm_getenv(const char* var) { return ret; } -void bc_vm_getenvFree(char* val) { +void +bc_vm_getenvFree(char* val) +{ BC_UNUSED(val); #ifdef _WIN32 free(val); @@ -373,14 +435,15 @@ void bc_vm_getenvFree(char* val) { * @param def The default. * @param flag The flag to set. */ -static void bc_vm_setenvFlag(const char* const var, int def, uint16_t flag) { - +static void +bc_vm_setenvFlag(const char* const var, int def, uint16_t flag) +{ // Get the value. char* val = bc_vm_getenv(var); // If there is no value... - if (val == NULL) { - + if (val == NULL) + { // Set the default. if (def) vm.flags |= flag; else vm.flags &= ~(flag); @@ -396,8 +459,9 @@ static void bc_vm_setenvFlag(const char* const var, int def, uint16_t flag) { * Parses the arguments in {B,D]C_ENV_ARGS. * @param env_args_name The environment variable to use. */ -static void bc_vm_envArgs(const char* const env_args_name) { - +static void +bc_vm_envArgs(const char* const env_args_name) +{ char *env_args = bc_vm_getenv(env_args_name), *buf, *start; char instr = '\0'; @@ -405,7 +469,7 @@ static void bc_vm_envArgs(const char* const env_args_name) { if (env_args == NULL) return; - // Windows already allocates, so we don't need to. + // Windows already allocates, so we don't need to. #ifndef _WIN32 start = buf = vm.env_args_buffer = bc_vm_strdup(env_args); #else // _WIN32 @@ -421,20 +485,21 @@ static void bc_vm_envArgs(const char* const env_args_name) { bc_vec_push(&vm.env_args, &env_args_name); // While we haven't reached the end of the args... - while (*buf) { - + while (*buf) + { // If we don't have whitespace... - if (!isspace(*buf)) { - + if (!isspace(*buf)) + { // If we have the start of a string... - if (*buf == '"' || *buf == '\'') { - + if (*buf == '"' || *buf == '\'') + { // Set stuff appropriately. instr = *buf; buf += 1; // Check for the empty string. - if (*buf == instr) { + if (*buf == instr) + { instr = '\0'; buf += 1; continue; @@ -445,15 +510,15 @@ static void bc_vm_envArgs(const char* const env_args_name) { bc_vec_push(&vm.env_args, &buf); // Parse the string. - while (*buf && ((!instr && !isspace(*buf)) || - (instr && *buf != instr))) + while (*buf && + ((!instr && !isspace(*buf)) || (instr && *buf != instr))) { buf += 1; } // If we did find the end of the string... - if (*buf) { - + if (*buf) + { if (instr) instr = '\0'; // Reset stuff. @@ -472,7 +537,8 @@ static void bc_vm_envArgs(const char* const env_args_name) { bc_vec_push(&vm.env_args, &buf); // Parse the arguments. - bc_args((int) vm.env_args.len - 1, bc_vec_item(&vm.env_args, 0), false); + bc_args((int) vm.env_args.len - 1, bc_vec_item(&vm.env_args, 0), false, + BC_PROG_SCALE(&vm.prog)); } /** @@ -480,9 +546,10 @@ static void bc_vm_envArgs(const char* const env_args_name) { * @param var The environment variable to pull it from. * @return The line length. */ -static size_t bc_vm_envLen(const char *var) { - - char *lenv = bc_vm_getenv(var); +static size_t +bc_vm_envLen(const char* var) +{ + char* lenv = bc_vm_getenv(var); size_t i, len = BC_NUM_PRINT_WIDTH; int num; @@ -492,11 +559,14 @@ static size_t bc_vm_envLen(const char *var) { len = strlen(lenv); // Figure out if it's a number. - for (num = 1, i = 0; num && i < len; ++i) num = isdigit(lenv[i]); + for (num = 1, i = 0; num && i < len; ++i) + { + num = isdigit(lenv[i]); + } // If it is a number... - if (num) { - + if (num) + { // Parse it and clamp it if needed. len = (size_t) atoi(lenv) - 1; if (len == 1 || len >= UINT16_MAX) len = BC_NUM_PRINT_WIDTH; @@ -510,8 +580,9 @@ static size_t bc_vm_envLen(const char *var) { } #endif // BC_ENABLE_LIBRARY -void bc_vm_shutdown(void) { - +void +bc_vm_shutdown(void) +{ BC_SIG_ASSERT_LOCKED; #if BC_ENABLE_NLS @@ -520,8 +591,9 @@ void bc_vm_shutdown(void) { #if BC_ENABLE_HISTORY // This must always run to ensure that the terminal is back to normal, i.e., - // has raw mode disabled. - if (BC_TTY) bc_history_free(&vm.history); + // has raw mode disabled. But we should only do it if we did not have a bad + // terminal because history was not initialized if it is a bad terminal. + if (BC_TTY && !vm.history.badTerm) bc_history_free(&vm.history); #endif // BC_ENABLE_HISTORY #ifndef NDEBUG @@ -531,7 +603,8 @@ void bc_vm_shutdown(void) { bc_vec_free(&vm.files); bc_vec_free(&vm.exprs); - if (BC_PARSE_IS_INITED(&vm.read_prs, &vm.prog)) { + if (BC_PARSE_IS_INITED(&vm.read_prs, &vm.prog)) + { bc_vec_free(&vm.read_buf); bc_parse_free(&vm.read_prs); } @@ -554,22 +627,24 @@ void bc_vm_shutdown(void) { #endif // !BC_ENABLE_LIBRARY } -void bc_vm_addTemp(BcDig *num) { - +void +bc_vm_addTemp(BcDig* num) +{ BC_SIG_ASSERT_LOCKED; // If we don't have room, just free. if (vm.temps_len == BC_VM_MAX_TEMPS) free(num); - else { - + else + { // Add to the buffer and length. temps_buf[vm.temps_len] = num; vm.temps_len += 1; } } -BcDig* bc_vm_takeTemp(void) { - +BcDig* +bc_vm_takeTemp(void) +{ BC_SIG_ASSERT_LOCKED; if (!vm.temps_len) return NULL; @@ -579,8 +654,9 @@ BcDig* bc_vm_takeTemp(void) { return temps_buf[vm.temps_len]; } -void bc_vm_freeTemps(void) { - +void +bc_vm_freeTemps(void) +{ size_t i; BC_SIG_ASSERT_LOCKED; @@ -588,35 +664,47 @@ void bc_vm_freeTemps(void) { if (!vm.temps_len) return; // Free them all... - for (i = 0; i < vm.temps_len; ++i) free(temps_buf[i]); + for (i = 0; i < vm.temps_len; ++i) + { + free(temps_buf[i]); + } vm.temps_len = 0; } -inline size_t bc_vm_arraySize(size_t n, size_t size) { +inline size_t +bc_vm_arraySize(size_t n, size_t size) +{ size_t res = n * size; if (BC_ERR(BC_VM_MUL_OVERFLOW(n, size, res))) + { bc_vm_fatalError(BC_ERR_FATAL_ALLOC_ERR); + } return res; } -inline size_t bc_vm_growSize(size_t a, size_t b) { +inline size_t +bc_vm_growSize(size_t a, size_t b) +{ size_t res = a + b; if (BC_ERR(res >= SIZE_MAX || res < a)) + { bc_vm_fatalError(BC_ERR_FATAL_ALLOC_ERR); + } return res; } -void* bc_vm_malloc(size_t n) { - +void* +bc_vm_malloc(size_t n) +{ void* ptr; BC_SIG_ASSERT_LOCKED; ptr = malloc(n); - if (BC_ERR(ptr == NULL)) { - + if (BC_ERR(ptr == NULL)) + { bc_vm_freeTemps(); ptr = malloc(n); @@ -627,16 +715,17 @@ void* bc_vm_malloc(size_t n) { return ptr; } -void* bc_vm_realloc(void *ptr, size_t n) { - +void* +bc_vm_realloc(void* ptr, size_t n) +{ void* temp; BC_SIG_ASSERT_LOCKED; temp = realloc(ptr, n); - if (BC_ERR(temp == NULL)) { - + if (BC_ERR(temp == NULL)) + { bc_vm_freeTemps(); temp = realloc(ptr, n); @@ -647,16 +736,17 @@ void* bc_vm_realloc(void *ptr, size_t n) { return temp; } -char* bc_vm_strdup(const char *str) { - - char *s; +char* +bc_vm_strdup(const char* str) +{ + char* s; BC_SIG_ASSERT_LOCKED; s = strdup(str); - if (BC_ERR(s == NULL)) { - + if (BC_ERR(s == NULL)) + { bc_vm_freeTemps(); s = strdup(str); @@ -668,8 +758,9 @@ char* bc_vm_strdup(const char *str) { } #if !BC_ENABLE_LIBRARY -void bc_vm_printf(const char *fmt, ...) { - +void +bc_vm_printf(const char* fmt, ...) +{ va_list args; sig_atomic_t lock; @@ -685,7 +776,9 @@ void bc_vm_printf(const char *fmt, ...) { } #endif // !BC_ENABLE_LIBRARY -void bc_vm_putchar(int c, BcFlushType type) { +void +bc_vm_putchar(int c, BcFlushType type) +{ #if BC_ENABLE_LIBRARY bc_vec_pushByte(&vm.out, (uchar) c); #else // BC_ENABLE_LIBRARY @@ -704,14 +797,18 @@ void bc_vm_putchar(int c, BcFlushType type) { * just in case. * @param msg The message to print. */ -BC_NORETURN static void bc_abortm(const char* msg) { +BC_NORETURN static void +bc_abortm(const char* msg) +{ bc_file_puts(&vm.ferr, bc_flush_none, msg); bc_file_puts(&vm.ferr, bc_flush_none, "; this is a bug"); bc_file_flush(&vm.ferr, bc_flush_none); abort(); } -void bc_pledge(const char *promises, const char* execpromises) { +void +bc_pledge(const char* promises, const char* execpromises) +{ int r = pledge(promises, execpromises); if (r) bc_abortm("pledge() failed"); } @@ -723,7 +820,9 @@ void bc_pledge(const char *promises, const char* execpromises) { * @param path The path. * @param permissions The permissions for the path. */ -static void bc_unveil(const char *path, const char *permissions) { +static void +bc_unveil(const char* path, const char* permissions) +{ int r = unveil(path, permissions); if (r) bc_abortm("unveil() failed"); } @@ -731,13 +830,17 @@ static void bc_unveil(const char *path, const char *permissions) { #else // __OpenBSD__ -void bc_pledge(const char *promises, const char *execpromises) { +void +bc_pledge(const char* promises, const char* execpromises) +{ BC_UNUSED(promises); BC_UNUSED(execpromises); } #if BC_ENABLE_EXTRA_MATH -static void bc_unveil(const char *path, const char *permissions) { +static void +bc_unveil(const char* path, const char* permissions) +{ BC_UNUSED(path); BC_UNUSED(permissions); } @@ -750,11 +853,12 @@ static void bc_unveil(const char *path, const char *permissions) { * done executing a line of stdin. This is to prevent memory usage growing * without bound. This is an idea from busybox. */ -static void bc_vm_clean(void) { - - BcVec *fns = &vm.prog.fns; - BcFunc *f = bc_vec_item(fns, BC_PROG_MAIN); - BcInstPtr *ip = bc_vec_item(&vm.prog.stack, 0); +static void +bc_vm_clean(void) +{ + BcVec* fns = &vm.prog.fns; + BcFunc* f = bc_vec_item(fns, BC_PROG_MAIN); + BcInstPtr* ip = bc_vec_item(&vm.prog.stack, 0); bool good = ((vm.status && vm.status != BC_STATUS_QUIT) || vm.sig); BC_SIG_ASSERT_LOCKED; @@ -772,14 +876,15 @@ static void bc_vm_clean(void) { // For dc, it is safe only when all of the results on the results stack are // safe, which means that they are temporaries or other things that don't // need strings or constants. - if (BC_IS_DC) { - + if (BC_IS_DC) + { size_t i; good = true; - for (i = 0; good && i < vm.prog.results.len; ++i) { - BcResult *r = (BcResult*) bc_vec_item(&vm.prog.results, i); + for (i = 0; good && i < vm.prog.results.len; ++i) + { + BcResult* r = (BcResult*) bc_vec_item(&vm.prog.results, i); good = BC_VM_SAFE_RESULT(r); } } @@ -787,11 +892,11 @@ static void bc_vm_clean(void) { // If this condition is true, we can get rid of strings, // constants, and code. - if (good && vm.prog.stack.len == 1 && ip->idx == f->code.len) { - + if (good && vm.prog.stack.len == 1 && ip->idx == f->code.len) + { #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { bc_vec_popAll(&f->labels); bc_vec_popAll(&f->strs); bc_vec_popAll(&f->consts); @@ -806,7 +911,8 @@ static void bc_vm_clean(void) { #if DC_ENABLED // Note to self: you cannot delete strings and functions. Deal with it. - if (BC_IS_DC) { + if (BC_IS_DC) + { bc_vec_popAll(vm.prog.consts); bc_slabvec_clear(&vm.main_const_slab); } @@ -825,13 +931,14 @@ static void bc_vm_clean(void) { * @param is_exprs True if the text is from command-line expressions, false * otherwise. */ -static void bc_vm_process(const char *text, bool is_stdin, bool is_exprs) { - +static void +bc_vm_process(const char* text, bool is_stdin, bool is_exprs) +{ // Set up the parser. bc_parse_text(&vm.prs, text, is_stdin, is_exprs); - do { - + do + { BC_SIG_LOCK; #if BC_ENABLED @@ -841,7 +948,10 @@ static void bc_vm_process(const char *text, bool is_stdin, bool is_exprs) { #endif // BC_ENABLED // Parse it all. - while (BC_PARSE_CAN_PARSE(vm.prs)) vm.parse(&vm.prs); + while (BC_PARSE_CAN_PARSE(vm.prs)) + { + vm.parse(&vm.prs); + } BC_SIG_UNLOCK; @@ -852,8 +962,8 @@ static void bc_vm_process(const char *text, bool is_stdin, bool is_exprs) { // Flush in interactive mode. if (BC_I) bc_file_flush(&vm.fout, bc_flush_save); - - } while (vm.prs.l.t != BC_LEX_EOF); + } + while (vm.prs.l.t != BC_LEX_EOF); } #if BC_ENABLED @@ -864,7 +974,9 @@ static void bc_vm_process(const char *text, bool is_stdin, bool is_exprs) { * it cannot parse any further. But if we reach the end of a file or stdin has * no more data, we know we can add an empty else clause. */ -static void bc_vm_endif(void) { +static void +bc_vm_endif(void) +{ bc_parse_endif(&vm.prs); bc_program_exec(&vm.prog); } @@ -874,9 +986,10 @@ static void bc_vm_endif(void) { * Processes a file. * @param file The filename. */ -static void bc_vm_file(const char *file) { - - char *data = NULL; +static void +bc_vm_file(const char* file) +{ + char* data = NULL; assert(!vm.sig_pop); @@ -916,8 +1029,9 @@ err: BC_LONGJMP_CONT; } -bool bc_vm_readLine(bool clear) { - +bool +bc_vm_readLine(bool clear) +{ BcStatus s; bool good; @@ -931,13 +1045,15 @@ bool bc_vm_readLine(bool clear) { if (vm.eof) return false; - do { + do + { // bc_read_line() must always return either BC_STATUS_SUCCESS or // BC_STATUS_EOF. Everything else, it and whatever it calls, must jump // out instead. s = bc_read_line(&vm.line_buf, ">>> "); vm.eof = (s == BC_STATUS_EOF); - } while (!(s) && !vm.eof && vm.line_buf.len < 1); + } + while (!(s) && !vm.eof && vm.line_buf.len < 1); good = (vm.line_buf.len > 1); @@ -950,8 +1066,9 @@ bool bc_vm_readLine(bool clear) { /** * Processes text from stdin. */ -static void bc_vm_stdin(void) { - +static void +bc_vm_stdin(void) +{ bool clear = true; vm.is_stdin = true; @@ -979,10 +1096,10 @@ static void bc_vm_stdin(void) { restart: // While we still read data from stdin. - while (bc_vm_readLine(clear)) { - + while (bc_vm_readLine(clear)) + { size_t len = vm.buffer.len - 1; - const char *str = vm.buffer.v; + const char* str = vm.buffer.v; // We don't want to clear the buffer when the line ends with a backslash // because a backslash newline is special in bc. @@ -993,7 +1110,8 @@ restart: bc_vm_process(vm.buffer.v, true, false); if (vm.eof) break; - else { + else + { BC_SIG_LOCK; bc_vm_clean(); BC_SIG_UNLOCK; @@ -1015,15 +1133,17 @@ err: #if !BC_ENABLE_MEMCHECK assert(vm.status != BC_STATUS_ERROR_FATAL); - vm.status = vm.status == BC_STATUS_QUIT || !BC_I ? - vm.status : BC_STATUS_SUCCESS; + vm.status = vm.status == BC_STATUS_QUIT || !BC_I ? vm.status : + BC_STATUS_SUCCESS; #else // !BC_ENABLE_MEMCHECK vm.status = vm.status == BC_STATUS_ERROR_FATAL || - vm.status == BC_STATUS_QUIT || !BC_I ? - vm.status : BC_STATUS_SUCCESS; + vm.status == BC_STATUS_QUIT || !BC_I ? + vm.status : + BC_STATUS_SUCCESS; #endif // !BC_ENABLE_MEMCHECK - if (!vm.status && !vm.eof) { + if (!vm.status && !vm.eof) + { bc_vec_empty(&vm.buffer); BC_LONGJMP_STOP; BC_SIG_UNLOCK; @@ -1040,8 +1160,9 @@ err: BC_LONGJMP_CONT; } -bool bc_vm_readBuf(bool clear) { - +bool +bc_vm_readBuf(bool clear) +{ size_t len = vm.exprs.len - 1; bool more; @@ -1061,8 +1182,9 @@ bool bc_vm_readBuf(bool clear) { return more; } -static void bc_vm_exprs(void) { - +static void +bc_vm_exprs(void) +{ bool clear = true; // Prepare the lexer. @@ -1077,10 +1199,10 @@ static void bc_vm_exprs(void) { BC_SETJMP_LOCKED(err); BC_SIG_UNLOCK; - while (bc_vm_readBuf(clear)) { - + while (bc_vm_readBuf(clear)) + { size_t len = vm.buffer.len - 1; - const char *str = vm.buffer.v; + const char* str = vm.buffer.v; // We don't want to clear the buffer when the line ends with a backslash // because a backslash newline is special in bc. @@ -1116,14 +1238,18 @@ err: * @param name The name of the library. * @param text The text of the source code. */ -static void bc_vm_load(const char *name, const char *text) { - +static void +bc_vm_load(const char* name, const char* text) +{ bc_lex_file(&vm.prs.l, name); bc_parse_text(&vm.prs, text, false, false); BC_SIG_LOCK; - while (vm.prs.l.t != BC_LEX_EOF) vm.parse(&vm.prs); + while (vm.prs.l.t != BC_LEX_EOF) + { + vm.parse(&vm.prs); + } BC_SIG_UNLOCK; } @@ -1133,33 +1259,41 @@ static void bc_vm_load(const char *name, const char *text) { /** * Loads the default error messages. */ -static void bc_vm_defaultMsgs(void) { - +static void +bc_vm_defaultMsgs(void) +{ size_t i; vm.func_header = bc_err_func_header; // Load the error categories. for (i = 0; i < BC_ERR_IDX_NELEMS + BC_ENABLED; ++i) + { vm.err_ids[i] = bc_errs[i]; + } // Load the error messages. - for (i = 0; i < BC_ERR_NELEMS; ++i) vm.err_msgs[i] = bc_err_msgs[i]; + for (i = 0; i < BC_ERR_NELEMS; ++i) + { + vm.err_msgs[i] = bc_err_msgs[i]; + } } /** * Loads the error messages for the locale. If NLS is disabled, this just loads * the default messages. */ -static void bc_vm_gettext(void) { - +static void +bc_vm_gettext(void) +{ #if BC_ENABLE_NLS uchar id = 0; int set = 1, msg = 1; size_t i; // If no locale, load the defaults. - if (vm.locale == NULL) { + if (vm.locale == NULL) + { vm.catalog = BC_VM_INVALID_CATALOG; bc_vm_defaultMsgs(); return; @@ -1168,7 +1302,8 @@ static void bc_vm_gettext(void) { vm.catalog = catopen(BC_MAINEXEC, NL_CAT_LOCALE); // If no catalog, load the defaults. - if (vm.catalog == BC_VM_INVALID_CATALOG) { + if (vm.catalog == BC_VM_INVALID_CATALOG) + { bc_vm_defaultMsgs(); return; } @@ -1178,16 +1313,19 @@ static void bc_vm_gettext(void) { // Load the error categories. for (set += 1; msg <= BC_ERR_IDX_NELEMS + BC_ENABLED; ++msg) + { vm.err_ids[msg - 1] = catgets(vm.catalog, set, msg, bc_errs[msg - 1]); + } i = 0; id = bc_err_ids[i]; // Load the error messages. In order to understand this loop, you must know // the order of messages and categories in the enum and in the locale files. - for (set = id + 3, msg = 1; i < BC_ERR_NELEMS; ++i, ++msg) { - - if (id != bc_err_ids[i]) { + for (set = id + 3, msg = 1; i < BC_ERR_NELEMS; ++i, ++msg) + { + if (id != bc_err_ids[i]) + { msg = 1; id = bc_err_ids[i]; set = id + 3; @@ -1205,15 +1343,16 @@ static void bc_vm_gettext(void) { * probably be combined with bc_vm_boot(), but I don't care enough. Really, this * function starts when execution of bc or dc source code starts. */ -static void bc_vm_exec(void) { - +static void +bc_vm_exec(void) +{ size_t i; bool has_file = false; #if BC_ENABLED // Load the math libraries. - if (BC_IS_BC && (vm.flags & BC_FLAG_L)) { - + if (BC_IS_BC && (vm.flags & BC_FLAG_L)) + { // Can't allow redefinitions in the builtin library. vm.no_redefine = true; @@ -1233,8 +1372,8 @@ static void bc_vm_exec(void) { #endif // BC_ENABLED // If there are expressions to execute... - if (vm.exprs.len) { - + if (vm.exprs.len) + { // Process the expressions. bc_vm_exprs(); @@ -1243,8 +1382,9 @@ static void bc_vm_exec(void) { } // Process files. - for (i = 0; i < vm.files.len; ++i) { - char *path = *((char**) bc_vec_item(&vm.files, i)); + for (i = 0; i < vm.files.len; ++i) + { + char* path = *((char**) bc_vec_item(&vm.files, i)); if (!strcmp(path, "")) continue; has_file = true; bc_vm_file(path); @@ -1280,8 +1420,9 @@ static void bc_vm_exec(void) { if (BC_IS_BC || !has_file) bc_vm_stdin(); } -void bc_vm_boot(int argc, char *argv[]) { - +void +bc_vm_boot(int argc, char* argv[]) +{ int ttyin, ttyout, ttyerr; bool tty; const char* const env_len = BC_IS_BC ? "BC_LINE_LENGTH" : "DC_LINE_LENGTH"; @@ -1312,6 +1453,15 @@ void bc_vm_boot(int argc, char *argv[]) { // Set the error messages. bc_vm_gettext(); +#if BC_ENABLE_LINE_LIB + // Initialize the output file buffers. + bc_file_init(&vm.ferr, stderr); + bc_file_init(&vm.fout, stdout); + + // Set the input buffer. + vm.buf = output_bufs; + +#else // BC_ENABLE_LINE_LIB // Initialize the output file buffers. They each take portions of the global // buffer. stdout gets more because it will probably have more data. bc_file_init(&vm.ferr, STDERR_FILENO, output_bufs + BC_VM_STDOUT_BUF_SIZE, @@ -1320,6 +1470,7 @@ void bc_vm_boot(int argc, char *argv[]) { // Set the input buffer to the rest of the global buffer. vm.buf = output_bufs + BC_VM_STDOUT_BUF_SIZE + BC_VM_STDERR_BUF_SIZE; +#endif // BC_ENABLE_LINE_LIB // Set the line length by environment variable. vm.line_len = (uint16_t) bc_vm_envLen(env_len); @@ -1351,8 +1502,8 @@ void bc_vm_boot(int argc, char *argv[]) { vm.flags |= BC_I ? BC_FLAG_Q : 0; #if BC_ENABLED - if (BC_IS_BC) { - + if (BC_IS_BC) + { // bc checks this environment variable to see if it should run in // standard mode. char* var = bc_vm_getenv("POSIXLY_CORRECT"); @@ -1366,8 +1517,8 @@ void bc_vm_boot(int argc, char *argv[]) { #endif // BC_ENABLED // Are we in TTY mode? - if (BC_TTY) { - + if (BC_TTY) + { const char* const env_tty = BC_IS_BC ? "BC_TTY_MODE" : "DC_TTY_MODE"; int env_tty_def = BC_IS_BC ? BC_DEFAULT_TTY_MODE : DC_DEFAULT_TTY_MODE; const char* const env_prompt = BC_IS_BC ? "BC_PROMPT" : "DC_PROMPT"; @@ -1385,11 +1536,11 @@ void bc_vm_boot(int argc, char *argv[]) { // Process environment and command-line arguments. bc_vm_envArgs(env_args); - bc_args(argc, argv, true); + bc_args(argc, argv, true, BC_PROG_SCALE(&vm.prog)); // If we are in interactive mode... - if (BC_I) { - + if (BC_I) + { const char* const env_sigint = BC_IS_BC ? "BC_SIGINT_RESET" : "DC_SIGINT_RESET"; int env_sigint_def = BC_IS_BC ? BC_DEFAULT_SIGINT_RESET : @@ -1405,7 +1556,8 @@ void bc_vm_boot(int argc, char *argv[]) { // Print the banner if allowed. We have to be in bc, in interactive mode, // and not be quieted by command-line option or environment variable. - if (BC_IS_BC && BC_I && (vm.flags & BC_FLAG_Q)) { + if (BC_IS_BC && BC_I && (vm.flags & BC_FLAG_Q)) + { bc_vm_info(NULL); bc_file_putchar(&vm.fout, bc_flush_none, '\n'); bc_file_flush(&vm.fout, bc_flush_none); @@ -1419,8 +1571,9 @@ void bc_vm_boot(int argc, char *argv[]) { } #endif // !BC_ENABLE_LIBRARY -void bc_vm_init(void) { - +void +bc_vm_init(void) +{ BC_SIG_ASSERT_LOCKED; #if !BC_ENABLE_LIBRARY @@ -1433,8 +1586,9 @@ void bc_vm_init(void) { bc_num_one(&vm.one); // Set up more constant BcNum's. - memcpy(vm.max_num, bc_num_bigdigMax, - bc_num_bigdigMax_size * sizeof(BcDig)); + // NOLINTNEXTLINE + memcpy(vm.max_num, bc_num_bigdigMax, bc_num_bigdigMax_size * sizeof(BcDig)); + // NOLINTNEXTLINE memcpy(vm.max2_num, bc_num_bigdigMax2, bc_num_bigdigMax2_size * sizeof(BcDig)); bc_num_setup(&vm.max, vm.max_num, BC_NUM_BIGDIG_LOG10); @@ -1463,8 +1617,9 @@ void bc_vm_init(void) { } #if BC_ENABLE_LIBRARY -void bc_vm_atexit(void) { - +void +bc_vm_atexit(void) +{ bc_vm_shutdown(); #ifndef NDEBUG @@ -1472,8 +1627,9 @@ void bc_vm_atexit(void) { #endif // NDEBUG } #else // BC_ENABLE_LIBRARY -int bc_vm_atexit(int status) { - +int +bc_vm_atexit(int status) +{ // Set the status correctly. int s = BC_STATUS_IS_ERROR(status) ? status : BC_STATUS_SUCCESS; diff --git a/contrib/bc/tests/bcl.c b/contrib/bc/tests/bcl.c index e1d527ad8721..6f462ce9dc4f 100644 --- a/contrib/bc/tests/bcl.c +++ b/contrib/bc/tests/bcl.c @@ -43,12 +43,15 @@ * Takes an error code and aborts if it actually is an error. * @param e The error code. */ -static void err(BclError e) { +static void +err(BclError e) +{ if (e != BCL_ERROR_NONE) abort(); } -int main(void) { - +int +main(void) +{ BclError e; BclContext ctxt; size_t scale; @@ -135,15 +138,13 @@ int main(void) { res = bcl_string(n5); - if (strcmp(res, "-351137.0060159482")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-351137.0060159482")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(n6); - if (strcmp(res, ".00000152374405414")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, ".00000152374405414")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); @@ -156,8 +157,7 @@ int main(void) { res = bcl_string(bcl_dup(n4)); - if (strcmp(res, "94538.1346457028")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "94538.1346457028")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); @@ -178,8 +178,7 @@ int main(void) { res = bcl_string(bcl_dup(n4)); - if (strcmp(res, "94538")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "94538")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); @@ -195,8 +194,7 @@ int main(void) { res = bcl_string(bcl_dup(n4)); - if (strcmp(res, "94538")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "94538")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); @@ -235,8 +233,7 @@ int main(void) { bcl_num_free(n); // Test leading zeroes. - if (bcl_leadingZeroes()) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (bcl_leadingZeroes()) err(BCL_ERROR_FATAL_UNKNOWN_ERR); n = bcl_parse("0.01"); err(bcl_err(n)); @@ -251,84 +248,70 @@ int main(void) { err(bcl_err(n4)); res = bcl_string(bcl_dup(n)); - if (strcmp(res, ".01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, ".01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n2)); - if (strcmp(res, "-.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n3)); - if (strcmp(res, "1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n4)); - if (strcmp(res, "-1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); bcl_setLeadingZeroes(true); - if (!bcl_leadingZeroes()) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (!bcl_leadingZeroes()) err(BCL_ERROR_FATAL_UNKNOWN_ERR); res = bcl_string(bcl_dup(n)); - if (strcmp(res, "0.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "0.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n2)); - if (strcmp(res, "-0.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-0.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n3)); - if (strcmp(res, "1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(bcl_dup(n4)); - if (strcmp(res, "-1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); bcl_setLeadingZeroes(false); - if (bcl_leadingZeroes()) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (bcl_leadingZeroes()) err(BCL_ERROR_FATAL_UNKNOWN_ERR); res = bcl_string(n); - if (strcmp(res, ".01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, ".01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(n2); - if (strcmp(res, "-.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(n3); - if (strcmp(res, "1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); res = bcl_string(n4); - if (strcmp(res, "-1.01")) - err(BCL_ERROR_FATAL_UNKNOWN_ERR); + if (strcmp(res, "-1.01")) err(BCL_ERROR_FATAL_UNKNOWN_ERR); free(res); diff --git a/contrib/bc/tests/history.py b/contrib/bc/tests/history.py index c74dfd72f0a7..f1787a27e864 100755 --- a/contrib/bc/tests/history.py +++ b/contrib/bc/tests/history.py @@ -251,7 +251,7 @@ def test_sigint_sigquit(exe, args, env): try: send(child, "\t") - expect(child, " ") + expect(child, "\t") send(child, "\x03") # send(child, "\x1c") wait(child) @@ -320,7 +320,7 @@ def test_sigint(exe, args, env): try: send(child, "\t") - expect(child, " ") + expect(child, "\t") send(child, "\x03") wait(child) except pexpect.TIMEOUT: @@ -355,7 +355,7 @@ def test_sigtstp(exe, args, env): try: send(child, "\t") - expect(child, " ") + expect(child, "\t") send(child, "\x13") time.sleep(1) if not child.isalive(): @@ -395,7 +395,7 @@ def test_sigstop(exe, args, env): try: send(child, "\t") - expect(child, " ") + expect(child, "\t") send(child, "\x14") time.sleep(1) if not child.isalive(): @@ -678,7 +678,7 @@ def test_bc7(exe, args, env): send(child, "\x1b[0;4\x1b[0A") send(child, "\n") expect(child, prompt) - send(child, " ") + send(child, "\t") send(child, "\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb\x1bb") send(child, "\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf\x1bf") send(child, "\n") diff --git a/contrib/bc/tests/other.sh b/contrib/bc/tests/other.sh index 64ba877a20c0..4e277059a32c 100755 --- a/contrib/bc/tests/other.sh +++ b/contrib/bc/tests/other.sh @@ -62,6 +62,8 @@ else halt="q" fi +mkdir -p "$outputdir" + # For tests later. num=100000000000000000000000000000000000000000000000000000000000000000000000000000 num2="$num" @@ -143,7 +145,7 @@ if [ "$d" = "bc" ]; then redefine_res="$outputdir/bc_outputs/redefine.txt" redefine_out="$outputdir/bc_outputs/redefine_results.txt" - outdir=$(dirname "$easter_out") + outdir=$(dirname "$redefine_out") if [ ! -d "$outdir" ]; then mkdir -p "$outdir" @@ -416,6 +418,60 @@ checkerrtest "$d" "$err" "colon long option" "$out2" "$d" printf 'pass\n' +printf 'Running %s builtin variable arg tests...' "$d" + +if [ "$extra_math" -ne 0 ]; then + + out=$(printf '14\n15\n16\n17.25\n') + printf '%s\n' "$out" > "$out1" + + if [ "$d" = "bc" ]; then + data=$(printf 's=scale;i=ibase;o=obase;t=seed@2;ibase=A;obase=A;s;i;o;t;') + else + data=$(printf 'J2@OIKAiAopRpRpRpR') + fi + + printf '%s\n' "$data" | "$exe" "$@" -S14 -I15 -O16 -E17.25 > "$out2" + checktest "$d" "$?" "builtin variable args" "$out1" "$out2" + + printf '%s\n' "$data" | "$exe" "$@" --scale=14 --ibase=15 --obase=16 --seed=17.25 > "$out2" + checktest "$d" "$?" "builtin variable long args" "$out1" "$out2" + +else + + out=$(printf '14\n15\n16\n') + printf '%s\n' "$out" > "$out1" + + if [ "$d" = "bc" ]; then + data=$(printf 's=scale;i=ibase;o=obase;ibase=A;obase=A;s;i;o;') + else + data=$(printf 'OIKAiAopRpRpR') + fi + + printf '%s\n' "$data" | "$exe" "$@" -S14 -I15 -O16 > "$out2" + checktest "$d" "$?" "builtin variable args" "$out1" "$out2" + + printf '%s\n' "$data" | "$exe" "$@" --scale=14 --ibase=15 --obase=16 > "$out2" + checktest "$d" "$?" "builtin variable long args" "$out1" "$out2" + +fi + +printf 'scale\n' | "$exe" "$@" --scale=18923c.rlg > /dev/null 2> "$out2" +err="$?" + +checkerrtest "$d" "$err" "invalid command-line arg for builtin variable" "$out2" "$d" + +if [ "$extra_math" -ne 0 ]; then + + printf 'seed\n' | "$exe" "$@" --seed=18923c.rlg > /dev/null 2> "$out2" + err="$?" + + checkerrtest "$d" "$err" "invalid command-line arg for seed" "$out2" "$d" + +fi + +printf 'pass\n' + printf 'Running %s directory test...' "$d" "$exe" "$@" "$testdir" > /dev/null 2> "$out2" diff --git a/contrib/bc/vs/bc.vcxproj b/contrib/bc/vs/bc.vcxproj index 6cfd7d489927..ce34162118e1 100644 --- a/contrib/bc/vs/bc.vcxproj +++ b/contrib/bc/vs/bc.vcxproj @@ -102,7 +102,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=0;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BUILD_TYPE=HN;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=1;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BC_ENABLE_EDITLINE=0;BC_ENABLE_READLINE=0;BUILD_TYPE=N;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <ConformanceMode>true</ConformanceMode> @@ -123,7 +123,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=0;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BUILD_TYPE=HN;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=1;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BC_ENABLE_EDITLINE=0;BC_ENABLE_READLINE=0;BUILD_TYPE=N;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <ConformanceMode>true</ConformanceMode> @@ -144,7 +144,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=0;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BUILD_TYPE=HN;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=1;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BC_ENABLE_EDITLINE=0;BC_ENABLE_READLINE=0;BUILD_TYPE=N;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <ConformanceMode>true</ConformanceMode> @@ -164,7 +164,7 @@ <WarningLevel>Level3</WarningLevel> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=0;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BUILD_TYPE=HN;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BC_ENABLED=1;DC_ENABLED=1;BC_ENABLE_EXTRA_MATH=1;BC_ENABLE_HISTORY=1;BC_ENABLE_NLS=0;BC_DEBUG_CODE=0;BC_ENABLE_LIBRARY=0;BC_ENABLE_EDITLINE=0;BC_ENABLE_READLINE=0;BUILD_TYPE=N;BC_DEFAULT_BANNER=1;BC_DEFAULT_SIGINT_RESET=0;DC_DEFAULT_SIGINT_RESET=0;BC_DEFAULT_TTY_MODE=1;DC_DEFAULT_TTY_MODE=1;BC_DEFAULT_PROMPT=1;DC_DEFAULT_PROMPT=1;BC_DEFAULT_EXPR_EXIT=1;DC_DEFAULT_EXPR_EXIT=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -228,6 +228,7 @@ <ClCompile Include="..\src\dc_lex.c" /> <ClCompile Include="..\src\dc_parse.c" /> <ClCompile Include="..\src\file.c" /> + <ClCompile Include="..\src\history.c" /> <ClCompile Include="..\src\lang.c" /> <ClCompile Include="..\src\lex.c" /> <ClCompile Include="..\src\library.c" /> @@ -244,50 +245,50 @@ <ItemGroup> <CustomBuild Include="..\gen\lib.bc"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib.c bc_lib bc_lib_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib.c 0 bc_lib bc_lib_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src2\lib.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib.c bc_lib bc_lib_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib.c 0 bc_lib bc_lib_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src2\lib.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\lib.c bc_lib bc_lib_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\lib.c 0 bc_lib bc_lib_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src2\lib.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\lib.c bc_lib bc_lib_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\lib.c 0 bc_lib bc_lib_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src2\lib.c</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> <CustomBuild Include="..\gen\lib2.bc"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib2.c bc_lib2 bc_lib2_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib2.c 0 bc_lib2 bc_lib2_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src2\lib2.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib2.c bc_lib2 bc_lib2_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\lib2.c 0 bc_lib2 bc_lib2_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src2\lib2.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\lib2.c bc_lib2 bc_lib2_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\lib2.c 0 bc_lib2 bc_lib2_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src2\lib2.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\lib2.c bc_lib2 bc_lib2_name BC_ENABLED 1</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\lib2.c 0 bc_lib2 bc_lib2_name BC_ENABLED 1</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src2\lib2.c</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> <CustomBuild Include="..\gen\dc_help.txt"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c dc_help "" DC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c 0 dc_help "" DC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src2\dc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c dc_help "" DC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c 0 dc_help "" DC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src2\dc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c dc_help "" DC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c 0 dc_help "" DC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src2\dc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c dc_help "" DC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\dc_help.c 0 dc_help "" DC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src2\dc_help.c</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> <CustomBuild Include="..\gen\bc_help.txt"> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c bc_help "" BC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c 0 bc_help "" BC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">src2\bc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c bc_help "" BC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c 0 bc_help "" BC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">src2\bc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c bc_help "" BC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c 0 bc_help "" BC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src2\bc_help.c</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c bc_help "" BC_ENABLED</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)strgen.exe %(Identity) src2\bc_help.c 0 bc_help "" BC_ENABLED</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src2\bc_help.c</Outputs> </CustomBuild> </ItemGroup> |