move parse_int to util module

remove duplication

Author: wnienhaus

esp32_ulp/opcodes.py

@@ -13,7 +13,7 @@
 from uctypes import struct, addressof, LITTLE_ENDIAN, UINT32, BFUINT32, BF_POS, BF_LEN
 
 from .soc import *
-from .util import split_tokens, validate_expression
+from .util import split_tokens, validate_expression, parse_int
 
 # XXX dirty hack: use a global for the symbol table
 symbols = None
@@ -297,26 +297,6 @@ def eval_arg(arg):
     return eval(parts)
 
 
-def parse_int(literal):
-    """
-    Parses string literals into integers, using base prefixes
-    0x (hex), 0b (binary), and 0o or legacy 0NNN (octal).
-    Without prefix will be treated as decimal.
-    """
-    if len(literal) > 2:
-        prefix_start = 1 if literal[0] == '-' else 0  # skip negative sign if present
-
-        if literal[prefix_start] == "0":
-            prefix = literal[prefix_start + 1]
-            if prefix == "x":
-                return int(literal, 16)
-            elif prefix == "b":
-                return int(literal, 2)
-            return int(literal, 8)  # legacy octal (e.g. 077)
-
-    return int(literal)  # implicit base10
-
-
 def arg_qualify(arg):
     """
     look at arg and qualify its type:

esp32_ulp/opcodes_s2.py

@@ -12,7 +12,7 @@
 from ucollections import namedtuple
 from uctypes import struct, addressof, LITTLE_ENDIAN, UINT32, BFUINT32, BF_POS, BF_LEN
 
-from .util import split_tokens, validate_expression
+from .util import split_tokens, validate_expression, parse_int
 
 # XXX dirty hack: use a global for the symbol table
 symbols = None
@@ -313,26 +313,6 @@ def eval_arg(arg):
     return eval(parts)
 
 
-def parse_int(literal):
-    """
-    Parses string literals into integers, using base prefixes
-    0x (hex), 0b (binary), and 0o or legacy 0NNN (octal).
-    Without prefix will be treated as decimal.
-    """
-    if len(literal) > 2:
-        prefix_start = 1 if literal[0] == '-' else 0  # skip negative sign if present
-
-        if literal[prefix_start] == "0":
-            prefix = literal[prefix_start + 1]
-            if prefix == "x":
-                return int(literal, 16)
-            elif prefix == "b":
-                return int(literal, 2)
-            return int(literal, 8)  # legacy octal (e.g. 077)
-
-    return int(literal)  # implicit base10
-
-
 def arg_qualify(arg):
     """
     look at arg and qualify its type:

esp32_ulp/util.py

@@ -77,6 +77,28 @@ def validate_expression(param):
     return True
 
 
+def parse_int(literal):
+    """
+    Parses string literals into integers, using base prefixes
+    0xNNN (hex), 0bNNN (binary), and 0oNNN or 0NNN (octal).
+    Without prefix will be treated as decimal.
+    """
+    if len(literal) > 2:
+        prefix_start = 1 if literal[0] == '-' else 0  # skip negative sign if present
+
+        if literal[prefix_start] == "0":
+            prefix = literal[prefix_start + 1]
+            if prefix == "x":  # Hex
+                return int(literal, 16)
+            elif prefix == "b":  # Binary
+                return int(literal, 2)
+            elif prefix == "o":  # Octal, Python style (0oNNN)
+                return int(literal, 8)
+            return int(literal, 8)  # Octal, GNU as style (0NNN)
+
+    return int(literal)  # implicit decimal (base10)
+
+
 def file_exists(filename):
     try:
         os.stat(filename)

tests/opcodes.py

@@ -39,29 +39,6 @@ def test_make_ins():
     assert _delay.all == 0x40000023
 
 
-def test_parse_int():
-    # decimal
-    assert parse_int("5") == 5, "5 == 5"
-    assert parse_int("-5") == -5, "-5 == -5"
-    # hex
-    assert parse_int("0x5") == 5, "0x5 == 5"
-    assert parse_int("0x5a") == 90, "0x5a == 90"
-    assert parse_int("-0x5a") == -90, "-0x5a == -90"
-    # binary
-    assert parse_int("0b1001") == 9, "0b1001 == 9"
-    assert parse_int("-0b1001") == -9, "-0b1001 == 9"
-    # octal
-    assert parse_int("0100") == 64, "0100 == 64"
-    assert parse_int("0o210") == 136, "0o210 == 136"
-    assert parse_int("-0100") == -64, "-0100 == -64"
-    assert parse_int("-0o210") == -136, "-0o210 == -136"
-    # negative cases
-    assert_raises(ValueError, parse_int, '0b123', message="invalid syntax for integer with base 2: '123'")
-    assert_raises(ValueError, parse_int, '0900', message="invalid syntax for integer with base 8: '0900'")
-    assert_raises(ValueError, parse_int, '0o900', message="invalid syntax for integer with base 8: '900'")
-    assert_raises(ValueError, parse_int, '0xg', message="invalid syntax for integer with base 16: 'g'")
-
-
 def test_arg_qualify():
     assert arg_qualify('r0') == ARG(REG, 0, 'r0')
     assert arg_qualify('R3') == ARG(REG, 3, 'R3')
