oaknut-basic 12.17.0__tar.gz → 12.18.0__tar.gz

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oaknut-basic
-Version: 12.17.0
+Version: 12.18.0
 Summary: BBC BASIC tools: program tokeniser/de-tokeniser and PRINT#/INPUT# data-file reader/writer
 Author-email: Robert Smallshire <robert@smallshire.org.uk>
 License-Expression: MIT
@@ -17,8 +17,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: oaknut-exception>=10.0
 Requires-Dist: oaknut-codecs>=12.7
-Provides-Extra: cli
-Requires-Dist: oaknut-cli>=10.0; extra == "cli"
+Requires-Dist: click>=8.1.7
+Requires-Dist: asyoulikeit>=1.5.1
+Requires-Dist: oaknut-cli>=10.0
 Dynamic: license-file
 
 <p align="center">
@@ -67,12 +68,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python
@@ -130,9 +131,9 @@ Programs are handled by the functions `tokenise`, `detokenise`, and
 ```python
 from oaknut.basic import tokenise, detokenise
 
-program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')   # str -> bytes
-listing = detokenise(program)                          # bytes -> str
-assert tokenise(detokenise(program)) == program        # byte-exact
+program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')  # str -> bytes
+listing = detokenise(program)  # bytes -> str
+assert tokenise(detokenise(program)) == program  # byte-exact
 ```
 
 When the program lives in a disc image, prefer the path-object wrappers
@@ -149,12 +150,12 @@ polymorphic `write` picks the record type from the Python value; typed
 from oaknut.basic import datafile
 
 with datafile.open("scores.dat", "w") as f:
-    f.write("ALICE")     # str   -> string record
-    f.write(42)          # int   -> integer record
-    f.write(3.5)         # float -> real record
+    f.write("ALICE")  # str   -> string record
+    f.write(42)  # int   -> integer record
+    f.write(3.5)  # float -> real record
 
 with datafile.open("scores.dat", "r") as f:
-    for value in f:      # yields "ALICE", 42, 3.5
+    for value in f:  # yields "ALICE", 42, 3.5
         print(value)
 ```
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/README.md

@@ -44,12 +44,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python
@@ -107,9 +107,9 @@ Programs are handled by the functions `tokenise`, `detokenise`, and
 ```python
 from oaknut.basic import tokenise, detokenise
 
-program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')   # str -> bytes
-listing = detokenise(program)                          # bytes -> str
-assert tokenise(detokenise(program)) == program        # byte-exact
+program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')  # str -> bytes
+listing = detokenise(program)  # bytes -> str
+assert tokenise(detokenise(program)) == program  # byte-exact
 ```
 
 When the program lives in a disc image, prefer the path-object wrappers
@@ -126,12 +126,12 @@ polymorphic `write` picks the record type from the Python value; typed
 from oaknut.basic import datafile
 
 with datafile.open("scores.dat", "w") as f:
-    f.write("ALICE")     # str   -> string record
-    f.write(42)          # int   -> integer record
-    f.write(3.5)         # float -> real record
+    f.write("ALICE")  # str   -> string record
+    f.write(42)  # int   -> integer record
+    f.write(3.5)  # float -> real record
 
 with datafile.open("scores.dat", "r") as f:
-    for value in f:      # yields "ALICE", 42, 3.5
+    for value in f:  # yields "ALICE", 42, 3.5
         print(value)
 ```
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/pyproject.toml

@@ -20,16 +20,22 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
-# The tokeniser and de-tokeniser raise categorised errors from the shared
-# oaknut-exception hierarchy, so the CLI boundary can render them without a
-# traceback. That is the package's only runtime dependency.
-dependencies = ["oaknut-exception>=10.0", "oaknut-codecs>=12.7"]
-
-# The `cli` extra pulls the shared CLI toolkit (Click, asyoulikeit, the
-# Acorn text codec and the categorised-error boundary) so this package
-# can offer the standalone `oaknut-basic` command.
-[project.optional-dependencies]
-cli = ["oaknut-cli>=10.0"]
+# This package ships the standalone `oaknut-basic` console script (see
+# [project.scripts] below), and that script's module imports Click,
+# asyoulikeit and oaknut.cli at load time. A console script is installed
+# unconditionally, so those must be unconditional dependencies too —
+# otherwise `pip install oaknut-basic` / `uvx oaknut-basic` yields an
+# executable that dies with ModuleNotFoundError before it runs. The
+# tokeniser and de-tokeniser also raise categorised errors from the
+# shared oaknut-exception hierarchy so the CLI boundary can render them
+# without a traceback.
+dependencies = [
+    "oaknut-exception>=10.0",
+    "oaknut-codecs>=12.7",
+    "click>=8.1.7",
+    "asyoulikeit>=1.5.1",
+    "oaknut-cli>=10.0",
+]
 
 [project.scripts]
 oaknut-basic = "oaknut.basic.cli:cli"

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/__init__.py

@@ -81,7 +81,7 @@ from oaknut.basic.tokens import (
     TOKEN_TO_KEYWORD,
 )
 
-__version__ = "12.17.0"
+__version__ = "12.18.0"
 
 # Canonical load addresses for BBC BASIC programs on each host.
 # Programs saved by *SAVE on a real machine use these by default.

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/cli.py

