Changes in src/Tuples/TupleExpansionNew.cpp [ce1d721:e9e9f56]

File:

• src/Tuples/TupleExpansionNew.cpp (modified) (7 diffs)

src/Tuples/TupleExpansionNew.cpp

@@ -10 +10 @@
 // Created On       : Mon Aug 23 15:36:09 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 29 14:06:00 2022
-// Update Count     : 2
+// Last Modified On : Tue Sep 20 16:17:00 2022
+// Update Count     : 4
 //
 
@@ -100 +100 @@
 }
 
-struct TupleAssignExpander {
+/// Replaces Tuple Assign & Index Expressions, and Tuple Types.
+struct TupleMainExpander final :
+                public ast::WithCodeLocation,
+                public ast::WithDeclsToAdd<>,
+                public ast::WithGuards,
+                public ast::WithVisitorRef<TupleMainExpander> {
         ast::Expr const * postvisit( ast::TupleAssignExpr const * expr ) {
                 // Just move the env on the new top level expression.
@@ -106 +111 @@
                         &ast::TupleAssignExpr::env, expr->env.get() );
         }
-};
-
-struct TupleTypeReplacer :
-                public ast::WithGuards,
-                public ast::WithVisitorRef<TupleTypeReplacer>,
-                public ast::WithDeclsToAdd<> {
-        void previsit( ast::ParseNode const * node ) {
-                GuardValue( location ) = &node->location;
-        }
-
-        void previsit( ast::CompoundStmt const * stmt ) {
-                previsit( (ast::ParseNode const *)stmt );
+
+        void previsit( ast::CompoundStmt const * ) {
                 GuardScope( typeMap );
         }
@@ -185 +180 @@
                 return newType;
         }
-private:
-        ScopedMap< int, ast::StructDecl const * > typeMap;
-        CodeLocation const * location = nullptr;
-};
-
-struct TupleIndexExpander {
+
         ast::Expr const * postvisit( ast::TupleIndexExpr const * expr ) {
                 CodeLocation const & location = expr->location;
@@ -221 +211 @@
                 return memberExpr;
         }
+private:
+        ScopedMap< int, ast::StructDecl const * > typeMap;
 };
 
@@ -257 +249 @@
 }
 
-struct TupleExprExpander {
+struct TupleExprExpander final {
         ast::Expr const * postvisit( ast::TupleExpr const * expr ) {
                 return replaceTupleExpr( expr->location,
@@ -275 +267 @@
 
 void expandTuples( ast::TranslationUnit & translationUnit ) {
-        // These may not have to be seperate passes.
-        ast::Pass<TupleAssignExpander>::run( translationUnit );
-        ast::Pass<TupleTypeReplacer>::run( translationUnit );
-        ast::Pass<TupleIndexExpander>::run( translationUnit );
+        // These can't just be combined simply (there might be a way with work).
+        ast::Pass<TupleMainExpander>::run( translationUnit );
         ast::Pass<TupleExprExpander>::run( translationUnit );
 }