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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coco-tools
-Version: 0.17
+Version: 0.18
 Summary: TRS-80 Color Computer Tools
 Home-page: https://github.com/jamieleecho/coco-tools
 Author: Jamie Cho

{coco-tools-0.17 → coco-tools-0.18}/coco/__init__.py

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

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

@@ -1003,7 +1003,15 @@ class BasicDimStatement(AbstractBasicStatement):
     def default_str_storage(self, val):
         self._default_str_storage = val
 
-    def init_text_for_var(self, dim_var):
+    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)),
+                ],
+                multi_line=False,
+            ).basic09_text(0)
+
         for_statements = (
             BasicForStatement(
                 BasicVar(f"tmp_{ii + 1}"),
@@ -1085,7 +1093,6 @@ class BasicDimStatement(AbstractBasicStatement):
             (
                 self.init_text_for_var(dim_var)
                 for dim_var in dim_vars
-                if isinstance(dim_var, BasicArrayRef)
             )
         )
         init_text = "\n" + init_text if init_text else ""

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

@@ -214,7 +214,7 @@ KEYWORDS = "|".join(
 
 grammar = Grammar(
     rf"""
-    aaa_prog            = multi_line eol* ~r"\x00?" eof
+    aaa_prog            = (space* eol+)* multi_line eol* ~r"\x00?" eof
     multi_line          = line space* multi_line_elements
     multi_line_elements = multi_line_element*
     multi_line_element  = eol+ line space*
@@ -380,7 +380,7 @@ grammar = Grammar(
     comment_text    = ~r".*"
     comment_token   = ~r"(REM|')"
     eof             = ~r"$"
-    eol             = ~r"[\n\r]+"
+    eol             = ~r"[\n\r]"
     linenum         = ~r"[0-9]+"
     literal         = num_literal
     hex_literal     = ~r"& *H *[0-9A-F][0-9A-F]?[0-9A-F]?[0-9A-F]?[0-9A-F]?[0-9A-F]?"

{coco-tools-0.17 → coco-tools-0.18}/coco/b09/parser.py

@@ -134,7 +134,7 @@ class BasicVisitor(NodeVisitor):
         return node
 
     def visit_aaa_prog(self, _, visited_children):
-        return BasicProg(visited_children[0])
+        return BasicProg(visited_children[1])
 
     def visit_arr_assign(self, _, visited_children):
         let_kw, _, array_ref_exp, _, _, _, val_exp = visited_children

{coco-tools-0.17 → coco-tools-0.18}/coco/b09/visitors.py

@@ -220,11 +220,16 @@ class StatementCollectorVisitor(BasicConstructVisitor):
 
 
 class VarInitializerVisitor(BasicConstructVisitor):
+    _vars: Set[str]
+    _dimmed_var_names: Set[str]
+
     def __init__(self):
         self._vars = set()
+        self._dimmed_var_names = set()
 
     @property
     def assignment_lines(self) -> List[BasicLine]:
+        vars_to_assign = self._vars - self._dimmed_var_names
         return [
             BasicLine(
                 None,
@@ -237,7 +242,7 @@ class VarInitializerVisitor(BasicConstructVisitor):
                                 is_str_expr=var.endswith("$"),
                             ),
                         )
-                        for var in sorted(self._vars)
+                        for var in sorted(vars_to_assign)
                         if ((var.endswith("$") and len(var) <= 3) or len(var) <= 2)
                     ]
                 ),
@@ -247,6 +252,15 @@ class VarInitializerVisitor(BasicConstructVisitor):
     def visit_var(self, var) -> None:
         self._vars.add(var.name())
 
+    def visit_statement(self, statement: BasicForStatement) -> None:
+        if isinstance(statement, BasicDimStatement):
+            self._dimmed_var_names.update(
+                [
+                    var.var.name() if isinstance(var, BasicArrayRef) else var.name()
+                    for var in statement.dim_vars
+                ]
+            )
+
 
 class StrVarAllocatorVisitor(BasicConstructVisitor):
     _vars: Set[str]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coco-tools
-Version: 0.17
+Version: 0.18
 Summary: TRS-80 Color Computer Tools
 Home-page: https://github.com/jamieleecho/coco-tools
 Author: Jamie Cho

{coco-tools-0.17 → coco-tools-0.18}/setup.py

@@ -3,7 +3,7 @@
 import setuptools
 
 # VERSION MUST be defined on line 6
-VERSION = "0.17"
+VERSION = "0.18"
 
 with open("README.md", "r") as fh:
     long_description = fh.read()