coco-tools 0.18__tar.gz → 0.20__tar.gz

{coco-tools-0.18/coco_tools.egg-info → coco_tools-0.20}/PKG-INFO

@@ -1,20 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: coco-tools
-Version: 0.18
+Version: 0.20
 Summary: TRS-80 Color Computer Tools
-Home-page: https://github.com/jamieleecho/coco-tools
-Author: Jamie Cho
-Author-email: jamieleecho+coco_tools@gmail.com
-License: GPLv2
-Keywords: coco image conversion trs-80 tandy
+Author-email: Jamie Cho <jamieleecho@gmail.com>
+License-Expression: GPL-2.0
+Project-URL: Repository, https://github.com/jamieleecho/coco-tools
+Project-URL: Issues, https://github.com/jamieleecho/coco-tools/issues
+Keywords: coco,image,conversion,trs-80,tandy
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9.19
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: parsimonious>=0.10.0
+Requires-Dist: Pillow>=7.0.0
+Requires-Dist: pypng>=0.0.18
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pydantic-yaml>=1.3.0
+Dynamic: license-file
 
 # coco-tools
 
@@ -30,35 +35,63 @@ pip install coco-tools
 # To install from source
 git clone https://github.com/jamieleecho/coco-tools.git
 cd coco-tools
-python3 setup.py
+make install-pre-commit
+make install
 ```
 
+The `Makefile` makes it easy to perform the most common operations:
+* `make all` transpiles several exapmle ECB programs to Basic09
+* `make check-all` runs linting and `uv.lock` checks
+* `make check-lint` checks for linting issues
+* `make check-lock` verifies the `uv.lock` is aligned to `pyproject.toml`
+* `make clean` cleans the virtual environment and caches
+* `make default` runs a default set of checks on the code
+* `make fix-all` formats the code, fixes lint errors and runs locks `uv.lock` to `pyproject.toml`
+* `make fix-format` formats the code
+* `make fix-lint` fixes linting issues
+* `make fix-lint-unsafe` fixes linting issues potentially adding inadvertant bugs
+* `make help` outputs the different make options
+* `make install` build install the distribution
+* `make install-pre-commit` installs pre-commit hooks
+* `make lock` locks `uv.lock` to `pyproject.toml`
+* `make install-pre-commit` installs pre-commit hooks
+* `make run-tests` runs the unit tests
+* `make sync` syncs the python environment with `uv.lock`
+
+`.vscode/settings.json` is set so that unit tests can be run without further configuration.
+
 ## Tools
 
 ### [decb-to-b09](./README.decb-to-b09.md)
 
 ```
-usage: decb-to-b09 [-h] [--version] [-l] [-z] [-D] [-w] program.bas program.b09
+usage: decb-to-b09 [-h] [--version] [-l] [-z] [-s DEFAULT_STRING_STORAGE] [-D] [-w]
+                   [-c CONFIG_FILE]
+                   program.bas program.b09
 
 Convert a Color BASIC program to a BASIC09 program
 Copyright (c) 2023 by Jamie Cho
-Version: 0.8
+Version: 0.18
 
 positional arguments:
   program.bas           input DECB text program file
   program.b09           output BASIC09 text program file
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   --version             show program's version number and exit
   -l, --filter-unused-linenum
                         Filter out line numbers not referenced by the program
   -z, --dont-initialize-vars
                         Don't pre-initialize all variables
+  -s DEFAULT_STRING_STORAGE, --default-string-storage DEFAULT_STRING_STORAGE
+                        Bytes to allocate for each string
   -D, --dont-output-dependencies
                         Don't output required dependencies
   -w, --dont-run-width-32
                         if set don't run the default width 32
+  -c CONFIG_FILE, --config-file CONFIG_FILE
+                        Optional compiler configuration file
 ```
 
 ### cm3toppm
@@ -242,18 +275,38 @@ options:
 ## Developing and Testing
 
 ```
+# To set up pre-commit checks
+pre-commit install
+
 # Build the docker image
