ast_code_generator is updated: codegen generates prettified source codes.

Author: shtaxxx

pyverilog/ast_code_generator/codegen.py

@@ -11,6 +11,7 @@
 import os
 import math
 import re
+import functools
 from jinja2 import Environment, FileSystemLoader
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
@@ -22,6 +23,22 @@
 
 DEFAULT_TEMPLATE_DIR = os.path.dirname(os.path.abspath(__file__)) + '/template/'
 
+#-------------------------------------------------------------------------------
+try:
+    import textwrap
+    indent = textwrap.indent
+except:
+    def indent(text, prefix, predicate=None):
+        if predicate is None: predicate = lambda x: x and not x.isspace()
+        ret = []
+        for line in text.split('\n'):
+            if predicate(line):
+                ret.append(prefix)
+            ret.append(line)
+            ret.append('\n')
+        return ''.join(ret[:-1])
+    
+#-------------------------------------------------------------------------------
 class ConvertVisitor(object):
     def visit(self, node):
         method = 'visit_' + node.__class__.__name__
@@ -42,8 +59,9 @@ def escape(s):
     return s
 
 class ASTCodeGenerator(ConvertVisitor):
-    def __init__(self):
+    def __init__(self, indentsize=2):
         self.env = Environment(loader=FileSystemLoader(DEFAULT_TEMPLATE_DIR))
+        self.indent = functools.partial(indent, prefix=' '*indentsize)
 
     def visit_Source(self, node):
         filename = getfilename(node)