@@ -217,8 +217,8 @@ def _listing_to_bytes(listing: str, encoding: str) -> bytes:
     type=click.Choice(["rom", "greedy"]),
     default="rom",
     show_default=True,
-    help="Which tokeniser to emulate. \"rom\" is byte-exact to the BBC BASIC "
-    "ROM. Use \"greedy\" to reproduce the greedier third-party tokeniser "
+    help='Which tokeniser to emulate. "rom" is byte-exact to the BBC BASIC '
+    'ROM. Use "greedy" to reproduce the greedier third-party tokeniser '
     "behind some early-1980s commercial programs, so their de-tokenised "
     "source re-tokenises byte-identically.",
 )

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/detect.py

@@ -162,8 +162,7 @@ def detect(data: bytes | bytearray) -> Detection:
             if line_count == 0:
                 return Detection(
                     Verdict.NOT_BASIC,
-                    f"&0D &{marker:02X} at offset 0 — terminator with no lines, "
-                    "not a program",
+                    f"&0D &{marker:02X} at offset 0 — terminator with no lines, not a program",
                 )
             program_length = pos + 2
             trailing = n - program_length
@@ -195,10 +194,7 @@ def detect(data: bytes | bytearray) -> Detection:
         line_no = (marker << 8) | data[pos + 2]
         length = data[pos + 3]
         if length < HEADER_LENGTH:
-            return broke(
-                f"line {line_no} at offset {pos} has length {length} "
-                f"(< {HEADER_LENGTH})"
-            )
+            return broke(f"line {line_no} at offset {pos} has length {length} (< {HEADER_LENGTH})")
         if pos + length > n:
             return broke(f"line {line_no} at offset {pos} runs {length} bytes past end of data")
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/dialect.py