-docker-compose build test
+docker compose build test
 
 # Run tests using the source on the docker image
-docker-compose run test
+docker compose run test
 
 # Run tests using the source on the host computer
-docker-compose run testv
+docker compose run testv
 
-# To make changes and develop locally
+# To develop locally
 pip install -r requirements.txt
-pre-commit install
+
+# Run linting, build example disk images for basic conversion
+make
+
+# Remove built artifacts
+make clean
+
+# Reformats the code
+make format
+
+# Only runs linting
+make lint
+
+# Only run tests
+make test
+
+# Build basic and os-9 eample images
+make basic.dsk os9boot.dsk
 ```
 
 ## Credits
@@ -263,6 +316,7 @@ The programs in the examples/decb and examples/other-decb-examples-to-try direct
 * banner.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/banner.c10
 * cadnza.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/cadnza.c10
 * cflip.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/cflip.c10
+* flip.bas -- https://github.com/daftspaniel/RetroCornerRedux/blob/main/Dragon/Originals/FlipBits/flip.bas
 * loops.bas -- https://colorcomputerarchive.com/repo/Documents/Manuals/Hardware/Color%20Computer%203%20Extended%20Basic%20(Tandy).pdf
 * f15eagle.bas -- https://colorcomputerarchive.com/repo/Disks/Magazines/Rainbow%20On%20Disk.zip
 * mars.bas -- https://github.com/jggames/trs80mc10/tree/9df4c9578250009d68a03101d626faa3c22e7445/quicktype/Text%20Adventures/WorkInProgress/Mars

coco-tools-0.18/PKG-INFO → coco_tools-0.20/README.md

@@ -1,21 +1,3 @@
-Metadata-Version: 2.1
-Name: coco-tools
-Version: 0.18
-Summary: TRS-80 Color Computer Tools
-Home-page: https://github.com/jamieleecho/coco-tools
-Author: Jamie Cho
-Author-email: jamieleecho+coco_tools@gmail.com
-License: GPLv2
-Keywords: coco image conversion trs-80 tandy
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9.19
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 # coco-tools
 
 This is a simple collection of tools to assist with developing software for
@@ -30,35 +12,63 @@ pip install coco-tools
 # To install from source
 git clone https://github.com/jamieleecho/coco-tools.git
 cd coco-tools
-python3 setup.py
+make install-pre-commit
+make install
 ```
 
+The `Makefile` makes it easy to perform the most common operations:
+* `make all` transpiles several exapmle ECB programs to Basic09
+* `make check-all` runs linting and `uv.lock` checks
+* `make check-lint` checks for linting issues
+* `make check-lock` verifies the `uv.lock` is aligned to `pyproject.toml`
+* `make clean` cleans the virtual environment and caches
+* `make default` runs a default set of checks on the code
+* `make fix-all` formats the code, fixes lint errors and runs locks `uv.lock` to `pyproject.toml`
+* `make fix-format` formats the code
+* `make fix-lint` fixes linting issues
+* `make fix-lint-unsafe` fixes linting issues potentially adding inadvertant bugs
+* `make help` outputs the different make options
+* `make install` build install the distribution
+* `make install-pre-commit` installs pre-commit hooks
+* `make lock` locks `uv.lock` to `pyproject.toml`
+* `make install-pre-commit` installs pre-commit hooks
+* `make run-tests` runs the unit tests
+* `make sync` syncs the python environment with `uv.lock`
+
+`.vscode/settings.json` is set so that unit tests can be run without further configuration.
+
 ## Tools
 
 ### [decb-to-b09](./README.decb-to-b09.md)
 
 ```
-usage: decb-to-b09 [-h] [--version] [-l] [-z] [-D] [-w] program.bas program.b09
+usage: decb-to-b09 [-h] [--version] [-l] [-z] [-s DEFAULT_STRING_STORAGE] [-D] [-w]
+                   [-c CONFIG_FILE]
+                   program.bas program.b09
 
 Convert a Color BASIC program to a BASIC09 program
 Copyright (c) 2023 by Jamie Cho
-Version: 0.8
+Version: 0.18
 
 positional arguments:
   program.bas           input DECB text program file
   program.b09           output BASIC09 text program file
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   --version             show program's version number and exit
   -l, --filter-unused-linenum
                         Filter out line numbers not referenced by the program
   -z, --dont-initialize-vars
                         Don't pre-initialize all variables
+  -s DEFAULT_STRING_STORAGE, --default-string-storage DEFAULT_STRING_STORAGE
+                        Bytes to allocate for each string
   -D, --dont-output-dependencies
                         Don't output required dependencies
   -w, --dont-run-width-32
                         if set don't run the default width 32
+  -c CONFIG_FILE, --config-file CONFIG_FILE
+                        Optional compiler configuration file
 ```
 
 ### cm3toppm
