Merge pull request #9 from fukatani/work

Singed/Unsigned constant issue is fixed! Thanks!

Author: shtaxxx

pyverilog/testcode/decimal.v

@@ -0,0 +1,19 @@
+//`default_nettype none
+
+module TOP(CLK, RST);
+  input CLK, RST;
+  reg [7:0] cnt1;
+
+
+  always @(posedge CLK or negedge RST) begin
+    if(RST) begin
+      cnt1 <= 'd0;
+    end else begin
+      cnt1 <= cnt1 + 8'd1;
+    end
+  end
+
+
+
+endmodule
+

pyverilog/testcode/decimal2.v

@@ -0,0 +1,18 @@
+//`default_nettype none
+
+module TOP(CLK, RST);
+  input CLK, RST;
+  reg [7:0] cnt2;
+
+
+  always @(posedge CLK or negedge RST) begin
+    if(RST) begin
+      cnt2 <= 'd0;
+    end else begin
+      cnt2 <= cnt2 + 'd1;
+    end
+  end
+
+
+endmodule
+

pyverilog/testcode/test_sd.py

@@ -45,6 +45,17 @@ def test_ptr_clock_reset(self):
         self.assertEqual(binddict.values()[0][0].getClockBit(), 2)
         self.assertEqual(binddict.values()[0][0].getResetBit(), 0)
 
+    def test_decimal(self):
+        terms, binddict = self.dataflow_wrapper("decimal.v")
+        self.assertEqual(binddict.values()[0][0].tostr(),
+        "(Bind dest:TOP.cnt1 tree:(Branch Cond:(Terminal TOP.RST) True:(IntConst 'd0) False:(Operator Plus Next:(Terminal TOP.cnt1),(IntConst 8'd1))))")
+
+    def test_ptr_clock_reset(self):
+        terms, binddict = self.dataflow_wrapper("decimal2.v")
+        self.assertEqual(binddict.values()[0][0].tostr(),
+        "(Bind dest:TOP.cnt2 tree:(Branch Cond:(Terminal TOP.RST) True:(IntConst 'd0) False:(Operator Plus Next:(Terminal TOP.cnt2),(IntConst 'd1))))")
+
+
     def dataflow_wrapper(self,code_file):
 
         from optparse import OptionParser

pyverilog/vparser/lexer.py

@@ -181,7 +181,7 @@ def t_COMMENTOUT(self, t):
     signed_hex_number = '[0-9]*\'sh[0-9a-fA-Fxz][0-9a-fA-Fxz_]*'
 
     decimal_number = '[0-9]*\'d[0-9xz][0-9xz_]*' + '|' + '([0-9]*\'d)?[0-9][0-9_]*'
-    signed_decimal_number = '[0-9]*\'s(d?)[0-9xz][0-9xz_]*' + '|' + '([0-9]*\'s(d?))?[0-9][0-9_]*'
+    signed_decimal_number = '[0-9]*\'s(d?)[0-9xz][0-9xz_]*'
 
     exponent_part = r"""([eE][-+]?[0-9]+)"""
     fractional_constant = r"""([0-9]*\.[0-9]+)|([0-9]+\.)"""