Changeset 4406887

Timestamp:

Nov 3, 2020, 8:48:53 PM (4 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:

a3f5208a

Parents:

3c80ccc (diff), 293dc1c (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

Files:

• AST/Convert.cpp (modified) (3 diffs)
• AST/Convert.hpp (modified) (1 diff)
• AST/Fwd.hpp (modified) (1 diff)
• AST/Pass.hpp (modified) (3 diffs)
• AST/Pass.impl.hpp (modified) (2 diffs)
• AST/Pass.proto.hpp (modified) (1 diff)
• InitTweak/FixGlobalInit.cc (modified) (3 diffs)
• InitTweak/FixGlobalInit.h (modified) (1 diff)
• InitTweak/FixInit.h (modified) (2 diffs)
• InitTweak/FixInitNew.cpp (modified) (4 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• ResolvExpr/Resolver.h (modified) (3 diffs)

src/AST/Convert.cpp

@@ -25 +25 @@
 #include "AST/Init.hpp"
 #include "AST/Stmt.hpp"
+#include "AST/TranslationUnit.hpp"
 #include "AST/TypeSubstitution.hpp"
 
@@ -1404 +1405 @@
 };
 
-std::list< Declaration * > convert( const std::list< ast::ptr< ast::Decl > > && translationUnit ) {
+std::list< Declaration * > convert( const ast::TranslationUnit && translationUnit ) {
         ConverterNewToOld c;
         std::list< Declaration * > decls;
-        for(auto d : translationUnit) {
+        for(auto d : translationUnit.decls) {
                 decls.emplace_back( c.decl( d ) );
         }
@@ -2803 +2804 @@
 #undef GET_ACCEPT_1
 
-std::list< ast::ptr< ast::Decl > > convert( const std::list< Declaration * > && translationUnit ) {
+ast::TranslationUnit convert( const std::list< Declaration * > && translationUnit ) {
         ConverterOldToNew c;
-        std::list< ast::ptr< ast::Decl > > decls;
+        ast::TranslationUnit unit;
         for(auto d : translationUnit) {
                 d->accept( c );
-                decls.emplace_back( c.decl() );
+                unit.decls.emplace_back( c.decl() );
         }
         deleteAll(translationUnit);
-        return decls;
+        return unit;
 }

src/AST/Convert.hpp

@@ -18 +18 @@
 #include <list>
 
-#include "AST/Node.hpp"
-
 class Declaration;
 namespace ast {
-        class Decl;
+        class TranslationUnit;
 };
 
-std::list< Declaration * > convert( const std::list< ast::ptr< ast::Decl > > && translationUnit );
-std::list< ast::ptr< ast::Decl > > convert( const std::list< Declaration * > && translationUnit );
+std::list< Declaration * > convert( const ast::TranslationUnit && translationUnit );
+ast::TranslationUnit convert( const std::list< Declaration * > && translationUnit );

src/AST/Fwd.hpp

@@ -137 +137 @@
 typedef unsigned int UniqueId;
 
+class TranslationUnit;
+// TODO: Get from the TranslationUnit:
 extern Type * sizeType;
 extern FunctionDecl * dereferenceOperator;

src/AST/Pass.hpp

@@ -103 +103 @@
         /// Construct and run a pass on a translation unit.
         template< typename... Args >
-        static void run( std::list< ptr<Decl> > & decls, Args &&... args ) {
+        static void run( TranslationUnit & decls, Args &&... args ) {
                 Pass<core_t> visitor( std::forward<Args>( args )... );
                 accept_all( decls, visitor );
@@ -119 +119 @@
         // Versions of the above for older compilers.
         template< typename... Args >
-        static void run( std::list< ptr<Decl> > & decls ) {
+        static void run( TranslationUnit & decls ) {
                 Pass<core_t> visitor;
                 accept_all( decls, visitor );
@@ -303 +303 @@
 void accept_all( std::list< ast::ptr<ast::Decl> > &, ast::Pass<core_t> & visitor );
 
+template<typename core_t>
+void accept_all( ast::TranslationUnit &, ast::Pass<core_t> & visitor );
+
 //-------------------------------------------------------------------------------------------------
 // PASS ACCESSORIES

src/AST/Pass.impl.hpp

@@ -20 +20 @@
 #include <unordered_map>
 
+#include "AST/TranslationUnit.hpp"
 #include "AST/TypeSubstitution.hpp"
 
@@ -430 +431 @@
         pass_visitor_stats.depth--;
         if ( !errors.isEmpty() ) { throw errors; }
+}
+
+template< typename core_t >
+inline void ast::accept_all( ast::TranslationUnit & unit, ast::Pass< core_t > & visitor ) {
+        return ast::accept_all( unit.decls, visitor );
 }
 

src/AST/Pass.proto.hpp

@@ -22 +22 @@
 template<typename core_t>
 class Pass;
+
+class TranslationUnit;
 
 struct PureVisitor;

src/InitTweak/FixGlobalInit.cc

@@ -109 +109 @@
         }
 
-        void fixGlobalInit(std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary) {
+        void fixGlobalInit(ast::TranslationUnit & translationUnit, bool inLibrary) {
                 ast::Pass<GlobalFixer_new> fixer;
                 accept_all(translationUnit, fixer);
@@ -119 +119 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("constructor", std::move(ctorParams))});
 
-                        translationUnit.emplace_back( initFunction );
+                        translationUnit.decls.emplace_back( initFunction );
                 } // if
 
@@ -128 +128 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("destructor", std::move(dtorParams))});
 
-                        translationUnit.emplace_back(destroyFunction);
+                        translationUnit.decls.emplace_back(destroyFunction);
                 } // if
         }

src/InitTweak/FixGlobalInit.h

@@ -29 +29 @@
         /// function is for library code.
         void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
-        void fixGlobalInit( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary );
+        void fixGlobalInit( ast::TranslationUnit & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/FixInit.h

@@ -19 +19 @@
 #include <string>  // for string
 
-#include <AST/Fwd.hpp>
-
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace InitTweak {
@@ -27 +28 @@
         void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
 
-        void fix( std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary);
+        void fix( ast::TranslationUnit & translationUnit, bool inLibrary);
 } // namespace
 

src/InitTweak/FixInitNew.cpp

@@ -179 +179 @@
         /// expand each object declaration to use its constructor after it is declared.
         struct FixInit : public ast::WithStmtsToAdd<> {
-                static void fixInitializers( std::list< ast::ptr<ast::Decl> > &translationUnit );
+                static void fixInitializers( ast::TranslationUnit &translationUnit );
 
                 const ast::DeclWithType * postvisit( const ast::ObjectDecl *objDecl );
@@ -225 +225 @@
 } // namespace
 
-void fix( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary ) {
+void fix( ast::TranslationUnit & translationUnit, bool inLibrary ) {
         ast::Pass<SelfAssignChecker>::run( translationUnit );
 
@@ -308 +308 @@
         }
 
-        void FixInit::fixInitializers( std::list< ast::ptr<ast::Decl> > & translationUnit ) {
+        void FixInit::fixInitializers( ast::TranslationUnit & translationUnit ) {
                 ast::Pass<FixInit> fixer;
 
@@ -314 +314 @@
                 // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
                 SemanticErrorException errors;
-                for ( auto i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
+                for ( auto i = translationUnit.decls.begin(); i != translationUnit.decls.end(); ++i ) {
                         try {
                                 // maybeAccept( *i, fixer ); translationUnit should never contain null
                                 *i = (*i)->accept(fixer);
-                                translationUnit.splice( i, fixer.core.staticDtorDecls );
+                                translationUnit.decls.splice( i, fixer.core.staticDtorDecls );
                         } catch( SemanticErrorException &e ) {
                                 errors.append( e );

src/ResolvExpr/Resolver.cc

@@ -1274 +1274 @@
         // size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
 
-        void resolve( std::list< ast::ptr< ast::Decl > >& translationUnit ) {
+        void resolve( ast::TranslationUnit& translationUnit ) {
                 ast::Pass< Resolver_new >::run( translationUnit );
         }

src/ResolvExpr/Resolver.h

@@ -35 +35 @@
         class StmtExpr;
         class SymbolTable;
+        class TranslationUnit;
         class Type;
         class TypeEnvironment;
@@ -55 +56 @@
 
         /// Checks types and binds syntactic constructs to typed representations
-        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit );
+        void resolve( ast::TranslationUnit& translationUnit );
         /// Searches expr and returns the first DeletedExpr found, otherwise nullptr
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr );
@@ -69 +70 @@
                 const ast::Expr * untyped, const ast::SymbolTable & symtab);
         /// Resolves a constructor init expression
-        ast::ptr< ast::Init > resolveCtorInit( 
+        ast::ptr< ast::Init > resolveCtorInit(
                 const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
         /// Resolves a statement expression
-        ast::ptr< ast::Expr > resolveStmtExpr( 
+        ast::ptr< ast::Expr > resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab );
 } // namespace ResolvExpr