Changes in / [5ab99b7:d5014e4] in sasmodels

File:

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

sasmodels/py2c.py

@@ -112 +112 @@
 # Update Notes
 # ============
-# 11/22/2017, O.E.   Each 'visit_*' method is to build a C statement string. It
-#                     shold insert 4 blanks per indentation level.
-#                     The 'body' method will combine all the strings, by adding
-#                     the 'current_statement' to the c_proc string list
-#    11/2017, OE: variables, argument definition implemented.
-#    Note: An argument is considered an array if it is the target of an
-#         assignment. In that case it is translated to <var>[0]
-# 11/27/2017, OE: 'pow' basicly working
-#   /12/2017, OE: Multiple assignment: a1,a2,...,an=b1,b2,...bn implemented
-#   /12/2017, OE: Power function, including special cases of
+# 2017-11-22, OE: Each 'visit_*' method is to build a C statement string. It
+#                 shold insert 4 blanks per indentation level. The 'body'
+#                 method will combine all the strings, by adding the
+#                 'current_statement' to the c_proc string list
+# 2017-11-22, OE: variables, argument definition implemented.  Note: An
+#                 argument is considered an array if it is the target of an
+#                 assignment. In that case it is translated to <var>[0]
+# 2017-11-27, OE: 'pow' basicly working
+# 2017-12-07, OE: Multiple assignment: a1,a2,...,an=b1,b2,...bn implemented
+# 2017-12-07, OE: Power function, including special cases of
 #                 square(x)(pow(x,2)) and cube(x)(pow(x,3)), implemented in
 #                 translate_power, called from visit_BinOp
-# 12/07/2017, OE: Translation of integer division, '\\' in python, implemented
+# 2017-12-07, OE: Translation of integer division, '\\' in python, implemented
 #                 in translate_integer_divide, called from visit_BinOp
-# 12/07/2017, OE: C variable definition handled in 'define_c_vars'
+# 2017-12-07, OE: C variable definition handled in 'define_c_vars'
 #               : Python integer division, '//', translated to C in
 #                 'translate_integer_divide'
-# 12/15/2017, OE: Precedence maintained by writing opening and closing
+# 2017-12-15, OE: Precedence maintained by writing opening and closing
 #                 parenthesesm '(',')', in procedure 'visit_BinOp'.
-# 12/18/2017, OE: Added call to 'add_current_line()' at the beginning
+# 2017-12-18, OE: Added call to 'add_current_line()' at the beginning
 #                 of visit_Return
 # 2018-01-03, PK: Update interface for use in sasmodels
@@ -140 +140 @@
 # 2018-01-03, PK: simplistic print function, for debugging
 # 2018-01-03, PK: while expr: ... => while (expr) { ... }
+# 2018-01-04, OE: Fixed bug in 'visit_If': visiting node.orelse in case else exists.
 
 from __future__ import print_function
@@ -184 +185 @@
 
 
-def to_source(tree, constants=None, fname=None, lineno=0):
-    """
-    This function can convert a syntax tree into C sourcecode.
-    """
-    generator = SourceGenerator(constants=constants, fname=fname, lineno=lineno)
-    generator.visit(tree)
-    c_code = "".join(generator.c_proc)
-    return c_code
-
+# TODO: should not allow eval of arbitrary python
 def isevaluable(s):
     try:
@@ -329 +322 @@
                 except AttributeError:
                     arg_name = arg.id
