Changes in src/AST/SymbolTable.hpp [d859a30:b9fe89b]

File:

• src/AST/SymbolTable.hpp (modified) (5 diffs)

src/AST/SymbolTable.hpp

@@ -93 +93 @@
 
 public:
-        SymbolTable();
+
+        /// Mode to control when (during which pass) user-caused name-declaration errors get reported.
+        /// The default setting `AssertClean` supports, "I expect all user-caused errors to have been
+        /// reported by now," or, "I wouldn't know what to do with an error; are there even any here?"
+        enum ErrorDetection {
+                AssertClean,               ///< invalid user decls => assert fails during addFoo (default)
+                ValidateOnAdd,             ///< invalid user decls => calls SemanticError during addFoo
+                IgnoreErrors               ///< acts as if unspecified decls were removed, forcing validity
+        };
+
+        explicit SymbolTable(
+                ErrorDetection             ///< mode for the lifetime of the symbol table (whole pass)
+        );
+        SymbolTable() : SymbolTable(AssertClean) {}
         ~SymbolTable();
+
+        ErrorDetection getErrorMode() const {
+                return errorMode;
+        }
 
         // when using an indexer manually (e.g., within a mutator traversal), it is necessary to
@@ -158 +175 @@
 
 private:
+        void OnFindError( CodeLocation location, std::string error ) const;
+
+        template< typename T >
+        void OnFindError( const T * obj, const std::string & error ) const {
+                OnFindError( obj->location, toString( error, obj ) );
+        }
+
+        template< typename T >
+        void OnFindError( CodeLocation location, const T * obj, const std::string & error ) const {
+                OnFindError( location, toString( error, obj ) );
+        }
+
         /// Ensures that a proper backtracking scope exists before a mutation
         void lazyInitScope();
@@ -168 +197 @@
         bool removeSpecialOverrides( IdData & decl, MangleTable::Ptr & mangleTable );
 
-        /// Options for handling identifier conflicts
+        /// Error detection mode given at construction (pass-specific).
+        /// Logically const, except that the symbol table's push-pop is achieved by autogenerated
+        /// assignment onto self.  The feield is left motuable to keep this code-gen simple.
+        /// Conceptual constness is preserved by all SymbolTable in a stack sharing the same mode.
+        ErrorDetection errorMode;
+
+        /// Options for handling identifier conflicts.
+        /// Varies according to AST location during traversal: captures semantics of the construct
+        /// being visited as "would shadow" vs "must not collide."
+        /// At a given AST location, is the same for every pass.
         struct OnConflict {
                 enum {
-                        Error,  ///< Throw a semantic error
+                        Error,  ///< Follow the current pass's ErrorDetection mode (may throw a semantic error)
                         Delete  ///< Delete the earlier version with the delete statement
                 } mode;
@@ -191 +229 @@
                 const Decl * deleter );
 
+        /// true if redeclaration conflict between two types
+        bool addedTypeConflicts( const NamedTypeDecl * existing, const NamedTypeDecl * added ) const;
+
+        /// true if redeclaration conflict between two aggregate declarations
+        bool addedDeclConflicts( const AggregateDecl * existing, const AggregateDecl * added ) const;
+
         /// common code for addId, addDeletedId, etc.
         void addIdCommon(
@@ -213 +257 @@
 }
 
+
 // Local Variables: //
 // tab-width: 4 //