@@ -142,9 +142,7 @@ _BASIC_V_SINGLE_BYTE_OVERRIDES = {
 # (so a bare prefix never resolves to AUTO/DELETE/LOAD), then apply the
 # re-purposed single-byte slots.
 _basic_v_single_byte = {
-    token: keyword
-    for token, keyword in TOKEN_TO_KEYWORD.items()
-    if token not in (0xC6, 0xC7, 0xC8)
+    token: keyword for token, keyword in TOKEN_TO_KEYWORD.items() if token not in (0xC6, 0xC7, 0xC8)
 }
 _basic_v_single_byte.update(_BASIC_V_SINGLE_BYTE_OVERRIDES)
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/exceptions.py

@@ -96,8 +96,7 @@ class LineNumberRangeError(TokeniseError):
 
     def __init__(self, line_index: int, line_number: int, line_text: str) -> None:
         super().__init__(
-            f"line {line_index}: line number {line_number} is out of range "
-            f"(0-{MAX_LINE_NUMBER})",
+            f"line {line_index}: line number {line_number} is out of range (0-{MAX_LINE_NUMBER})",
             line_index=line_index,
             line_text=line_text,
         )
@@ -300,10 +299,7 @@ class IntegerRangeError(DataFileError):
     """
 
     def __init__(self, value: int) -> None:
-        super().__init__(
-            f"{value} is out of range for a BBC integer "
-            f"(must be -2**31 .. 2**31 - 1)"
-        )
+        super().__init__(f"{value} is out of range for a BBC integer (must be -2**31 .. 2**31 - 1)")
         self.value = value
 
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/float5.py

@@ -58,9 +58,7 @@ def unpack_float5(packed: bytes) -> float:
         return 0.0
     sign_and_msb = packed[1]
     negative = bool(sign_and_msb & 0x80)
-    significand = (
-        ((sign_and_msb | 0x80) << 24) | (packed[2] << 16) | (packed[3] << 8) | packed[4]
-    )
+    significand = ((sign_and_msb | 0x80) << 24) | (packed[2] << 16) | (packed[3] << 8) | packed[4]
     value = math.ldexp(significand, exponent - _EXPONENT_FOLD)
     return -value if negative else value
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut/basic/tokeniser.py

@@ -72,6 +72,7 @@ Crunch = Literal["rom", "greedy"]
 def _split_source_lines(source: str) -> list[str]:
     return LINE_SEPARATOR_RE.split(source)
 
+
 # Keyword entries grouped by first character, preserving ROM order within
 # each group, so the crunch only scans the relevant group.
 _KEYWORDS_BY_FIRST: dict[str, list[tuple[str, int, int]]] = {}

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut_basic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oaknut-basic
-Version: 12.17.0
+Version: 12.18.0
 Summary: BBC BASIC tools: program tokeniser/de-tokeniser and PRINT#/INPUT# data-file reader/writer
 Author-email: Robert Smallshire <robert@smallshire.org.uk>
 License-Expression: MIT
@@ -17,8 +17,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: oaknut-exception>=10.0
 Requires-Dist: oaknut-codecs>=12.7
-Provides-Extra: cli
-Requires-Dist: oaknut-cli>=10.0; extra == "cli"
+Requires-Dist: click>=8.1.7
+Requires-Dist: asyoulikeit>=1.5.1
+Requires-Dist: oaknut-cli>=10.0
 Dynamic: license-file
 
 <p align="center">
@@ -67,12 +68,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python
@@ -130,9 +131,9 @@ Programs are handled by the functions `tokenise`, `detokenise`, and
 ```python
 from oaknut.basic import tokenise, detokenise
 
-program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')   # str -> bytes
-listing = detokenise(program)                          # bytes -> str
-assert tokenise(detokenise(program)) == program        # byte-exact
+program = tokenise('10 PRINT "HELLO"\n20 GOTO 10\n')  # str -> bytes
+listing = detokenise(program)  # bytes -> str
+assert tokenise(detokenise(program)) == program  # byte-exact
 ```
 
 When the program lives in a disc image, prefer the path-object wrappers
@@ -149,12 +150,12 @@ polymorphic `write` picks the record type from the Python value; typed
 from oaknut.basic import datafile
 
 with datafile.open("scores.dat", "w") as f:
-    f.write("ALICE")     # str   -> string record
-    f.write(42)          # int   -> integer record
-    f.write(3.5)         # float -> real record
+    f.write("ALICE")  # str   -> string record
+    f.write(42)  # int   -> integer record
+    f.write(3.5)  # float -> real record
 
 with datafile.open("scores.dat", "r") as f:
-    for value in f:      # yields "ALICE", 42, 3.5
+    for value in f:  # yields "ALICE", 42, 3.5
         print(value)
 ```
 

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut_basic.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ tests/test_greedy_crunch.py
 tests/test_keyword_coverage.py
 tests/test_linenumber.py
 tests/test_numbering.py
+tests/test_packaging.py
 tests/test_rom_golden.py
 tests/test_rom_golden_detokenise.py
 tests/test_scanner.py

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/src/oaknut_basic.egg-info/requires.txt

@@ -1,5 +1,5 @@
 oaknut-exception>=10.0
 oaknut-codecs>=12.7
-
-[cli]
+click>=8.1.7
+asyoulikeit>=1.5.1
 oaknut-cli>=10.0

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/tests/test_data_cli.py

@@ -58,9 +58,7 @@ class TestEncode:
 
     def test_encode_pound_sign_uses_acorn(self, tmp_path):
         out = tmp_path / "out.dat"
-        result = CliRunner().invoke(
-            cli, ["data", "encode", "-", str(out)], input=json.dumps(["£"])
-        )
+        result = CliRunner().invoke(cli, ["data", "encode", "-", str(out)], input=json.dumps(["£"]))
         assert result.exit_code == 0, result.output
         # 00 (string tag) 01 (length) 60 (pound) — single char, reversal a no-op.
         assert out.read_bytes() == bytes.fromhex("000160")

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/tests/test_detect.py

@@ -23,7 +23,7 @@ def _program(*lines: tuple[int, bytes]) -> bytes:
 
 class TestClean:
     def test_tokenised_program_is_basic(self):
-        program = tokenise("10 PRINT \"HELLO\"\n20 GOTO 10")
+        program = tokenise('10 PRINT "HELLO"\n20 GOTO 10')
         result = detect(program)
         assert result.verdict is Verdict.BASIC
         assert result.is_basic

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/tests/test_greedy_crunch.py

@@ -61,9 +61,7 @@ _VECTORS = [
     # Rule 2 — an FN/PROC name breaks at a FLAG_START keyword (THEN/ELSE).
     (
         "IFA THENPROCWTKEYELSEPROCBKKEY",
-        bytes.fromhex(
-            "e7 41 20 8c f2 57 54 4b 45 59 45 4c 53 45 50 52 4f 43 42 4b 4b 45 59"
-        ),
+        bytes.fromhex("e7 41 20 8c f2 57 54 4b 45 59 45 4c 53 45 50 52 4f 43 42 4b 4b 45 59"),
         bytes.fromhex("e7 41 20 8c f2 57 54 4b 45 59 8b f2 42 4b 4b 45 59"),
     ),
     # Rule 2 — a function keyword embedded in a name is not a break point.

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/tests/test_keyword_coverage.py

@@ -66,7 +66,9 @@ def test_every_keyword_tokenises_to_its_token(keyword, token, flags):
     assert _body(prefix + keyword) == prefix.encode("latin-1") + bytes([token])
 
 
-@pytest.mark.parametrize(("keyword", "token"), [(kw, t) for kw, t, _f in KEYWORDS], ids=_ids(KEYWORDS))
+@pytest.mark.parametrize(
+    ("keyword", "token"), [(kw, t) for kw, t, _f in KEYWORDS], ids=_ids(KEYWORDS)
+)
 def test_every_token_detokenises_to_its_keyword(keyword, token):
     program = b"\x0d\x00\x0a\x05" + bytes([token]) + b"\x0d\xff"
     assert detokenise(program) == f"10{keyword}\n"

{oaknut_basic-12.17.0 → oaknut_basic-12.18.0}/tests/test_numbering.py

@@ -16,8 +16,8 @@ _DATA_DIRPATH = Path(__file__).parent / "data"
 
 class TestNumberLines:
     def test_numbers_each_line_from_ten_in_tens(self):
-        source = "PRINT \"Hello\"\nEND"
-        assert basic.number_lines(source) == "10 PRINT \"Hello\"\n20 END"
+        source = 'PRINT "Hello"\nEND'
+        assert basic.number_lines(source) == '10 PRINT "Hello"\n20 END'
 
     def test_custom_step(self):
         source = "A\nB\nC"

oaknut_basic-12.18.0/tests/test_packaging.py

@@ -0,0 +1,56 @@
+"""Packaging-metadata guards for the standalone ``oaknut-basic`` command.
+
+Unlike the filesystem plugin packages (``oaknut-dfs``/``oaknut-adfs`` …),
+which only contribute ``disc`` subcommands via entry points and ship no
+console script of their own, ``oaknut-basic`` declares its own
+``[project.scripts]`` entry point. A console script that is always
+installed must have everything it imports as an *unconditional* runtime
+dependency, otherwise ``pip install oaknut-basic`` / ``uvx oaknut-basic``
+produces an executable that dies with ``ModuleNotFoundError`` at import
+(see issue #49).
+"""
+
+from importlib.metadata import entry_points, requires
+
+_DISTRIBUTION = "oaknut-basic"
+
+# Everything oaknut/basic/cli.py imports at module load, mapped to the
+# distribution that supplies it.
+_CLI_REQUIREMENTS = ("oaknut-cli", "click", "asyoulikeit")
+
+
+def _unconditional_requirements():
+    """Distribution names required without an ``extra ==`` marker."""
+    names = set()
+    for requirement in requires(_DISTRIBUTION) or []:
+        # "oaknut-cli>=10.0; extra == 'cli'" -> skip; extras are optional.
+        spec, _, marker = requirement.partition(";")
+        if "extra" in marker:
+            continue
+        name = (
+            spec.strip()
+            .split("[")[0]
+            .split("<")[0]
+            .split(">")[0]
+            .split("=")[0]
+            .split("!")[0]
+            .split("~")[0]
+            .strip()
+        )
+        names.add(name.lower())
+    return names
+
+
+def test_console_script_is_declared():
+    scripts = entry_points(group="console_scripts")
+    assert any(ep.name == "oaknut-basic" for ep in scripts)
+
+
+def test_cli_dependencies_are_unconditional():
+    unconditional = _unconditional_requirements()
+    missing = [name for name in _CLI_REQUIREMENTS if name.lower() not in unconditional]
+    assert not missing, (
+        f"{_DISTRIBUTION} ships a console script but these imports of "
+        f"oaknut.basic.cli are not unconditional dependencies: {missing}. "
+        "Promote them out of the [cli] extra into [project.dependencies]."
+    )

oaknut_basic-12.18.0/tests/test_rom_golden.py

@@ -0,0 +1,100 @@
+"""Golden tokeniser vectors from the genuine BBC BASIC II ROM.
+
+Generated by scripts (basictool's 6502 emulation of the BASIC II ROM)
+and committed as static data: the ROM is the authority for what the
+tokeniser must produce, and this test holds it to that. basictool is
+NOT a test dependency — regenerate with scripts/gen_rom_golden.py if the
+vector set changes.
+"""
+
+import pytest
+from oaknut.basic import tokenise
+
+# (source after the line number, tokenised body the ROM produces).
+_GOLDEN = [
+    ('PRINT "Hi"', b' \xf1 "Hi"'),
+    ("END", b" \xe0"),
+    ("GOTO 100", b" \xe5 \x8dDd@"),
+    ("FOR I=1 TO 10 STEP 2", b" \xe3 I=1 \xb8 10 \x88 2"),
+    ("NEXT I", b" \xed I"),
+    ("REPEAT", b" \xf5"),
+    ("UNTIL X>5", b" \xfd X>5"),
+    ("IF A=1 THEN PRINT A", b" \xe7 A=1 \x8c \xf1 A"),
+    ("X=INT(RND(1)*6)+1", b" X=\xa8(\xb3(1)*6)+1"),
+    ("PROCdraw(x%,y%)", b" \xf2draw(x%,y%)"),
+    ("DEF PROCgbpb(A$,T%)", b" \xdd \xf2gbpb(A$,T%)"),
+    ("DEF FNsq(x)=x*x", b" \xdd \xa4sq(x)=x*x"),
+    ("=FNsq(3)", b" =\xa4sq(3)"),
+    ("P.", b" \xf1"),
+    ("PR.", b" \xf1"),
+    ("PRO.", b" \xf2"),
+    ("F.", b" \xe3"),
+    ("N.", b" \xed"),
+    ("G.100", b" \xe5\x8dDd@"),
+    ("REP.", b" \xf5"),
+    ("AND0", b" \x80\x8dT@@"),
+    ("TO1", b" \xb8\x8dTA@"),
+    ("PRINT1", b" \xf11"),
+    ("DIV9", b" \x81\x8dTI@"),
+    ("SIN1", b" \xb5\x8dTA@"),
+    ("TAB(1", b" \x8a\x8dTA@"),
+    ("X=2", b" X=2"),
+    ("5", b" \x8dTE@"),
+    ("GOTO0", b" \xe5\x8dT@@"),
+    ("GOTO1", b" \xe5\x8dTA@"),
+    ("GOTO 10", b" \xe5 \x8dTJ@"),
+    ("GOTO 32767", b" \xe5 \x8d`\x7f\x7f"),
+    ("GOSUB 100", b" \xe4 \x8dDd@"),
+    ("RESTORE 100,200", b" \xf7 \x8dDd@,\x8ddH@"),
+    ("ON X GOTO 10,20,30", b" \xee X \xe5 \x8dTJ@,\x8dTT@,\x8dT^@"),
+    ("IF A THEN 100 ELSE 200", b" \xe7 A \x8c \x8dDd@ \x8b \x8ddH@"),
+    ("GOTO X", b" \xe5 X"),
+    ("GOTO -5", b" \xe5 -5"),
+    ("RESTORE", b" \xf7"),
+    ("TRACE 500", b" \xfc \x8ddtA"),
+    ("RENUMBER 100,10", b" \xcc \x8dDd@,\x8dTJ@"),
+    ("PAGE=&2000", b" \xd0=&2000"),
+    ("X=PAGE", b" X=\x90"),
+    ("PRINT PAGE", b" \xf1 \x90"),
+    ("TIME=0", b" \xd1=0"),
+    ("X=TIME", b" X=\x91"),
+    ("PTR#3=0", b" \xcf#3=0"),
+    ("X=PTR#3", b" X=\x8f#3"),
+    ("HIMEM=&7C00", b" \xd3=&7C00"),
+    ("LOMEM=PAGE", b" \xd2=\x90"),
+    ("? ERR PAGE", b" ? \x9f \x90"),
+    ("GET$;,PTR", b" \xbe;,\x8f"),
+    ("INSTR(A$,B$) PTR", b" \xa7A$,B$) \x8f"),
+    ("OPENOUT LOMEM", b" \xae \xd2"),
+    ("SQR RAD PTR", b" \xb6 \xb2 \xcf"),
+    ("RND * SQR ENDPROC", b" \xb3 * SQR ENDPROC"),
+    ('A$="he""llo"', b' A$="he""llo"'),
+    ('PRINT "GOTO 10"', b' \xf1 "GOTO 10"'),
+    ("X=&FF+&1A2B", b" X=&FF+&1A2B"),
+    ("Y=1.5E3+.25", b" Y=1.5E3+.25"),
+    ('PRINT "unterminated GOTO', b' \xf1 "unterminated GOTO'),
+    ("REM this has PRINT GOTO 10", b" \xf4 this has PRINT GOTO 10"),
+    ("DATA 1,2,PRINT,3:X=4", b" \xdc 1,2,PRINT,3:X=4"),
+    ("*CAT", b" *CAT"),
+    ("*FX 21,0", b" *FX 21,0"),
+    ("X=3*4", b" X=3*4"),
+    ("PRINT~&FF", b" \xf1~&FF"),
+    ("VDU 26,12;0;", b" \xef 26,12;0;"),
+    ("TIMER", b" TIMER"),
+    ("TRUEELSE", b" TRUEELSE"),
+    ("GDIV40", b" GDIV40"),
+    ("TOTAL", b" \xb8TAL"),
+    ("DIVMOD", b" \x81\x83"),
+    ("TRUE+", b" \xb9+"),
+    ("text%?p%=ASC(MID$(A$,i%,1))", b" text%?p%=\x97(\xc1A$,i%,1))"),
+    ("?(a%+1)=&FF", b" ?(a%+1)=&FF"),
+    ("A=1:B=2:PRINT A,B", b" A=1:B=2:\xf1 A,B"),
+    ("COLOUR 129:CLS", b" \xfb 129:\xdb"),
+    ("MODE 7:VDU 23", b" \xeb 7:\xef 23"),
+]
+
+
+@pytest.mark.parametrize(("source", "expected_body"), _GOLDEN, ids=[v[0] for v in _GOLDEN])
+def test_tokenises_like_the_basic_ii_rom(source, expected_body):
+    program = tokenise("10 " + source)
+    assert program[4 : program[3]] == expected_body

oaknut_basic-12.18.0/tests/test_rom_golden_detokenise.py

@@ -0,0 +1,54 @@
+"""Golden de-tokeniser vectors from the genuine BBC BASIC II ROM.
+
+Generated by scripts/gen_rom_detok_golden.py from basictool's 6502
+emulation of the BASIC II ROM and committed as static data: the ROM's
+LIST output is the authority for what de-tokenising must produce (the
+expected text is rebuilt in our plain line-number style from the ROM's
+LIST bodies). basictool is NOT a test dependency.
+"""
+
+import pytest
+from oaknut.basic import detokenise
+
+# (tokenised program bytes, expected de-tokenised text).
+_GOLDEN = [
+    (b'\r\x00\n\x16 \xf1 "Hello, world!"\r\xff', '10 PRINT "Hello, world!"\n'),
+    (b"\r\x00\n\x0b \xe5 \x8dDd@\r\xff", "10 GOTO 100\n"),
+    (b"\r\x00\n\r \xe4 \x8ddH@:\xf8\r\xff", "10 GOSUB 200:RETURN\n"),
+    (b"\r\x00\n\x19 \xee X \xe5 \x8dTJ@,\x8dTT@,\x8dT^@\r\xff", "10 ON X GOTO 10,20,30\n"),
+    (b"\r\x00\n\x18 \xe7 A=1 \x8c \x8dTr@ \x8b \x8dT|@\r\xff", "10 IF A=1 THEN 50 ELSE 60\n"),
+    (b"\r\x00\n\x11 \xf7 \x8dDd@:\xf3 A,B\r\xff", "10 RESTORE 100:READ A,B\n"),
+    (b"\r\x00\n\x17 \xe3 I=1 \xb8 10 \x88 2:\xed I\r\xff", "10 FOR I=1 TO 10 STEP 2:NEXT I\n"),
+    (b"\r\x00\n\x0c \xf5:\xfd X>5\r\xff", "10 REPEAT:UNTIL X>5\n"),
+    (b"\r\x00\n\x0c \xd0=&2000\r\xff", "10 PAGE=&2000\n"),
+    (b"\r\x00\n\x08 X=\x90\r\xff", "10 X=PAGE\n"),
+    (b"\r\x00\n\n \xcf#3=0\r\xff", "10 PTR#3=0\n"),
+    (b"\r\x00\n\x0c \xd1=0:X=\x91\r\xff", "10 TIME=0:X=TIME\n"),
+    (b"\r\x00\n\x10 \xd3=&7C00:\xd2=\x90\r\xff", "10 HIMEM=&7C00:LOMEM=PAGE\n"),
+    (b'\r\x00\n\x15 A$=\xbd(34)+"quote"\r\xff', '10 A$=CHR$(34)+"quote"\n'),
+    (b'\r\x00\n\x1d \xf1 "GOTO 10 is text here"\r\xff', '10 PRINT "GOTO 10 is text here"\n'),
+    (b"\r\x00\n\x16 X=&FF+&1A2B \x80 &F0\r\xff", "10 X=&FF+&1A2B AND &F0\n"),
+    (b"\r\x00\n\x10 Y=1.5E3+.25\r\xff", "10 Y=1.5E3+.25\n"),
+    (
+        b"\r\x00\n$ \xf4 this REM has PRINT GOTO in it\r\xff",
+        "10 REM this REM has PRINT GOTO in it\n",
+    ),
+    (b"\r\x00\n\x18 \xdc 1,2,PRINT,3,hello\r\xff", "10 DATA 1,2,PRINT,3,hello\n"),
+    (b"\r\x00\n\t *CAT\r\xff", "10 *CAT\n"),
+    (b"\r\x00\n\x14 \xef 23,255;0;0;0;\r\xff", "10 VDU 23,255;0;0;0;\n"),
+    (b"\r\x00\n\x13 \xf2draw(x%,y%):\xe1\r\xff", "10 PROCdraw(x%,y%):ENDPROC\n"),
+    (b"\r\x00\n\x11 \xdd \xa4sq(x)=x*x\r\xff", "10 DEF FNsq(x)=x*x\n"),
+    (b"\r\x00\n\x11 L%=\xa9(A$)+\xb1-\x9c\r\xff", "10 L%=LEN(A$)+POS-COUNT\n"),
+    (b"\r\x00\n\x12 X=\xa8(\xb3(1)*6)+1\r\xff", "10 X=INT(RND(1)*6)+1\n"),
+    (b"\r\x00\n\n \xf1~&AB\r\xff", "10 PRINT~&AB\n"),
+    (b"\r\x00\n\x14 @%=&90A:\xf1 \x8a5);X\r\xff", "10 @%=&90A:PRINT TAB(5);X\n"),
+    (b"\r\x00\n\x12 \xfb 129:\xe6 0,1:\xdb\r\xff", "10 COLOUR 129:GCOL 0,1:CLS\n"),
+    (b"\r\x00\n\x10 \xeb 7:\xf1'\x8a10)'\r\xff", "10 MODE 7:PRINT'TAB(10)'\n"),
+    (b"\r\x00\n\x17 ?(addr%+1)=base%?2\r\xff", "10 ?(addr%+1)=base%?2\n"),
+    (b'\r\x00\n\x19 \xf1 "unterminated GOTO\r\xff', '10 PRINT "unterminated GOTO\n'),
+]
+
+
+@pytest.mark.parametrize(("program", "expected"), _GOLDEN, ids=range(len(_GOLDEN)))
+def test_detokenises_like_the_basic_ii_rom(program, expected):
+    assert detokenise(program) == expected

oaknut_basic-12.17.0/tests/test_rom_golden.py

@@ -1,100 +0,0 @@
-"""Golden tokeniser vectors from the genuine BBC BASIC II ROM.
-
-Generated by scripts (basictool's 6502 emulation of the BASIC II ROM)
-and committed as static data: the ROM is the authority for what the
-tokeniser must produce, and this test holds it to that. basictool is
-NOT a test dependency — regenerate with scripts/gen_rom_golden.py if the
-vector set changes.
-"""
-
-import pytest
-from oaknut.basic import tokenise
-
-# (source after the line number, tokenised body the ROM produces).
-_GOLDEN = [
-    ('PRINT "Hi"', b' \xf1 "Hi"'),
-    ('END', b' \xe0'),
-    ('GOTO 100', b' \xe5 \x8dDd@'),
-    ('FOR I=1 TO 10 STEP 2', b' \xe3 I=1 \xb8 10 \x88 2'),
-    ('NEXT I', b' \xed I'),
-    ('REPEAT', b' \xf5'),
-    ('UNTIL X>5', b' \xfd X>5'),
-    ('IF A=1 THEN PRINT A', b' \xe7 A=1 \x8c \xf1 A'),
-    ('X=INT(RND(1)*6)+1', b' X=\xa8(\xb3(1)*6)+1'),
-    ('PROCdraw(x%,y%)', b' \xf2draw(x%,y%)'),
-    ('DEF PROCgbpb(A$,T%)', b' \xdd \xf2gbpb(A$,T%)'),
-    ('DEF FNsq(x)=x*x', b' \xdd \xa4sq(x)=x*x'),
-    ('=FNsq(3)', b' =\xa4sq(3)'),
-    ('P.', b' \xf1'),
-    ('PR.', b' \xf1'),
-    ('PRO.', b' \xf2'),
-    ('F.', b' \xe3'),
-    ('N.', b' \xed'),
-    ('G.100', b' \xe5\x8dDd@'),
-    ('REP.', b' \xf5'),
-    ('AND0', b' \x80\x8dT@@'),
-    ('TO1', b' \xb8\x8dTA@'),
-    ('PRINT1', b' \xf11'),
-    ('DIV9', b' \x81\x8dTI@'),
-    ('SIN1', b' \xb5\x8dTA@'),
-    ('TAB(1', b' \x8a\x8dTA@'),
-    ('X=2', b' X=2'),
-    ('5', b' \x8dTE@'),
-    ('GOTO0', b' \xe5\x8dT@@'),
-    ('GOTO1', b' \xe5\x8dTA@'),
-    ('GOTO 10', b' \xe5 \x8dTJ@'),
-    ('GOTO 32767', b' \xe5 \x8d`\x7f\x7f'),
-    ('GOSUB 100', b' \xe4 \x8dDd@'),
-    ('RESTORE 100,200', b' \xf7 \x8dDd@,\x8ddH@'),
-    ('ON X GOTO 10,20,30', b' \xee X \xe5 \x8dTJ@,\x8dTT@,\x8dT^@'),
-    ('IF A THEN 100 ELSE 200', b' \xe7 A \x8c \x8dDd@ \x8b \x8ddH@'),
-    ('GOTO X', b' \xe5 X'),
-    ('GOTO -5', b' \xe5 -5'),
-    ('RESTORE', b' \xf7'),
-    ('TRACE 500', b' \xfc \x8ddtA'),
-    ('RENUMBER 100,10', b' \xcc \x8dDd@,\x8dTJ@'),
-    ('PAGE=&2000', b' \xd0=&2000'),
-    ('X=PAGE', b' X=\x90'),
-    ('PRINT PAGE', b' \xf1 \x90'),
-    ('TIME=0', b' \xd1=0'),
-    ('X=TIME', b' X=\x91'),
-    ('PTR#3=0', b' \xcf#3=0'),
-    ('X=PTR#3', b' X=\x8f#3'),
-    ('HIMEM=&7C00', b' \xd3=&7C00'),
-    ('LOMEM=PAGE', b' \xd2=\x90'),
-    ('? ERR PAGE', b' ? \x9f \x90'),
-    ('GET$;,PTR', b' \xbe;,\x8f'),
-    ('INSTR(A$,B$) PTR', b' \xa7A$,B$) \x8f'),
-    ('OPENOUT LOMEM', b' \xae \xd2'),
-    ('SQR RAD PTR', b' \xb6 \xb2 \xcf'),
-    ('RND * SQR ENDPROC', b' \xb3 * SQR ENDPROC'),
-    ('A$="he""llo"', b' A$="he""llo"'),
-    ('PRINT "GOTO 10"', b' \xf1 "GOTO 10"'),
-    ('X=&FF+&1A2B', b' X=&FF+&1A2B'),
-    ('Y=1.5E3+.25', b' Y=1.5E3+.25'),
-    ('PRINT "unterminated GOTO', b' \xf1 "unterminated GOTO'),
-    ('REM this has PRINT GOTO 10', b' \xf4 this has PRINT GOTO 10'),
-    ('DATA 1,2,PRINT,3:X=4', b' \xdc 1,2,PRINT,3:X=4'),
-    ('*CAT', b' *CAT'),
-    ('*FX 21,0', b' *FX 21,0'),
-    ('X=3*4', b' X=3*4'),
-    ('PRINT~&FF', b' \xf1~&FF'),
-    ('VDU 26,12;0;', b' \xef 26,12;0;'),
-    ('TIMER', b' TIMER'),
-    ('TRUEELSE', b' TRUEELSE'),
-    ('GDIV40', b' GDIV40'),
-    ('TOTAL', b' \xb8TAL'),
-    ('DIVMOD', b' \x81\x83'),
-    ('TRUE+', b' \xb9+'),
-    ('text%?p%=ASC(MID$(A$,i%,1))', b' text%?p%=\x97(\xc1A$,i%,1))'),
-    ('?(a%+1)=&FF', b' ?(a%+1)=&FF'),
-    ('A=1:B=2:PRINT A,B', b' A=1:B=2:\xf1 A,B'),
-    ('COLOUR 129:CLS', b' \xfb 129:\xdb'),
-    ('MODE 7:VDU 23', b' \xeb 7:\xef 23'),
-]
-
-
-@pytest.mark.parametrize(("source", "expected_body"), _GOLDEN, ids=[v[0] for v in _GOLDEN])
-def test_tokenises_like_the_basic_ii_rom(source, expected_body):
-    program = tokenise("10 " + source)
-    assert program[4 : program[3]] == expected_body

oaknut_basic-12.17.0/tests/test_rom_golden_detokenise.py

@@ -1,51 +0,0 @@
-"""Golden de-tokeniser vectors from the genuine BBC BASIC II ROM.
-
-Generated by scripts/gen_rom_detok_golden.py from basictool's 6502
-emulation of the BASIC II ROM and committed as static data: the ROM's
-LIST output is the authority for what de-tokenising must produce (the
-expected text is rebuilt in our plain line-number style from the ROM's
-LIST bodies). basictool is NOT a test dependency.
-"""
-
-import pytest
-from oaknut.basic import detokenise
-
-# (tokenised program bytes, expected de-tokenised text).
-_GOLDEN = [
-    (b'\r\x00\n\x16 \xf1 "Hello, world!"\r\xff', '10 PRINT "Hello, world!"\n'),
-    (b'\r\x00\n\x0b \xe5 \x8dDd@\r\xff', '10 GOTO 100\n'),
-    (b'\r\x00\n\r \xe4 \x8ddH@:\xf8\r\xff', '10 GOSUB 200:RETURN\n'),
-    (b'\r\x00\n\x19 \xee X \xe5 \x8dTJ@,\x8dTT@,\x8dT^@\r\xff', '10 ON X GOTO 10,20,30\n'),
-    (b'\r\x00\n\x18 \xe7 A=1 \x8c \x8dTr@ \x8b \x8dT|@\r\xff', '10 IF A=1 THEN 50 ELSE 60\n'),
-    (b'\r\x00\n\x11 \xf7 \x8dDd@:\xf3 A,B\r\xff', '10 RESTORE 100:READ A,B\n'),
-    (b'\r\x00\n\x17 \xe3 I=1 \xb8 10 \x88 2:\xed I\r\xff', '10 FOR I=1 TO 10 STEP 2:NEXT I\n'),
-    (b'\r\x00\n\x0c \xf5:\xfd X>5\r\xff', '10 REPEAT:UNTIL X>5\n'),
-    (b'\r\x00\n\x0c \xd0=&2000\r\xff', '10 PAGE=&2000\n'),
-    (b'\r\x00\n\x08 X=\x90\r\xff', '10 X=PAGE\n'),
-    (b'\r\x00\n\n \xcf#3=0\r\xff', '10 PTR#3=0\n'),
-    (b'\r\x00\n\x0c \xd1=0:X=\x91\r\xff', '10 TIME=0:X=TIME\n'),
-    (b'\r\x00\n\x10 \xd3=&7C00:\xd2=\x90\r\xff', '10 HIMEM=&7C00:LOMEM=PAGE\n'),
-    (b'\r\x00\n\x15 A$=\xbd(34)+"quote"\r\xff', '10 A$=CHR$(34)+"quote"\n'),
-    (b'\r\x00\n\x1d \xf1 "GOTO 10 is text here"\r\xff', '10 PRINT "GOTO 10 is text here"\n'),
-    (b'\r\x00\n\x16 X=&FF+&1A2B \x80 &F0\r\xff', '10 X=&FF+&1A2B AND &F0\n'),
-    (b'\r\x00\n\x10 Y=1.5E3+.25\r\xff', '10 Y=1.5E3+.25\n'),
-    (b'\r\x00\n$ \xf4 this REM has PRINT GOTO in it\r\xff', '10 REM this REM has PRINT GOTO in it\n'),
-    (b'\r\x00\n\x18 \xdc 1,2,PRINT,3,hello\r\xff', '10 DATA 1,2,PRINT,3,hello\n'),
-    (b'\r\x00\n\t *CAT\r\xff', '10 *CAT\n'),
-    (b'\r\x00\n\x14 \xef 23,255;0;0;0;\r\xff', '10 VDU 23,255;0;0;0;\n'),
-    (b'\r\x00\n\x13 \xf2draw(x%,y%):\xe1\r\xff', '10 PROCdraw(x%,y%):ENDPROC\n'),
-    (b'\r\x00\n\x11 \xdd \xa4sq(x)=x*x\r\xff', '10 DEF FNsq(x)=x*x\n'),
-    (b'\r\x00\n\x11 L%=\xa9(A$)+\xb1-\x9c\r\xff', '10 L%=LEN(A$)+POS-COUNT\n'),
-    (b'\r\x00\n\x12 X=\xa8(\xb3(1)*6)+1\r\xff', '10 X=INT(RND(1)*6)+1\n'),
-    (b'\r\x00\n\n \xf1~&AB\r\xff', '10 PRINT~&AB\n'),
-    (b'\r\x00\n\x14 @%=&90A:\xf1 \x8a5);X\r\xff', '10 @%=&90A:PRINT TAB(5);X\n'),
-    (b'\r\x00\n\x12 \xfb 129:\xe6 0,1:\xdb\r\xff', '10 COLOUR 129:GCOL 0,1:CLS\n'),
-    (b"\r\x00\n\x10 \xeb 7:\xf1'\x8a10)'\r\xff", "10 MODE 7:PRINT'TAB(10)'\n"),
-    (b'\r\x00\n\x17 ?(addr%+1)=base%?2\r\xff', '10 ?(addr%+1)=base%?2\n'),
-    (b'\r\x00\n\x19 \xf1 "unterminated GOTO\r\xff', '10 PRINT "unterminated GOTO\n'),
-]
-
-
-@pytest.mark.parametrize(("program", "expected"), _GOLDEN, ids=range(len(_GOLDEN)))
-def test_detokenises_like_the_basic_ii_rom(program, expected):
-    assert detokenise(program) == expected