Changes in src/AST/Expr.cpp [e6cf857f:f27331c]

File:

• src/AST/Expr.cpp (modified) (5 diffs)

src/AST/Expr.cpp

@@ -10 +10 @@
 // Created On       : Wed May 15 17:00:00 2019
 // Last Modified By : Andrew Beach
-// Created On       : Wed May 18 13:56:00 2022
-// Update Count     : 8
+// Created On       : Tue Nov 30 14:23:00 2021
+// Update Count     : 7
 //
 
@@ -21 +21 @@
 
 #include "Copy.hpp"                // for shallowCopy
+#include "Eval.hpp"                // for call
 #include "GenericSubstitution.hpp"
 #include "LinkageSpec.hpp"
@@ -66 +67 @@
 // --- UntypedExpr
 
-bool UntypedExpr::get_lvalue() const {
-        std::string fname = InitTweak::getFunctionName( this );
-        return lvalueFunctionNames.count( fname );
-}
-
 UntypedExpr * UntypedExpr::createDeref( const CodeLocation & loc, const Expr * arg ) {
         assert( arg );
 
-        UntypedExpr * ret = createCall( loc, "*?", { arg } );
+        UntypedExpr * ret = call( loc, "*?", arg );
         if ( const Type * ty = arg->result ) {
                 const Type * base = InitTweak::getPointerBase( ty );
@@ -91 +87 @@
 }
 
+bool UntypedExpr::get_lvalue() const {
+        std::string fname = InitTweak::getFunctionName( this );
+        return lvalueFunctionNames.count( fname );
+}
+
 UntypedExpr * UntypedExpr::createAssign( const CodeLocation & loc, const Expr * lhs, const Expr * rhs ) {
         assert( lhs && rhs );
 
-        UntypedExpr * ret = createCall( loc, "?=?", { lhs, rhs } );
+        UntypedExpr * ret = call( loc, "?=?", lhs, rhs );
         if ( lhs->result && rhs->result ) {
                 // if both expressions are typed, assumes that this assignment is a C bitwise assignment,
@@ -101 +102 @@
         }
         return ret;
-}
-
-UntypedExpr * UntypedExpr::createCall( const CodeLocation & loc,
-                const std::string & name, std::vector<ptr<Expr>> && args ) {
-        return new UntypedExpr( loc,
-                        new NameExpr( loc, name ), std::move( args ) );
 }