Tweak reporting of invalid formal names

nickg · Dec 11, 2024 · 8e2e229 · 8e2e229
1 parent 6276c46
commit 8e2e229
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/src/names.c b/src/names.c
@@ -1782,16 +1782,6 @@ tree_t resolve_name(nametab_t *tab, const loc_t *loc, ident_t name)
       else if (name == well_known(W_ERROR)) {
          // Was a parse error, suppress further errors
       }
-      else if (tab->top_scope->formal_kind != F_NONE
-               && tab->top_scope->formal_fn != NULL) {
-         diag_t *d = diag_new(DIAG_ERROR, loc);
-
-         if (tab->top_scope->formal_fn != NULL)
-            (*tab->top_scope->formal_fn)(d, name, tab->top_scope->formal_arg);
-
-         diag_emit(d);
-         tab->top_scope->formal_fn = NULL;  // Suppress further errors
-      }
       else if (tab->top_scope->overload && !tab->top_scope->overload->error) {
          diag_t *d = diag_new(DIAG_ERROR, loc);
          diag_printf(d, "no possible overload of %s has formal %s",
@@ -1817,8 +1807,17 @@ tree_t resolve_name(nametab_t *tab, const loc_t *loc, ident_t name)
          diag_emit(d);
          tab->top_scope->overload->error = true;
       }
-      else if (tab->top_scope->formal_kind != F_NONE)
-         ;  // Was earlier error
+      else if (tab->top_scope->formal_kind != F_NONE) {
+         diag_t *d = diag_new(DIAG_ERROR, loc);
+
+         if (tab->top_scope->formal_fn != NULL)
+            (*tab->top_scope->formal_fn)(d, name, tab->top_scope->formal_arg);
+         else
+            diag_printf(d, "invalid formal name %s", istr(name));
+
+         diag_emit(d);
+         tab->top_scope->suppress = true;  // Suppress further errors
+      }
       else if (tab->top_scope->overload == NULL) {
          diag_t *d = diag_new(DIAG_ERROR, loc);
 

diff --git a/src/parse.c b/src/parse.c
@@ -3127,9 +3127,7 @@ static tree_t p_formal_part(type_t *signature)
          *signature = p_signature();
          tree_set_loc(name, CURRENT_LOC);
       }
-      if (!(tree_has_type(name) && type_is_none(tree_type(name))))
-         break;
-      // Fall-through
+      break;
 
    default:
       parse_error(CURRENT_LOC, "illegal formal designator");

diff --git a/test/parse/issue1091.vhd b/test/parse/issue1091.vhd
@@ -12,9 +12,6 @@ end;
 
 --------------------------------------------------------------------------------
 
-LIBRARY IEEE;
-USE IEEE.std_logic_1164.ALL;
-
 PACKAGE Vital_Memory IS END PACKAGE Vital_Memory;
 PACKAGE BODY Vital_Memory IS
     PROCEDURE InternalTimingCheck (CONSTANT SetupHigh : IN TIME := 0 ns) IS
@@ -23,6 +20,6 @@ PACKAGE BODY Vital_Memory IS
 
     PROCEDURE VitalMemorySetupHoldCheck (SIGNAL TestSignal : IN time) IS
     BEGIN
-        InternalTimingCheck (IEEE.SetupHigh => TestSignal);
+        InternalTimingCheck (WORK.SetupHigh => TestSignal);
     END VitalMemorySetupHoldCheck;
 END PACKAGE BODY Vital_Memory;
diff --git a/test/test_parse.c b/test/test_parse.c
@@ -7041,7 +7041,7 @@ START_TEST(test_issue1091)
 
    const error_t expect[] = {
       { 10, "illegal formal designator" },
-      { 26, "illegal formal designator" },
+      { 23, "invalid formal name WORK.SETUPHIGH" },
       { -1, NULL }
    };
    expect_errors(expect);

diff --git a/test/test_sem.c b/test/test_sem.c
@@ -3817,6 +3817,7 @@ START_TEST(test_issue1020)
    input_from_file(TESTDIR "/sem/issue1020.vhd");
 
    const error_t expect[] = {
+      { 13, "invalid formal name V" },
       { 13, "sorry, conversions are not yet supported here" },
       { -1, NULL }
    };