openscad-parser 2.5.0__tar.gz → 2.5.2__tar.gz

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_parser
-Version: 2.5.0
+Version: 2.5.2
 Summary: A PEG parser to read OpenSCAD language source code, with optional AST tree generation.
 Keywords: openscad,openscad parser,parser
 Author: Revar Desmera

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "openscad_parser"
-version = "2.5.0"
+version = "2.5.2"
 description = "A PEG parser to read OpenSCAD language source code, with optional AST tree generation."
 readme = "README.rst"
 authors = [

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/src/openscad_parser/ast/builder.py

@@ -257,14 +257,11 @@ class ASTBuilderVisitor(PTNodeVisitor):
             position=self._get_node_position(node)
         )
 
-    def visit_string_contents(self, node, children):
-        return str(children[-1]) if children else str(node.value)
-
     def visit_string_literal(self, node, children):
-        # Grammar: (TOK_DQUOTE, _(r'([^"\\]|\\.|\\$)*', str_repr='string'), TOK_DQUOTE)
-        # After visiting: [string_content] (TOK_DQUOTE nodes return None)
-        # The string content is a Terminal node, extract its value
-        value = children[-1] if children else str(node.value)
+        # Grammar: single regex matching the full quoted string including quotes.
+        # Strip the surrounding double-quotes to get the raw content.
+        raw = str(node.value)
+        value = raw[1:-1] if raw.startswith('"') and raw.endswith('"') else raw
         return StringLiteral(
             val=value,
             position=self._get_node_position(node)
@@ -989,10 +986,14 @@ class ASTBuilderVisitor(PTNodeVisitor):
         return children[0]
     
     def visit_range_expr(self, node, children):
+        # OpenSCAD syntax: [start:end] or [start:step:end]
         start = children[0]
-        end = children[1]
-        # Step is optional - if present, use it; otherwise default to 1.0
-        step = children[2] if len(children) > 2 else NumberLiteral(val=1.0, position=self._get_node_position(node))
+        if len(children) > 2:
+            step = children[1]
+            end = children[2]
+        else:
+            end = children[1]
+            step = NumberLiteral(val=1.0, position=self._get_node_position(node))
         return RangeLiteral(start=start, end=end, step=step, position=self._get_node_position(node))
     
     def visit_vector_expr(self, node, children):

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/src/openscad_parser/ast/nodes.py

@@ -380,8 +380,8 @@ class RangeLiteral(Primary):
     
     Examples:
         [0:10]      // Range from 0 to 10 with step 1
-        [0:10:2]    // Range from 0 to 10 with step 2
-        [10:0:-1]   // Range from 10 to 0 with step -1
+        [0:2:10]    // Range from 0 to 10 with step 2
+        [10:-1:0]   // Range from 10 to 0 with step -1
     
     Attributes:
         start: The starting value of the range.
@@ -393,7 +393,7 @@ class RangeLiteral(Primary):
     step: Expression
 
     def __str__(self):
-        return f"[{self.start} : {self.end} : {self.step}]"
+        return f"[{self.start} : {self.step} : {self.end}]"
 
     def build_scope(self, parent_scope: "Scope") -> None:
         self.scope = parent_scope

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/src/openscad_parser/ast/pretty_print.py

@@ -374,9 +374,9 @@ def _fmt_node(node: ASTNode, indent: int, w: int) -> str:
         rhs = _fmt_expr(node.expr, indent, w)
         inline = f"{pad}{node.name} = {rhs};"
         if rhs.startswith("[\n"):
-            # Re-format so ] aligns with [: pass the column of [ as indent.
-            bracket_col = indent + len(str(node.name)) + 3
-            rhs = _fmt_expr(node.expr, bracket_col, w)
+            # Re-format with ] one level from the assignment and content one
+            # level deeper — independent of variable name length.
+            rhs = _fmt_expr(node.expr, indent + w, w)
             return f"{pad}{node.name} = {rhs};"
         if len(inline.split("\n")[0]) > _MULTILINE_CHAR_LIMIT:
             rhs2 = _fmt_expr(node.expr, indent + w, w)

{openscad_parser-2.5.0 → openscad_parser-2.5.2}/src/openscad_parser/grammar.py

@@ -622,12 +622,9 @@ def member_expr():
     return (TOK_PERIOD, member_name)
 
 
-def string_contents():
-    return _(r'([^"\\]|\\.|\\$)*', str_repr='string')
-
-
 def string_literal():
-    return (TOK_DQUOTE, string_contents, TOK_DQUOTE)
+    # Single regex to avoid arpeggio's skipws stripping leading whitespace inside quotes.
+    return _(r'"(?:[^"\\]|\\.|\\$)*"', str_repr='string')
 
 
 def primary():