SystemVerilog: const

Author: kroening

src/verilog/parser.y

@@ -1381,20 +1381,24 @@ data_declaration:
 	  const_opt TOK_VAR lifetime_opt data_type_or_implicit list_of_variable_decl_assignments ';'
 	  	{ init($$, ID_decl);
 		  stack_expr($$).set(ID_class, ID_var);
-		  addswap($$, ID_type, $4);
+		  add_as_subtype(stack_type($1), stack_type($4));
+		  addswap($$, ID_type, $1);
 		  swapop($$, $5); }
 	| const_opt lifetime_opt data_type list_of_variable_decl_assignments ';'
 		{ init($$, ID_decl);
 		  stack_expr($$).set(ID_class, ID_reg);
-		  addswap($$, ID_type, $3);
+		  add_as_subtype(stack_type($1), stack_type($3));
+		  addswap($$, ID_type, $1);
 		  swapop($$, $4); }
 	| type_declaration
 	| package_import_declaration
 	;
 
 const_opt:
 	  /* Optional */
+		{ init($$, ID_nil); }
 	| TOK_CONST
+		{ init($$, ID_const); stack_type($$).add_subtype().make_nil(); }
 	;
 
 package_import_declaration_brace:

src/verilog/verilog_elaborate_type.cpp

@@ -468,6 +468,13 @@ typet verilog_typecheck_exprt::elaborate_type(const typet &src)
     tmp.subtype() = elaborate_type(tmp.subtype());
     return std::move(tmp);
   }
+  else if(src.id() == ID_const)
+  {
+    auto tmp = to_type_with_subtype(src).subtype();
+    elaborate_type(tmp);
+    tmp.set(ID_C_constant, true);
+    return tmp;
+  }
   else
   {
     throw errort().with_location(source_location)