Merge pull request #28 from metanest/case_insensitive_in_literal_spike

Thank you for your contribution! "change literals case insencitiveness"

Author: shtaxxx

pyverilog/dataflow/dataflow.py

@@ -120,34 +120,34 @@ def tostr(self):
     def eval(self):
         targ = self.value.replace('_','')
         signed = False
-        match = re.search(r's(.+)', targ)
+        match = re.search(r'[Ss](.+)', targ)
         if match is not None:
             signed = True
-        match = re.search(r'h(.+)', targ)
+        match = re.search(r'[Hh](.+)', targ)
         if match is not None:
             return int(match.group(1), 16)
-        match = re.search(r'd(.+)', targ)
+        match = re.search(r'[Dd](.+)', targ)
         if match is not None:
             return int(match.group(1), 10)
-        match = re.search(r'o(.+)', targ)
+        match = re.search(r'[Oo](.+)', targ)
         if match is not None:
             return int(match.group(1), 8)
-        match = re.search(r'b(.+)', targ)
+        match = re.search(r'[Bb](.+)', targ)
         if match is not None:
             return int(match.group(1), 2)
         return int(targ, 10)
     def width(self):
         targ = self.value.replace('_','')
-        match = re.search(r'(.+)\'h.+', targ)
+        match = re.search(r'(.+)\'[Hh].+', targ)
         if match is not None:
             return int(match.group(1), 10)
-        match = re.search(r'(.+)\'d.+', targ)
+        match = re.search(r'(.+)\'[Dd].+', targ)
         if match is not None:
             return int(match.group(1), 10)
-        match = re.search(r'(.+)\'o.+', targ)
+        match = re.search(r'(.+)\'[Oo].+', targ)
         if match is not None:
             return int(match.group(1), 10)
-        match = re.search(r'(.+)\'b.+', targ)
+        match = re.search(r'(.+)\'[Bb].+', targ)
         if match is not None:
             return int(match.group(1), 10)
         return 32

pyverilog/dataflow/optimizer.py

@@ -87,6 +87,8 @@ def optimizeConstant(self, tree):
         if isinstance(tree, DFIntConst):
             if 'x' in tree.value or 'z' in tree.value:
                 return DFUndefined(tree.width())
+            if 'X' in tree.value or 'Z' in tree.value:
+                return DFUndefined(tree.width())
             return DFEvalValue(tree.eval(), tree.width())
         if isinstance(tree, DFFloatConst):
             return DFEvalValue(tree.eval(), self.default_width, isfloat=True)
@@ -95,6 +97,8 @@ def optimizeConstant(self, tree):
         if isinstance(tree, DFConstant):
             if 'x' in tree.value or 'z' in tree.value:
                 return DFUndefined()
+            if 'X' in tree.value or 'Z' in tree.value:
+                return DFUndefined()
             return DFEvalValue(tree.eval(), self.default_width)
 
         if isinstance(tree, DFOperator):