Snap for 6050516 from 88e03486d3707cbcf17c8b225364cb3b76ed127c to rvc-release

Change-Id: Iffc29e9c632f62e6174076aef9c1fe60f130443c

25 files changed, 1198 insertions, 125 deletions

diff --git a/.travis.yml b/.travis.yml
index 3791aff5..1ae2e4f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,11 @@ dist: xenial
 
 language: c
 
+arch:
+  - amd64
+  - ppc64le
+
 compiler:
-  - clang
   - gcc
 
 env:
@@ -17,24 +20,12 @@ env:
     - CONFIGURE_ARGS=-fEHNPSOg GEN_HOST=1 LONG_BIT=64
     - CONFIGURE_ARGS=-bfEHNPSOg GEN_HOST=1 LONG_BIT=64
     - CONFIGURE_ARGS=-dfEHNPSOg GEN_HOST=1 LONG_BIT=64
-    - CONFIGURE_ARGS=-fHNPSOg GEN_HOST=0 LONG_BIT=64
-    - CONFIGURE_ARGS=-bfHNPSOg GEN_HOST=0 LONG_BIT=64
-    - CONFIGURE_ARGS=-dfHNPSOg GEN_HOST=0 LONG_BIT=64
-    - CONFIGURE_ARGS=-fEHNPSOg GEN_HOST=0 LONG_BIT=64
-    - CONFIGURE_ARGS=-bfEHNPSOg GEN_HOST=0 LONG_BIT=64
-    - CONFIGURE_ARGS=-dfEHNPSOg GEN_HOST=0 LONG_BIT=64
     - CONFIGURE_ARGS=-fHNPSOg GEN_HOST=1 LONG_BIT=32
     - CONFIGURE_ARGS=-bfHNPSOg GEN_HOST=1 LONG_BIT=32
     - CONFIGURE_ARGS=-dfHNPSOg GEN_HOST=1 LONG_BIT=32
     - CONFIGURE_ARGS=-fEHNPSOg GEN_HOST=1 LONG_BIT=32
     - CONFIGURE_ARGS=-bfEHNPSOg GEN_HOST=1 LONG_BIT=32
     - CONFIGURE_ARGS=-dfEHNPSOg GEN_HOST=1 LONG_BIT=32
-    - CONFIGURE_ARGS=-fHNPSOg GEN_HOST=0 LONG_BIT=32
-    - CONFIGURE_ARGS=-bfHNPSOg GEN_HOST=0 LONG_BIT=32
-    - CONFIGURE_ARGS=-dfHNPSOg GEN_HOST=0 LONG_BIT=32
-    - CONFIGURE_ARGS=-EfHNPSOg GEN_HOST=0 LONG_BIT=32
-    - CONFIGURE_ARGS=-bfEHNPSOg GEN_HOST=0 LONG_BIT=32
-    - CONFIGURE_ARGS=-dfEHNPSOg GEN_HOST=0 LONG_BIT=32
 
 before_install:
   - sudo apt-get install -y dc
@@ -46,4 +37,5 @@ before_script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
-script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./configure.sh "$CONFIGURE_ARGS" && make -j4 && make -j4 test ; fi
+script:
+  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./configure.sh "$CONFIGURE_ARGS" && make -j4 && make -j4 test ; fi
diff --git a/METADATA b/METADATA
index fa938a2f..9659ac7a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,13 +1,15 @@
 name: "gavinhoward/bc"
-description:
-    "An implementation of the POSIX bc calculator with GNU extensions and dc."
-
+description: "An implementation of the POSIX bc calculator with GNU extensions and dc."
 third_party {
   url {
     type: GIT
     value: "https://github.com/gavinhoward/bc"
   }
-  version: "2.3.0"
-  last_upgrade_date { year: 2019 month: 11 day: 14 }
+  version: "2.4.0"
   license_type: NOTICE
+  last_upgrade_date {
+    year: 2019
+    month: 12
+    day: 3
+  }
 }
diff --git a/Makefile.in b/Makefile.in
index 928d9cc3..9157868e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@
 #
 .POSIX:
 
-VERSION = 2.3.0
+VERSION = 2.4.0
 
 SRC = %%SRC%%
 OBJ = %%OBJ%%