@@ -240,7 +217,6 @@ def test_reg_address_translations_sens():
 
 test_make_ins_struct_def()
 test_make_ins()
-test_parse_int()
 test_arg_qualify()
 test_get_reg()
 test_get_imm()

tests/opcodes_s2.py

@@ -39,29 +39,6 @@ def test_make_ins():
     assert _delay.all == 0x40000023
 
 
-def test_parse_int():
-    # decimal
-    assert parse_int("5") == 5, "5 == 5"
-    assert parse_int("-5") == -5, "-5 == -5"
-    # hex
-    assert parse_int("0x5") == 5, "0x5 == 5"
-    assert parse_int("0x5a") == 90, "0x5a == 90"
-    assert parse_int("-0x5a") == -90, "-0x5a == -90"
-    # binary
-    assert parse_int("0b1001") == 9, "0b1001 == 9"
-    assert parse_int("-0b1001") == -9, "-0b1001 == 9"
-    # octal
-    assert parse_int("0100") == 64, "0100 == 64"
-    assert parse_int("0o210") == 136, "0o210 == 136"
-    assert parse_int("-0100") == -64, "-0100 == -64"
-    assert parse_int("-0o210") == -136, "-0o210 == -136"
-    # negative cases
-    assert_raises(ValueError, parse_int, '0b123', message="invalid syntax for integer with base 2: '123'")
-    assert_raises(ValueError, parse_int, '0900', message="invalid syntax for integer with base 8: '0900'")
-    assert_raises(ValueError, parse_int, '0o900', message="invalid syntax for integer with base 8: '900'")
-    assert_raises(ValueError, parse_int, '0xg', message="invalid syntax for integer with base 16: 'g'")
-
-
 def test_arg_qualify():
     assert arg_qualify('r0') == ARG(REG, 0, 'r0')
     assert arg_qualify('R3') == ARG(REG, 3, 'R3')
@@ -290,7 +267,6 @@ def test_reg_address_translations_s3_sens():
 
 test_make_ins_struct_def()
 test_make_ins()
-test_parse_int()
 test_arg_qualify()
 test_get_reg()
 test_get_imm()

tests/util.py

@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: MIT
 
 import os
-from esp32_ulp.util import split_tokens, validate_expression, file_exists
+from esp32_ulp.util import split_tokens, validate_expression, parse_int, file_exists
 
 tests = []
 
@@ -18,6 +18,19 @@ def test(param):
     tests.append(param)
 
 
+def assert_raises(exception, func, *args, message=None):
+    try:
+        func(*args)
+    except exception as e:
+        raised = True
+        actual_message = e.args[0]
+    else:
+        raised = False
+    assert raised
+    if message:
+        assert actual_message == message, '%s == %s' % (actual_message, message)
+
+
 @test
 def test_split_tokens():
     assert split_tokens("") == []
@@ -69,6 +82,30 @@ def test_validate_expression():
     assert validate_expression('def CAFE()') is False
 
 
+@test
+def test_parse_int():
+    # decimal
+    assert parse_int("5") == 5, "5 == 5"
+    assert parse_int("-5") == -5, "-5 == -5"
+    # hex
+    assert parse_int("0x5") == 5, "0x5 == 5"
+    assert parse_int("0x5a") == 90, "0x5a == 90"
+    assert parse_int("-0x5a") == -90, "-0x5a == -90"
+    # binary
+    assert parse_int("0b1001") == 9, "0b1001 == 9"
+    assert parse_int("-0b1001") == -9, "-0b1001 == 9"
+    # octal
+    assert parse_int("0100") == 64, "0100 == 64"
+    assert parse_int("0o210") == 136, "0o210 == 136"
+    assert parse_int("-0100") == -64, "-0100 == -64"
+    assert parse_int("-0o210") == -136, "-0o210 == -136"
+    # negative cases
+    assert_raises(ValueError, parse_int, '0b123', message="invalid syntax for integer with base 2: '123'")
+    assert_raises(ValueError, parse_int, '0900', message="invalid syntax for integer with base 8: '0900'")
+    assert_raises(ValueError, parse_int, '0o900', message="invalid syntax for integer with base 8: '900'")
+    assert_raises(ValueError, parse_int, '0xg', message="invalid syntax for integer with base 16: 'g'")
+
+
 @test
 def test_file_exists():
     testfile = '.testfile'