-                w_str = ("Default Parameters are unknown to C: '%s = %s"
+                w_str = ("C does not support default parameters: %s=%s"
                          % (arg_name, str(default.n)))
                 self.warnings.append(w_str)
@@ -508 +501 @@
         self.current_function = node.name
 
+        # remember the location of the next warning that will be inserted
+        # so that we can stuff the function name ahead of the warning list
+        # if any warnings are generated by the function.
+        warning_index = len(self.warnings)
+
         self.newline(extra=1)
         self.decorators(node)
@@ -523 +521 @@
         del self.c_pointers[:]
         self.current_function = ""
+        if warning_index != len(self.warnings):
+            self.warnings.insert(warning_index, "Warning in function '" + node.name + "':")
 
     def visit_ClassDef(self, node):
@@ -586 +586 @@
                 self.newline()
                 self.write_c('else {')
-                self.body(node.body)
+                self.body(else_)
                 self.add_c_line('}')
                 break
@@ -615 +615 @@
         return start, stop, step
 
+    def add_c_int_var(self, name):
+        if name not in self.c_int_vars:
+            self.c_int_vars.append(name)
+
     def visit_For(self, node):
         # node: for iterator is stored in node.target.
@@ -627 +631 @@
                     iterator = self.current_statement
                     self.current_statement = ''
-                    if iterator not in self.c_int_vars:
-                        self.c_int_vars.append(iterator)
+                    self.add_c_int_var(iterator)
                     start, stop, step = self.get_for_range(node)
                     self.write_c("for (" + iterator + "=" + str(start) +
@@ -736 +739 @@
             self.write_c('return')
         else:
-            self.write_c('return(')
+            self.write_c('return ')
             self.visit(node.value)
-        self.write_c(')')
         self.add_semi_colon()
         self.in_expr = False
@@ -855 +857 @@
                 name not in self.c_constants and not name.isdigit()):
             if self.in_subscript:
-                self.c_int_vars.append(node.id)
+                self.add_c_int_var(node.id)
             else:
                 self.c_vars.append(node.id)
@@ -1252 +1254 @@
     Convert a list of functions to a list of C code strings.
 
+    Returns list of corresponding code snippets (with trailing lines in
+    each block) and a list of warnings generated by the translator.
+
     A function is given by the tuple (source, filename, line number).
 
@@ -1266 +1271 @@
     """
     snippets = []
-    #snippets.append("#include <math.h>")
-    #snippets.append("")
+    warnings = []
     for source, fname, lineno in functions:
         line_directive = '#line %d "%s"\n'%(lineno, fname.replace('\\', '\\\\'))
@@ -1275 +1279 @@
         source = PRINT_STR.sub(SUBST_STR, source)
         tree = ast.parse(source)
-        c_code = to_source(tree, constants=constants, fname=fname, lineno=lineno)
+        generator = SourceGenerator(constants=constants, fname=fname, lineno=lineno)
+        generator.visit(tree)
+        c_code = "".join(generator.c_proc)
         snippets.append(c_code)
-    return snippets
-
-def main():
-    import os
-    #print("Parsing...using Python" + sys.version)
-    if len(sys.argv) == 1:
-        print("""\
-Usage: python py2c.py <infile> [<outfile>]
-
-if outfile is omitted, output file is '<infile>.c'
-""")
-        return
-
-    fname_in = sys.argv[1]
-    if len(sys.argv) == 2:
-        fname_base = os.path.splitext(fname_in)[0]
-        fname_out = str(fname_base) + '.c'
-    else:
-        fname_out = sys.argv[2]
-
-    with open(fname_in, "r") as python_file:
-        code = python_file.read()
-    name = "gauss"
-    code = (code
-            .replace(name+'.n', 'GAUSS_N')
-            .replace(name+'.z', 'GAUSS_Z')
-            .replace(name+'.w', 'GAUSS_W')
-            .replace('if __name__ == "__main__"', "def main()")
-    )
-
-
-    c_code = "".join(translate([(code, fname_in, 1)]))
-    c_code = c_code.replace("double main()", "int main(int argc, char *argv[])")
-
-    with open(fname_out, "w") as file_out:
-        file_out.write("""
+        warnings.extend(generator.warnings)
+    return snippets, warnings
+
+def to_source(tree, constants=None, fname=None, lineno=0):
+    """
+    This function can convert a syntax tree into C sourcecode.
+    """
+    c_code = "".join(generator.c_proc)
+    return c_code
+
+
+C_HEADER = """
 #include <stdio.h>
 #include <stdbool.h>
@@ -1330 +1312 @@
     return ans;
 }
-
-""")
+"""
+
+USAGE = """\
+Usage: python py2c.py <infile> [<outfile>]
+
+if outfile is omitted, output file is '<infile>.c'
+"""
+
+def main():
+    import os
+    #print("Parsing...using Python" + sys.version)
+    if len(sys.argv) == 1:
+        print(USAGE)
+        return
+
+    fname_in = sys.argv[1]
+    if len(sys.argv) == 2:
+        fname_base = os.path.splitext(fname_in)[0]
+        fname_out = str(fname_base) + '.c'
+    else:
+        fname_out = sys.argv[2]
+
+    with open(fname_in, "r") as python_file:
+        code = python_file.read()
+    name = "gauss"
+    code = (code
+            .replace(name+'.n', 'GAUSS_N')
+            .replace(name+'.z', 'GAUSS_Z')
+            .replace(name+'.w', 'GAUSS_W')
+            .replace('if __name__ == "__main__"', "def main()")
+           )
+
+    translation, warnings = translate([(code, fname_in, 1)])
+    c_code = "".join(translation)
+    c_code = c_code.replace("double main()", "int main(int argc, char *argv[])")
+
+    with open(fname_out, "w") as file_out:
+        file_out.write(C_HEADER)
         file_out.write(c_code)
+
+    if warnings:
+        print("\n".join(warnings))
     #print("...Done")