Merge pull request #330 from boriel/release/bumpversion

Release/bumpversion

Author: boriel

Changelog.md

@@ -1,4 +1,13 @@
-[v1.10.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.10.0)
+[v1.10.1](https://github.com/boriel/zxbasic/tree/v1.10.1)
+===
++ Deprecating `zxb` executable in favour of `zxbc`
++ ! Many bugs fixed (CODE, VAL, preprocessor...)
++ ! Improved stability
++ Can now hide LOAD messages using -D HIDE_LOAD_MSG
++ Improved Windows deployment
++ Fixes a Warning for python 3.8.x
+
+[v1.10.0](https://github.com/boriel/zxbasic/tree/v1.10.0)
 ===
 + ! Fix warning in arrays boundaries checks
 + Added support for ZX Next extended ASM instruction set
@@ -8,57 +17,57 @@
 + Improved compatibility with Sinclair BASIC (--sinclair)
 + Updates testing and parsing tools
 + Code generation optimized
-+ Many bugfixes and improves stability
++ Many bugfixes and improved stability
 + Updates in online documentation
 
-[v1.9.9](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.9)
+[v1.9.9](https://github.com/boriel/zxbasic/tree/v1.9.9)
 ===
 + ! Fix warning in parameters ByRef
 + Makes LOAD and SAVE to ignore BREAK
 + ! Little bug fixes and better stability
 + Some docs and README fixes and improvements
 
-[v1.9.8](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.8)
+[v1.9.8](https://github.com/boriel/zxbasic/tree/v1.9.8)
 ===
 + ! Fix memory leak bug when doing procrustean substring assignation
 + Also optimizes substring access not allocating mem when not needed
 
-[v1.9.7](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.7)
+[v1.9.7](https://github.com/boriel/zxbasic/tree/v1.9.7)
 ===
 + Allow some extra chars within the ASM sections for 3rd party assemblers
 + ! Little bugfixes
 + Now printing at the end scrolls up the screen!
 
-[v1.9.6](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.6)
+[v1.9.6](https://github.com/boriel/zxbasic/tree/v1.9.6)
 ===
 + ! Bugfix: grammar errors for RESTORE
 + Change LD (IX/IY + NN), r instructions to standardize it
 
-[v1.9.5](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.5)
+[v1.9.5](https://github.com/boriel/zxbasic/tree/v1.9.5)
 ===
 + ! Bugfix: error compiling to binary with headerless mode (thx to em00k)
 + ! Bugfix: fixes several crashes under some conditions
 
-[v1.9.4](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.4)
+[v1.9.4](https://github.com/boriel/zxbasic/tree/v1.9.4)
 ===
 + ! Bugfix: Fixes escape code for backslash (thx to em00k)
 
-[v1.9.3](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.3)
+[v1.9.3](https://github.com/boriel/zxbasic/tree/v1.9.3)
 ===
 + ! Bugfix: fixes some bugs in the parser to improve stability.
 
-[v1.9.2](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.2)
+[v1.9.2](https://github.com/boriel/zxbasic/tree/v1.9.2)
 ===
 + ! Bugfix: fixes a bug in the optimizer (-O3 and -O4)
 + Add `fastplot.bas` library
 
-[v1.9.1](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.1)
+[v1.9.1](https://github.com/boriel/zxbasic/tree/v1.9.1)
 ===
 + ! Bugfix: array access read / write might overflow. Fixed.
 + Array access speedup and optimization.
 + Dropped support for PyPy and Python 2.x
 
-[v1.9.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.9.0)
+[v1.9.0](https://github.com/boriel/zxbasic/tree/v1.9.0)
 ===
 + New and completely refactored optimizer which now allow patterns.<br />
   This new optimizer (after a year of hard work) not only optimizes better,<br />
@@ -68,7 +77,7 @@
 + zxbasm allows labels to be declared without using colon.
 + Some other little optimization
 
-[v1.8.10](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.10)
+[v1.8.10](https://github.com/boriel/zxbasic/tree/v1.8.10)
 ===
 + ! Bugfix: `FLASH 8` and `BRIGHT 8` were not working correctly. Fixed.
 + Changelog file renamed to `Changelog.md` and renovated. Now uses Markdown.
@@ -78,29 +87,29 @@
 + Add `--append-binary` command line flag to append binaries to tape file
 + Add `--append-headless-binary` cmdlie flag to do like the above, but headless. 
 
-[v1.8.9](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.9)
+[v1.8.9](https://github.com/boriel/zxbasic/tree/v1.8.9)
 ===
 + ! Bugfix: Crash in `READ` and `DATA` sentences under some cases
 + ! Bugfix: Fix `INT` to behave like the original one (Round to -INF)
 + ! Bugfix: `--array-check` was not working properly. Fixed!
 
-[v1.8.8](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.8)
+[v1.8.8](https://github.com/boriel/zxbasic/tree/v1.8.8)
 ===
 + ! Bugfix: fix 32 bit operations (`DIV`, `MOD`...)
 
-[v1.8.7](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.7)
+[v1.8.7](https://github.com/boriel/zxbasic/tree/v1.8.7)
 ===
 + ! Bugfix: do not remove ASM blocks (optimize)
 
-[v1.8.6](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.6)
+[v1.8.6](https://github.com/boriel/zxbasic/tree/v1.8.6)
 ===
 + ! Bugfix: `END` instruction was not returning result. Fixed.
 
-[v1.8.5](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.5)
+[v1.8.5](https://github.com/boriel/zxbasic/tree/v1.8.5)
 ===
 + ! Bugfix: crash on bad array declaration
 
-[v1.8.4](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.4)
+[v1.8.4](https://github.com/boriel/zxbasic/tree/v1.8.4)
 ===
 + ! Several bugfixes with contants declaration
 + Suport for UTF-8 BOM files
@@ -109,22 +118,22 @@
 + ! Other bugfixes and better stability
 + Better warning explanation under some circumstances
 
-[v1.8.3](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.3)
+[v1.8.3](https://github.com/boriel/zxbasic/tree/v1.8.3)
 ===
 + ! Bugfix in the peephole optimizer (`-O2`)
 + ! Several bugfixes to improve stability
 + Optimization in the peephole optimizer (`-O1`)
 + Support for extended array str element operations
 + ! Other syntax bugfixes
 
-[v1.8.2](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.2)
+[v1.8.2](https://github.com/boriel/zxbasic/tree/v1.8.2)
 ===
 + ! Bugfixes in the peephole optimizer
 + Shorter and faster generated code (deep optimizations)
 + ! Bugfix in the `PRINT42` routine that now supports newlines, etc
 + Implemented routine `input42` (`INPUT42.BAS`) for `PRINT42` mode
 
-[v1.8.1](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.1)
+[v1.8.1](https://github.com/boriel/zxbasic/tree/v1.8.1)
 ===
 + ! Bugfixes in the peephole optimizer
 + ! Bugfix in `OUT` instruction
@@ -133,50 +142,50 @@
 * Added `basic.bas` library (meta-interpreter) and `eval.bas` example!!
   (thanks to @mcleod_ideafix!!!)
 
-[v1.8.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.0)
+[v1.8.0](https://github.com/boriel/zxbasic/tree/v1.8.0)
 ===
 + ! Bugfixes in the peephole optimizer (`-O3`)
 + Better optimized code
 + Improved compiling speed and more stability
 + Fixes minor errors and bugs
 + Now single line `IF` sentences does not require `END IF`
 
-[v1.7.2](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.7.2)
+[v1.7.2](https://github.com/boriel/zxbasic/tree/v1.7.2)
 ===
 + ! Bugfixes in libraries `esxdos.bas` and `memcopy.bas`
 + Improved `pong.bas` example
 + Improved readme file :) (thanks to @harko and @haplo)
 
-[v1.7.1](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.7.1)
+[v1.7.1](https://github.com/boriel/zxbasic/tree/v1.7.1)
 ===
 + ! Bugfixes with `-O3` and `DATA` statements
 + Little improvements
 + Updates `README.md` file and added `TESTING.md` one.
 
-[v1.7.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.7.0)
+[v1.7.0](https://github.com/boriel/zxbasic/tree/v1.7.0)
 ===
 + Added `READ`, `DATA`, `RESTORE` (finally!)
 + Allows to call SUBs with no parenthesis (e.g. `mySUB 1, 2+a`)
 + Allows to call FUNCTIONS with 1 or no params with no parenthesis (e.g. `MyFunc x+2`)
 + Some bug fixes for better stability
 
-[v1.6.13](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.13)
+[v1.6.13](https://github.com/boriel/zxbasic/tree/v1.6.13)
 ===
 + ! Fixes and improves strict mode checking
 + Adds `#error` and `#warning` directives
 
-[v1.6.12](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.12)
+[v1.6.12](https://github.com/boriel/zxbasic/tree/v1.6.12)
 ===
 + Adds missing default font (Haplo) for Radastan mode
 + ! Bugfixes and little improvements
 
-[v1.6.11](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.11)
+[v1.6.11](https://github.com/boriel/zxbasic/tree/v1.6.11)
 ===
 + ! Fix infinite recursive include in Windows OS (yes, win sucks)
 + Little optimizations in `memset()` and `RND`
 + Standardize file includes like in cpp
 
-[v1.6.10](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.10)
+[v1.6.10](https://github.com/boriel/zxbasic/tree/v1.6.10)
 ===
 + Added many more drawing primitives for Radastan Mode
 + Added instructions `ON .. GOTO` and `ON .. GOSUB`
@@ -186,7 +195,7 @@
 + Allows array initialization with @label references
 + Switch `.bas` libraries (not the compiler) to **MIT license**
 
-[v1.6.9](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.9)
+[v1.6.9](https://github.com/boriel/zxbasic/tree/v1.6.9)
 ===
 + ! Fixes a bug in the peephole (`-O3`) optimizer
 + Improved speed for `Integer` / `Unteger` operations
@@ -197,13 +206,13 @@
 + ! Fixes and improvements to the ESXDOS library (by @mcleod_ideafix)
 + Added new ESXDOS sample program (directory tree listing)
 
-[v1.6.8](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.8)
+[v1.6.8](https://github.com/boriel/zxbasic/tree/v1.6.8)
 ===
 + ! Fixed some bugs in the assembler
 + ! Fixed a bug when calling a function in advance
 + ! Fixed a problem in tox, setting the terminal to UTF-8
 
-[v1.6.7](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.7)
+[v1.6.7](https://github.com/boriel/zxbasic/tree/v1.6.7)
 ===
 + Added more testing and bitbucket pipelines using tox
 + ! Do not optimize user inlined ASM. It must go as is.
@@ -213,14 +222,14 @@
 + ! Fix to make make it to work in python 2.7
 + ! Refactorize the assembler to use centralized configuration
 
-[v1.6.6](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.6.6)
+[v1.6.6](https://github.com/boriel/zxbasic/tree/v1.6.6)
 ===
 + ! Fixed a bug in constant evaluation
 + ! Allows non constant initialization of scalar variables like DIM a$ = "hi"
 + ! Fix bugs in the assembler not allowing complex expressions
 + ! Fix a rare crash when using functions before declaring them
 
-[v1.4.0.x](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.4.0.x)
+[v1.4.0.x](https://github.com/boriel/zxbasic/tree/v1.4.0.x)
 ===
 
 This is a long (near 3 year) set of versions in which the compiler
@@ -240,7 +249,7 @@ The major feature in this release is the posibility to declare nested functions.
 These functions are declared within others, and can only be called from within
 their respective parent function body.
 
-[v1.3.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.3.0)
+[v1.3.0](https://github.com/boriel/zxbasic/tree/v1.3.0)
 ===
 + ! Fixed a bug in `USR <string>`
 + ! Fixed a bug in `SAVE` / `LOAD`
@@ -254,7 +263,7 @@ their respective parent function body.
 + ! Fixed a bug with peephole optimizer (`-O3`)
 + Some changes and code refactorization towards 2.x branch
 
-[v1.2.9](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.2.9)
+[v1.2.9](https://github.com/boriel/zxbasic/tree/v1.2.9)
 ===
 + ! Fixed a serious bug with ALL integer (signed/unsigned) operands
   which were not working correctly under some circumstances.
@@ -271,7 +280,7 @@ their respective parent function body.
 + Fixed more than 50 other minor bugs in both the compiler and the assembler
 + `THEN` keyword is now optional in `IF` statements
 
-[v1.2.8](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.2.8)
+[v1.2.8](https://github.com/boriel/zxbasic/tree/v1.2.8)
 ===
 + Code rearranged and restructured for future deep refactorizations.
 + ! Complete rewritten backend (or almost!) to fix a bug in code
@@ -298,7 +307,7 @@ their respective parent function body.
 + ! `CSRLN` and `POS` optimized to this new `PRINT` scheme!
 ... and much much more
 
-[v1.2.7](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.2.7)
+[v1.2.7](https://github.com/boriel/zxbasic/tree/v1.2.7)
 ===
 + `DRAW` is now much faster (and a bit more larger)
 + `PLOT`, `DRAW` and `CIRCLE` now supports change screen address (for double-buffering)
@@ -316,7 +325,7 @@ their respective parent function body.
   optimized for space (and also slightly faster)
 + Added Flight Simulator example
 
-[v1.2.6](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.2.6)
+[v1.2.6](https://github.com/boriel/zxbasic/tree/v1.2.6)
 ===
 + Bitwise `bAND`, `bOR`, `bXOR`, `bNOT` finally added for 8, 16 and 32 bits
 + The assembler now supports `ALIGN <integer>` directive

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zxbasic"
-version = "1.10.0"
+version = "1.10.1"
 description = "Boriel's ZX BASIC Compiler"
 authors = ["Jose Rodriguez <boriel@gmail.com>"]
 license = "GPL-3.0-or-later"

setup.py

@@ -30,7 +30,7 @@
 
 setup_kwargs = {
     'name': 'zxbasic',
-    'version': '1.10.0',
+    'version': '1.10.1',
     'description': "Boriel's ZX BASIC Compiler",
     'long_description': None,
     'author': 'Jose Rodriguez',

tests/functional/test_cmdline.txt

@@ -3,16 +3,16 @@
 >>> os.environ['COLUMNS'] = '80'
 
 >>> process_file('arrbase1.bas', ['-q', '-S', '-O --asm', '-O --mmap arrbase1.map'])
-usage: zxb [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE] [-T] [-t] [-B] [-a] [-A]
-           [-S ORG] [-e STDERR] [--array-base ARRAY_BASE]
-           [--string-base STRING_BASE] [-Z] [-H HEAP_SIZE] [--debug-memory]
-           [--debug-array] [--strict-bool] [--enable-break] [-E] [--explicit]
-           [-D DEFINES] [-M MEMORY_MAP] [-i] [-I INCLUDE_PATH] [--strict]
-           [--headerless] [--version] [--parse-only]
-           [--append-binary APPEND_BINARY]
-           [--append-headless-binary APPEND_HEADLESS_BINARY] [-N]
-           PROGRAM
-zxb: error: Option --asm and --mmap cannot be used together
+usage: zxbc.py [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE] [-T] [-t] [-B] [-a]
+               [-A] [-S ORG] [-e STDERR] [--array-base ARRAY_BASE]
+               [--string-base STRING_BASE] [-Z] [-H HEAP_SIZE]
+               [--debug-memory] [--debug-array] [--strict-bool]
+               [--enable-break] [-E] [--explicit] [-D DEFINES] [-M MEMORY_MAP]
+               [-i] [-I INCLUDE_PATH] [--strict] [--headerless] [--version]
+               [--parse-only] [--append-binary APPEND_BINARY]
+               [--append-headless-binary APPEND_HEADLESS_BINARY] [-N]
+               PROGRAM
+zxbc.py: error: Option --asm and --mmap cannot be used together
 
 >>> process_file('arrbase1.bas', ['-q', '-S', '-O -D EMPTY_MACRO'])
 

zxb/version.py

@@ -1 +1 @@
-VERSION = '1.10.0'
+VERSION = '1.10.1'

zxb/zxb.py

@@ -85,7 +85,7 @@ def main(args=None, emitter=None):
     # ------------------------------------------------------------
     # Command line parsing
     # ------------------------------------------------------------
-    parser = argparse.ArgumentParser(prog='zxb')
+    parser = argparse.ArgumentParser()
     parser.add_argument('PROGRAM', type=str,
                         help='BASIC program file')
     parser.add_argument('-d', '--debug', dest='debug', default=OPTIONS.Debug.value, action='count',

zxbasm/zxbasm.py

@@ -33,7 +33,7 @@ def main(args=None):
     zxbpp.init()
 
     # Create option parser
-    o_parser = argparse.ArgumentParser(prog='zxbasm')
+    o_parser = argparse.ArgumentParser()
     o_parser.add_argument('PROGRAM', type=str, help='ASM program file')
     o_parser.add_argument("-d", "--debug", action="count", default=OPTIONS.Debug.value,
                           help="Enable verbosity/debugging output")