Merged in feature/base_org_hexa (pull request #179)

Feature/base org hexa

Approved-by: Jose Rodriguez <boriel@gmail.com>

Author: boriel

api/utils.py

@@ -72,3 +72,31 @@ def flatten_list(x):
             result.extend(flatten_list(l))
 
     return result
+
+
+def parse_int(str_num):
+    """ Given an integer number, return its value,
+    or None if it could not be parsed.
+    Allowed formats: DECIMAL, HEXA (0xnnn, $nnnn or nnnnh)
+    :param str_num: (string) the number to be parsed
+    :return: an integer number or None if it could not be parsedd
+    """
+    str_num = (str_num or "").strip().upper()
+    if not str_num:
+        return None
+
+    base = 10
+    if str_num.startswith('0X'):
+        base = 16
+        str_num = str_num[2:]
+    if str_num.endswith('H'):
+        base = 16
+        str_num = str_num[:-1]
+    if str_num.startswith('$'):
+        base = 16
+        str_num = str_num[1:]
+
+    try:
+        return int(str_num, base)
+    except ValueError:
+        return None

tests/cmdline/__init__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+
+path = os.path.realpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+sys.path.insert(0, path)

tests/cmdline/empty.bas

@@ -0,0 +1,2 @@
+
+

tests/cmdline/test_zxb.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+import zxb
+import os
+
+PATH = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
+
+
+class EnsureRemoveFile(object):
+    """ Ensures a filename is removed if exists after
+    a block of code is executed
+    """
+    def __init__(self, output_file_name):
+        self.fname = output_file_name
+
+    def remove_file(self):
+        if os.path.isfile(self.fname):
+            os.unlink(self.fname)
+
+    def __enter__(self):
+        self.remove_file()
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.remove_file()
+
+
+@pytest.fixture
+def file_bas():
+    return os.path.join(PATH, 'empty.bas')
+
+
+@pytest.fixture
+def file_bin():
+    return os.path.join(PATH, 'empty.bin')
+
+
+def test_compile_only(file_bas, file_bin):
+    """ Should not generate a file
+    """
+    with EnsureRemoveFile(file_bin):
+        zxb.main(['--parse-only', file_bas, '-o', file_bin])
+        assert not os.path.isfile(file_bin), 'Should not create file "empty.bin"'
+
+
+def test_org_allows_0xnnnn_format(file_bas, file_bin):
+    """ Should allow hexadecimal format 0x in org
+    """
+    with EnsureRemoveFile(file_bin):
+        zxb.main(['--parse-only', '--org', '0xC000', file_bas, '-o', file_bin])
+        assert zxb.OPTIONS.org.value == 0xC000, 'Should set ORG to 0xC000'

tests/functional/test_.py

@@ -19,7 +19,10 @@ def flush(self):
         sys.stdout.flush()
 
 
-def process_file(fname):
+def process_file(fname, params=None):
+    if params is None:
+        params = ['-S', '-q']
+
     try:
         current_path = os.path.abspath(os.getcwd())
         test.set_temp_dir()
@@ -29,7 +32,7 @@ def process_file(fname):
             fname = os.path.basename(fname)
         else:
             os.chdir(os.path.realpath(os.path.dirname(__file__)))
-        test.main(['-S', '-q', fname])
+        test.main(params + [fname])
         os.chdir(current_path)
     finally:
         os.rmdir(test.TEMP_DIR)

zxb.py

@@ -106,7 +106,7 @@ def main(args=None):
                         help="Sets the program to be run once loaded")
     parser.add_argument('-A', '--asm', action='store_true',
                         help="Sets output format to asm")
-    parser.add_argument('-S', '--org', type=int, default=OPTIONS.org.value,
+    parser.add_argument('-S', '--org', type=str, default=str(OPTIONS.org.value),
                         help="Start of machine code. By default %i" % OPTIONS.org.value)
     parser.add_argument('-e', '--errmsg', type=str, dest='stderr', default=OPTIONS.StdErrFileName.value,
                         help='Error messages file (standard error console by default)')
@@ -144,6 +144,8 @@ def main(args=None):
     parser.add_argument('--headerless', action='store_true',
                         help='Header-less mode: omit asm prologue and epilogue')
     parser.add_argument('--version', action='version', version='%(prog)s {0}'.format(VERSION))
+    parser.add_argument('--parse-only', action='store_true',
+                        help="Only parses to check for syntax and semantic errors")
 
     options = parser.parse_args(args=args)
 
@@ -158,7 +160,6 @@ def main(args=None):
     OPTIONS.array_base.value = options.array_base
     OPTIONS.string_base.value = options.string_base
     OPTIONS.Sinclair.value = options.sinclair
-    OPTIONS.org.value = options.org
     OPTIONS.heap_size.value = options.heap_size
     OPTIONS.memoryCheck.value = options.debug_memory
     OPTIONS.strictBool.value = options.strict_bool or OPTIONS.Sinclair.value
@@ -170,6 +171,10 @@ def main(args=None):
     OPTIONS.strict.value = options.strict
     OPTIONS.headerless.value = options.headerless
 
+    OPTIONS.org.value = api.utils.parse_int(options.org)
+    if OPTIONS.org.value is None:
+        parser.error("Invalid --org option '{}'".format(options.org))
+
     if options.defines:
         for i in options.defines:
             name, val = tuple(i.split('=', 1))
@@ -187,8 +192,9 @@ def main(args=None):
 
     debug.ENABLED = OPTIONS.Debug.value
 
-    if int(options.tzx) + int(options.tap) + int(options.asm) + int(options.emit_backend) > 1:
-        parser.error("Options --tap, --tzx, --emit-backend and --asm are mutually exclusive")
+    if int(options.tzx) + int(options.tap) + int(options.asm) + int(options.emit_backend) + \
+            int(options.parse_only) > 1:
+        parser.error("Options --tap, --tzx, --emit-backend, --parse-only and --asm are mutually exclusive")
         return 3
 
     if options.basic and not options.tzx and not options.tap:
@@ -319,7 +325,7 @@ def main(args=None):
     if options.asm:  # Only output assembler file
         with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:
             output(asm_output, output_file)
-    else:
+    elif not options.parse_only:
         fout = StringIO()
         output(asm_output, fout)
         asmparse.assemble(fout.getvalue())