diff --git a/NEWS.md b/NEWS.md
new file mode 100644
index 00000000..e5708b1d
--- /dev/null
+++ b/NEWS.md
@@ -0,0 +1,493 @@
+# News
+
+## 2.4.0
+
+This is a production release primarily aimed at improving `dc`.
+
+* A couple of copy and paste errors in the [`dc` manual][10] were fixed.
+* `dc` startup was optimized by making sure it didn't have to set up `bc`-only
+  things.
+* The `bc` `&&` and `||` were made available to `dc` through the `M` and `m`
+  commands, respectively.
+* `dc` macros were changed to be tail call-optimized.
+
+The last item, tail call optimization, means that if the last thing in a macro
+is a call to another macro, then the old macro is popped before executing the
+new macro. This change was made to stop `dc` from consuming more and more memory
+as macros are executed in a loop.
+
+The `q` and `Q` commands still respect the "hidden" macros by way of recording
+how many macros were removed by tail call optimization.
+
+## 2.3.2
+
+This is a production release meant to fix warnings in the Gentoo `ebuild` by
+making it possible to disable binary stripping. Other users do *not* need to
+upgrade.
+
+## 2.3.1
+
+This is a production release. It fixes a bug that caused `-1000000000 < -1` to
+return `0`. This only happened with negative numbers and only if the value on
+the left was more negative by a certain amount.
+
+## 2.3.0
+
+This is a production release with changes to the build system.
+
+## 2.2.0
+
+This release is a production release. It only has new features and performance
+improvements.
+
+1.	The performance of `sqrt(x)` was improved.
+2.	The new function `root(x, n)` was added to the extended math library to
+	calculate `n`th roots.
+3.	The new function `cbrt(x)` was added to the extended math library to
+	calculate cube roots.
+
+## 2.1.3
+
+This is a non-critical release; it just changes the build system, and in
+non-breaking ways:
+
+1.	Linked locale files were changed to link to their sources with a relative
+	link.
+2.	A bug in `configure.sh` that caused long option parsing to fail under `bash`
+	was fixed.
+
+## 2.1.2
+
+This release is not a critical release.
+
+1.	A few codes were added to history.
+2.	Multiplication was optimized a bit more.
+3.	Addition and subtraction were both optimized a bit more.
+
+## 2.1.1
+
+This release contains a fix for the test suite made for Linux from Scratch: now
+the test suite prints `pass` when a test is passed.
+
+Other than that, there is no change in this release, so distros and other users
+do not need to upgrade.
+
+## 2.1.0
+
+This release is a production release.
+
+The following bugs were fixed:
+
+1.	A `dc` bug that caused stack mishandling was fixed.
+2.	A warning on OpenBSD was fixed.
+3.	Bugs in `ctrl+arrow` operations in history were fixed.
+4.	The ability to paste multiple lines in history was added.
+5.	A `bc` bug, mishandling of array arguments to functions, was fixed.
+6.	A crash caused by freeing the wrong pointer was fixed.
+7.	A `dc` bug where strings, in a rare case, were mishandled in parsing was
+	fixed.
+
+In addition, the following changes were made:
+
+1.	Division was slightly optimized.
+2.	An option was added to the build to disable printing of prompts.
+3.	The special case of empty arguments is now handled. This is to prevent
+	errors in scripts that end up passing empty arguments.
+4.	A harmless bug was fixed. This bug was that, with the pop instructions
+	(mostly) removed (see below), `bc` would leave extra values on its stack for
+	`void` functions and in a few other cases. These extra items would not
+	affect anything put on the stack and would not cause any sort of crash or
+	even buggy behavior, but they would cause `bc` to take more memory than it
+	needed.
+
+On top of the above changes, the following optimizations were added:
+
+1.	The need for pop instructions in `bc` was removed.
+2.	Extra tests on every iteration of the interpreter loop were removed.
+3.	Updating function and code pointers on every iteration of the interpreter
+	loop was changed to only updating them when necessary.
+4.	Extra assignments to pointers were removed.
+
+Altogether, these changes sped up the interpreter by around 2x.
+
+***NOTE***: This is the last release with new features because this `bc` is now
+considered complete. From now on, only bug fixes and new translations will be
+added to this `bc`.
+
+## 2.0.3
+
+This is a production, bug-fix release.
+
+Two bugs were fixed in this release:
+
+1.	A rare and subtle signal handling bug was fixed.
+2.	A misbehavior on `0` to a negative power was fixed.
+
+The last bug bears some mentioning.
+
+When I originally wrote power, I did not thoroughly check its error cases;
+instead, I had it check if the first number was `0` and then if so, just return
+`0`. However, `0` to a negative power means that `1` will be divided by `0`,
+which is an error.
+
+I caught this, but only after I stopped being cocky. You see, sometime later, I
+had noticed that GNU `bc` returned an error, correctly, but I thought it was
+wrong simply because that's not what my `bc` did. I saw it again later and had a
+double take. I checked for real, finally, and found out that my `bc` was wrong
+all along.
+
+That was bad on me. But the bug was easy to fix, so it is fixed now.
+
+There are two other things in this release:
+
+1.	Subtraction was optimized by [Stefan Eßer][14].
+2.	Division was also optimized, also by Stefan Eßer.
+
+## 2.0.2
+
+This release contains a fix for a possible overflow in the signal handling. I
+would be surprised if any users ran into it because it would only happen after 2
+billion (`2^31-1`) `SIGINT`'s, but I saw it and had to fix it.
+
+## 2.0.1
+
+This release contains very few things that will apply to any users.
+
+1.	A slight bug in `dc`'s interactive mode was fixed.
+2.	A bug in the test suite that was only triggered on NetBSD was fixed.
+3.	**The `-P`/`--no-prompt` option** was added for users that do not want a
+	prompt.
+4.	A `make check` target was added as an alias for `make test`.
+5.	`dc` got its own read prompt: `?> `.
+
+## 2.0.0
+
+This release is a production release.
+
+This release is also a little different from previous releases. From here on
+out, I do not plan on adding any more features to this `bc`; I believe that it
+is complete. However, there may be bug fix releases in the future, if I or any
+others manage to find bugs.
+
+This release has only a few new features:
+
+1.	`atan2(y, x)` was added to the extended math library as both `a2(y, x)` and
+	`atan2(y, x)`.
+2.	Locales were fixed.
+3.	A **POSIX shell-compatible script was added as an alternative to compiling
+	`gen/strgen.c`** on a host machine. More details about making the choice
+	between the two can be found by running `./configure.sh --help` or reading
+	the [build manual][13].
+4.	Multiplication was optimized by using **diagonal multiplication**, rather
+	than straight brute force.
+5.	The `locale_install.sh` script was fixed.
+6.	`dc` was given the ability to **use the environment variable
+	`DC_ENV_ARGS`**.
+7.	`dc` was also given the ability to **use the `-i` or `--interactive`**
+	options.
+8.	Printing the prompt was fixed so that it did not print when it shouldn't.
+9.	Signal handling was fixed.
+10.	**Handling of `SIGTERM` and `SIGQUIT`** was fixed.
+11.	The **built-in functions `maxibase()`, `maxobase()`, and `maxscale()`** (the
+	commands `T`, `U`, `V` in `dc`, respectively) were added to allow scripts to
+	query for the max allowable values of those globals.
+12.	Some incompatibilities with POSIX were fixed.
+
+In addition, this release is `2.0.0` for a big reason: the internal format for
+numbers changed. They used to be a `char` array. Now, they are an array of
+larger integers, packing more decimal digits into each integer. This has
+delivered ***HUGE*** performance improvements, especially for multiplication,
+division, and power.
+
+This `bc` should now be the fastest `bc` available, but I may be wrong.
+
+## 1.2.8
+
+This release contains a fix for a harmless bug (it is harmless in that it still
+works, but it just copies extra data) in the [`locale_install.sh`][12] script.
+
+## 1.2.7
+
+This version contains fixes for the build on Arch Linux.
+
+## 1.2.6
+
+This release removes the use of `local` in shell scripts because it's not POSIX
+shell-compatible, and also updates a man page that should have been updated a
+long time ago but was missed.
+
+## 1.2.5
+
+This release contains some missing locale `*.msg` files.
+
+## 1.2.4
+
+This release contains a few bug fixes and new French translations.
+
+## 1.2.3
+
+This release contains a fix for a bug: use of uninitialized data. Such data was
+only used when outputting an error message, but I am striving for perfection. As
+Michelangelo said, "Trifles make perfection, and perfection is no trifle."
+
+## 1.2.2
+
+This release contains fixes for OpenBSD.
+
+## 1.2.1
+
+This release contains bug fixes for some rare bugs.
+
+## 1.2.0
+
+This is a production release.
+
+There have been several changes since `1.1.0`:
+
+1.	The build system had some changes.
+2.	Locale support has been added. (Patches welcome for translations.)
+3.	**The ability to turn `ibase`, `obase`, and `scale` into stacks** was added
+	with the `-g` command-line option. (See the [`bc` manual][9] for more
+	details.)
+4.	Support for compiling on Mac OSX out of the box was added.
+5.	The extended math library got `t(x)`, `ceil(x)`, and some aliases.
+6.	The extended math library also got `r2d(x)` (for converting from radians to
+	degrees) and `d2r(x)` (for converting from degrees to radians). This is to
+	allow using degrees with the standard library.
+7.	Both calculators now accept numbers in **scientific notation**. See the
+	[`bc` manual][9] and the [`dc` manual][10] for details.
+8.	Both calculators can **output in either scientific or engineering
+	notation**. See the [`bc` manual][9] and the [`dc` manual][10] for details.
+9.	Some inefficiencies were removed.
+10.	Some bugs were fixed.
+11.	Some bugs in the extended library were fixed.
+12.	Some defects from [Coverity Scan][11] were fixed.
+
+## 1.1.4
+
+This release contains a fix to the build system that allows it to build on older
+versions of `glibc`.
+
+## 1.1.3
+
+This release contains a fix for a bug in the test suite where `bc` tests and
+`dc` tests could not be run in parallel.
+
+## 1.1.2
+
+This release has a fix for a history bug; the down arrow did not work.
+
+## 1.1.1
+
+This release fixes a bug in the `1.1.0` build system. The source is exactly the
+same.
+
+The bug that was fixed was a failure to install if no `EXECSUFFIX` was used.
+
+## 1.1.0
+
+This is a production release. However, many new features were added since `1.0`.
+
+1.	**The build system has been changed** to use a custom, POSIX
+	shell-compatible configure script ([`configure.sh`][6]) to generate a POSIX
+	make-compatible `Makefile`, which means that `bc` and `dc` now build out of
+	the box on any POSIX-compatible system.
+2.	Out-of-memory and output errors now cause the `bc` to report the error,
+	clean up, and die, rather than just reporting and trying to continue.
+3.	**Strings and constants are now garbage collected** when possible.
+4.	Signal handling and checking has been made more simple and more thorough.
+5.	`BcGlobals` was refactored into `BcVm` and `BcVm` was made global. Some
+	procedure names were changed to reflect its difference to everything else.
+6.	Addition got a speed improvement.
+7.	Some common code for addition and multiplication was refactored into its own
+	procedure.
+8.	A bug was removed where `dc` could have been selected, but the internal
+	`#define` that returned `true` for a query about `dc` would not have
+	returned `true`.
+9.	Useless calls to `bc_num_zero()` were removed.
+10.	**History support was added.** The history support is based off of a
+	[UTF-8 aware fork][7] of [`linenoise`][8], which has been customized with
+	`bc`'s own data structures and signal handling.
+11.	Generating C source from the math library now removes tabs from the library,
+	shrinking the size of the executable.
+12.	The math library was shrunk.
+13.	Error handling and reporting was improved.
+14.	Reallocations were reduced by giving access to the request size for each
+	operation.
+15.	**`abs()` (`b` command for `dc`) was added as a builtin.**
+16.	Both calculators were tested on FreeBSD.
+17.	Many obscure parse bugs were fixed.
+18.	Markdown and man page manuals were added, and the man pages are installed by
+	`make install`.
+19.	Executable size was reduced, though the added features probably made the
+	executable end up bigger.
+20.	**GNU-style array references were added as a supported feature.**
+21.	Allocations were reduced.
+22.	**New operators were added**: `$` (`$` for `dc`), `@` (`@` for `dc`), `@=`,
+	`<<` (`H` for `dc`), `<<=`, `>>` (`h` for `dc`), and `>>=`. See the
+	[`bc` manual][9] and the [`dc` manual][10] for more details.
+23.	**An extended math library was added.** This library contains code that
+	makes it so I can replace my desktop calculator with this `bc`. See the
+	[`bc` manual][3] for more details.
+24.	Support for all capital letters as numbers was added.
+25.	**Support for GNU-style void functions was added.**
+26.	A bug fix for improper handling of function parameters was added.
+27.	Precedence for the or (`||`) operator was changed to match GNU `bc`.
+28.	`dc` was given an explicit negation command.
+29.	`dc` was changed to be able to handle strings in arrays.
+
+## 1.1 Release Candidate 3
+
+This release is the eighth release candidate for 1.1, though it is the third
+release candidate meant as a general release candidate. The new code has not
+been tested as thoroughly as it should for release.
+
+## 1.1 Release Candidate 2
+
+This release is the seventh release candidate for 1.1, though it is the second
+release candidate meant as a general release candidate. The new code has not
+been tested as thoroughly as it should for release.
+
+## 1.1 FreeBSD Beta 5
+
+This release is the sixth release candidate for 1.1, though it is the fifth
+release candidate meant specifically to test if `bc` works on FreeBSD. The new
+code has not been tested as thoroughly as it should for release.
+
+## 1.1 FreeBSD Beta 4
+
+This release is the fifth release candidate for 1.1, though it is the fourth
+release candidate meant specifically to test if `bc` works on FreeBSD. The new
+code has not been tested as thoroughly as it should for release.
+
+## 1.1 FreeBSD Beta 3
+
+This release is the fourth release candidate for 1.1, though it is the third
+release candidate meant specifically to test if `bc` works on FreeBSD. The new
+code has not been tested as thoroughly as it should for release.
+
+## 1.1 FreeBSD Beta 2
+
+This release is the third release candidate for 1.1, though it is the second
+release candidate meant specifically to test if `bc` works on FreeBSD. The new
+code has not been tested as thoroughly as it should for release.
+
+## 1.1 FreeBSD Beta 1
+
+This release is the second release candidate for 1.1, though it is meant
+specifically to test if `bc` works on FreeBSD. The new code has not been tested as
+thoroughly as it should for release.
+
+## 1.1 Release Candidate 1
+
+This is the first release candidate for 1.1. The new code has not been tested as
+thoroughly as it should for release.
+
+## 1.0
+
+This is the first non-beta release. `bc` is ready for production use.
+
+As such, a lot has changed since 0.5.
+
+1.	`dc` has been added. It has been tested even more thoroughly than `bc` was
+	for `0.5`. It does not have the `!` command, and for security reasons, it
+	never will, so it is complete.
+2.	`bc` has been more thoroughly tested. An entire section of the test suite
+	(for both programs) has been added to test for errors.
+3.	A prompt (`>>> `) has been added for interactive mode, making it easier to
+	see inputs and outputs.
+4.	Interrupt handling has been improved, including elimination of race
+	conditions (as much as possible).
+5.	MinGW and [Windows Subsystem for Linux][1] support has been added (see
+	[xstatic][2] for binaries).
+6.	Memory leaks and errors have been eliminated (as far as ASan and Valgrind
+	can tell).
+7.	Crashes have been eliminated (as far as [afl][3] can tell).
+8.	Karatsuba multiplication was added (and thoroughly) tested, speeding up
+	multiplication and power by orders of magnitude.
+9.	Performance was further enhanced by using a "divmod" function to reduce
+	redundant divisions and by removing superfluous `memset()` calls.
+10.	To switch between Karatsuba and `O(n^2)` multiplication, the config variable
+	`BC_NUM_KARATSUBA_LEN` was added. It is set to a sane default, but the
+	optimal number can be found with [`karatsuba.py`][4] (requires Python 3)
+	and then configured through `make`.
+11.	The random math test generator script was changed to Python 3 and improved.
+	`bc` and `dc` have together been run through 30+ million random tests.
+12.	All known math bugs have been fixed, including out of control memory
+	allocations in `sine` and `cosine` (that was actually a parse bug), certain
+	cases of infinite loop on square root, and slight inaccuracies (as much as
+	possible; see the [README][5]) in transcendental functions.
+13.	Parsing has been fixed as much as possible.
+14.	Test coverage was improved to 94.8%. The only paths not covered are ones
+	that happen when `malloc()` or `realloc()` fails.
+15.	An extension to get the length of an array was added.
+16.	The boolean not (`!`) had its precedence change to match negation.
+17.	Data input was hardened.
+18.	`bc` was made fully compliant with POSIX when the `-s` flag is used or
+	`POSIXLY_CORRECT` is defined.
+19.	Error handling was improved.
+20.	`bc` now checks that files it is given are not directories.
+
+## 1.0 Release Candidate 7
+
+This is the seventh release candidate for 1.0. It fixes a few bugs in 1.0
+Release Candidate 6.
+
+## 1.0 Release Candidate 6
+
+This is the sixth release candidate for 1.0. It fixes a few bugs in 1.0 Release
+Candidate 5.
+
+## 1.0 Release Candidate 5
+
+This is the fifth release candidate for 1.0. It fixes a few bugs in 1.0 Release
+Candidate 4.
+
+## 1.0 Release Candidate 4
+
+This is the fourth release candidate for 1.0. It fixes a few bugs in 1.0 Release
+Candidate 3.
+
+## 1.0 Release Candidate 3
+
+This is the third release candidate for 1.0. It fixes a few bugs in 1.0 Release
+Candidate 2.
+
+## 1.0 Release Candidate 2
+
+This is the second release candidate for 1.0. It fixes a few bugs in 1.0 Release
+Candidate 1.
+
+## 1.0 Release Candidate 1
+
+This is the first Release Candidate for 1.0. `bc` is complete, with `dc`, but it
+is not tested.
+
+## 0.5
+
+This beta release completes more features, but it is still not complete nor
+tested as thoroughly as necessary.
+
+## 0.4.1
+
+This beta release fixes a few bugs in 0.4.
+
+## 0.4
+
+This is a beta release. It does not have the complete set of features, and it is
+not thoroughly tested.
+
+[1]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
+[2]: https://pkg.musl.cc/bc/
+[3]: http://lcamtuf.coredump.cx/afl/
+[4]: ./karatsuba.py
+[5]: ./README.md
+[6]: ./configure.sh
+[7]: https://github.com/rain-1/linenoise-mob
+[8]: https://github.com/antirez/linenoise
+[9]: ./manuals/bc.1.ronn
+[10]: ./manuals/dc.1.ronn
+[11]: https://scan.coverity.com/projects/gavinhoward-bc
+[12]: ./locale_install.sh
+[13]: ./manuals/build.md
+[14]: https://github.com/stesser
diff --git a/README.md b/README.md
index ef15ca4a..2784cbed 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,11 @@ For packages that are not built on the oldest supported hardware,
 `-march=native` is not recommended because of the possibility of illegal
 instructions.
 
