added support for (non)optional arguments

SolidCode · etjones · May 24, 2021 · May 16, 2021 · May 16, 2021 · May 16, 2021
commit b883cfa54398ad02cda3fd175cd6ad5a6e2ee766
diff --git a/solid/examples/basic_scad_include.py b/solid/examples/basic_scad_include.py
@@ -13,6 +13,7 @@
 def demo_import_scad():
     scad_path = Path(__file__).parent / 'scad_to_include.scad'
     scad_mod = import_scad(scad_path)
+    scad_mod.optional_nondefault_arg(1)
     return scad_mod.steps(5)
 
 

diff --git a/solid/examples/scad_to_include.scad b/solid/examples/scad_to_include.scad
@@ -13,7 +13,7 @@ module steps(howmany=3){
     }
 }
 
-module blub(a) cube([a, 2, 2]);
+module blub(a, b=1) cube([a, 2, 2]);
 
 function scad_points() = [[0,0], [1,0], [0,1]];
 

diff --git a/solid/py_scadparser/scad_parser.py b/solid/py_scadparser/scad_parser.py
@@ -14,6 +14,7 @@ class ScadTypes(Enum):
     FUNCTION = 2
     USE = 3
     INCLUDE = 4
+    PARAMETER = 5
 
 class ScadObject:
     def __init__(self, scadType):
@@ -37,17 +38,31 @@ def __init__(self, name):
         super().__init__(ScadTypes.GLOBAL_VAR)
         self.name = name
 
-class ScadModule(ScadObject):
-    def __init__(self, name, parameters):
-        super().__init__(ScadTypes.MODULE)
+class ScadCallable(ScadObject):
+    def __init__(self, name, parameters, scadType):
+        super().__init__(scadType)
         self.name = name
         self.parameters = parameters
 
-class ScadFunction(ScadObject):
+    def __repr__(self):
+        return f'{self.name} ({self.parameters})'
+
+class ScadModule(ScadCallable):
+    def __init__(self, name, parameters):
+        super().__init__(name, parameters, ScadTypes.MODULE)
+
+class ScadFunction(ScadCallable):
     def __init__(self, name, parameters):
-        super().__init__(ScadTypes.FUNCTION)
+        super().__init__(name, parameters, ScadTypes.FUNCTION)
+
+class ScadParameter(ScadObject):
+    def __init__(self, name, optional=False):
+        super().__init__(ScadTypes.PARAMETER)
         self.name = name
-        self.parameters = parameters
+        self.optional = optional
+
+    def __repr__(self):
+        return self.name + "=..." if self.optional else  self.name
 
 precedence = (
     ('nonassoc', "THEN"),
@@ -202,7 +217,7 @@ def p_parameter_list(p):
 def p_parameter(p):
     '''parameter : ID
                 |  ID "=" expression'''
-    p[0] = p[1]
+    p[0] = ScadParameter(p[1], len(p) == 4)
 
 def p_function(p):
     '''function : FUNCTION ID "(" opt_parameter_list ")" "=" expression
@@ -269,11 +284,11 @@ def parseFileAndPrintGlobals(scadFile):
 
     print("Modules:")
     for m in modules:
-        print(f'    {m.name}({m.parameters})')
+        print(f'    {m}')
 
     print("Functions:")
     for m in functions:
-        print(f'    {m.name}({m.parameters})')
+        print(f'    {m}')
 
     print("Global Vars:")
     for m in globalVars:

diff --git a/solid/solidpython.py b/solid/solidpython.py
@@ -618,7 +618,16 @@ def parse_scad_callables(filename: str) -> List[dict]:
 
     callables = []
     for c in modules + functions:
-        callables.append({'name': c.name, 'args': [], 'kwargs': c.parameters})
+        args = []
+        kwargs = []
+
+        for p in c.parameters:
+            if p.optional:
+                kwargs.append(p.name)
+            else:
+                args.append(p.name)
+
+        callables.append({'name': c.name, 'args': args, 'kwargs': kwargs})
 
     return callables
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ module steps(howmany=3){ @@
         }
     }
-    module blub(a) cube([a, 2, 2]);
+    module blub(a, b=1) cube([a, 2, 2]);
     function scad_points() = [[0,0], [1,0], [0,1]];
@@ Expand Down @@