Changeset b82d140 for src/AST

Timestamp:

Nov 10, 2020, 12:44:44 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

080b0a1, 883c4d9, f33eab7

Parents:

82a2fed (diff), cdacb73 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Decl.hpp (modified) (1 diff)
• Init.hpp (modified) (4 diffs)
• Pass.impl.hpp (modified) (2 diffs)
• Pass.proto.hpp (modified) (1 diff)
• Type.cpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -2764 +2764 @@
                         old->location,
                         GET_ACCEPT_1(value, Expr),
-                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::NoConstruct
                 );
         }
@@ -2773 +2773 @@
                         GET_ACCEPT_V(initializers, Init),
                         GET_ACCEPT_V(designations, Designation),
-                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::NoConstruct
                 );
         }

src/AST/Decl.hpp

@@ -79 +79 @@
         ptr<Expr> asmName;
         bool isDeleted = false;
+        bool isTypeFixed = false;
 
         DeclWithType( const CodeLocation& loc, const std::string& name, Storage::Classes storage,

src/AST/Init.hpp

@@ -50 +50 @@
 
 /// Flag for whether to construct from initialzier
-enum ConstructFlag { DoConstruct, MaybeConstruct };
+enum ConstructFlag { NoConstruct, MaybeConstruct };
 
 /// Object initializer base class
@@ -71 +71 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = DoConstruct )
+        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = NoConstruct )
         : Init( loc, mc ), value( val ) {}
 
@@ -90 +90 @@
 
         ListInit( const CodeLocation & loc, std::vector<ptr<Init>> && is,
-                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = DoConstruct );
+                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = NoConstruct );
 
         using iterator = std::vector<ptr<Init>>::iterator;
@@ -118 +118 @@
         ConstructorInit( 
                 const CodeLocation & loc, const Stmt * ctor, const Stmt * dtor, const Init * init )
-        : Init( loc, DoConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
+        : Init( loc, MaybeConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
 
         const Init * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.impl.hpp

@@ -423 +423 @@
                 }
                 catch( SemanticErrorException &e ) {
-                        errors.append( e );
+                        if (__pass::onError (visitor.core, *i, 0))
+                                errors.append( e );
                 }
 
@@ -683 +684 @@
                 // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
                 auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
-                        if ( enterScope ) __pass::symtab::enter(core, 0);
+                        if ( enterScope ) {
+                                __pass::symtab::enter(core, 0);
+                                __pass::scope::enter(core, 0);
+                        }
                 }, [this, leaveScope = !this->atFunctionTop]() {
-                        if ( leaveScope ) __pass::symtab::leave(core, 0);
+                        if ( leaveScope ) {
+                                __pass::symtab::leave(core, 0);
+                                __pass::scope::leave(core, 0);
+                        }
                 });
                 ValueGuard< bool > guard2( atFunctionTop );

src/AST/Pass.proto.hpp

@@ -266 +266 @@
         static void endTrace(core_t &, long) {}
 
+        // Allows visitor to handle an error on top-level declarations, and possibly suppress the error.
+        // If onError() returns false, the error will be ignored. By default, it returns true.
+
+        template< typename core_t >
+        static bool onError (core_t &, ptr<Decl> &, long) { return true; }
+
+        template< typename core_t >
+        static auto onError (core_t & core, ptr<Decl> & decl, int) -> decltype(core.onError(decl)) {
+                return core.onError(decl); 
+        }
+
         // Another feature of the templated visitor is that it calls beginScope()/endScope() for compound statement.
         // All passes which have such functions are assumed desire this behaviour

src/AST/Type.cpp

@@ -211 +211 @@
         for ( const Type * ty : types ) {
                 members.emplace_back( new ObjectDecl{
-                        CodeLocation{}, "", ty, new ListInit( CodeLocation{}, {}, {}, MaybeConstruct ),
+                        CodeLocation{}, "", ty, new ListInit( CodeLocation{}, {}, {}, NoConstruct ),
                         Storage::Classes{}, Linkage::Cforall } );
         }