If statement nest is updated.

Author: shtaxxx

sample/bram/bram.py

@@ -27,10 +27,11 @@ def mkBram(name):
     d_addr = m.Reg('d_' + addr.name, datawidth)
     mem = m.Reg('mem', datawidth, addrwidth)
 
-    m.Always(Posedge(clk),
-             [ If(write, [ mem[addr].set(datain) ]),
-               d_addr.set(addr) ])
-    m.Assign(dataout, mem[d_addr])
+    m.Always(Posedge(clk))(
+        If(write)( mem[addr](datain) ),
+        d_addr(addr)
+    )
+    m.Assign(dataout(mem[d_addr]))
 
     return m
 
@@ -57,17 +58,23 @@ def cond(name='label'):
         return ret
 
     def goto_next():
-        return state.set( state + 1 )
+        return state( state + 1 )
 
-    m.Always(Posedge(clk),
-             ( If(rst,
-                  ( addr.set(0), datain.set(0), write.set(0), state.set(0) ),
-                  ( If(cond(), ( addr.set(0), datain.set(0), write.set(0), goto_next() )),
-                    If(cond(), ( write.set(1), datain.set(datain + 4), goto_next() )),
-                    If(cond(), ( write.set(0), goto_next() )),
-                    If(cond(), ( If(addr == 128,
-                                    ( addr.set(0), state.set(label[0]) ),
-                                    ( addr.set(addr + 1), state.set(label[1]) ))))))))
+    m.Always(Posedge(clk))(
+        If(rst)(
+            addr(0), datain(0), write(0), state(0)
+        ).els(
+            If(cond())( addr(0), datain(0), write(0), goto_next() ),
+            If(cond())( write(1), datain(datain + 4), goto_next() ),
+            If(cond())( write(0), goto_next() ),
+            If(cond())(
+                If(addr == 128)(
+                    addr(0), state(label[0])
+                ).els(
+                    addr(addr + 1), state(label[1])
+                )
+            )))
+
     return m
 
 #-------------------------------------------------------------------------------

sample/led/led.py

@@ -12,16 +12,21 @@ def mkLed():
     led = m.OutputReg('LED', width)
     count = m.Reg('count', 32)
 
-    m.Always(Posedge(clk),
-             ( If(rst,
-                  ( count.set(0), ),
-                  ( count.set(count + 1), )), ))
+    m.Always(Posedge(clk))(
+        If(rst)(
+            count(0)
+        ).els(
+            count(count + 1)
+        ))
 
-    m.Always(Posedge(clk),
-             ( If(rst,
-                  ( led.set(0), ),
-                  ( If(count == 1024 - 1,
-                       ( led.set(led + 1), )))), ))
+    m.Always(Posedge(clk))(
+        If(rst)(
+            led(0)
+        ).els(
+            If(count == 1024 - 1)(
+                led(led + 1)
+            )
+        ))
 
     return m
 

veriloggen/module.py

@@ -79,13 +79,13 @@ def Localparam(self, name, value, width=None, signed=False, length=None):
         return t
 
     #---------------------------------------------------------------------------
-    def Always(self, sensitivity, statement):
-        t = vtypes.Always(sensitivity, statement)
+    def Always(self, sensitivity, *statement):
+        t = vtypes.Always(sensitivity, *statement)
         self.always.append(t)
         return t
 
-    def Assign(self, left, right):
-        t = vtypes.Assign(left, right)
+    def Assign(self, statement):
+        t = vtypes.Assign(statement)
         self.assign.append(t)
         return t
 

veriloggen/toverilog.py

@@ -125,8 +125,10 @@ def visit_Always(self, node):
 
     #---------------------------------------------------------------------------
     def visit_Assign(self, node):
-        left = self.bind_visitor.visit(node.left)
-        right = self.bind_visitor.visit(node.right)
+        if not isinstance(node.statement, vtypes.Subst):
+            raise TypeError("Assign expects Subst object.")
+        left = self.bind_visitor.visit(node.statement.left)
+        right = self.bind_visitor.visit(node.statement.right)
         return vast.Assign(left, right)
 
     #---------------------------------------------------------------------------

veriloggen/vtypes.py

@@ -70,6 +70,9 @@ def assign(self, r):
     def set(self, r):
         return self.assign(r)
 
+    def __call__(self, r):
+        return self.assign(r)
+        
     def __ilshift__(self, r):
         return self.assign(r)
 
@@ -78,6 +81,7 @@ def __setattr__(self, name, value):
             return self.assign(value)
         else:
             _Numeric.__setattr__(self, name, value)
+            
 
 #-------------------------------------------------------------------------------
 class Reg(_Variable): pass
@@ -195,14 +199,19 @@ def __init__(self, var, step):
 
 #-------------------------------------------------------------------------------
 class Always(_VtypesObject):
-    def __init__(self, sensitivity, statement):
+    def __init__(self, sensitivity, *statement):
         self.sensitivity = sensitivity
-        self.statement = statement
+        self.statement = tuple(statement)
+
+    def __call__(self, *statement):
+        if self.statement:
+            raise ValueError("Statement is already assigned.")
+        self.statement = tuple(statement)
+        return self
 
 class Assign(_VtypesObject):
-    def __init__(self, left, right):
-        self.left = left
-        self.right = right
+    def __init__(self, statement):
+        self.statement = statement
 
 #-------------------------------------------------------------------------------
 class Edge(_VtypesObject):
@@ -219,11 +228,26 @@ def __init__(self, left, right):
         self.right = right
 
 class If(_VtypesObject):
-    def __init__(self, condition, true_statement, false_statement=None):
+    def __init__(self, condition, true_statement=None, false_statement=None):
         self.condition = condition
         self.true_statement = true_statement
         self.false_statement = false_statement
 
+    def __call__(self, *args):
+        if self.true_statement is None:
+            self.true_statement = tuple(args)
+            return self
+        if self.false_statement is None:
+            self.false_statement = tuple(args)
+            return self
+        raise ValueError("True statement and False statement are already assigned.")
+
+    def els(self, *args):
+        if self.false_statement is None:
+            self.false_statement = tuple(args)
+            return self
+        raise ValueError("False statement is already assigned.")
+        
 class For(_VtypesObject):
     def __init__(self, pre, condition, post, statement):
         self.pre = pre