Some dict instances are replaced with collections.OrderedDict.

Author: shtaxxx

dataflow/subset.py

@@ -9,6 +9,7 @@
 
 import sys
 import os
+import collections
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
 
@@ -47,7 +48,7 @@ def getBindSubset(self, termname, visited_sources=set()):
         if term is None: raise verror.DefinitionError('No such signal')
         bindlist = self.getBindlist(termname)
         nextsources = visited_sources.copy()
-        ret_binds = {}
+        ret_binds = collections.OrderedDict()
         for bind in bindlist:
             if not termname in ret_binds:
                 ret_binds[termname] = []
@@ -70,7 +71,7 @@ def getBindSubset(self, termname, visited_sources=set()):
 
     ############################################################################
     def getBindSourceSubset(self, targets):
-        visited_binddict = {}
+        visited_binddict = collections.OrderedDict()
         visited_sources = set()
         for target in targets:
             termname = util.toTermname(target)
@@ -90,11 +91,11 @@ def getSubset(self, targets):
         return self._discretion(visited_binddict, visited_sources)
 
     def _discretion(self, visited_binddict, visited_sources):
-        terms = {}
-        parameter = {}
-        assign = {}
-        always_clockedge = {}
-        always_combination = {}
+        terms = collections.OrderedDict()
+        parameter = collections.OrderedDict()
+        assign = collections.OrderedDict()
+        always_clockedge = collections.OrderedDict()
+        always_combination = collections.OrderedDict()
 
         # discretion the signal desclaration
         for source in visited_sources:

dataflow/visit.py

@@ -179,7 +179,7 @@ def getParamNames(self):
 
 class DefinitionInfoTable(object):
     def __init__(self):
-        self.dict = {}
+        self.dict = collections.OrderedDict()
         self.current = None
     def addDefinition(self, name, definition):
         if name in self.dict:
@@ -264,8 +264,8 @@ def __init__(self, name, previous, frametype='none',
         self.variables = Variables()
         self.functions = FunctionInfoTable()
         self.tasks = TaskInfoTable()
-        self.blockingassign = {}
-        self.nonblockingassign = {}
+        self.blockingassign = collections.OrderedDict()
+        self.nonblockingassign = collections.OrderedDict()
 
         self.modulename = modulename
 
@@ -541,28 +541,28 @@ def getAllInstances(self):
         return tuple(ret)
 
     def getAllSignals(self):
-        ret = {}
+        ret = collections.OrderedDict()
         for dk, dv in self.dict.items():
             ret.update(
                 map_key((lambda x: dk+ScopeLabel(x,'signal')), dv.getSignals()))
         return ret
 
     def getAllConsts(self):
-        ret = {}
+        ret = collections.OrderedDict()
         for dk, dv in self.dict.items():
             ret.update(
                 map_key((lambda x: dk+ScopeLabel(x,'signal')), dv.getConsts()))
         return ret
 
     def getAllFunctions(self):
-        ret = {}
+        ret = collections.OrderedDict()
         for dk, dv in self.dict.items():
             ret.update(
                 map_key((lambda x: dk+ScopeLabel(x,'function')), dv.getFunctions()))
         return ret
 
     def getAllTasks(self):
-        ret = {}
+        ret = collections.OrderedDict()
         for dk, dv in self.dict.items():
             ret.update(
                 map_key((lambda x: dk+ScopeLabel(x,'task')), dv.getTasks()))
@@ -640,9 +640,9 @@ def getNonblockingAssigns(self):
 
     def getPreviousNonblockingAssign(self):
         previous = self.dict[self.current].previous
-        if len(previous) == 0: return {}
+        if len(previous) == 0: return collections.OrderedDict()
         previous_frame = self.dict[previous]
-        if not previous_frame.isAlways(): return {}
+        if not previous_frame.isAlways(): return collections.OrderedDict()
         return previous_frame.getNonblockingAssigns()
 
     def searchConstantDefinition(self, key, name):