Changeset df6cc9d for src/AST/Expr.cpp

Timestamp:

Oct 19, 2022, 4:43:26 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

1a45263

Parents:

9cd5bd2 (diff), 135143ba (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:

Merge branch 'master' into pthread-emulation

File:

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

src/AST/Expr.cpp

@@ -22 +22 @@
 #include "Copy.hpp"                // for shallowCopy
 #include "GenericSubstitution.hpp"
+#include "Inspect.hpp"
 #include "LinkageSpec.hpp"
 #include "Stmt.hpp"
@@ -29 +30 @@
 #include "Common/SemanticError.h"
 #include "GenPoly/Lvalue.h"        // for referencesPermissable
-#include "InitTweak/InitTweak.h"   // for getFunction, getPointerBase
 #include "ResolvExpr/typeops.h"    // for extractResultType
 #include "Tuples/Tuples.h"         // for makeTupleType
@@ -58 +58 @@
 
 bool ApplicationExpr::get_lvalue() const {
-        if ( const DeclWithType * func = InitTweak::getFunction( this ) ) {
+        if ( const DeclWithType * func = getFunction( this ) ) {
                 return func->linkage == Linkage::Intrinsic && lvalueFunctionNames.count( func->name );
         }
@@ -67 +67 @@
 
 bool UntypedExpr::get_lvalue() const {
-        std::string fname = InitTweak::getFunctionName( this );
+        std::string fname = getFunctionName( this );
         return lvalueFunctionNames.count( fname );
 }
@@ -76 +76 @@
         UntypedExpr * ret = createCall( loc, "*?", { arg } );
         if ( const Type * ty = arg->result ) {
-                const Type * base = InitTweak::getPointerBase( ty );
+                const Type * base = getPointerBase( ty );
                 assertf( base, "expected pointer type in dereference (type was %s)", toString( ty ).c_str() );
 
@@ -335 +335 @@
         // first argument
         assert( callExpr );
-        const Expr * arg = InitTweak::getCallArg( callExpr, 0 );
+        const Expr * arg = getCallArg( callExpr, 0 );
         assert( arg );
         result = arg->result;