@@ -242,18 +252,38 @@ options:
 ## Developing and Testing
 
 ```
+# To set up pre-commit checks
+pre-commit install
+
 # Build the docker image
-docker-compose build test
+docker compose build test
 
 # Run tests using the source on the docker image
-docker-compose run test
+docker compose run test
 
 # Run tests using the source on the host computer
-docker-compose run testv
+docker compose run testv
 
-# To make changes and develop locally
+# To develop locally
 pip install -r requirements.txt
-pre-commit install
+
+# Run linting, build example disk images for basic conversion
+make
+
+# Remove built artifacts
+make clean
+
+# Reformats the code
+make format
+
+# Only runs linting
+make lint
+
+# Only run tests
+make test
+
+# Build basic and os-9 eample images
+make basic.dsk os9boot.dsk
 ```
 
 ## Credits
@@ -263,6 +293,7 @@ The programs in the examples/decb and examples/other-decb-examples-to-try direct
 * banner.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/banner.c10
 * cadnza.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/cadnza.c10
 * cflip.bas -- https://colorcomputerarchive.com/repo/MC-10/Software/Books/TRS-80%20Color%20Computer%20%26%20MC-10%20Programs/cflip.c10
+* flip.bas -- https://github.com/daftspaniel/RetroCornerRedux/blob/main/Dragon/Originals/FlipBits/flip.bas
 * loops.bas -- https://colorcomputerarchive.com/repo/Documents/Manuals/Hardware/Color%20Computer%203%20Extended%20Basic%20(Tandy).pdf
 * f15eagle.bas -- https://colorcomputerarchive.com/repo/Disks/Magazines/Rainbow%20On%20Disk.zip
 * mars.bas -- https://github.com/jggames/trs80mc10/tree/9df4c9578250009d68a03101d626faa3c22e7445/quicktype/Text%20Adventures/WorkInProgress/Mars

{coco-tools-0.18 → coco_tools-0.20}/coco/__init__.py

@@ -1,2 +1,2 @@
 # __version__ MUST be defined on line 2
-__version__ = "0.18"
+__version__ = "0.20"

{coco-tools-0.18 → coco_tools-0.20}/coco/b09/compiler.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import List
 
 from coco import b09
@@ -12,6 +13,7 @@ from coco.b09.elements import (
     BasicRunCall,
     BasicVar,
 )
+from coco.b09.configs import CompilerConfigs
 from coco.b09.grammar import grammar, PROCNAME_REGEX
 from coco.b09.parser import BasicVisitor
 from coco.b09.procbank import ProcedureBank
