Changeset 4d860ea3

Timestamp:

Oct 6, 2023, 2:58:48 PM (9 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

500a60f

Parents:

0860d9c

Message:

Fix compiler bug where duplicate type declarations caused crash.

And add missing test. The test runs and fails with the previous cfa compiler.

Files:

• src/Validate/NoIdSymbolTable.hpp (modified) (1 diff)
• tests/errors/.expect/scope-type.txt (added)
• tests/errors/.expect/scope.txt (modified) (1 diff)
• tests/errors/scope-type.cfa (added)
• tests/errors/scope.cfa (modified) (1 diff)

src/Validate/NoIdSymbolTable.hpp

@@ -20 +20 @@
 namespace Validate {
 
-// A SymbolTable that only has the operations used in the Translate Dimension
-// pass. More importantly, it doesn't have some methods that should no be
+// A SymbolTable that only tracks names relevant to Validate passes.
+// It tracks type names but not identifier names.
+// Some of the canonicalization that occurs before the resolver
+// affects how identifier name errors get reported to the user.
+// The Validate phase needs to chase type names,
+// but it is too early to try tracking identifier names.
+// Identifier skipping is acheived by omitting methods that should not be
 // called by the Pass template (lookupId and addId).
 class NoIdSymbolTable {
         ast::SymbolTable base;
 public:
+        // All names that are tracked (now) are eligible for collision validation (now).
+        // (Names that are only tracked later get their collision validation then.)
+        NoIdSymbolTable() : base(ast::SymbolTable::ValidateOnAdd) {}
+
 #       define FORWARD_X( func, types_and_names, just_names ) \
         inline auto func types_and_names -> decltype( base.func just_names ) { \

tests/errors/.expect/scope.txt

@@ -1 @@
-errors/scope.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
-errors/scope.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
+errors/scope.cfa:13:1 error: duplicate object definition for thisIsAnError: signed int
+errors/scope.cfa:30:1 error: duplicate function definition for butThisIsAnError: function
 ... with parameters
   double

tests/errors/scope.cfa

@@ -1 @@
-int thisIsAnError;
-int thisIsAnError;
+// Keep harmonized with errors/scope.
 
-int thisIsNotAnError;
-float thisIsNotAnError;
+#ifdef OMIT_DRIVING_REJECTIONS
+// For manual sanity checking:
+// Leave out the offensive declarations and verify that what's left is accepted.
+#define EXPREJ(...)
+#else 
+#define EXPREJ(...) __VA_ARGS__
+#endif
 
-int thisIsAlsoNotAnError() {
-  int thisIsNotAnError;
-}
 
-int thisIsAlsoNotAnError( double x ) {
-}
+        int thisIsAnError;
+EXPREJ( int thisIsAnError; )
 
-double thisIsStillNotAnError( double );
-double thisIsStillNotAnError( double );
+        int thisIsNotAnError;
+        float thisIsNotAnError;
 
-double butThisIsAnError( double ) {
-}
+        int thisIsAlsoNotAnError() {
+          int thisIsNotAnError;
+        }
 
-double butThisIsAnError( double ) {
-}
+        int thisIsAlsoNotAnError( double x ) {
+        }
+
+        double thisIsStillNotAnError( double );
+        double thisIsStillNotAnError( double );
+
+        double butThisIsAnError( double ) {
+        }
+EXPREJ(
+        double butThisIsAnError( double ) {
+        }
+)
 
 // Local Variables: //