Changes in src/SymTab/Autogen.h [417117e:b4f8808]

File:

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

src/SymTab/Autogen.h

@@ -21 +21 @@
 
 #include "AST/Decl.hpp"
-#include "AST/Eval.hpp"
 #include "AST/Expr.hpp"
 #include "AST/Init.hpp"
@@ -98 +97 @@
                         //   type->get_qualifiers() = Type::Qualifiers();
                         Type * castType = addCast->clone();
-                        castType->get_qualifiers() -= Type::Qualifiers( Type::Lvalue | Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                        castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
                         // castType->set_lvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new ReferenceType( Type::Qualifiers(), castType ) );
@@ -265 +264 @@
                 }
 
-                ast::ptr< ast::Expr > begin, end;
-                std::string cmp, update;
+                ast::ptr< ast::Expr > begin, end, cmp, update;
 
                 if ( forward ) {
@@ -272 +270 @@
                         begin = ast::ConstantExpr::from_int( loc, 0 );
                         end = array->dimension;
-                        cmp = "?<?";
-                        update = "++?";
+                        cmp = new ast::NameExpr{ loc, "?<?" };
+                        update = new ast::NameExpr{ loc, "++?" };
                 } else {
                         // generate: for ( int i = N-1; i >= 0; --i )
-                        begin = ast::call( 
-                                loc, "?-?", array->dimension, ast::ConstantExpr::from_int( loc, 1 ) );
+                        begin = new ast::UntypedExpr{ 
+                                loc, new ast::NameExpr{ loc, "?-?" }, 
+                                { array->dimension, ast::ConstantExpr::from_int( loc, 1 ) } };
                         end = ast::ConstantExpr::from_int( loc, 0 );
-                        cmp = "?>=?";
-                        update = "--?";
+                        cmp = new ast::NameExpr{ loc, "?>=?" };
+                        update = new ast::NameExpr{ loc, "--?" };
                 }
 
@@ -286 +285 @@
                         loc, indexName.newName(), new ast::BasicType{ ast::BasicType::SignedInt }, 
                         new ast::SingleInit{ loc, begin } };
-                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 );
+                
+                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 } } };
                 
                 // srcParam must keep track of the array indices to build the source parameter and/or 
                 // array list initializer
-                srcParam.addArrayIndex( indexVar, array->dimension );
+                srcParam.addArrayIndex( new ast::VariableExpr{ loc, index }, array->dimension );
 
                 // for stmt's body, eventually containing call
@@ -382 +384 @@
                 if ( isUnnamedBitfield( obj ) ) return {};
 
-                ast::ptr< ast::Type > addCast;
+                ast::ptr< ast::Type > addCast = nullptr;
                 if ( (fname == "?{}" || fname == "^?{}") && ( ! obj || ( obj && ! obj->bitfieldWidth ) ) ) {
                         assert( dstParam->result );