load functions name update

momirza · Jun 24, 2012 · 2d17de9 · 2d17de9
1 parent 2772657
commit 2d17de9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/bin/extract.py b/bin/extract.py
@@ -96,8 +96,8 @@ def readT(self, newtype):
 
     def __slice(self, inputdata):
         totallen = len(inputdata)
-        from pydsl.Memory.Storage.Loader import load_type
-        currenttype = load_type(CURRENTGRAMMAR)
+        from pydsl.Memory.Storage.Loader import load_grammartools
+        currenttype = load_grammartools(CURRENTGRAMMAR)
         try:
             maxl = currenttype.maxsize
         except NotImplementedError:

diff --git a/pydsl/Function/Channel.py b/pydsl/Function/Channel.py
@@ -27,12 +27,12 @@
 import logging
 LOG = logging.getLogger(__name__)
 
-def _loadTypeInstances(originaldic):
+def _loadCheckers(originaldic):
     """Converts {"channelname","type"} into {"channelname",instance}"""
-    from pydsl.Memory.Storage.Loader import load_type
+    from pydsl.Memory.Storage.Loader import load_checker
     result = {}
     for key in originaldic:
-        result[key] = load_type(str(originaldic[key]))
+        result[key] = load_checker(str(originaldic[key]))
     return result
 
 class HostChannel(FunctionInterface):
@@ -49,8 +49,8 @@ def __init__(self, inputtypedict:dict, outputtypedict:dict):
                 raise TypeError
         self.inputdefinition = inputtypedict
         self.outputdefinition = outputtypedict
-        self.__inputchanneldic = _loadTypeInstances(inputtypedict)
-        self.__outputchanneldic = _loadTypeInstances(outputtypedict)
+        self.__inputchanneldic = _loadCheckers(inputtypedict)
+        self.__outputchanneldic = _loadCheckers(outputtypedict)
         self._connections = {}
 
     def connect(self, intchannel, extGT, extChannel):