From c7a7965c4966946e87689018505d9d0d22b062ed Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 9 Nov 2024 16:49:34 -0500 Subject: [PATCH] Rename identifer token --- src/verilog.y | 2 +- test_regress/t/t_class_param_comma_bad.out | 10 +++++----- test_regress/t/t_inst_param_comma_bad.out | 12 ++++++------ test_regress/t/t_lint_implicit_type_bad.out | 2 +- test_regress/t/t_lint_pkg_colon_bad.out | 2 +- test_regress/t/t_param_type_bad.out | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/verilog.y b/src/verilog.y index 73bb8967a..cb8883b89 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -442,7 +442,7 @@ BISONPRE_VERSION(3.7,%define api.header.include {"V3ParseBison.h"}) %token yaID__ETC "IDENTIFIER" %token yaID__CC "IDENTIFIER-::" %token yaID__LEX "IDENTIFIER-in-lex" -%token yaID__aTYPE "TYPE-IDENTIFIER" +%token yaID__aTYPE "IDENTIFIER-for-type" // Can't predecode aFUNCTION, can declare after use // Can't predecode aINTERFACE, can declare after use // Can't predecode aTASK, can declare after use diff --git a/test_regress/t/t_class_param_comma_bad.out b/test_regress/t/t_class_param_comma_bad.out index b7de6da25..a775e47c0 100644 --- a/test_regress/t/t_class_param_comma_bad.out +++ b/test_regress/t/t_class_param_comma_bad.out @@ -1,16 +1,16 @@ -%Error: t/t_class_param_comma_bad.v:16:22: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_class_param_comma_bad.v:16:22: syntax error, unexpected ')', expecting IDENTIFIER-for-type 16 | Cls #(.PARAMB(14),) ce; | ^ -%Error: t/t_class_param_comma_bad.v:17:13: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_class_param_comma_bad.v:17:13: syntax error, unexpected ')', expecting IDENTIFIER-for-type 17 | Cls #(14,) cf; | ^ -%Error: t/t_class_param_comma_bad.v:18:14: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_class_param_comma_bad.v:18:14: syntax error, unexpected ')', expecting IDENTIFIER-for-type 18 | Cls2 #(15,) cg; | ^ -%Error: t/t_class_param_comma_bad.v:19:23: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_class_param_comma_bad.v:19:23: syntax error, unexpected ')', expecting IDENTIFIER-for-type 19 | Cls2 #(.PARAMB(16),) ch; | ^ -%Error: t/t_class_param_comma_bad.v:20:23: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_class_param_comma_bad.v:20:23: syntax error, unexpected ')', expecting IDENTIFIER-for-type 20 | Cls2 #(.PARAMC(17),) ci; | ^ %Error: Exiting due to diff --git a/test_regress/t/t_inst_param_comma_bad.out b/test_regress/t/t_inst_param_comma_bad.out index a272b2577..0f1ad9b1a 100644 --- a/test_regress/t/t_inst_param_comma_bad.out +++ b/test_regress/t/t_inst_param_comma_bad.out @@ -1,19 +1,19 @@ -%Error: t/t_inst_param_comma_bad.v:35:15: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:35:15: syntax error, unexpected ')', expecting IDENTIFIER-for-type 35 | M #(.P(13),) m1( | ^ -%Error: t/t_inst_param_comma_bad.v:40:11: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:40:11: syntax error, unexpected ')', expecting IDENTIFIER-for-type 40 | M #(14,) m2 ( | ^ -%Error: t/t_inst_param_comma_bad.v:45:11: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:45:11: syntax error, unexpected ')', expecting IDENTIFIER-for-type 45 | M #(14,) m3 ( | ^ -%Error: t/t_inst_param_comma_bad.v:50:15: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:50:15: syntax error, unexpected ')', expecting IDENTIFIER-for-type 50 | N #(.P(13),) n1( | ^ -%Error: t/t_inst_param_comma_bad.v:55:11: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:55:11: syntax error, unexpected ')', expecting IDENTIFIER-for-type 55 | N #(14,) n2 ( | ^ -%Error: t/t_inst_param_comma_bad.v:60:11: syntax error, unexpected ')', expecting TYPE-IDENTIFIER +%Error: t/t_inst_param_comma_bad.v:60:11: syntax error, unexpected ')', expecting IDENTIFIER-for-type 60 | N #(14,) n3 ( | ^ %Error: Exiting due to diff --git a/test_regress/t/t_lint_implicit_type_bad.out b/test_regress/t/t_lint_implicit_type_bad.out index 8f0e6e645..27fc9c53d 100644 --- a/test_regress/t/t_lint_implicit_type_bad.out +++ b/test_regress/t/t_lint_implicit_type_bad.out @@ -1,4 +1,4 @@ -%Error: t/t_lint_implicit_type_bad.v:11:11: syntax error, unexpected TYPE-IDENTIFIER +%Error: t/t_lint_implicit_type_bad.v:11:11: syntax error, unexpected IDENTIFIER-for-type 11 | assign imp_type_conflict = 1'b1; | ^~~~~~~~~~~~~~~~~ %Error: Exiting due to diff --git a/test_regress/t/t_lint_pkg_colon_bad.out b/test_regress/t/t_lint_pkg_colon_bad.out index 9058994fd..dacf56eda 100644 --- a/test_regress/t/t_lint_pkg_colon_bad.out +++ b/test_regress/t/t_lint_pkg_colon_bad.out @@ -2,7 +2,7 @@ 7 | module t (input mispkg::foo_t a); | ^~~~~~ ... For error description see https://verilator.org/warn/PKGNODECL?v=latest -%Error: t/t_lint_pkg_colon_bad.v:7:25: syntax error, unexpected IDENTIFIER, expecting TYPE-IDENTIFIER +%Error: t/t_lint_pkg_colon_bad.v:7:25: syntax error, unexpected IDENTIFIER, expecting IDENTIFIER-for-type 7 | module t (input mispkg::foo_t a); | ^~~~~ %Error: Exiting due to diff --git a/test_regress/t/t_param_type_bad.out b/test_regress/t/t_param_type_bad.out index 528bd8fc5..2c7ea7959 100644 --- a/test_regress/t/t_param_type_bad.out +++ b/test_regress/t/t_param_type_bad.out @@ -1,4 +1,4 @@ -%Error: t/t_param_type_bad.v:9:27: syntax error, unexpected INTEGER NUMBER, expecting IDENTIFIER or TYPE-IDENTIFIER or randomize +%Error: t/t_param_type_bad.v:9:27: syntax error, unexpected INTEGER NUMBER, expecting IDENTIFIER or IDENTIFIER-for-type or randomize 9 | localparam type bad2 = 2; | ^ %Error: Exiting due to