+#### Stripping Binaries
+
+By default, non-debug binaries are stripped, but stripping can be disabled with
+the `-T` option to `configure.sh`.
+
 #### Using This `bc` as an Alternative
 
 If this `bc` is packaged as an alternative to an already existing `bc` package,
diff --git a/configure.sh b/configure.sh
index ebce8930..46e37bfc 100755
--- a/configure.sh
+++ b/configure.sh
@@ -47,17 +47,17 @@ usage() {
 
 	printf 'usage: %s -h\n' "$script"
 	printf '       %s --help\n' "$script"
-	printf '       %s [-bD|-dB|-c] [-EfgGHMNPS] [-O OPT_LEVEL] [-k KARATSUBA_LEN]\n' "$script"
+	printf '       %s [-bD|-dB|-c] [-EfgGHMNPST] [-O OPT_LEVEL] [-k KARATSUBA_LEN]\n' "$script"
 	printf '       %s \\\n' "$script"
-	printf '           [--bc-only --disable-dc|--dc-only --disable-bc|--coverage] \\\n'
-	printf '           [--debug --disable-extra-math --disable-generated-tests]   \\\n'
-	printf '           [--disable-history --disable-man-pages --disable-nls]      \\\n'
-	printf '           [--disable-prompt --disable-signal-handling]               \\\n'
-	printf '           [--opt=OPT_LEVEL] [--karatsuba-len=KARATSUBA_LEN]          \\\n'
-	printf '           [--prefix=PREFIX] [--bindir=BINDIR]                        \\\n'
-	printf '           [--datarootdir=DATAROOTDIR] [--datadir=DATADIR]            \\\n'
-	printf '           [--mandir=MANDIR] [--man1dir=MAN1DIR]                      \\\n'
-	printf '           [--force]                                                  \\\n'
+	printf '           [--bc-only --disable-dc|--dc-only --disable-bc|--coverage]    \\\n'
+	printf '           [--debug --disable-extra-math --disable-generated-tests]      \\\n'
+	printf '           [--disable-history --disable-man-pages --disable-nls]         \\\n'
+	printf '           [--disable-prompt --disable-signal-handling --disable-strip]  \\\n'
+	printf '           [--opt=OPT_LEVEL] [--karatsuba-len=KARATSUBA_LEN]             \\\n'
+	printf '           [--prefix=PREFIX] [--bindir=BINDIR]                           \\\n'
+	printf '           [--datarootdir=DATAROOTDIR] [--datadir=DATADIR]               \\\n'
+	printf '           [--mandir=MANDIR] [--man1dir=MAN1DIR]                         \\\n'
+	printf '           [--force]                                                     \\\n'
 	printf '\n'
 	printf '    -b, --bc-only\n'
 	printf '        Build bc only. It is an error if "-d" or "-B" are specified too.\n'
@@ -111,6 +111,9 @@ usage() {
 	printf '        enabled.\n'
 	printf '    -S, --disable-signal-handling\n'
 	printf '        Disable signal handling. On by default.\n'
+	printf '    -T, --disable-strip\n'
+	printf '        Disable stripping symbols from the compiled binary or binaries.\n'
+	printf '        Stripping symbols only happens when debug mode is off.\n'
 	printf '    --prefix PREFIX\n'
 	printf '        The prefix to install to. Overrides "$PREFIX" if it exists.\n'
 	printf '        If PREFIX is "/usr", install path will be "/usr/bin".\n'
@@ -311,8 +314,9 @@ install_manpages=1
 nls=1
 prompt=1
 force=0
+strip_bin=1
 
-while getopts "bBcdDEfgGhHk:MNO:PS-" opt; do
+while getopts "bBcdDEfgGhHk:MNO:PST-" opt; do
 
 	case "$opt" in
 		b) bc_only=1 ;;
@@ -332,6 +336,7 @@ while getopts "bBcdDEfgGhHk:MNO:PS-" opt; do
 		O) optimization="$OPTARG" ;;
 		P) prompt=0 ;;
 		S) signals=0 ;;
