Verilog: allow typedefs as block identifiers

This changes the Verilog grammar to allow typedef identifiers to be reused
as block identifiers.

Author: kroening

regression/verilog/named_block/named_block_vs_typedef1.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+CORE
 named_block_vs_typedef1.sv
 
 ^EXIT=10$

src/verilog/parser.y

@@ -3341,8 +3341,8 @@ generate_block:
 	  generate_item
 	| TOK_BEGIN generate_item_brace TOK_END
 		{ init($$, ID_generate_block); swapop($$, $2); }
-	| TOK_BEGIN TOK_COLON generate_block_identifier
-		{ push_scope(stack_expr($3).id(), ".", verilog_scopet::BLOCK); }
+	| TOK_BEGIN TOK_COLON any_identifier
+		{ push_scope(stack_expr($3).get(ID_base_name), ".", verilog_scopet::BLOCK); }
 	  generate_item_brace TOK_END
 		{ pop_scope();
 		  init($$, ID_generate_block);
@@ -3654,8 +3654,8 @@ seq_block:
 	  block_item_declaration_or_statement_or_null_brace
 	  TOK_END
 		{ init($$, ID_block); swapop($$, $2); }
-        | TOK_BEGIN TOK_COLON block_identifier
-		{ push_scope(stack_expr($3).id(), ".", verilog_scopet::BLOCK); }
+        | TOK_BEGIN TOK_COLON any_identifier
+		{ push_scope(stack_expr($3).get(ID_base_name), ".", verilog_scopet::BLOCK); }
 	  block_item_declaration_or_statement_or_null_brace
           TOK_END
                 { init($$, ID_block);
@@ -3668,11 +3668,12 @@ seq_block:
 par_block:
 	  TOK_FORK statement_or_null_brace TOK_JOIN
 		{ init($$, ID_fork); swapop($$, $2); }
-        | TOK_FORK TOK_COLON block_identifier
+        | TOK_FORK TOK_COLON any_identifier
           statement_or_null_brace TOK_JOIN
                 { init($$, ID_block);
                   swapop($$, $4);
-                  addswap($$, ID_base_name, $3); }
+                  stack_expr($$).set(ID_base_name, stack_expr($3).get(ID_base_name));
+                }
 	;
 
 // System Verilog standard 1800-2017
@@ -4804,8 +4805,6 @@ ps_type_identifier: type_identifier;
 
 parameter_identifier: TOK_NON_TYPE_IDENTIFIER;
 
-generate_block_identifier: TOK_NON_TYPE_IDENTIFIER;
-
 udp_identifier: TOK_NON_TYPE_IDENTIFIER;
 
 task_identifier: hierarchical_identifier