Changeset e67a82d for src/SymTab/Autogen.h

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• src/SymTab/Autogen.h (modified) (5 diffs)

src/SymTab/Autogen.h

@@ -21 +21 @@
 
 #include "AST/Decl.hpp"
+#include "AST/Eval.hpp"
 #include "AST/Expr.hpp"
 #include "AST/Init.hpp"
@@ -265 +266 @@
                 }
 
-                ast::ptr< ast::Expr > begin, end, cmp, update;
+                ast::ptr< ast::Expr > begin, end;
+                std::string cmp, update;
 
                 if ( forward ) {
@@ -271 +273 @@
                         begin = ast::ConstantExpr::from_int( loc, 0 );
                         end = array->dimension;
-                        cmp = new ast::NameExpr{ loc, "?<?" };
-                        update = new ast::NameExpr{ loc, "++?" };
+                        cmp = "?<?";
+                        update = "++?";
                 } else {
                         // generate: for ( int i = N-1; i >= 0; --i )
-                        begin = new ast::UntypedExpr{ 
-                                loc, new ast::NameExpr{ loc, "?-?" }, 
-                                { array->dimension, ast::ConstantExpr::from_int( loc, 1 ) } };
+                        begin = ast::call( 
+                                loc, "?-?", array->dimension, ast::ConstantExpr::from_int( loc, 1 ) );
                         end = ast::ConstantExpr::from_int( loc, 0 );
-                        cmp = new ast::NameExpr{ loc, "?>=?" };
-                        update = new ast::NameExpr{ loc, "--?" };
+                        cmp = "?>=?";
+                        update = "--?";
                 }
 
@@ -286 +287 @@
                         loc, indexName.newName(), new ast::BasicType{ ast::BasicType::SignedInt }, 
                         new ast::SingleInit{ loc, begin } };
-                
-                ast::ptr< ast::Expr > cond = new ast::UntypedExpr{
-                        loc, cmp, { new ast::VariableExpr{ loc, index }, end } };
-                
-                ast::ptr< ast::Expr > inc = new ast::UntypedExpr{
-                        loc, update, { new ast::VariableExpr{ loc, index } } };
-                
-                ast::ptr< ast::Expr > dstIndex = new ast::UntypedExpr{
-                        loc, new ast::NameExpr{ loc, "?[?]" }, 
-                        { dstParam, new ast::VariableExpr{ loc, index } } };
+                ast::ptr< ast::Expr > indexVar = new ast::VariableExpr{ loc, index };
+                
+                ast::ptr< ast::Expr > cond = ast::call( loc, cmp, indexVar, end );
+                
+                ast::ptr< ast::Expr > inc = ast::call( loc, update, indexVar );
+                
+                ast::ptr< ast::Expr > dstIndex = ast::call( loc, "?[?]", dstParam, indexVar );
                 
                 // srcParam must keep track of the array indices to build the source parameter and/or 
                 // array list initializer
-                srcParam.addArrayIndex( new ast::VariableExpr{ loc, index }, array->dimension );
+                srcParam.addArrayIndex( indexVar, array->dimension );
 
                 // for stmt's body, eventually containing call
@@ -385 +383 @@
                 if ( isUnnamedBitfield( obj ) ) return {};
 
-                ast::ptr< ast::Type > addCast = nullptr;
+                ast::ptr< ast::Type > addCast;
                 if ( (fname == "?{}" || fname == "^?{}") && ( ! obj || ( obj && ! obj->bitfieldWidth ) ) ) {
                         assert( dstParam->result );