@@ -32,6 +34,7 @@ from coco.b09.visitors import (
     LineReferenceVisitor,
     LineZeroFilterVisitor,
     SetDimStringStorageVisitor,
+    SetInitializeVisitor,
     StatementCollectorVisitor,
     StrVarAllocatorVisitor,
     VarInitializerVisitor,
@@ -47,6 +50,7 @@ def convert(
     *,
     add_standard_prefix: bool = True,
     add_suffix: bool = True,
+    compiler_configs: CompilerConfigs = None,
     default_str_storage: int = b09.DEFAULT_STR_STORAGE,
     default_width32: bool = True,
     filter_unused_linenum: bool = False,
@@ -55,6 +59,7 @@ def convert(
     procname: str = "",
     skip_procedure_headers: bool = False,
 ) -> str:
+    compiler_configs = compiler_configs or CompilerConfigs()
     tree = grammar.parse(progin)
     bv = BasicVisitor()
     basic_prog: BasicProg = bv.visit(tree)
@@ -124,7 +129,8 @@ def convert(
     basic_prog.visit(BasicFunctionalExpressionPatcherVisitor())
 
     set_string_storage_vistor: SetDimStringStorageVisitor = SetDimStringStorageVisitor(
-        default_str_storage=default_str_storage
+        default_str_storage=default_str_storage,
+        string_configs=compiler_configs.string_configs,
     )
     basic_prog.visit(set_string_storage_vistor)
 
@@ -133,9 +139,10 @@ def convert(
     basic_prog.visit(dimmed_array_visitor)
     declare_array_visitor = DeclareImplicitArraysVisitor(
         dimmed_var_names=dimmed_array_visitor.dimmed_var_names,
+        initialize_vars=initialize_vars,
     )
     basic_prog.visit(declare_array_visitor)
-    basic_prog.extend_prefix_lines(declare_array_visitor.dim_statements)
+    basic_prog.insert_lines_at_beginning(declare_array_visitor.dim_statements)
 
     # allocate sufficient string storage
     str_var_allocator: StrVarAllocatorVisitor = StrVarAllocatorVisitor(
@@ -150,6 +157,8 @@ def convert(
         var_initializer = VarInitializerVisitor()
         basic_prog.visit(var_initializer)
         basic_prog.extend_prefix_lines(var_initializer.assignment_lines)
+    set_init_visitor = SetInitializeVisitor(initialize_vars)
+    basic_prog.visit(set_init_visitor)
 
     # remove unused line numbers
     line_ref_visitor = LineReferenceVisitor()
@@ -238,6 +247,7 @@ def convert_file(
     output_program_file: str,
     *,
     add_standard_prefix: bool = True,
+    config_file: str = None,
     default_width32: bool = True,
     default_str_storage: int = b09.DEFAULT_STR_STORAGE,
     filter_unused_linenum: bool = False,
@@ -246,9 +256,13 @@ def convert_file(
     procname: str = "",
 ) -> None:
     progin = input_program_file.read()
+    compiler_configs = (
+        CompilerConfigs.load(Path(config_file)) if config_file else CompilerConfigs()
+    )
     progout = convert(
         progin,
         add_standard_prefix=add_standard_prefix,
+        compiler_configs=compiler_configs,
         default_str_storage=default_str_storage,
         default_width32=default_width32,
         filter_unused_linenum=filter_unused_linenum,

coco_tools-0.20/coco/b09/configs.py

@@ -0,0 +1,37 @@
+import re
+from pathlib import Path
+from pydantic import BaseModel, Field, field_validator
+from pydantic_yaml import parse_yaml_raw_as
+from typing import Dict
+
+
+class StringConfigs(BaseModel):
+    strname_to_size: Dict[str, int] = Field(default_factory=lambda: {})
+
+    @field_validator("strname_to_size")
+    @classmethod
+    def check_mappings(cls, val: Dict[str, int]):
+        valid_var_regex = re.compile(r"[A-Z][A-Z_0-9]?")
+
+        for key, sz in val.items():
+            assert key.endswith("$") or key.endswith(
+                "$()"
+            ), f"{key} must end with a $ or $()"
+            assert key == key.upper(), f"{key} must be all caps"
+            var_only = key[: key.find("$")]
+            assert 1 <= len(var_only) <= 2, f"{var_only} must be 1 or 2 characters"
+            assert valid_var_regex.match(
+                var_only
+            ), f"{var_only} must be a valid BASIC name"
+            assert 0 < sz < 32767, f"{sz} for {key} must be between 0 and 32767"
+        return val
+
+
+class CompilerConfigs(BaseModel):
+    string_configs: StringConfigs = Field(default_factory=lambda: StringConfigs())
+
+    @classmethod
+    def load(cls, path: Path) -> "CompilerConfigs":
+        with open(path) as handle:
+            yaml = handle.read()
+            return parse_yaml_raw_as(cls, yaml)

{coco-tools-0.18 → coco_tools-0.20}/coco/b09/elements.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
+from collections import defaultdict
 from itertools import chain
-from typing import List, Literal, TYPE_CHECKING, Union
+from typing import Dict, List, Literal, TYPE_CHECKING, Union
 
 from coco.b09 import DEFAULT_STR_STORAGE
 
@@ -492,7 +493,7 @@ class BasicLine(AbstractBasicConstruct):
 
     def basic09_text(self, indent_level) -> str:
         if self._is_referenced and self._num is not None:
-            return f"{self._num} " f"{self._statements.basic09_text(indent_level)}"
+            return f"{self._num} {self._statements.basic09_text(indent_level)}"
         return f"{self._statements.basic09_text(indent_level)}"
 
     def visit(self, visitor: "BasicConstructVisitor") -> None:
@@ -826,7 +827,7 @@ class BasicFunctionCall(AbstractBasicExpression):
         self._args = args
 
     def basic09_text(self, indent_level: int) -> str:
-        return f"{self._func}" f"{self._args.basic09_text(indent_level)}"
+        return f"{self._func}{self._args.basic09_text(indent_level)}"
 
 
 class BasicDataStatement(AbstractBasicStatement):
@@ -969,8 +970,15 @@ class BasicJoystkExpression(BasicFunctionalExpression):
 class BasicDimStatement(AbstractBasicStatement):
     _default_str_storage: int
     _dim_vars: List["BasicArrayRef | BasicVar"]
+    _initialize_vars: bool
+    _strname_to_size: Dict[str, int]
 
-    def __init__(self, dim_vars: List["BasicArrayRef | BasicVar"]):
+    def __init__(
+        self,
+        dim_vars: List["BasicArrayRef | BasicVar"],
+        *,
+        initialize_vars: bool = False,
+    ):
         super().__init__()
         self._default_str_storage = DEFAULT_STR_STORAGE
         self._dim_vars = [
@@ -990,24 +998,44 @@ class BasicDimStatement(AbstractBasicStatement):
             )
             for var in dim_vars
         ]
+        self._initialize_vars = initialize_vars
+        self._strname_to_size = {}
 
     @property
     def default_str_storage(self):
         return self._default_str_storage
 
+    @default_str_storage.setter
+    def default_str_storage(self, val):
+        self._default_str_storage = val
+
     @property
     def dim_vars(self) -> List["BasicArrayRef | BasicVar"]:
         return self._dim_vars
 
-    @default_str_storage.setter
-    def default_str_storage(self, val):
-        self._default_str_storage = val
+    @property
+    def initialize_vars(self) -> bool:
+        return self._initialize_vars
+
+    @initialize_vars.setter
+    def initialize_vars(self, val: bool) -> None:
+        self._initialize_vars = val
+
+    @property
+    def strname_to_size(self):
+        return self._strname_to_size
+
+    @strname_to_size.setter
+    def strname_to_size(self, val):
+        self._strname_to_size = val
 
     def init_text_for_var(self, dim_var: "BasicArrayRef | BasicVar") -> str:
         if isinstance(dim_var, BasicVar):
             return BasicStatements(
                 [
-                    BasicAssignment(dim_var, BasicLiteral("" if dim_var.is_str_expr else 0)),
+                    BasicAssignment(
+                        dim_var, BasicLiteral("" if dim_var.is_str_expr else 0)
+                    ),
                 ],
                 multi_line=False,
             ).basic09_text(0)
@@ -1065,19 +1093,39 @@ class BasicDimStatement(AbstractBasicStatement):
             )
         ]
 
-        str_vars_text: str = (
+        str_var_names_to_exp = {
+            str_var.name()
+            if isinstance(str_var, BasicVar)
+            else str_var.var.name(): str_var
+            for str_var in str_vars
+        }
+
+        str_var_to_size = {
+            str_var: self.strname_to_size[str_name]
+            if str_name in self.strname_to_size
+            else self.default_str_storage
+            for str_name, str_var in str_var_names_to_exp.items()
+        }
+
+        str_size_to_strs: Dict[int, List[BasicVar | BasicArrayRef]] = defaultdict(list)
+        for var, size in str_var_to_size.items():
+            str_size_to_strs[size].append(var)
+
+        str_vars_text_list: List[str] = [
             self._basic09_text(
-                str_vars,
-                ""
-                if self.default_str_storage == DEFAULT_STR_STORAGE
-                else f": STRING[{self._default_str_storage}]",
+                list_vars,
+                "" if size == DEFAULT_STR_STORAGE else f": STRING[{size}]",
                 indent_level,
             )
-            + ("\n" if non_str_vars else "")
-            if str_vars
+            for size, list_vars in str_size_to_strs.items()
+        ]
+
+        str_vars_text = (
+            ("\n".join(str_vars_text_list) + ("\n" if non_str_vars else ""))
+            if str_vars_text_list
             else ""
         )
-        non_str_vars_text: str = (
+        non_str_vars_text = (
             self._basic09_text(non_str_vars, "", indent_level) if non_str_vars else ""
         )
 
@@ -1089,13 +1137,13 @@ class BasicDimStatement(AbstractBasicStatement):
         dim_var_text: str = ", ".join(
             (dim_var.basic09_text(indent_level) for dim_var in dim_vars)
         )
-        init_text = "\n".join(
-            (
-                self.init_text_for_var(dim_var)
-                for dim_var in dim_vars
+        if self.initialize_vars:
+            init_text = "\n".join(
+                (self.init_text_for_var(dim_var) for dim_var in dim_vars)
             )
-        )
-        init_text = "\n" + init_text if init_text else ""
+            init_text = "\n" + init_text if init_text else ""
+        else:
+            init_text = ""
 
         return (
             f"{super().basic09_text(indent_level)}"

{coco-tools-0.18 → coco_tools-0.20}/coco/b09/grammar.py

@@ -49,7 +49,7 @@ QUOTED_STR3_FUNCTION_NAMES = [f'"{name}"' for name in STR3_FUNCTIONS]
 
 STR_NUM_FUNCTIONS = {
     "ASC": "ASC",
-    "VAL": "VAL",
+    "VAL": "RUN ecb_val",
     "LEN": "LEN",
 }
 
@@ -133,7 +133,7 @@ KEYWORDS = "|".join(
             "GOSUB",
             "GOTO",
             "HBUFF",
-            "HGET" "HCIRCLE",
+            "HGETHCIRCLE",
             "HCLS",
             "HCOLOR",
             "HEX$",
@@ -299,8 +299,8 @@ grammar = Grammar(
                     / hget_statement
                     / hput_statement
                     / hpaint_statement
-    statement2      = ({ ' / '.join(QUOTED_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space* ")" space*
-    statement3      = ({ ' / '.join(QUOTED_STATEMENTS3_NAMES)}) space* "(" space* exp space* "," space* exp space* "," space* exp space* ")" space*
+    statement2      = ({" / ".join(QUOTED_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space* ")" space*
+    statement3      = ({" / ".join(QUOTED_STATEMENTS3_NAMES)}) space* "(" space* exp space* "," space* exp space* "," space* exp space* ")" space*
     statements           = statement? space* statements_elements space* last_statement?
     last_statement  = comment / partial_str_arr_assign / partial_str_assign
     partial_str_arr_assign = "LET"? space* str_array_ref_exp space* "=" space* partial_str_lit
@@ -342,8 +342,8 @@ grammar = Grammar(
     num_power_exp        = val_exp space* num_power_sub_exps
     num_power_sub_exps   = num_power_sub_exp*
     num_power_sub_exp    = ("^" space* val_exp space*)
-    func_exp        = ({ ' / '.join(QUOTED_FUNCTION_NAMES)}) space* "(" space* exp space* ")" space*
-    func_str_exp    = ({ ' / '.join(QUOTED_STR_NUM_FUNCTIONS_NAMES)}) space* "(" space* str_exp space* ")" space*
+    func_exp        = ({" / ".join(QUOTED_FUNCTION_NAMES)}) space* "(" space* exp space* ")" space*
+    func_str_exp    = ({" / ".join(QUOTED_STR_NUM_FUNCTIONS_NAMES)}) space* "(" space* str_exp space* ")" space*
     val_exp         = num_literal
                     / hex_literal
                     / paren_exp
@@ -363,11 +363,11 @@ grammar = Grammar(
     str_exp          = str_simple_exp space* str_exp_elements
     str_exp_elements = str_exp_element*
     str_exp_element  = "+" space* str_simple_exp space*
-    str2_func_exp    = ({ ' / '.join(QUOTED_STR2_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* ")" space*
-    str3_func_exp    = ({ ' / '.join(QUOTED_STR3_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* "," space* exp space* ")" space*
-    num_str_func_exp = ({ ' / '.join(QUOTED_NUM_STR_FUNCTIONS_NAMES)}) space* "(" space* exp space* ")" space*
-    num_str_func_exp_statements = ({ ' / '.join(QUOTED_NUM_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
-    str_func_exp_statements = ({ ' / '.join(QUOTED_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space*
+    str2_func_exp    = ({" / ".join(QUOTED_STR2_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* ")" space*
+    str3_func_exp    = ({" / ".join(QUOTED_STR3_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* "," space* exp space* ")" space*
+    num_str_func_exp = ({" / ".join(QUOTED_NUM_STR_FUNCTIONS_NAMES)}) space* "(" space* exp space* ")" space*
+    num_str_func_exp_statements = ({" / ".join(QUOTED_NUM_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
+    str_func_exp_statements = ({" / ".join(QUOTED_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space*
     str_simple_exp   = str_literal
                      / str2_func_exp
                      / str3_func_exp
@@ -413,7 +413,7 @@ grammar = Grammar(
     linenum_list        = linenum space* linenum_list0
     linenum_list0       = linenum_list_elem*
     linenum_list_elem   = "," space* linenum space*
-    functions           = ~r"{'|'.join(FUNCTIONS.keys())}"
+    functions           = ~r"{"|".join(FUNCTIONS.keys())}"
     data_statement      = "DATA" space* data_elements space*
     data_elements       = data_element space* data_elements0
     data_element        = data_num_element / data_str_element
@@ -425,7 +425,7 @@ grammar = Grammar(
     data_str_element0   = space* str_literal space*
     data_str_element1   = space* data_str_literal
     data_str_literal    = ~r'[^",:\n]*'
-    single_kw_statement = ({ ' / '.join(QUOTED_SINGLE_KEYWORD_STATEMENTS)}) space*
+    single_kw_statement = ({" / ".join(QUOTED_SINGLE_KEYWORD_STATEMENTS)}) space*
     for_statement       = "FOR" space* var space* "=" space* exp space* "TO" space* exp space*
     for_step_statement  = "FOR" space* var space* "=" space* exp space* "TO" space* exp space* "STEP" space* exp space*
     next_statement      = next_var_statement / next_empty_statement
@@ -434,8 +434,8 @@ grammar = Grammar(
     var_list            = var space* var_list_elements
     var_list_elements   = var_list_element*
     var_list_element    = "," space* var space*
-    func_to_statements  = ({ ' / '.join(QUOTED_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
-    func_to_statements2 = ({ ' / '.join(QUOTED_FUNCTIONS_TO_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space*")" space*
+    func_to_statements  = ({" / ".join(QUOTED_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
+    func_to_statements2 = ({" / ".join(QUOTED_FUNCTIONS_TO_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space*")" space*
     joystk_to_statement = "JOYSTK" space* "(" space* exp space* ")" space*
     dim_element0        = (int_literal / int_hex_literal)
     dim_var             = (dim_array_var / str_var / var)