__getattr__ methods of module and dataflow are updated.

Author: shtaxxx

veriloggen/core/module.py

@@ -392,7 +392,28 @@ def get_ports(self):
 
     def get_vars(self):
         return self.variable
-    
+
+    def __getitem__(self, r):
+        if isinstance(r, slice):
+            raise TypeError("Index must be str.")
+        if not isinstance(r, str):
+            raise TypeError("Index must be str.")
+
+        v = self.find_identifier(r)
+        if v is None:
+            raise NameError("No such variable '%s'" % r)
+        return v
+
+    def __getattr__(self, attr):
+        try:
+            return vtypes.VeriloggenNode.__getattr__(self, attr)
+        except AttributeError as e:
+            if 'io_variable' in dir(self):
+                v = self.find_identifier(attr)
+                if v is not None:
+                    return v
+            raise e
+
     #---------------------------------------------------------------------------
     def copy_params(self, src, prefix=None, postfix=None, exclude=None):
         if prefix is None: prefix = ''

veriloggen/dataflow/dataflow.py

@@ -4,6 +4,7 @@
 import sys
 import copy
 import collections
+import functools
 
 import veriloggen.core.vtypes as vtypes
 from veriloggen.core.module import Module
@@ -204,14 +205,22 @@ def pipeline_depth(self):
 
     #-------------------------------------------------------------------------
     def __getattr__(self, attr):
-        func = getattr(dtypes, attr)
+        try:
+            return object.__getattr__(self, attr)
 
-        def wrapper(*args, **kwargs):
-            v = func(*args, **kwargs)
-            if isinstance(v, dtypes._Numeric):
-                v._set_module(self.module)
-                v._set_df(self)
-                v._set_seq(self.seq)
-            return v
+        except AttributeError as e:
+            if attr.startswith('__') or attr not in dir(dtypes):
+                raise e
 
-        return wrapper
+            func = getattr(dtypes, attr)
+
+            @functools.wraps(func)
+            def wrapper(*args, **kwargs):
+                v = func(*args, **kwargs)
+                if isinstance(v, dtypes._Numeric):
+                    v._set_module(self.module)
+                    v._set_df(self)
+                    v._set_seq(self.seq)
+                return v
+
+            return wrapper