Changeset 293dc1c for src/AST

Timestamp:

Nov 3, 2020, 4:06:20 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

4406887

Parents:

daefe93

Message:

TranslationUnit? is now used at the top-level of the new-ast passes.

Location:

src/AST

Files:

• Convert.cpp (modified) (3 diffs)
• Convert.hpp (modified) (1 diff)
• Fwd.hpp (modified) (1 diff)
• Pass.hpp (modified) (3 diffs)
• Pass.impl.hpp (modified) (2 diffs)
• Pass.proto.hpp (modified) (1 diff)

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;