diff --git a/ivtest/gold/br1027a.gold b/ivtest/gold/br1027a.gold index dc6440404..f36904c5c 100644 --- a/ivtest/gold/br1027a.gold +++ b/ivtest/gold/br1027a.gold @@ -1,2 +1,2 @@ -./ivltests/br1027a.v:1: error: missing task/function port direction. -./ivltests/br1027a.v:1: error: missing task/function port direction. +./ivltests/br1027a.v:1: error: Missing task/function port direction. +./ivltests/br1027a.v:1: error: Missing task/function port direction. diff --git a/ivtest/gold/br1027c.gold b/ivtest/gold/br1027c.gold index 80d6309f4..8a77a84d7 100644 --- a/ivtest/gold/br1027c.gold +++ b/ivtest/gold/br1027c.gold @@ -1 +1 @@ -./ivltests/br1027c.v:1: error: missing task/function port direction. +./ivltests/br1027c.v:1: error: Missing task/function port direction. diff --git a/ivtest/gold/br1027e.gold b/ivtest/gold/br1027e.gold index 39b8bbdb1..0fd2f25cd 100644 --- a/ivtest/gold/br1027e.gold +++ b/ivtest/gold/br1027e.gold @@ -1 +1 @@ -./ivltests/br1027e.v:1: error: missing task/function port direction. +./ivltests/br1027e.v:1: error: Missing task/function port direction. diff --git a/ivtest/gold/br_gh79.gold b/ivtest/gold/br_gh79.gold index 8f510dc1c..3b6dc8e58 100644 --- a/ivtest/gold/br_gh79.gold +++ b/ivtest/gold/br_gh79.gold @@ -1,16 +1,16 @@ ./ivltests/br_gh79.v:6: syntax error -./ivltests/br_gh79.v:6: error: malformed statement +./ivltests/br_gh79.v:6: error: Malformed statement ./ivltests/br_gh79.v:7: syntax error -./ivltests/br_gh79.v:7: error: malformed statement +./ivltests/br_gh79.v:7: error: Malformed statement ./ivltests/br_gh79.v:9: syntax error -./ivltests/br_gh79.v:9: error: malformed statement +./ivltests/br_gh79.v:9: error: Malformed statement ./ivltests/br_gh79.v:10: syntax error -./ivltests/br_gh79.v:10: error: malformed statement +./ivltests/br_gh79.v:10: error: Malformed statement ./ivltests/br_gh79.v:12: syntax error -./ivltests/br_gh79.v:12: error: malformed statement +./ivltests/br_gh79.v:12: error: Malformed statement ./ivltests/br_gh79.v:13: syntax error -./ivltests/br_gh79.v:13: error: malformed statement +./ivltests/br_gh79.v:13: error: Malformed statement ./ivltests/br_gh79.v:15: syntax error -./ivltests/br_gh79.v:15: error: malformed statement +./ivltests/br_gh79.v:15: error: Malformed statement ./ivltests/br_gh79.v:16: syntax error -./ivltests/br_gh79.v:16: error: malformed statement +./ivltests/br_gh79.v:16: error: Malformed statement diff --git a/ivtest/gold/pr3366217d.gold b/ivtest/gold/pr3366217d.gold index 2c8f41971..08d576716 100644 --- a/ivtest/gold/pr3366217d.gold +++ b/ivtest/gold/pr3366217d.gold @@ -1,22 +1,22 @@ -./ivltests/pr3366217d.v:3: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:4: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:5: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:6: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:6: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:7: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:8: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:9: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:10: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:10: error: undefined value used in enum name sequence. -./ivltests/pr3366217d.v:13: error: zero count used in enum name sequence. -./ivltests/pr3366217d.v:14: error: zero count used in enum name sequence. -./ivltests/pr3366217d.v:17: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:18: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:19: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:20: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:20: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:21: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:22: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:23: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:24: error: negative value used in enum name sequence. -./ivltests/pr3366217d.v:24: error: negative value used in enum name sequence. +./ivltests/pr3366217d.v:3: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:4: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:5: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:6: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:6: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:7: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:8: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:9: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:10: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:10: error: Undefined value used in enum name sequence. +./ivltests/pr3366217d.v:13: error: Zero count used in enum name sequence. +./ivltests/pr3366217d.v:14: error: Zero count used in enum name sequence. +./ivltests/pr3366217d.v:17: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:18: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:19: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:20: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:20: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:21: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:22: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:23: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:24: error: Negative value used in enum name sequence. +./ivltests/pr3366217d.v:24: error: Negative value used in enum name sequence. diff --git a/ivtest/gold/struct_invalid_member.gold b/ivtest/gold/struct_invalid_member.gold index 6fce735b8..166601db0 100644 --- a/ivtest/gold/struct_invalid_member.gold +++ b/ivtest/gold/struct_invalid_member.gold @@ -1,8 +1,8 @@ ./ivltests/struct_invalid_member.v:9: syntax error -./ivltests/struct_invalid_member.v:9: Error in struct/union member. +./ivltests/struct_invalid_member.v:9: error: Error in struct/union member. ./ivltests/struct_invalid_member.v:10: syntax error -./ivltests/struct_invalid_member.v:10: Error in struct/union member. +./ivltests/struct_invalid_member.v:10: error: Error in struct/union member. ./ivltests/struct_invalid_member.v:11: syntax error -./ivltests/struct_invalid_member.v:11: Error in struct/union member. +./ivltests/struct_invalid_member.v:11: error: Error in struct/union member. ./ivltests/struct_invalid_member.v:12: syntax error -./ivltests/struct_invalid_member.v:12: Error in struct/union member. +./ivltests/struct_invalid_member.v:12: error: Error in struct/union member. diff --git a/ivtest/gold/sv_end_labels_unnamed.gold b/ivtest/gold/sv_end_labels_unnamed.gold index 2979cbbc3..32f53a3a5 100644 --- a/ivtest/gold/sv_end_labels_unnamed.gold +++ b/ivtest/gold/sv_end_labels_unnamed.gold @@ -1,3 +1,3 @@ -./ivltests/sv_end_labels_unnamed.v:7: error: unnamed block must not have end label. -./ivltests/sv_end_labels_unnamed.v:11: error: unnamed block must not have end label. -./ivltests/sv_end_labels_unnamed.v:14: error: unnamed fork must not have end label. +./ivltests/sv_end_labels_unnamed.v:7: error: Unnamed block must not have end label. +./ivltests/sv_end_labels_unnamed.v:11: error: Unnamed block must not have end label. +./ivltests/sv_end_labels_unnamed.v:14: error: Unnamed fork must not have end label. diff --git a/ivtest/gold/sv_timeunit_prec_fail1.gold b/ivtest/gold/sv_timeunit_prec_fail1.gold index 398fd2552..30682f076 100644 --- a/ivtest/gold/sv_timeunit_prec_fail1.gold +++ b/ivtest/gold/sv_timeunit_prec_fail1.gold @@ -1,20 +1,20 @@ -./ivltests/sv_timeunit_prec_fail1a.v:9: error: repeat timeunit does not match the initial timeunit for this scope. -./ivltests/sv_timeunit_prec_fail1a.v:10: error: repeat timeprecision does not match the initial timeprecision for this scope. -./ivltests/sv_timeunit_prec_fail1a.v:15: error: repeat timeunit does not match the initial timeunit for this scope. -./ivltests/sv_timeunit_prec_fail1a.v:21: error: repeat timeprecision does not match the initial timeprecision for this scope. -./ivltests/sv_timeunit_prec_fail1a.v:27: error: repeat timeunit found and the initial timeunit for this scope is missing. -./ivltests/sv_timeunit_prec_fail1a.v:33: error: repeat timeprecision found and the initial timeprecision for this scope is missing. -./ivltests/sv_timeunit_prec_fail1a.v:40: error: repeat timeprecision found and the initial timeprecision for this scope is missing. -./ivltests/sv_timeunit_prec_fail1a.v:47: error: repeat timeunit found and the initial timeunit for this scope is missing. -./ivltests/sv_timeunit_prec_fail1a.v:53: Invalid timeunit constant (1st digit). -./ivltests/sv_timeunit_prec_fail1a.v:54: Invalid timeprecision constant (1st digit). -./ivltests/sv_timeunit_prec_fail1a.v:56: Invalid timeunit constant (number of zeros). -./ivltests/sv_timeunit_prec_fail1a.v:57: Invalid timeprecision constant (number of zeros). -./ivltests/sv_timeunit_prec_fail1a.v:59: Invalid timeunit scale '2s'. -./ivltests/sv_timeunit_prec_fail1a.v:60: Invalid timeprecision scale '2s'. -./ivltests/sv_timeunit_prec_fail1a.v:63: Invalid timeunit constant ('_' is not supported). -./ivltests/sv_timeunit_prec_fail1a.v:64: Invalid timeprecision constant ('_' is not supported). -./ivltests/sv_timeunit_prec_fail1b.v:4: error: a timeprecision is missing or is too large! -./ivltests/sv_timeunit_prec_fail1c.v:4: error: a timeprecision is missing or is too large! -./ivltests/sv_timeunit_prec_fail1d.v:5: error: a timeprecision is missing or is too large! -./ivltests/sv_timeunit_prec_fail1e.v:5: error: a timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail1a.v:9: error: Repeat timeunit does not match the initial timeunit for this scope. +./ivltests/sv_timeunit_prec_fail1a.v:10: error: Repeat timeprecision does not match the initial timeprecision for this scope. +./ivltests/sv_timeunit_prec_fail1a.v:15: error: Repeat timeunit does not match the initial timeunit for this scope. +./ivltests/sv_timeunit_prec_fail1a.v:21: error: Repeat timeprecision does not match the initial timeprecision for this scope. +./ivltests/sv_timeunit_prec_fail1a.v:27: error: Repeat timeunit found and the initial timeunit for this scope is missing. +./ivltests/sv_timeunit_prec_fail1a.v:33: error: Repeat timeprecision found and the initial timeprecision for this scope is missing. +./ivltests/sv_timeunit_prec_fail1a.v:40: error: Repeat timeprecision found and the initial timeprecision for this scope is missing. +./ivltests/sv_timeunit_prec_fail1a.v:47: error: Repeat timeunit found and the initial timeunit for this scope is missing. +./ivltests/sv_timeunit_prec_fail1a.v:53: error: Invalid timeunit constant (1st digit). +./ivltests/sv_timeunit_prec_fail1a.v:54: error: Invalid timeprecision constant (1st digit). +./ivltests/sv_timeunit_prec_fail1a.v:56: error: Invalid timeunit constant (number of zeros). +./ivltests/sv_timeunit_prec_fail1a.v:57: error: Invalid timeprecision constant (number of zeros). +./ivltests/sv_timeunit_prec_fail1a.v:59: error: Invalid timeunit scale '2s'. +./ivltests/sv_timeunit_prec_fail1a.v:60: error: Invalid timeprecision scale '2s'. +./ivltests/sv_timeunit_prec_fail1a.v:63: error: Invalid timeunit constant ('_' is not supported). +./ivltests/sv_timeunit_prec_fail1a.v:64: error: Invalid timeprecision constant ('_' is not supported). +./ivltests/sv_timeunit_prec_fail1b.v:4: error: A timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail1c.v:4: error: A timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail1d.v:5: error: A timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail1e.v:5: error: A timeprecision is missing or is too large! diff --git a/ivtest/gold/sv_timeunit_prec_fail2.gold b/ivtest/gold/sv_timeunit_prec_fail2.gold index 7ccd2b8aa..3e4323eab 100644 --- a/ivtest/gold/sv_timeunit_prec_fail2.gold +++ b/ivtest/gold/sv_timeunit_prec_fail2.gold @@ -1,20 +1,20 @@ -./ivltests/sv_timeunit_prec_fail2a.v:8: error: repeat timeunit does not match the initial timeunit for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:8: error: repeat timeprecision does not match the initial timeprecision for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:13: error: repeat timeunit does not match the initial timeunit for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:13: error: repeat timeprecision does not match the initial timeprecision for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:14: error: repeat timeunit does not match the initial timeunit for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:15: error: repeat timeprecision does not match the initial timeprecision for this scope. -./ivltests/sv_timeunit_prec_fail2a.v:21: error: repeat timeunit found and the initial timeunit for this scope is missing. -./ivltests/sv_timeunit_prec_fail2a.v:21: error: repeat timeprecision found and the initial timeprecision for this scope is missing. -./ivltests/sv_timeunit_prec_fail2a.v:27: error: repeat timeprecision found and the initial timeprecision for this scope is missing. -./ivltests/sv_timeunit_prec_fail2a.v:33: error: repeat timeunit found and the initial timeunit for this scope is missing. -./ivltests/sv_timeunit_prec_fail2a.v:39: Invalid timeunit constant (1st digit). -./ivltests/sv_timeunit_prec_fail2a.v:39: Invalid timeprecision constant (1st digit). -./ivltests/sv_timeunit_prec_fail2a.v:41: Invalid timeunit constant (number of zeros). -./ivltests/sv_timeunit_prec_fail2a.v:41: Invalid timeprecision constant (number of zeros). -./ivltests/sv_timeunit_prec_fail2a.v:43: Invalid timeunit scale '2s'. -./ivltests/sv_timeunit_prec_fail2a.v:43: Invalid timeprecision scale '2s'. -./ivltests/sv_timeunit_prec_fail2a.v:46: Invalid timeunit constant ('_' is not supported). -./ivltests/sv_timeunit_prec_fail2a.v:46: Invalid timeprecision constant ('_' is not supported). -./ivltests/sv_timeunit_prec_fail2b.v:4: error: a timeprecision is missing or is too large! -./ivltests/sv_timeunit_prec_fail2c.v:5: error: a timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail2a.v:8: error: Repeat timeunit does not match the initial timeunit for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:8: error: Repeat timeprecision does not match the initial timeprecision for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:13: error: Repeat timeunit does not match the initial timeunit for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:13: error: Repeat timeprecision does not match the initial timeprecision for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:14: error: Repeat timeunit does not match the initial timeunit for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:15: error: Repeat timeprecision does not match the initial timeprecision for this scope. +./ivltests/sv_timeunit_prec_fail2a.v:21: error: Repeat timeunit found and the initial timeunit for this scope is missing. +./ivltests/sv_timeunit_prec_fail2a.v:21: error: Repeat timeprecision found and the initial timeprecision for this scope is missing. +./ivltests/sv_timeunit_prec_fail2a.v:27: error: Repeat timeprecision found and the initial timeprecision for this scope is missing. +./ivltests/sv_timeunit_prec_fail2a.v:33: error: Repeat timeunit found and the initial timeunit for this scope is missing. +./ivltests/sv_timeunit_prec_fail2a.v:39: error: Invalid timeunit constant (1st digit). +./ivltests/sv_timeunit_prec_fail2a.v:39: error: Invalid timeprecision constant (1st digit). +./ivltests/sv_timeunit_prec_fail2a.v:41: error: Invalid timeunit constant (number of zeros). +./ivltests/sv_timeunit_prec_fail2a.v:41: error: Invalid timeprecision constant (number of zeros). +./ivltests/sv_timeunit_prec_fail2a.v:43: error: Invalid timeunit scale '2s'. +./ivltests/sv_timeunit_prec_fail2a.v:43: error: Invalid timeprecision scale '2s'. +./ivltests/sv_timeunit_prec_fail2a.v:46: error: Invalid timeunit constant ('_' is not supported). +./ivltests/sv_timeunit_prec_fail2a.v:46: error: Invalid timeprecision constant ('_' is not supported). +./ivltests/sv_timeunit_prec_fail2b.v:4: error: A timeprecision is missing or is too large! +./ivltests/sv_timeunit_prec_fail2c.v:5: error: A timeprecision is missing or is too large! diff --git a/parse.y b/parse.y index d84f204d7..8da3e535b 100644 --- a/parse.y +++ b/parse.y @@ -250,16 +250,16 @@ static long check_enum_seq_value(const YYLTYPE&loc, verinum *arg, bool zero_ok) // We can never have an undefined value in an enumeration name // declaration sequence. if (! arg->is_defined()) { - yyerror(loc, "error: undefined value used in enum name sequence."); + yyerror(loc, "error: Undefined value used in enum name sequence."); // We can never have a negative value in an enumeration name // declaration sequence. } else if (arg->is_negative()) { - yyerror(loc, "error: negative value used in enum name sequence."); + yyerror(loc, "error: Negative value used in enum name sequence."); } else { value = arg->as_ulong(); // We cannot have a zero enumeration name declaration count. if (! zero_ok && (value == 0)) { - yyerror(loc, "error: zero count used in enum name sequence."); + yyerror(loc, "error: Zero count used in enum name sequence."); value = 1; } } @@ -273,7 +273,7 @@ static void check_end_label(const struct vlltype&loc, const char *type, return; if (!begin) - yyerror(loc, "error: unnamed %s must not have end label.", type); + yyerror(loc, "error: Unnamed %s must not have end label.", type); else if (strcmp(begin, end) != 0) yyerror(loc, "error: %s end label `%s` doesn't match %s name" " `%s`.", type, end, type, begin); @@ -946,7 +946,7 @@ class_item /* IEEE1800-2005: A.1.8 */ | ';' | error ';' - { yyerror(@2, "error: invalid class item."); + { yyerror(@2, "error: Invalid class item."); yyerrok; } @@ -1892,7 +1892,7 @@ modport_ports_list pform_add_modport_port(@3, last_modport_port.direction, lex_strings.make($3), 0); } else if (last_modport_port.type != MP_TF) { - yyerror(@3, "error: list of identifiers not allowed here."); + yyerror(@3, "error: List of identifiers not allowed here."); } delete[] $3; } @@ -2369,7 +2369,7 @@ tf_port_item /* IEEE1800-2005: A.2.7 */ list* port_list = make_port_list($4, $5, 0); if (use_port_type == NetNet::PIMPLICIT) { - yyerror(@1, "error: missing task/function port direction."); + yyerror(@1, "error: Missing task/function port direction."); use_port_type = NetNet::PINPUT; // for error recovery } if (($3 == 0) && ($1==NetNet::PIMPLICIT)) { @@ -2533,7 +2533,7 @@ variable_lifetime_opt : lifetime { if (pform_requires_sv(@1, "Overriding default variable lifetime") && $1 != pform_peek_scope()->default_lifetime) { - yyerror(@1, "sorry: overriding the default variable lifetime " + yyerror(@1, "sorry: Overriding the default variable lifetime " "is not yet supported."); } var_lifetime = $1; @@ -2642,24 +2642,24 @@ block_item_decl trailing semi-colon to resync the parser. */ | K_var variable_lifetime_opt data_type_or_implicit error ';' - { yyerror(@1, "error: syntax error in variable list."); + { yyerror(@1, "error: Syntax error in variable list."); yyerrok; } | variable_lifetime_opt data_type error ';' - { yyerror(@1, "error: syntax error in variable list."); + { yyerror(@1, "error: Syntax error in variable list."); yyerrok; } | K_event error ';' - { yyerror(@1, "error: syntax error in event variable list."); + { yyerror(@1, "error: Syntax error in event variable list."); yyerrok; } | parameter error ';' - { yyerror(@1, "error: syntax error in parameter list."); + { yyerror(@1, "error: Syntax error in parameter list."); yyerrok; } | localparam error ';' - { yyerror(@1, "error: syntax error localparam list."); + { yyerror(@1, "error: Syntax error localparam list."); yyerrok; } ; @@ -2876,7 +2876,7 @@ struct_union_member /* IEEE 1800-2012 A.2.2.1 */ $$ = tmp; } | error ';' - { yyerror(@2, "Error in struct/union member."); + { yyerror(@2, "error: Error in struct/union member."); yyerrok; $$ = 0; } @@ -4591,7 +4591,7 @@ lpvalue } | streaming_concatenation - { yyerror(@1, "sorry: streaming concatenation not supported in l-values."); + { yyerror(@1, "sorry: Streaming concatenation not supported in l-values."); $$ = 0; } ; @@ -4811,7 +4811,7 @@ module_item } pform_set_data_type(@2, data_type, $5, $2, $1); if ($4 != 0) { - yyerror(@2, "sorry: net delays not supported."); + yyerror(@2, "sorry: Net delays not supported."); delete $4; } delete $1; @@ -4821,7 +4821,7 @@ module_item { real_type_t*tmpt = new real_type_t(real_type_t::REAL); pform_set_data_type(@2, tmpt, $4, NetNet::WIRE, $1); if ($3 != 0) { - yyerror(@3, "sorry: net delays not supported."); + yyerror(@3, "sorry: Net delays not supported."); delete $3; } delete $1; @@ -5183,7 +5183,7 @@ module_item specify_item_list_opt K_endspecify | K_specify error K_endspecify - { yyerror(@1, "error: syntax error in specify block"); + { yyerror(@1, "error: Syntax error in specify block"); yyerrok; } @@ -5192,18 +5192,18 @@ module_item reasonable error message can be produced. */ | error ';' - { yyerror(@2, "error: invalid module item."); + { yyerror(@2, "error: Invalid module item."); yyerrok; } | K_assign error '=' expression ';' - { yyerror(@1, "error: syntax error in left side of " + { yyerror(@1, "error: Syntax error in left side of " "continuous assignment."); yyerrok; } | K_assign error ';' - { yyerror(@1, "error: syntax error in continuous assignment"); + { yyerror(@1, "error: Syntax error in continuous assignment"); yyerrok; } @@ -5548,7 +5548,7 @@ parameter_value_opt $$ = lst; } | '#' error - { yyerror(@1, "error: syntax error in parameter value assignment list."); + { yyerror(@1, "error: Syntax error in parameter value assignment list."); $$ = 0; } | @@ -5657,7 +5657,7 @@ port_name $$ = tmp; } | attribute_list_opt '.' IDENTIFIER '(' error ')' - { yyerror(@3, "error: invalid port connection expression."); + { yyerror(@3, "error: Invalid port connection expression."); named_pexpr_t*tmp = new named_pexpr_t; tmp->name = lex_strings.make($3); tmp->parm = 0; @@ -5794,7 +5794,7 @@ port_reference $$ = ptmp; } | IDENTIFIER '[' error ']' - { yyerror(@1, "error: invalid port bit select"); + { yyerror(@1, "error: Invalid port bit select"); Module::port_t*ptmp = new Module::port_t; PEIdent*wtmp = new PEIdent(lex_strings.make($1)); FILE_NAME(wtmp, @1); @@ -6679,7 +6679,7 @@ statement_item /* This is roughly statement_item in the LRM */ $$ = tmp; } | error ';' - { yyerror(@2, "error: malformed statement"); + { yyerror(@2, "error: Malformed statement"); yyerrok; $$ = new PNoop; } diff --git a/pform.cc b/pform.cc index 2e275cc52..fc61b9657 100644 --- a/pform.cc +++ b/pform.cc @@ -569,7 +569,7 @@ void pform_set_scope_timescale(const struct vlltype&loc) if (gn_system_verilog() && (scope->time_unit < scope->time_precision)) { if (scope->time_unit_is_local || scope->time_prec_is_local) { - VLerror("error: a timeprecision is missing or is too large!"); + VLerror("error: A timeprecision is missing or is too large!"); } } else { assert(scope->time_unit >= scope->time_precision); @@ -1093,7 +1093,7 @@ bool get_time_unit(const char*cp, int &unit) bool rc = true; if (strchr(cp, '_')) { - VLerror(yylloc, "Invalid timeunit constant ('_' is not " + VLerror(yylloc, "error: Invalid timeunit constant ('_' is not " "supported)."); return false; } @@ -1118,7 +1118,7 @@ bool get_time_unit(const char*cp, int &unit) rc = false; ostringstream msg; - msg << "Invalid timeunit scale '" << cp << "'."; + msg << "error: Invalid timeunit scale '" << cp << "'."; VLerror(msg.str().c_str()); } @@ -1134,11 +1134,11 @@ static bool get_time_unit_prec(const char*cp, int &res, bool is_unit) /* We do not support a '_' in these time constants. */ if (strchr(cp, '_')) { if (is_unit) { - VLerror(yylloc, "Invalid timeunit constant ('_' is not " - "supported)."); + VLerror(yylloc, "error: Invalid timeunit constant ('_' " + "is not supported)."); } else { - VLerror(yylloc, "Invalid timeprecision constant ('_' is not " - "supported)."); + VLerror(yylloc, "error: Invalid timeprecision constant ('_' " + "is not supported)."); } return true; } @@ -1146,9 +1146,11 @@ static bool get_time_unit_prec(const char*cp, int &res, bool is_unit) /* Check for the 1 digit. */ if (*cp != '1') { if (is_unit) { - VLerror(yylloc, "Invalid timeunit constant (1st digit)."); + VLerror(yylloc, "error: Invalid timeunit constant " + "(1st digit)."); } else { - VLerror(yylloc, "Invalid timeprecision constant (1st digit)."); + VLerror(yylloc, "error: Invalid timeprecision constant " + "(1st digit)."); } return true; } @@ -1158,11 +1160,11 @@ static bool get_time_unit_prec(const char*cp, int &res, bool is_unit) res = strspn(cp, "0"); if (res > 2) { if (is_unit) { - VLerror(yylloc, "Invalid timeunit constant (number of " - "zeros)."); + VLerror(yylloc, "error: Invalid timeunit constant " + "(number of zeros)."); } else { - VLerror(yylloc, "Invalid timeprecision constant (number of " - "zeros)."); + VLerror(yylloc, "error: Invalid timeprecision constant " + "(number of zeros)."); } return true; } @@ -1196,7 +1198,7 @@ static bool get_time_unit_prec(const char*cp, int &res, bool is_unit) } ostringstream msg; - msg << "Invalid "; + msg << "error: Invalid "; if (is_unit) msg << "timeunit"; else msg << "timeprecision"; msg << " scale '" << cp << "'."; @@ -1220,10 +1222,10 @@ void pform_set_timeunit(const char*txt, bool initial_decl) scope->time_unit_is_default = false; allow_timeunit_decl = false; } else if (!scope->time_unit_is_local) { - VLerror(yylloc, "error: repeat timeunit found and the initial " + VLerror(yylloc, "error: Repeat timeunit found and the initial " "timeunit for this scope is missing."); } else if (scope->time_unit != val) { - VLerror(yylloc, "error: repeat timeunit does not match the " + VLerror(yylloc, "error: Repeat timeunit does not match the " "initial timeunit for this scope."); } } @@ -1258,10 +1260,10 @@ void pform_set_timeprec(const char*txt, bool initial_decl) scope->time_prec_is_default = false; allow_timeprec_decl = false; } else if (!scope->time_prec_is_local) { - VLerror(yylloc, "error: repeat timeprecision found and the initial " + VLerror(yylloc, "error: Repeat timeprecision found and the initial " "timeprecision for this scope is missing."); } else if (scope->time_precision != val) { - VLerror(yylloc, "error: repeat timeprecision does not match the " + VLerror(yylloc, "error: Repeat timeprecision does not match the " "initial timeprecision for this scope."); } } @@ -1458,7 +1460,7 @@ void pform_endmodule(const char*name, bool inside_celldefine, perm_string tmp_name = tmp_module->mod_name(); pform_cur_module.pop_front(); ostringstream msg; - msg << "Module " << mod_name + msg << "error: Module " << mod_name << " was nested within " << tmp_name << " but broken."; VLerror(msg.str().c_str()); @@ -1492,7 +1494,7 @@ void pform_endmodule(const char*name, bool inside_celldefine, if (test != use_module_map.end()) { ostringstream msg; - msg << "Module " << name << " was already declared here: " + msg << "error: Module " << name << " was already declared here: " << test->second->get_fileline() << endl; VLerror(msg.str().c_str()); } else { @@ -2127,7 +2129,7 @@ void pform_make_udp(const struct vlltype&loc, perm_string name, // Put the primitive into the primitives table if (pform_primitives[name]) { - VLerror("UDP primitive already exists."); + VLerror("error: UDP primitive already exists."); } else { PUdp*udp = new PUdp(name, pins.size()); @@ -2210,7 +2212,7 @@ static void pform_makegate(PGBuiltin::Type type, list*attr) { if (info.parms_by_name) { - cerr << info.get_fileline() << ": Gates do not have port names." + cerr << info.get_fileline() << ": error: Gates do not have port names." << endl; error_count += 1; return; @@ -2515,7 +2517,7 @@ void pform_make_var_init(const struct vlltype&li, perm_string name, PExpr*expr) { if (! pform_at_module_level() && !gn_system_verilog()) { - VLerror(li, "error: variable declaration assignments are only " + VLerror(li, "error: Variable declaration assignments are only " "allowed at the module level."); delete expr; return; @@ -2678,7 +2680,7 @@ void pform_makewire(const struct vlltype&li, list*attr) { if (is_compilation_unit(lexical_scope) && !gn_system_verilog()) { - VLerror(li, "error: variable declarations must be contained within a module."); + VLerror(li, "error: Variable declarations must be contained within a module."); return; } @@ -2876,7 +2878,7 @@ void pform_set_attrib(perm_string name, perm_string key, char*value) } else { delete[] value; - VLerror("Unable to match name for setting attribute."); + VLerror("error: Unable to match name for setting attribute."); } } @@ -2890,7 +2892,7 @@ void pform_set_type_attrib(perm_string name, const string&key, { map::const_iterator udp = pform_primitives.find(name); if (udp == pform_primitives.end()) { - VLerror("type name is not (yet) defined."); + VLerror("error: Type name is not (yet) defined."); delete[] value; return; } @@ -2923,7 +2925,7 @@ static void pform_set_type_parameter(const struct vlltype&loc, perm_string name, pform_requires_sv(loc, "Type parameter"); if (value_range) - VLerror(loc, "error: type parameter must not have value range."); + VLerror(loc, "error: Type parameter must not have value range."); type_parameter_t *type = new type_parameter_t(name); pform_set_typedef(loc, name, type, 0); diff --git a/pform_package.cc b/pform_package.cc index a772c26ea..856f8c103 100644 --- a/pform_package.cc +++ b/pform_package.cc @@ -60,9 +60,9 @@ void pform_end_package_declaration(const struct vlltype&loc) map::const_iterator test = packages_by_name.find(use_name); if (test != packages_by_name.end()) { ostringstream msg; - msg << "Package " << use_name << " was already declared here: " + msg << "error: Package " << use_name << " was already declared here: " << test->second->get_fileline() << ends; - VLerror(msg.str().c_str()); + VLerror(loc, msg.str().c_str()); }