+		T) strip_bin=0 ;;
 		-)
 			arg="$1"
 			arg="${arg#--}"
@@ -415,6 +420,7 @@ while getopts "bBcdDEfgGhHk:MNO:PS-" opt; do
 				disable-nls) nls=0 ;;
 				disable-prompt) prompt=0 ;;
 				disable-signal-handling) signals=0 ;;
+				disable-strip) strip_bin=0 ;;
 				help* | bc-only* | dc-only* | coverage* | debug*)
 					usage "No arg allowed for --$arg option" ;;
 				disable-bc* | disable-dc* | disable-extra-math*)
@@ -423,6 +429,8 @@ while getopts "bBcdDEfgGhHk:MNO:PS-" opt; do
 					usage "No arg allowed for --$arg option" ;;
 				disable-man-pages* | disable-nls* | disable-signal-handling*)
 					usage "No arg allowed for --$arg option" ;;
+				disable-strip*)
+					usage "No arg allowed for --$arg option" ;;
 				'') break ;; # "--" terminates argument processing
 				* ) usage "Invalid option $LONG_OPTARG" ;;
 			esac
@@ -558,7 +566,9 @@ if [ "$debug" -eq 1 ]; then
 
 else
 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
-	LDFLAGS="-s $LDFLAGS"
+	if [ "$strip_bin" -ne 0 ]; then
+		LDFLAGS="-s $LDFLAGS"
+	fi
 fi
 
 if [ -n "$optimization" ]; then
