Changeset 5c2a0f2 in sasmodels

Timestamp:

Dec 18, 2017 11:59:35 AM (7 years ago)

Author:

Omer Eisenberg <omereis@…>

Children:

4c72117

Parents:

d9341fa

Message:

writing constants in C source

File:

• sasmodels/py2c.py (modified) (8 diffs)

sasmodels/py2c.py

@@ -100 +100 @@
 
 #def to_source(node, indent_with=' ' * 4, add_line_information=False):
-def to_source(node, func_name):
+def to_source(node, func_name, constants=None):
     """This function can convert a node tree back into python sourcecode.
     This is useful for debugging purposes, especially if you're dealing with
@@ -118 +118 @@
     number information of statement nodes.
     """
-    generator = SourceGenerator(' ' * 4, False)
+    generator = SourceGenerator(' ' * 4, False, constants)
 #    generator.required_functions = func_name
     generator.visit(node)
@@ -138 +138 @@
     """
 
-    def __init__(self, indent_with, add_line_information=False):
+    def __init__(self, indent_with, add_line_information=False, constants=None):
         self.result = []
         self.indent_with = indent_with
@@ -160 +160 @@
         self.C_Functions = []
         self.C_Vectors = []
+        self.C_Constants = constants
         self.SubRef = False
         self.InSubscript = False
@@ -800 +801 @@
             name = node.id
 #       add variable to C_Vars if it ins't there yet, not an argument and not a number
-        if((name not in self.C_Functions) and (name not in self.C_Vars) and \
+        if ((name not in self.C_Functions) and (name not in self.C_Vars) and \
             (name not in self.C_IntVars) and (name not in self.arguments) and \
-            (name.isnumeric() == False)):
+            (name not in self.C_Constants) and (name.isnumeric() == False)):
             if(self.InSubscript):
                 self.C_IntVars.append(node.id)
@@ -945 +946 @@
 
     def visit_Subscript(self, node):
-        if(node.value.id not in self.C_Pointers):
-            self.C_Pointers.append(node.value.id)
+        if (node.value.id not in self.C_Constants):
+            if(node.value.id not in self.C_Pointers):
+                self.C_Pointers.append(node.value.id)
         self.SubRef = True
         self.visit(node.value)
@@ -1105 +1107 @@
     vars = c_constants.keys()
     for c_var in vars:
-        declare_values = str(c_constants[c_var])
-        if (hasattr(declare_values,'__len__')):
-            declare_values = declare_values.replace ('  ',' ')
-            declare_values = declare_values.replace ('[ ','[')
-            declare_values = declare_values.replace (' ]',']')
-            declare_values = declare_values.replace (' ',',')
+        c_values = c_constants[c_var]
+        declare_values = str(c_values)
         str_dcl = "double " + c_var
+        if (hasattr(c_values,'__len__')):
+            str_dcl += "[]"
+            len_prev = len(declare_values)
+            len_after = len_prev - 1
+            declare_values = declare_values.replace ('[','')
+            declare_values = declare_values.replace (']','').strip()
+            while (len_after < len_prev):
+                len_prev = len_after
+                declare_values = declare_values.replace ('  ',' ')
+                len_after = len(declare_values)
+            declare_values = "{" + declare_values.replace (' ',',') + "}"
         str_dcl += " = " + declare_values + ";"
         sniplets.append (str_dcl)
@@ -1126 +1135 @@
 #        sniplets.append(line_directive)
         tree = ast.parse(source)
-        sniplet = to_source(tree, functions) # in the future add filename, offset, constants
+        sniplet = to_source(tree, functions, constants) # in the future add filename, offset, constants
         sniplets.append(sniplet)
     c_code = "\n".join(sniplets)