Some variable and attribute name bugs are fixed.

Author: shtaxxx

dataflow/bindvisitor.py

@@ -23,11 +23,13 @@
     from pyverilog.dataflow.visit import *
     from pyverilog.dataflow.optimizer import VerilogOptimizer
     import pyverilog.dataflow.reorder as reorder
+    import pyverilog.dataflow.replace as replace
 else:
     from dataflow import *
     from visit import *
     from optimizer import VerilogOptimizer
     import reorder
+    import replace
 
 class BindVisitor(NodeVisitor):
     def __init__(self, moduleinfotable, top, frames, noreorder=False):
@@ -1062,7 +1064,7 @@ def removeOverwrappedCondition(self, tree, current_bindlist, scope):
          rest_condlist, 
          rest_flowlist, 
          match_flowlist) = self.diffBranchTree(merged_tree, condlist, flowlist)
-         return tree_replace.replaceUndefined(merged_tree, tree.name)
+         return replace.replaceUndefined(merged_tree, tree.name)
 
     def resolveBlockingAssign(self, tree, scope):
         if tree is None: return None

dataflow/merge.py

@@ -413,8 +413,8 @@ def splitBind(self, bind, splitpos):
             left_lsb = splitpos
             left_msb = msb.value
             left_width = msb.value - splitpos + 1
-            right_tree = tree_reorder.reorder(DFPartselect(copy.deepcopy(tree), DFEvalValue(right_width-1), DFEvalValue(0)))
-            left_tree = tree_reorder.reorder(DFPartselect(copy.deepcopy(tree), DFEvalValue(msb.value), DFEvalValue(msb.value-left_width+1)))
+            right_tree = reorder.reorder(DFPartselect(copy.deepcopy(tree), DFEvalValue(right_width-1), DFEvalValue(0)))
+            left_tree = reorder.reorder(DFPartselect(copy.deepcopy(tree), DFEvalValue(msb.value), DFEvalValue(msb.value-left_width+1)))
             right_tree = self.optimizer.optimize(right_tree)
             left_tree = self.optimizer.optimize(left_tree)
             left_bind = copy.deepcopy(bind)

dataflow/signalvisitor.py

@@ -21,10 +21,12 @@
     from pyverilog.dataflow.dataflow import *
     from pyverilog.dataflow.visit import *
     from pyverilog.dataflow.optimizer import VerilogOptimizer
+    import pyverilog.dataflow.reorder as reorder
 else:
     from dataflow import *
     from visit import *
     from optimizer import VerilogOptimizer
+    import reorder
 
 class SignalVisitor(NodeVisitor):
     def __init__(self, moduleinfotable, top):
@@ -472,20 +474,20 @@ def makeDFTree(self, node, scope):
             false_df = self.makeDFTree(node.false_value, scope)
             cond_df = self.makeDFTree(node.cond, scope)
             if isinstance(cond_df, DFBranch):
-                return tree_reorder.insertCond(cond_df, true_df, false_df)
+                return reorder.insertCond(cond_df, true_df, false_df)
             return DFBranch(cond_df, true_df, false_df)
 
         if isinstance(node, UnaryOperator):
             right_df = self.makeDFTree(node.right, scope)
             if isinstance(right_df, DFBranch):
-                return tree_reorder.insertUnaryOp(right_df, node.__class__.__name__)
+                return reorder.insertUnaryOp(right_df, node.__class__.__name__)
             return DFOperator((right_df,), node.__class__.__name__)
 
         if isinstance(node, Operator):
             left_df = self.makeDFTree(node.left, scope)
             right_df = self.makeDFTree(node.right, scope)
             if isinstance(left_df, DFBranch) or isinstance(right_df, DFBranch):
-                return tree_reorder.insertOp(left_df, right_df, node.__class__.__name__)
+                return reorder.insertOp(left_df, right_df, node.__class__.__name__)
             return DFOperator((left_df, right_df,), node.__class__.__name__)
 
         if isinstance(node, Partselect):
@@ -494,7 +496,7 @@ def makeDFTree(self, node, scope):
             lsb_df = self.makeDFTree(node.lsb, scope)
 
             if isinstance(var_df, DFBranch):
-                return tree_reorder.insertPartselect(var_df, msb_df, lsb_df)
+                return reorder.insertPartselect(var_df, msb_df, lsb_df)
             return DFPartselect(var_df, msb_df, lsb_df)
 
         if isinstance(node, Pointer):
@@ -513,7 +515,7 @@ def makeDFTree(self, node, scope):
                 nextnodes.append(self.makeDFTree(n, scope))
             for n in nextnodes:
                 if isinstance(n, DFBranch):
-                    return tree_reorder.insertConcat(tuple(nextnodes))
+                    return reorder.insertConcat(tuple(nextnodes))
             return DFConcat(tuple(nextnodes))
 
         if isinstance(node, Repeat):