Changeset e6cf857f for src/AST

Timestamp:

May 18, 2022, 2:24:48 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

288927f

Parents:

767a8ef

Message:

call -> createCall: The template wrapper has been removed and now it is beside similar helper functions.

Location:

src/AST

Files:

• Eval.hpp (deleted)
• Expr.cpp (modified) (5 diffs)
• Expr.hpp (modified) (1 diff)
• module.mk (modified) (1 diff)

src/AST/Expr.cpp

@@ -10 +10 @@
 // Created On       : Wed May 15 17:00:00 2019
 // Last Modified By : Andrew Beach
-// Created On       : Tue Nov 30 14:23:00 2021
-// Update Count     : 7
+// Created On       : Wed May 18 13:56:00 2022
+// Update Count     : 8
 //
 
@@ -21 +21 @@
 
 #include "Copy.hpp"                // for shallowCopy
-#include "Eval.hpp"                // for call
 #include "GenericSubstitution.hpp"
 #include "LinkageSpec.hpp"
@@ -67 +66 @@
 // --- 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 = call( loc, "*?", arg );
+        UntypedExpr * ret = createCall( loc, "*?", { arg } );
         if ( const Type * ty = arg->result ) {
                 const Type * base = InitTweak::getPointerBase( ty );
@@ -87 +91 @@
 }
 
-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 = call( loc, "?=?", lhs, rhs );
+        UntypedExpr * ret = createCall( loc, "?=?", { lhs, rhs } );
         if ( lhs->result && rhs->result ) {
                 // if both expressions are typed, assumes that this assignment is a C bitwise assignment,
@@ -102 +101 @@
         }
         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 ) );
 }
 

src/AST/Expr.hpp

@@ -230 +230 @@
         /// Creates a new assignment expression
         static UntypedExpr * createAssign( const CodeLocation & loc, const Expr * lhs, const Expr * rhs );
+        /// Creates a new call of a variable.
+        static UntypedExpr * createCall( const CodeLocation & loc,
+                const std::string & name, std::vector<ptr<Expr>> && args );
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/module.mk

@@ -29 +29 @@
         AST/DeclReplacer.cpp \
         AST/DeclReplacer.hpp \
-        AST/Eval.hpp \
         AST/Expr.cpp \
         AST/Expr.hpp \