Merge pull request #47 from THofstee/patch-2

add preliminary support for `always_latch`

Author: shtaxxx

pyverilog/vparser/ast.py

@@ -742,6 +742,10 @@ class AlwaysComb(Always):
     pass
 
 
+class AlwaysLatch(Always):
+    pass
+
+
 class SensList(Node):
     attr_names = ()
 

pyverilog/vparser/lexer.py

@@ -55,7 +55,7 @@ def token(self):
         'FUNCTION', 'ENDFUNCTION', 'TASK', 'ENDTASK',
         'INPUT', 'INOUT', 'OUTPUT', 'TRI', 'REG', 'LOGIC', 'WIRE', 'INTEGER', 'REAL', 'SIGNED',
         'PARAMETER', 'LOCALPARAM', 'SUPPLY0', 'SUPPLY1',
-        'ASSIGN', 'ALWAYS', 'ALWAYS_FF', 'ALWAYS_COMB', 'SENS_OR', 'POSEDGE', 'NEGEDGE', 'INITIAL',
+        'ASSIGN', 'ALWAYS', 'ALWAYS_FF', 'ALWAYS_COMB', 'ALWAYS_LATCH', 'SENS_OR', 'POSEDGE', 'NEGEDGE', 'INITIAL',
         'IF', 'ELSE', 'FOR', 'WHILE', 'CASE', 'CASEX', 'UNIQUE', 'ENDCASE', 'DEFAULT',
         'WAIT', 'FOREVER', 'DISABLE', 'FORK', 'JOIN',
     )

pyverilog/vparser/parser.py

@@ -473,6 +473,7 @@ def p_standard_item(self, p):
         | always
         | always_ff
         | always_comb
+        | always_latch
         | initial
         | instance
         | function
@@ -1273,10 +1274,17 @@ def p_always(self, p):
     def p_always_ff(self, p):
         'always_ff : ALWAYS_FF senslist always_statement'
         p[0] = AlwaysFF(p[2], p[3], lineno=p.lineno(1))
+        p.set_lineno(0, p.lineno(1))
 
     def p_always_comb(self, p):
         'always_comb : ALWAYS_COMB senslist always_statement'
         p[0] = AlwaysComb(p[2], p[3], lineno=p.lineno(1))
+        p.set_lineno(0, p.lineno(1))
+
+    def p_always_latch(self, p):
+        'always_latch : ALWAYS_LATCH senslist always_statement'
+        p[0] = AlwaysLatch(p[2], p[3], lineno=p.lineno(1))
+        p.set_lineno(0, p.lineno(1))
 
     def p_sens_egde_paren(self, p):
         'senslist : AT LPAREN edgesigs RPAREN'