diff --git a/include/program.h b/include/program.h
index 3a527a26..726fc8f6 100644
--- a/include/program.h
+++ b/include/program.h
@@ -55,11 +55,6 @@ typedef struct BcProgram {
 	BcBigDig globals[BC_PROG_GLOBALS_LEN];
 	BcVec globals_v[BC_PROG_GLOBALS_LEN];
 
-#if DC_ENABLED
-	BcBigDig strm;
-	BcNum strmb;
-#endif // DC_ENABLED
-
 	BcVec results;
 	BcVec stack;
 
@@ -74,6 +69,13 @@ typedef struct BcProgram {
 	BcVec arrs;
 	BcVec arr_map;
 
+#if DC_ENABLED
+	BcVec tail_calls;
+
+	BcBigDig strm;
+	BcNum strmb;
+#endif // DC_ENABLED
+
 	BcNum one;
 
 #if BC_ENABLED
diff --git a/manuals/bc.1 b/manuals/bc.1
index e75ad531..8262d38e 100644
--- a/manuals/bc.1
+++ b/manuals/bc.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BC" "1" "October 2019" "Gavin D. Howard" "General Commands Manual"
+.TH "BC" "1" "November 2019" "Gavin D. Howard" "General Commands Manual"
 .
 .SH "NAME"
 \fBbc\fR \- arbitrary\-precision arithmetic language and calculator
diff --git a/manuals/build.md b/manuals/build.md
index 52e1a492..c262b7d5 100644
--- a/manuals/build.md
+++ b/manuals/build.md
@@ -521,6 +521,26 @@ make
 make install
 ```
 
+## Stripping Binaries
+
+By default, when `bc` and `dc` are not built in debug mode, the binaries are
+stripped. Stripping can be disabled with either the `-T` or the
+`--disable-strip` option, as follows:
+
+```
+./configure.sh -T
+./configure.sh --disable-strip
+```
+
+Both commands are equivalent.
+
+The build and install can then be run as normal:
+
+```
+make
+make install
+```
+
 ## Binary Size
 
 When built with both calculators, all available features, and `-Os` using clang,
diff --git a/manuals/dc.1 b/manuals/dc.1
index 3fabd131..4cf53df5 100644
--- a/manuals/dc.1
+++ b/manuals/dc.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "DC" "1" "October 2019" "Gavin D. Howard" "General Commands Manual"
+.TH "DC" "1" "November 2019" "Gavin D. Howard" "General Commands Manual"
 .
 .SH "NAME"
 \fBdc\fR \- arbitrary\-precision reverse\-Polish notation calculator
@@ -329,6 +329,26 @@ The top two values are popped off of the stack, they are compared, and a \fB1\fR
 .IP
 This is a \fBnon\-portable extension\fR\.
 .
+.TP
+\fBM\fR
+The top two values are popped off of the stack\. If they are both non\-zero, a \fB1\fR is pushed onto the stack\. If either of them is zero, or both of them are, then a \fB0\fR is pushed onto the stack\.
+.
+.IP
+This is like the \fB&&\fR operator in bc(1), and it is not a short\-circuit operator\.
+.
+.IP
+This is a \fBnon\-portable extension\fR\.
+.
+.TP
+\fBm\fR
+The top two values are popped off of the stack\. If at least one of them is non\-zero, a \fB1\fR is pushed onto the stack\. If both of them are zero, then a \fB0\fR is pushed onto the stack\.
+.
+.IP
+This is like the \fB||\fR operator in bc(1), and it is not a short\-circuit operator\.
+.
+.IP
+This is a \fBnon\-portable extension\fR\.
+.
 .SS "Stack Control"
 These commands control the stack\.
 .
@@ -438,7 +458,7 @@ Strings can also be executed as macros\. For example, if the string \fB[1pR]\fR
 .
 .TP
 \fB[\fR\fIcharacters\fR\fB]\fR
-Makes a string containing \fBcharacters\fR and pushes it onto the stack\.
+Makes a string containing \fIcharacters\fR and pushes it onto the stack\.
 .
 .IP
 If there are brackets (\fB[\fR and \fB]\fR) in the string, then they must be balanced\. Unbalanced brackets can be escaped using a backslash (\fB\e\fR) character\.
@@ -521,7 +541,7 @@ This is a \fBnon\-portable extension\fR\.
 .
 .TP
 \fB=\fR\fIr\fR
-Pops two values off of the stack that must be numbers and compares them\. If the first value is equal to the second (greater than or equal to), then the contents of register \fBr\fR are executed\.
+Pops two values off of the stack that must be numbers and compares them\. If the first value is equal to the second, then the contents of register \fBr\fR are executed\.
 .
 .TP
 \fB=\fR\fIr\fR\fBe\fR\fIs\fR
@@ -532,7 +552,7 @@ This is a \fBnon\-portable extension\fR\.
 .
 .TP
 \fB!=\fR\fIr\fR
-Pops two values off of the stack that must be numbers and compares them\. If the first value is not equal to the second (greater than or equal to), then the contents of register \fBr\fR are executed\.
+Pops two values off of the stack that must be numbers and compares them\. If the first value is not equal to the second, then the contents of register \fBr\fR are executed\.
 .
 .TP
 \fB!=\fR\fIr\fR\fBe\fR\fIs\fR
diff --git a/manuals/dc.1.ronn b/manuals/dc.1.ronn
index a2aad0ad..7d1f0c9e 100644
--- a/manuals/dc.1.ronn
+++ b/manuals/dc.1.ronn
@@ -385,6 +385,26 @@ These are the commands used for arithmetic.
 
     This is a **non-portable extension**.
 
+  * `M`:
+    The top two values are popped off of the stack. If they are both non-zero, a
+    `1` is pushed onto the stack. If either of them is zero, or both of them
+    are, then a `0` is pushed onto the stack.
+
+    This is like the `&&` operator in bc(1), and it is not a short-circuit
+    operator.
+
+    This is a **non-portable extension**.
+
+  * `m`:
+    The top two values are popped off of the stack. If at least one of them is
+    non-zero, a `1` is pushed onto the stack. If both of them are zero, then a
+    `0` is pushed onto the stack.
+
+    This is like the `||` operator in bc(1), and it is not a short-circuit
+    operator.
+
+    This is a **non-portable extension**.
+
 ### Stack Control
 
 These commands control the stack.
@@ -489,7 +509,7 @@ executed as a macro, then the code `1pR` is executed, meaning that the `1` will
 be printed with a newline after and then popped from the stack.
 
   * `[`*characters*`]`:
-    Makes a string containing `characters` and pushes it onto the stack.
+    Makes a string containing *characters* and pushes it onto the stack.
 
     If there are brackets (`[` and `]`) in the string, then they must be
     balanced. Unbalanced brackets can be escaped using a backslash (`\`)
@@ -569,8 +589,8 @@ be printed with a newline after and then popped from the stack.
 
   * `=`*r*:
     Pops two values off of the stack that must be numbers and compares them. If
-    the first value is equal to the second (greater than or equal to), then the
-    contents of register `r` are executed.
+    the first value is equal to the second, then the contents of register `r`
+    are executed.
 
   * `=`*r*`e`*s*:
     Like the above, but will execute register `s` if the comparison fails.
@@ -579,8 +599,8 @@ be printed with a newline after and then popped from the stack.
 
   * `!=`*r*:
     Pops two values off of the stack that must be numbers and compares them. If
-    the first value is not equal to the second (greater than or equal to), then
-    the contents of register `r` are executed.
+    the first value is not equal to the second, then the contents of register
+    `r` are executed.
 
   * `!=`*r*`e`*s*:
     Like the above, but will execute register `s` if the comparison fails.
diff --git a/release.sh b/release.sh
index 9ba315f3..aa031a1b 100755
--- a/release.sh
+++ b/release.sh
@@ -28,8 +28,8 @@
 #
 
 usage() {
-	printf 'usage: %s [run_tests] [generate_tests] [test_with_clang] [test_with_gcc] \n'
-	printf '          [run_sanitizers] [run_valgrind] [run_64_bit]\n' "$script"
+	printf 'usage: %s [run_tests] [generate_tests] [test_with_clang] [test_with_gcc] \n' "$script"
+	printf '          [run_sanitizers] [run_valgrind] [run_64_bit] [run_gen_script]\n'
 	exit 1
 }
 
@@ -220,16 +220,20 @@ runconfigseries() {
 		runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
 			"$_runconfigseries_configure_flags" 1 64 "$_runconfigseries_run_tests"
 
-		runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
-			"$_runconfigseries_configure_flags" 0 64 "$_runconfigseries_run_tests"
+		if [ "$run_gen_script" -ne 0 ]; then
+			runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
+				"$_runconfigseries_configure_flags" 0 64 "$_runconfigseries_run_tests"
+		fi
 
 	fi
 
 	runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
 		"$_runconfigseries_configure_flags" 1 32 "$_runconfigseries_run_tests"
 
-	runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
-		"$_runconfigseries_configure_flags" 0 32 "$_runconfigseries_run_tests"
+	if [ "$run_gen_script" -ne 0 ]; then
+		runconfigtests "$_runconfigseries_CFLAGS" "$_runconfigseries_CC" \
+			"$_runconfigseries_configure_flags" 0 32 "$_runconfigseries_run_tests"
+	fi
 }
 
 runtestseries() {
@@ -438,6 +442,13 @@ else
 	run_64_bit=1
 fi
 
+if [ "$#" -gt 0 ]; then
+	run_gen_script="$1"
+	shift
+else
+	run_gen_script=0
+fi
+
 if [ "$run_64_bit" -ne 0 ]; then
 	bits=64
 else
diff --git a/src/data.c b/src/data.c
index a5785cbf..d2b53d5c 100644
--- a/src/data.c
+++ b/src/data.c
@@ -782,9 +782,9 @@ const uchar dc_lex_tokens[] = {
 	BC_LEX_INVALID,
 #endif // BC_ENABLE_EXTRA_MATH
 	BC_LEX_KW_IBASE, BC_LEX_INVALID, BC_LEX_KW_SCALE, BC_LEX_LOAD_POP,
-	BC_LEX_INVALID, BC_LEX_OP_BOOL_NOT, BC_LEX_KW_OBASE, BC_LEX_PRINT_STREAM,
-	BC_LEX_NQUIT, BC_LEX_POP, BC_LEX_STORE_PUSH, BC_LEX_KW_MAXIBASE,
-	BC_LEX_KW_MAXOBASE, BC_LEX_KW_MAXSCALE, BC_LEX_INVALID,
+	BC_LEX_OP_BOOL_AND, BC_LEX_OP_BOOL_NOT, BC_LEX_KW_OBASE,
+	BC_LEX_PRINT_STREAM, BC_LEX_NQUIT, BC_LEX_POP, BC_LEX_STORE_PUSH,
+	BC_LEX_KW_MAXIBASE, BC_LEX_KW_MAXOBASE, BC_LEX_KW_MAXSCALE, BC_LEX_INVALID,
 	BC_LEX_SCALE_FACTOR,
 	BC_LEX_INVALID, BC_LEX_KW_LENGTH, BC_LEX_INVALID, BC_LEX_INVALID,
 	BC_LEX_INVALID, BC_LEX_OP_POWER, BC_LEX_NEG, BC_LEX_INVALID,
@@ -796,7 +796,7 @@ const uchar dc_lex_tokens[] = {
 	BC_LEX_INVALID,
 #endif // BC_ENABLE_EXTRA_MATH
 	BC_LEX_STORE_IBASE, BC_LEX_INVALID, BC_LEX_STORE_SCALE, BC_LEX_LOAD,
-	BC_LEX_INVALID, BC_LEX_PRINT_POP, BC_LEX_STORE_OBASE, BC_LEX_KW_PRINT,
+	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_INVALID, BC_LEX_STACK_LEVEL,
@@ -821,7 +821,7 @@ const uchar dc_parse_insts[] = {
 #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_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,
diff --git a/src/lang.c b/src/lang.c
index 9e8947f3..625cf48d 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -97,10 +97,12 @@ void bc_func_init(BcFunc *f, const char *name) {
 	bc_vec_init(&f->strs, sizeof(char*), bc_string_free);
 	bc_vec_init(&f->consts, sizeof(BcConst), bc_const_free);
 #if BC_ENABLED
-	bc_vec_init(&f->autos, sizeof(BcLoc), NULL);
-	bc_vec_init(&f->labels, sizeof(size_t), NULL);
-	f->nparams = 0;
-	f->voidfn = false;
+	if (BC_IS_BC) {
+		bc_vec_init(&f->autos, sizeof(BcLoc), NULL);
+		bc_vec_init(&f->labels, sizeof(size_t), NULL);
+		f->nparams = 0;
+		f->voidfn = false;
+	}
 #endif // BC_ENABLED
 	f->name = name;
 }
@@ -111,10 +113,12 @@ void bc_func_reset(BcFunc *f) {
 	bc_vec_npop(&f->strs, f->strs.len);
 	bc_vec_npop(&f->consts, f->consts.len);
 #if BC_ENABLED
-	bc_vec_npop(&f->autos, f->autos.len);
-	bc_vec_npop(&f->labels, f->labels.len);
-	f->nparams = 0;
-	f->voidfn = false;
+	if (BC_IS_BC) {
+		bc_vec_npop(&f->autos, f->autos.len);
+		bc_vec_npop(&f->labels, f->labels.len);
+		f->nparams = 0;
+		f->voidfn = false;
+	}
 #endif // BC_ENABLED
 }
 
@@ -125,8 +129,10 @@ void bc_func_free(void *func) {
 	bc_vec_free(&f->strs);
 	bc_vec_free(&f->consts);
 #if BC_ENABLED
-	bc_vec_free(&f->autos);
-	bc_vec_free(&f->labels);
+	if (BC_IS_BC) {
+		bc_vec_free(&f->autos);
+		bc_vec_free(&f->labels);
+	}
 #endif // BC_ENABLED
 }
 
diff --git a/src/num.c b/src/num.c
index 76604307..a558a628 100644
--- a/src/num.c
+++ b/src/num.c
@@ -272,7 +272,7 @@ ssize_t bc_num_cmp(const BcNum *a, const BcNum *b) {
 	a_int -= b_int;
 	a_max = (a->rdx > b->rdx);
 
-	if (a_int) return (ssize_t) a_int;
+	if (a_int) return neg ? -((ssize_t) a_int) : (ssize_t) a_int;
 
 	if (a_max) {
 		min = b->rdx;
@@ -660,23 +660,23 @@ static BcStatus bc_num_as(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub) {
 	min_len = BC_MIN(len_l, len_r);
 
 	if (do_sub) {
-		for (i = 0; BC_NO_SIG && i < min_len; i++)
+		for (i = 0; BC_NO_SIG && i < min_len; ++i)
 			ptr_c[i] = bc_num_subDigits(ptr_l[i], ptr_r[i], &carry);
-		for (; BC_NO_SIG && i < len_l; i++)
+		for (; BC_NO_SIG && i < len_l; ++i)
 			ptr_c[i] = bc_num_subDigits(ptr_l[i], 0, &carry);
-		for (; BC_NO_SIG && i < len_r; i++)
+		for (; BC_NO_SIG && i < len_r; ++i)
 			ptr_c[i] = bc_num_subDigits(0, ptr_r[i], &carry);
-		for (; BC_NO_SIG && i < max_len - diff; i++)
+		for (; BC_NO_SIG && i < max_len - diff; ++i)
 			ptr_c[i] = bc_num_subDigits(0, 0, &carry);
 	}
 	else {
-		for (i = 0; BC_NO_SIG && i < min_len; i++)
+		for (i = 0; BC_NO_SIG && i < min_len; ++i)
 			ptr_c[i] = bc_num_addDigits(ptr_l[i], ptr_r[i], &carry);
-		for (; BC_NO_SIG && i < len_l; i++)
+		for (; BC_NO_SIG && i < len_l; ++i)
 			ptr_c[i] = bc_num_addDigits(ptr_l[i], 0, &carry);
-		for (; BC_NO_SIG && i < len_r; i++)
+		for (; BC_NO_SIG && i < len_r; ++i)
 			ptr_c[i] = bc_num_addDigits(0, ptr_r[i], &carry);
-		for (; BC_NO_SIG && i < max_len - diff; i++)
+		for (; BC_NO_SIG && i < max_len - diff; ++i)
 			ptr_c[i] = bc_num_addDigits(0, 0, &carry);
 	}
 
diff --git a/src/parse.c b/src/parse.c
index fc04608b..2bff1e42 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -136,24 +136,31 @@ BcStatus bc_parse_reset(BcParse *p, BcStatus s) {
 	p->auto_part = false;
 
 #if BC_ENABLED
-	bc_vec_npop(&p->flags, p->flags.len - 1);
-	bc_vec_npop(&p->exits, p->exits.len);
-	bc_vec_npop(&p->conds, p->conds.len);
-	bc_vec_npop(&p->ops, p->ops.len);
+	if (BC_IS_BC) {
+		bc_vec_npop(&p->flags, p->flags.len - 1);
+		bc_vec_npop(&p->exits, p->exits.len);
+		bc_vec_npop(&p->conds, p->conds.len);
+		bc_vec_npop(&p->ops, p->ops.len);
+	}
 #endif // BC_ENABLED
 
 	return bc_program_reset(p->prog, s);
 }
 
 void bc_parse_free(BcParse *p) {
+
 	assert(p != NULL);
+
 #if BC_ENABLED
-	bc_vec_free(&p->flags);
-	bc_vec_free(&p->exits);
-	bc_vec_free(&p->conds);
-	bc_vec_free(&p->ops);
-	bc_vec_free(&p->buf);
+	if (BC_IS_BC) {
+		bc_vec_free(&p->flags);
+		bc_vec_free(&p->exits);
+		bc_vec_free(&p->conds);
+		bc_vec_free(&p->ops);
+		bc_vec_free(&p->buf);
+	}
 #endif // BC_ENABLED
+
 	bc_lex_free(&p->l);
 }
 
@@ -166,12 +173,14 @@ void bc_parse_init(BcParse *p, BcProgram *prog, size_t func) {
 	assert(p != NULL && prog != NULL);
 
 #if BC_ENABLED
-	bc_vec_init(&p->flags, sizeof(uint16_t), NULL);
-	bc_vec_push(&p->flags, &flag);
-	bc_vec_init(&p->exits, sizeof(BcInstPtr), NULL);
-	bc_vec_init(&p->conds, sizeof(size_t), NULL);
-	bc_vec_init(&p->ops, sizeof(BcLexType), NULL);
-	bc_vec_init(&p->buf, sizeof(char), NULL);
+	if (BC_IS_BC) {
+		bc_vec_init(&p->flags, sizeof(uint16_t), NULL);
+		bc_vec_push(&p->flags, &flag);
+		bc_vec_init(&p->exits, sizeof(BcInstPtr), NULL);
+		bc_vec_init(&p->conds, sizeof(size_t), NULL);
+		bc_vec_init(&p->ops, sizeof(BcLexType), NULL);
+		bc_vec_init(&p->buf, sizeof(char), NULL);
+	}
 #endif // BC_ENABLED
 
 	bc_lex_init(&p->l);
diff --git a/src/program.c b/src/program.c
index ba5fa0e6..29593701 100644
--- a/src/program.c
+++ b/src/program.c
@@ -473,6 +473,12 @@ static BcStatus bc_program_read(BcProgram *p) {
 
 	bc_vec_pushByte(&f->code, vm->read_ret);
 	bc_vec_push(&p->stack, &ip);
+#if DC_ENABLED
+	if (!BC_IS_BC) {
+		size_t temp = 0;
+		bc_vec_push(&p->tail_calls, &temp);
+	}
+#endif // DC_ENABLED
 
 exec_err:
 	bc_parse_free(&parse);
@@ -558,7 +564,7 @@ static BcStatus bc_program_print(BcProgram *p, uchar inst, size_t idx) {
 		assert(inst != BC_INST_PRINT_STR);
 		s = bc_num_print(n, BC_PROG_OBASE(p), !pop);
 #if BC_ENABLED
-		if (BC_NO_ERR(!s)) bc_num_copy(&p->last, n);
+		if (BC_NO_ERR(!s) && BC_IS_BC) bc_num_copy(&p->last, n);
 #endif // BC_ENABLED
 	}
 	else {
@@ -1378,31 +1384,47 @@ static BcStatus bc_program_printStream(BcProgram *p) {
 	return s;
 }
 
-static BcStatus bc_program_nquit(BcProgram *p) {
+static BcStatus bc_program_nquit(BcProgram *p, uchar inst) {
 
 	BcStatus s;
 	BcResult *opnd;
 	BcNum *num;
 	BcBigDig val;
+	size_t i;
 
-	s = bc_program_prep(p, &opnd, &num);
-	if (BC_ERR(s)) return s;
-	s = bc_num_bigdig(num, &val);
-	if (BC_ERR(s)) return s;
+	assert(p->stack.len == p->tail_calls.len);
 
-	bc_vec_pop(&p->results);
+	if (inst == BC_INST_QUIT) {
+		val = 2;
+		s = BC_STATUS_SUCCESS;
+	}
+	else {
 
-	s = bc_program_checkStack(&p->stack, val);
-	if (BC_ERR(s)) return s;
-	else if (p->stack.len == val) return BC_STATUS_QUIT;
+		s = bc_program_prep(p, &opnd, &num);
+		if (BC_ERR(s)) return s;
+		s = bc_num_bigdig(num, &val);
+		if (BC_ERR(s)) return s;
+
+		bc_vec_pop(&p->results);
+	}
+
+	for (i = 0; val && i < p->tail_calls.len; ++i) {
+		size_t calls = *((size_t*) bc_vec_item_rev(&p->tail_calls, i)) + 1;
+		if (calls >= val) val = 0;
+		else val -= calls;
+	}
 
-	bc_vec_npop(&p->stack, val);
+	if (i == p->stack.len) s = BC_STATUS_QUIT;
+	else {
+		bc_vec_npop(&p->stack, i);
+		bc_vec_npop(&p->tail_calls, i);
+	}
 
 	return s;
 }
 
 static BcStatus bc_program_execStr(BcProgram *p, const char *restrict code,
-                                   size_t *restrict bgn, bool cond)
+                                   size_t *restrict bgn, bool cond, size_t len)
 {
 	BcStatus s = BC_STATUS_SUCCESS;
 	BcResult *r;
@@ -1414,6 +1436,8 @@ static BcStatus bc_program_execStr(BcProgram *p, const char *restrict code,
 	BcNum *n;
 	bool exec;
 
+	assert(p->stack.len == p->tail_calls.len);
+
 	s = bc_program_operand(p, &r, &n, 0);
 	if (BC_ERR(s)) return s;
 
@@ -1478,6 +1502,15 @@ static BcStatus bc_program_execStr(BcProgram *p, const char *restrict code,
 	ip.func = fidx;
 
 	bc_vec_pop(&p->results);
+
+	// Tail call.
+	if (p->stack.len > 1 && *bgn == len - 1 && code[*bgn] == BC_INST_POP_EXEC) {
+		size_t *call_ptr = bc_vec_top(&p->tail_calls);
+		*call_ptr += 1;
+		bc_vec_pop(&p->stack);
+	}
+	else bc_vec_push(&p->tail_calls, &ip.idx);
+
 	bc_vec_push(&p->stack, &ip);
 
 	return BC_STATUS_SUCCESS;
@@ -1543,9 +1576,16 @@ void bc_program_free(BcProgram *p) {
 	bc_vec_free(&p->arr_map);
 	bc_vec_free(&p->results);
 	bc_vec_free(&p->stack);
+
 #if BC_ENABLED
-	bc_num_free(&p->last);
+	if (BC_IS_BC) {
+		bc_num_free(&p->last);
+	}
 #endif // BC_ENABLED
+
+#if DC_ENABLED
+	if (!BC_IS_BC) bc_vec_free(&p->tail_calls);
+#endif // DC_ENABLED
 }
 #endif // NDEBUG
 
@@ -1568,16 +1608,23 @@ void bc_program_init(BcProgram *p) {
 	}
 
 #if DC_ENABLED
-	p->strm = UCHAR_MAX + 1;
-	bc_num_setup(&p->strmb, p->strmb_num, BC_NUM_BIGDIG_LOG10);
-	bc_num_bigdig2num(&p->strmb, p->strm);
+	if (!BC_IS_BC) {
+
+		bc_vec_init(&p->tail_calls, sizeof(size_t), NULL);
+		i = 0;
+		bc_vec_push(&p->tail_calls, &i);
+
+		p->strm = UCHAR_MAX + 1;
+		bc_num_setup(&p->strmb, p->strmb_num, BC_NUM_BIGDIG_LOG10);
+		bc_num_bigdig2num(&p->strmb, p->strm);
+	}
 #endif // DC_ENABLED
 
 	bc_num_setup(&p->one, p->one_num, BC_PROG_ONE_CAP);
 	bc_num_one(&p->one);
 
 #if BC_ENABLED
-	bc_num_init(&p->last, BC_NUM_DEF_SIZE);
+	if (BC_IS_BC) bc_num_init(&p->last, BC_NUM_DEF_SIZE);
 #endif // BC_ENABLED
 
 	bc_vec_init(&p->fns, sizeof(BcFunc), bc_func_free);
@@ -1747,10 +1794,10 @@ BcStatus bc_program_exec(BcProgram *p) {
 				code = func->code.v;
 				break;
 			}
+#endif // BC_ENABLED
 
 			case BC_INST_BOOL_OR:
 			case BC_INST_BOOL_AND:
-#endif // BC_ENABLED
 			case BC_INST_REL_EQ:
 			case BC_INST_REL_LE:
 			case BC_INST_REL_GE:
@@ -1918,6 +1965,7 @@ BcStatus bc_program_exec(BcProgram *p) {
 			{
 				assert(BC_PROG_STACK(&p->stack, 2));
 				bc_vec_pop(&p->stack);
+				bc_vec_pop(&p->tail_calls);
 				ip = bc_vec_top(&p->stack);
 				func = bc_vec_item(&p->fns, ip->func);
 				code = func->code.v;
@@ -1940,7 +1988,7 @@ BcStatus bc_program_exec(BcProgram *p) {
 			case BC_INST_EXEC_COND:
 			{
 				cond = (inst == BC_INST_EXEC_COND);
-				s = bc_program_execStr(p, code, &ip->idx, cond);
+				s = bc_program_execStr(p, code, &ip->idx, cond, func->code.len);
 				ip = bc_vec_top(&p->stack);
 				func = bc_vec_item(&p->fns, ip->func);
 				code = func->code.v;
@@ -2022,18 +2070,9 @@ BcStatus bc_program_exec(BcProgram *p) {
 			}
 
 			case BC_INST_QUIT:
-			{
-				if (p->stack.len <= 2) s = BC_STATUS_QUIT;
-				else bc_vec_npop(&p->stack, 2);
-				ip = bc_vec_top(&p->stack);
-				func = bc_vec_item(&p->fns, ip->func);
-				code = func->code.v;
-				break;
-			}
-
 			case BC_INST_NQUIT:
 			{
-				s = bc_program_nquit(p);
+				s = bc_program_nquit(p, inst);
 				ip = bc_vec_top(&p->stack);
 				func = bc_vec_item(&p->fns, ip->func);
 				code = func->code.v;
diff --git a/src/vm.c b/src/vm.c
index 0056c3f1..4a5507c3 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -362,7 +362,7 @@ static void bc_vm_clean(void) {
 	    ip->idx == f->code.len)
 	{
 #if BC_ENABLED
-		bc_vec_npop(&f->labels, f->labels.len);
+		if (BC_IS_BC) bc_vec_npop(&f->labels, f->labels.len);
 #endif // BC_ENABLED
 		bc_vec_npop(&f->strs, f->strs.len);
 		bc_vec_npop(&f->consts, f->consts.len);
@@ -387,7 +387,8 @@ static BcStatus bc_vm_process(const char *text, bool is_stdin) {
 	}
 
 #if BC_ENABLED
-	{
+	if (BC_IS_BC) {
+
 		uint16_t *flags = BC_PARSE_TOP_FLAG_PTR(&vm->prs);
 
 		if (!is_stdin && vm->prs.flags.len == 1 &&
@@ -421,7 +422,7 @@ static BcStatus bc_vm_file(const char *file) {
 	if (BC_ERR(s)) goto err;
 
 #if BC_ENABLED
-	if (BC_ERR(BC_PARSE_NO_EXEC(&vm->prs)))
+	if (BC_IS_BC && BC_ERR(BC_PARSE_NO_EXEC(&vm->prs)))
 		s = bc_parse_err(&vm->prs, BC_ERROR_PARSE_BLOCK);
 #endif // BC_ENABLED
 
@@ -506,7 +507,7 @@ static BcStatus bc_vm_stdin(void) {
 		else if (BC_ERR(string))
 			s = bc_parse_err(&vm->prs, BC_ERROR_PARSE_STRING);
 #if BC_ENABLED
-		else if (BC_ERR(BC_PARSE_NO_EXEC(&vm->prs)))
+		else if (BC_IS_BC && BC_ERR(BC_PARSE_NO_EXEC(&vm->prs)))
 			s = bc_parse_err(&vm->prs, BC_ERROR_PARSE_BLOCK);
 #endif // BC_ENABLED
 	}
diff --git a/tests/bc/all.txt b/tests/bc/all.txt
index 3bdca599..134e82fd 100644
--- a/tests/bc/all.txt
+++ b/tests/bc/all.txt
@@ -13,6 +13,7 @@ trunc
 places
 vars
 boolean
+comp
 abs
 assignments
 functions
diff --git a/tests/bc/comp.txt b/tests/bc/comp.txt
new file mode 100644
index 00000000..73aa4508
--- /dev/null
+++ b/tests/bc/comp.txt
@@ -0,0 +1,132 @@
+-999999999 < -1
+-999999999 > -1
+-1000000000 < -1
+-1000000000 > -1
+-1 < -999999999
+-1 > -999999999
+-1 < -1000000000
+-1 > -1000000000
+-99999 < -1
+-99999 > -1
+-100000 < -1
+-100000 > -1
+-1 < -99999
+-1 > -99999
+-1 < -100000
+-1 > -100000
+-999999999 < -1000000000
+-999999999 > -1000000000
+-1000000000 < -999999999
+-1000000000 > -999999999
+-99999 < -100000
+-99999 > -100000
+-100000 < -99999
+-100000 > -99999
+999999999 < 1
+999999999 > 1
+1000000000 < 1
+1000000000 > 1
+1 < 999999999
+1 > 999999999
+1 < 1000000000
+1 > 1000000000
+99999 < 1
+99999 > 1
+100000 < 1
+100000 > 1
+1 < 99999
+1 > 99999
+1 < 100000
+1 > 100000
+999999999 < 1000000000
+999999999 > 1000000000
+1000000000 < 999999999
+1000000000 > 999999999
+99999 < 100000
+99999 > 100000
+100000 < 99999
+100000 > 99999
+-999999999 < 1
+-999999999 > 1
+-1000000000 < 1
+-1000000000 > 1
+-1 < 999999999
+-1 > 999999999
+-1 < 1000000000
+-1 > 1000000000
+-99999 < 1
+-99999 > 1
+-100000 < 1
+-100000 > 1
+-1 < 99999
+-1 > 99999
+-1 < 100000
+-1 > 100000
+-999999999 < 1000000000
+-999999999 > 1000000000
+-1000000000 < 999999999
+-1000000000 > 999999999
+-99999 < 100000
+-99999 > 100000
+-100000 < 99999
+-100000 > 99999
+999999999 < -1
+999999999 > -1
+1000000000 < -1
+1000000000 > -1
+1 < -999999999
+1 > -999999999
+1 < -1000000000
+1 > -1000000000
+99999 < -1
+99999 > -1
+100000 < -1
+100000 > -1
+1 < -99999
+1 > -99999
+1 < -100000
+1 > -100000
+999999999 < -1000000000
+999999999 > -1000000000
+1000000000 < -999999999
+1000000000 > -999999999
+99999 < -100000
+99999 > -100000
+100000 < -99999
+100000 > -99999
+v = 18237
+v == v
+v != v
+4 < 0
+-4 < 0
+4 > 0
+-4 > 0
+5 > 4
+-5 > 4
+5 > -4
+-5 > -4
+5 < 4
+-5 < 4
+5 < -4
+-5 < -4
+1000000000.000000001 == 999999999.000000001
+1000000000.000000001 > 999999999.000000001
+1000000000.000000001 < 999999999.000000001
+1000000000.000000001 == 1000000000.000000001
+1000000000.000000001 > 1000000000.000000001
+1000000000.000000001 < 1000000000.000000001
+1000000000.000000001 == 1000000000.00000000100000000
+1000000000.000000001 > 1000000000.00000000100000000
+1000000000.000000001 < 1000000000.00000000100000000
+1000000000.000000001 == 1000000000.000000001000000001
+1000000000.000000001 > 1000000000.000000001000000001
+1000000000.000000001 < 1000000000.000000001000000001
+999999999.000000001 == 1000000000.000000001
+999999999.000000001 > 1000000000.000000001
+999999999.000000001 < 1000000000.000000001
+1000000000.00000000100000000 == 1000000000.000000001
+1000000000.00000000100000000 > 1000000000.000000001
+1000000000.00000000100000000 < 1000000000.000000001
+1000000000.000000001000000001 == 1000000000.000000001
+1000000000.000000001000000001 > 1000000000.000000001
+1000000000.000000001000000001 < 1000000000.000000001
diff --git a/tests/bc/comp_results.txt b/tests/bc/comp_results.txt
new file mode 100644
index 00000000..5aa90ebc
--- /dev/null
+++ b/tests/bc/comp_results.txt
@@ -0,0 +1,131 @@
+1
+0
+1
+0
+0
+1
+0
+1
+1
+0
+1
+0
+0
+1
+0
+1
+0
+1
+1
+0
+0
+1
+1
+0
+0
+1
+0
+1
+1
+0
+1
+0
+0
+1
+0
+1
+1
+0
+1
+0
+1
+0
+0
+1
+1
+0
+0
+1
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+1
+0
+0
+1
+1
+0
+1
+0
+1
+0
+0
+1
+0
+1
+0
+1
+0
+1
+0
+0
+1
+0
+0
+0
+0
+1
+0
+0
+1
+1
+0
+0
+0
+1
+0
diff --git a/tests/dc/boolean.txt b/tests/dc/boolean.txt
index 3e4a9bcb..815100f0 100644
--- a/tests/dc/boolean.txt
+++ b/tests/dc/boolean.txt
@@ -39,3 +39,42 @@ _1 0GpR
 _1NpR
 2398NpR
 _2983.2389NpR
+0 0MpR
+1 0MpR
+0 1MpR
+1 1MpR
+128973240 0MpR
+0 2893712MpR
+1982 28937MpR
+_2938 0MpR
+0 _1023.298037MpR
+0.283917 0MpR
+2389 _1208.28937MpR
+0 289.289372MpR
+_298.29387 0MpR
+_2983.28973 82937MpR
+0 _2938.320837MpR
+_2089.2308 0MpR
+_0.2893 _2938.28973MpR
+0.00000 1892MpR
+1289.023 .0000MpR
+0 0mpR
+1 0mpR
+0 1mpR
+1 1mpR
+128973240 0mpR
+0 2893712mpR
+1982 28937mpR
+_2938 0mpR
+0 _1023.298037mpR
+0.283917 0mpR
+2389 _1208.28937mpR
+0 289.289372mpR
+_298.29387 0mpR
+_2983.28973 82937mpR
+0 _2938.320837mpR
+_2089.2308 0mpR
+_0.2893 _2938.28973mpR
+0.00000 1892mpR
+1289.023 .0000mpR
+0.0000 .00000mpR
diff --git a/tests/dc/boolean_results.txt b/tests/dc/boolean_results.txt
index 4eafcb84..225cebbe 100644
--- a/tests/dc/boolean_results.txt
+++ b/tests/dc/boolean_results.txt
@@ -39,3 +39,42 @@
 0
 0
 0
+0
+0
+0
+1
+0
+0
+1
+0
+0
+0
+1
+0
+0
+1
+0
+0
+1
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
diff --git a/tests/dc/scripts/quit.dc b/tests/dc/scripts/quit.dc
new file mode 100644
index 00000000..81e6289a
--- /dev/null
+++ b/tests/dc/scripts/quit.dc
@@ -0,0 +1,2 @@
+1se [li p 1+si le li !=lem]sl [lk p 1+sk le lk !=o]so [0sk lox leQ 0sk lox le 3*1+Q 0sk lox]sm [0si llx le 1+se 10 le !=n]dsnx
+1si [li p 1+si 10 li !=set]ss [1000Q]st lsx
diff --git a/tests/dc/scripts/quit.txt b/tests/dc/scripts/quit.txt
new file mode 100644
index 00000000..a2b5201d
--- /dev/null
+++ b/tests/dc/scripts/quit.txt
@@ -0,0 +1,99 @@
+0
+0
+0
+1
+0
+1
+0
+1
+2
+0
+1
+2
+0
+1
+2
+3
+0
+1
+2
+3
+0
+1
+2
+3
+4
+0
+1
+2
+3
+4
+0
+1
+2
+3
+4
+5
+0
+1
+2
+3
+4
+5
+0
+1
+2
+3
+4
+5
+6
+0
+1
+2
+3
+4
+5
+6
+0
+1
+2
+3
+4
+5
+6
+7
+0
+1
+2
+3
+4
+5
+6
+7
+0
+1
+2
+3
+4
+5
+6
+7
+8
+0
+1
+2
+3
+4
+5
+6
+7
+8
+1
+2
+3
+4
+5
+6
+7
+8
+9