Explorar o código

Fixed symbols

Yentl Van Tendeloo %!s(int64=8) %!d(string=hai) anos
pai
achega
0550b77969

+ 6 - 2
interface/HUTN/hutn_compiler/primitives_visitor.py

@@ -463,9 +463,13 @@ class PrimitivesVisitor(Visitor):
         self.set_primitive(tree, (declare, assign))
         self.set_primitive(tree, (declare, assign))
 
 
     def visit_parameter(self, tree):
     def visit_parameter(self, tree):
-        n = self.node()
-
         symbol = self.get_symbol(tree)
         symbol = self.get_symbol(tree)
+
+        if self.debug_symbols:
+            n = self.value("%s [%s]" % (symbol.name, tree.get_reference_line()))
+        else:
+            n = self.node()
+
         symbol.node = n
         symbol.node = n
 
 
         self.set_primitive(tree, n)
         self.set_primitive(tree, n)

+ 4 - 2
kernel/modelverse_kernel/main.py

@@ -135,8 +135,10 @@ class ModelverseKernel(object):
             symbols, =       yield [("RD", [task_frame, "symbols"])]
             symbols, =       yield [("RD", [task_frame, "symbols"])]
             symbol_names_symbols, = yield [("RDK", [symbols])]
             symbol_names_symbols, = yield [("RDK", [symbols])]
             symbol_names =   yield [("RV", [i]) for i in symbol_names_symbols]
             symbol_names =   yield [("RV", [i]) for i in symbol_names_symbols]
-            symbol_values_symbols =  yield [("RD", [symbols, i]) for i in symbol_names]
-            symbol_values =  yield [("RV", [i]) for i in symbol_values_symbols]
+            symbol_value_symbols =  yield [("RD", [symbols, i]) for i in symbol_names]
+            symbol_value_symbols =  yield [("RD", [i, "value"]) for i in symbol_value_symbols]
+            symbol_values =  yield [("RV", [i]) for i in symbol_value_symbols]
+            print(locals())
             self.returnvalue = dict(zip(symbol_names, symbol_values))
             self.returnvalue = dict(zip(symbol_names, symbol_values))
 
 
     def execute_rule(self, taskname):
     def execute_rule(self, taskname):