@@ -66,13 +84,13 @@ def visit_Description(self, node):
     def visit_ModuleDef(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
-        paramlist = self.visit(node.paramlist) if node.paramlist is not None else ''
-        portlist = self.visit(node.portlist) if node.portlist is not None else ''
+        paramlist = self.indent(self.visit(node.paramlist)) if node.paramlist is not None else ''
+        portlist = self.indent(self.visit(node.portlist)) if node.portlist is not None else ''
         template_dict = {
             'modulename' : escape(node.name),
             'paramlist' : paramlist,
             'portlist' :  portlist,
-            'items' : [ self.visit(item) for item in node.items ] if node.items else (),
+            'items' : [ self.indent(self.visit(item)) for item in node.items ] if node.items else (),
             }
         rslt = template.render(template_dict)
         return rslt
@@ -641,10 +659,12 @@ def visit_NonblockingSubstitution(self, node):
     def visit_IfStatement(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
+        true_statement = '' if node.true_statement is None else self.visit(node.true_statement)
+        false_statement = '' if node.false_statement is None else self.visit(node.false_statement)
         template_dict = {
             'cond' : self.visit(node.cond),
-            'true_statement' : '' if node.true_statement is None else self.visit(node.true_statement),
-            'false_statement' : '' if node.false_statement is None else self.visit(node.false_statement),
+            'true_statement' : true_statement,
+            'false_statement' : false_statement,
             }
         rslt = template.render(template_dict)
         return rslt
@@ -711,7 +731,7 @@ def visit_Block(self, node):
         template = self.env.get_template(filename)
         template_dict = {
             'scope' : '' if node.scope is None else escape(node.scope),
-            'statements' : [ self.visit(statement) for statement in node.statements ],
+            'statements' : [ self.indent(self.visit(statement)) for statement in node.statements ],
             }
         rslt = template.render(template_dict)
         return rslt
@@ -765,7 +785,7 @@ def visit_DelayStatement(self, node):
     def visit_InstanceList(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
-        parameterlist = [ self.visit(param) for param in node.parameterlist ]
+        parameterlist = [ self.indent(self.visit(param)) for param in node.parameterlist ]
         instances = [ self.visit(instance) for instance in node.instances ]
         template_dict = {
             'module' : escape(node.module),
@@ -781,7 +801,7 @@ def visit_Instance(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         array = '' if node.array is None else self.visit(node.array)
-        portlist = [ self.visit(port) for port in node.portlist ]
+        portlist = [ self.indent(self.visit(port)) for port in node.portlist ]
         template_dict = {
             'name' : escape(node.name),
             'array' : array,
@@ -814,7 +834,7 @@ def visit_PortArg(self, node):
     def visit_Function(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
-        statement = [ self.visit(s) for s in node.statement ]
+        statement = [ self.indent(self.visit(s)) for s in node.statement ]
         template_dict = {
             'name' : escape(node.name),
             'retwidth' : self.visit(node.retwidth),
@@ -838,9 +858,10 @@ def visit_FunctionCall(self, node):
     def visit_Task(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
+        statement = [ self.indent(self.visit(s)) for s in node.statement ]
         template_dict = {
             'name' : escape(node.name),
-            'statement' : self.visit(node.statement),
+            'statement' : statement,
             }
         rslt = template.render(template_dict)
         return rslt
@@ -931,7 +952,7 @@ def visit_ParallelBlock(self, node):
         template = self.env.get_template(filename)
         template_dict = {
             'scope' : '' if node.scope is None else escape(node.scope),
-            'statements' : [ self.visit(statement) for statement in node.statements ],
+            'statements' : [ self.indent(self.visit(statement)) for statement in node.statements ],
             }
         rslt = template.render(template_dict)
         return rslt

pyverilog/ast_code_generator/template/always.txt

@@ -1,2 +1,2 @@
-always @({{ sens_list }})
-{{ statement }}
+
+always @({{ sens_list }}) {{ statement }}

pyverilog/ast_code_generator/template/block.txt

@@ -2,4 +2,4 @@ begin{% if scope != '' %} : {{ scope }}{% endif %}
 {%- for statement in statements %}
 {{ statement }}
 {%- endfor %}
-end 
+end

pyverilog/ast_code_generator/template/casestatement.txt

@@ -2,4 +2,4 @@ case({{ comp }})
 {%- for case in caselist %}
 {{ case }}
 {%- endfor %}
-endcase 
+endcase

pyverilog/ast_code_generator/template/forstatement.txt

@@ -1,2 +1 @@
-for({{ pre }} {{ cond }}; {{ post }})
-{{ statement }}
+for({{ pre }} {{ cond }}; {{ post }}) {{ statement }}

pyverilog/ast_code_generator/template/function.txt

@@ -1,3 +1,4 @@
+
 function {{ retwidth }} {{ name }};
 {%- for s in statement %}
 {{ s }}

pyverilog/ast_code_generator/template/generatestatement.txt

@@ -1,5 +1,3 @@
-generate
-{%- for item in items %}
-{{ item }}
-{%- endfor %}
-endgenerate 
+
+generate {% for item in items %}{{ item }}{% endfor %}
+endgenerate

pyverilog/ast_code_generator/template/ifstatement.txt

@@ -1,2 +1,5 @@
-if({{ cond }}) {{ true_statement }} 
-{% if false_statement != '' %}else {{ false_statement }}{% endif %}
+if({{ cond }}) {{ true_statement }}
+{%- if true_statement[-1] != ' ' and true_statement[-1] != '\n' %} {% endif -%}
+{%- if true_statement.count('\n') == 0 and false_statement != '' %}
+{% endif -%}
+{%- if false_statement != '' %}else {{ false_statement }}{% endif -%}

pyverilog/ast_code_generator/template/instancelist.txt

@@ -1,3 +1,4 @@
+
 {{ module }}
 {%- if len_parameterlist > 0 %}
 #({% for param in parameterlist %}

pyverilog/ast_code_generator/template/moduledef.txt

@@ -7,8 +7,7 @@ module {{ modulename }}{% if paramlist != '' %} #
 (
 {{ portlist }}
 );
-{%- for item in items %}
-{{ item }}
-{%- endfor %}
-endmodule
 
+{% for item in items %}{{ item }}
+{% endfor %}
+endmodule