memorize in visitor

Author: shtaxxx

veriloggen/dataflow/scheduler.py

@@ -20,17 +20,6 @@ def schedule(self, nodes):
 class ASAPScheduler(_Scheduler):
     """ Determine the scheduled cycle and insert delay variables to fill the gap """
 
-    def __init__(self):
-        self.visited_node = {}
-
-    def visit(self, node):
-        if node in self.visited_node:
-            return self.visited_node[node]
-        
-        ret = _Scheduler.visit(self, node)
-        self.visited_node[node] = ret
-        return ret
-        
     def schedule(self, nodes):
         for node in sorted(nodes, key=lambda x:x.object_id):
             self.visit(node)

veriloggen/dataflow/visitor.py

@@ -5,10 +5,21 @@
 
 #-------------------------------------------------------------------------------
 class _Visitor(object):
+    def __init__(self):
+        self.visited_node = {}
+
     def generic_visit(self, node):
         raise TypeError("Type '%s' is not supported." % str(type(node)))
 
     def visit(self, node):
+        if node in self.visited_node:
+            return self.visited_node[node]
+        
+        ret = self._visit(node)
+        self.visited_node[node] = ret
+        return ret
+        
+    def _visit(self, node):
         if isinstance(node, dtypes._Accumulator):
             return self.visit__Accumulator(node)