b1scad add support for union operator

bat52 · Dec 25, 2024 · 6fa4775 · 6fa4775
1 parent 400954f
commit 6fa4775
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/b1scad/scad/model04.scad b/src/b1scad/scad/model04.scad
@@ -0,0 +1,4 @@
+union() {
+    cube(20);
+    sphere(30);
+}
diff --git a/src/b1scad/scad2ast.py b/src/b1scad/scad2ast.py
@@ -13,7 +13,7 @@
 class OpenSCADLexer(Lexer):
     tokens = (
         CUBE, SPHERE, CYLINDER, 
-        TRANSLATE, ROTATE, SCALE, 
+        TRANSLATE, ROTATE, SCALE, UNION,
         LBRACE, RBRACE, LPAREN, RPAREN, LSQUARE, RSQUARE, COMMA, SEMICOLON,
         NUMBER
     )
@@ -23,6 +23,7 @@ class OpenSCADLexer(Lexer):
     CUBE = r'cube'
     SPHERE = r'sphere'
     CYLINDER = r'cylinder'
+    UNION = r'union'
     TRANSLATE = r'translate'
     ROTATE = r'rotate'
     SCALE = r'scale'

diff --git a/src/b1scad/scad2py.py b/src/b1scad/scad2py.py
@@ -32,6 +32,10 @@ def expr(self, t):
     def op(self, p):
         return f"{p.shape_set}.mv({p.vector})"
 
+    @_('UNION LPAREN RPAREN LBRACE shape_set RBRACE')
+    def op(self, p):
+        return f"{p.shape_set}"
+
     @_('ROTATE LPAREN vector RPAREN LBRACE shape_set RBRACE')
     def op(self, p):
         return f"{p.shape_set}.rotate({p.vector})"

diff --git a/src/b1scad/test.py b/src/b1scad/test.py
@@ -27,7 +27,7 @@ class B1scadTestMethods(unittest.TestCase):
     """Pylele Test Class"""
     def test_all_scad(self):
         scaddir = os.path.join(os.path.abspath(os.path.dirname(__file__)),"scad")
-        for idx in range(4):
+        for idx in range(5):
             fname = f"model{idx:02}"
             scadfname = f"{fname}.scad"
             fullscadfile = os.path.join(scaddir,scadfname)