python conditional and function call compilers

unknowncoder05 · unknowncoder05 · commit d57302ed477f · 2021-08-28T20:26:12.000-05:00
diff --git a/blueprints/examples/calculator/v2/services/processing/operations/sum.code.json b/blueprints/examples/calculator/v2/services/processing/operations/sum.code.json
@@ -32,6 +32,7 @@
             "code": [
                 {
                     "type": "function_call",
+                    "function":"print",
                     "args": ["result"]
                 }
             ]
diff --git a/compiler/python_compiler/engines/py3_8/Compiler.py b/compiler/python_compiler/engines/py3_8/Compiler.py
@@ -2,6 +2,6 @@
 from .get_fragment_class import get_fragment_class
 
 
-def compile(blueprint:dict)->str:
-    build = get_fragment_class(blueprint, compile)
+def compile(blueprint:dict, *, level = 0)->str:
+    build = get_fragment_class(blueprint, compile, level=level)
     return build.compile()
diff --git a/compiler/python_compiler/engines/py3_8/Fragment.py b/compiler/python_compiler/engines/py3_8/Fragment.py
@@ -1,9 +1,11 @@
 class Fragment:
     blueprint:dict
     general_compile=None#:function
-    def __init__(self, blueprint, *, compile) -> None:
+    level=0
+    def __init__(self, blueprint, *, compile, level=0) -> None:
         self.general_compile = compile
         self.blueprint = blueprint
+        self.level = level
     def compile(self)->str:
         fragment_build = self.blueprint.get("type","")
         return fragment_build
diff --git a/compiler/python_compiler/engines/py3_8/Function.py b/compiler/python_compiler/engines/py3_8/Function.py
@@ -6,7 +6,7 @@
 
 def get_function_name(fragment) -> str:
     if not (function_name := fragment.get(ATTRIBUTE_FUNCTION_NAME)):
-        CustomLogging.critical(f"Fragment type functions 'name' attribute does not exists")
+        CustomLogging.critical(f"Fragment type functions 'name' attribute does not exist")
     return function_name
 
 def get_function_args(fragment) -> dict:
@@ -50,7 +50,7 @@ def inputs_compile(self) -> str:
         if self.kwargs:
             function_kwargs = FunctionArgs(self.kwargs, compile=self.general_compile)
             if self.args:
-                inputs_build += ","
+                inputs_build += "," # TODO: disguisting but effective
             inputs_build += f" *, {function_kwargs.compile()}"
         return inputs_build
     def outputs_compile(self) -> str:
@@ -63,7 +63,7 @@ def outputs_compile(self) -> str:
     def code_lines_compile(self) -> list:
         code_build_lines = []
         for line in self.code:
-            code_build_lines.append(TAB+self.general_compile(line))
+            code_build_lines.append(TAB*(self.level+1)+self.general_compile(line, level=self.level+1))
         return code_build_lines
     def compile(self)->str:
         fragment_lines = []
diff --git a/compiler/python_compiler/engines/py3_8/Variable.py b/compiler/python_compiler/engines/py3_8/Variable.py
@@ -23,7 +23,7 @@
 
 def get_variable_name(fragment) -> str:
     if not (variable_name := fragment.get(ATTRIBUTE_VARIABLE_NAME)):
-        CustomLogging.critical(f"Fragment type variable '{ATTRIBUTE_VARIABLE_NAME}' attribute does not exists")
+        CustomLogging.critical(f"Fragment type variable '{ATTRIBUTE_VARIABLE_NAME}' attribute does not exist")
     return variable_name
 
 def get_variable_type(fragment) -> str:
@@ -40,7 +40,7 @@ def get_variable_assign_operator(fragment) -> str:
 
 def get_variable_expression(fragment) -> str:
     if not (variable_expression := fragment.get(ATTRIBUTE_VARIABLE_EXPRESSION)):
-        CustomLogging.critical(f"Fragment type variable '{ATTRIBUTE_VARIABLE_EXPRESSION}' attribute does not exists")
+        CustomLogging.critical(f"Fragment type variable '{ATTRIBUTE_VARIABLE_EXPRESSION}' attribute does not exist")
     return variable_expression
 
 
diff --git a/compiler/python_compiler/engines/py3_8/get_fragment_class.py b/compiler/python_compiler/engines/py3_8/get_fragment_class.py
@@ -18,11 +18,11 @@
     "return":Return
 }
 
-def get_fragment_class(blueprint, compile):
+def get_fragment_class(blueprint, compile, *, level=0):
     if fragment_type := blueprint.get(ATTRIBUTE_FRAGMENT_TYPE):
         if fragment_class := FRAGMENT_TYPES[fragment_type]:
-            return fragment_class(blueprint, compile=compile)
+            return fragment_class(blueprint, compile=compile, level=level)
         else:
-            CustomLogging.error(f"Fragment type {fragment_type} does not exists")
+            CustomLogging.error(f"Fragment type {fragment_type} does not exist")
     else:
         CustomLogging.error(f"Flag {ATTRIBUTE_FRAGMENT_TYPE} not defined in blueprint")
diff --git a/compiler/utils/flags.py b/compiler/utils/flags.py
@@ -28,8 +28,12 @@ def to_flag(text:str):
 
 ATTRIBUTE_FUNCTION_RETURN_ARGS = "args"
 
+ATTRIBUTE_FUNCTION_CALL_NAME = "function"
 
 ATTRIBUTE_VARIABLE_NAME = "name"
 ATTRIBUTE_VARIABLE_TYPE = "variable_type"
 ATTRIBUTE_VARIABLE_EXPRESSION = "expression"
-ATTRIBUTE_VARIABLE_ASSIGN_OPERATOR = "assign_operator"
+ATTRIBUTE_VARIABLE_ASSIGN_OPERATOR = "assign_operator"
+
+ATTRIBUTE_CONDITIONAL_CONDITION = "condition"
+ATTRIBUTE_CONDITIONAL_CODE = "code"

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"code": [`
`33`	`33`	`{`
`34`	`34`	`"type": "function_call",`
	`35`	`+ "function":"print",`
`35`	`36`	`"args": ["result"]`
`36`	`37`	`}`
`37`	`38`	`]`