Aargument order is changed for the backward compatibility.

Author: shtaxxx

pyverilog/vparser/ast.py

@@ -272,22 +272,22 @@ class StringConst(Constant):
 class Variable(Value):
     attr_names = ('name', 'signed')
 
-    def __init__(self, name, value=None, width=None, signed=False, dimensions=None, lineno=0):
+    def __init__(self, name, width=None, signed=False, dimensions=None, value=None, lineno=0):
         self.lineno = lineno
         self.name = name
-        self.value = value
         self.width = width
         self.signed = signed
         self.dimensions = dimensions
+        self.value = value
 
     def children(self):
         nodelist = []
-        if self.value:
-            nodelist.append(self.value)
         if self.width:
             nodelist.append(self.width)
         if self.dimensions:
             nodelist.append(self.dimensions)
+        if self.value:
+            nodelist.append(self.value)
         return tuple(nodelist)
 
 

pyverilog/vparser/parser.py

@@ -682,21 +682,25 @@ def p_declassign_element_delay(self, p):
     # Integer
     def p_integerdecl(self, p):
         'integerdecl : INTEGER integernamelist SEMICOLON'
-        intlist = [Integer(rname, rvalue,
+        intlist = [Integer(rname,
                            Width(msb=IntConst('31', lineno=p.lineno(2)),
                                  lsb=IntConst('0', lineno=p.lineno(2)),
                                  lineno=p.lineno(2)),
-                           signed=True, lineno=p.lineno(2)) for rname, rvalue in p[2]]
+                           signed=True,
+                           value=rvalue,
+                           lineno=p.lineno(2)) for rname, rvalue in p[2]]
         p[0] = Decl(tuple(intlist), lineno=p.lineno(1))
         p.set_lineno(0, p.lineno(1))
 
     def p_integerdecl_signed(self, p):
         'integerdecl : INTEGER SIGNED integernamelist SEMICOLON'
-        intlist = [Integer(rname, rvalue, 
+        intlist = [Integer(rname,
                            Width(msb=IntConst('31', lineno=p.lineno(3)),
                                  lsb=IntConst('0', lineno=p.lineno(3)),
                                  lineno=p.lineno(3)),
-                           signed=True, lineno=p.lineno(3)) for rname, rvalue in p[2]]
+                           signed=True,
+                           value=rvalue,
+                           lineno=p.lineno(3)) for rname, rvalue in p[2]]
         p[0] = Decl(tuple(intlist), lineno=p.lineno(1))
         p.set_lineno(0, p.lineno(1))