Changeset 6840e7c for src/InitTweak/InitTweak.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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 cleanup-dtors

File:

• src/InitTweak/InitTweak.cc (modified) (6 diffs)

src/InitTweak/InitTweak.cc

@@ -168 +168 @@
                 deleteAll( indices );
                 indices.clear();
+        }
+
+        bool InitExpander::addReference() {
+                bool added = false;
+                for ( Expression *& expr : cur ) {
+                        expr = new AddressExpr( expr );
+                        added = true;
+                }
+                return added;
         }
 
@@ -270 +279 @@
         }
 
-        Type * getThisType( FunctionType * ftype ) {
-                assertf( ftype, "getThisType: nullptr ftype" );
-                ObjectDecl * thisParam = getThisParam( ftype );
+        Type * getTypeofThis( FunctionType * ftype ) {
+                assertf( ftype, "getTypeofThis: nullptr ftype" );
+                ObjectDecl * thisParam = getParamThis( ftype );
                 ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( thisParam->type );
                 return refType->base;
         }
 
-        ObjectDecl * getThisParam( FunctionType * ftype ) {
-                assertf( ftype, "getThisParam: nullptr ftype" );
+        ObjectDecl * getParamThis( FunctionType * ftype ) {
+                assertf( ftype, "getParamThis: nullptr ftype" );
                 auto & params = ftype->parameters;
-                assertf( ! params.empty(), "getThisParam: ftype with 0 parameters: %s", toString( ftype ).c_str() );
+                assertf( ! params.empty(), "getParamThis: ftype with 0 parameters: %s", toString( ftype ).c_str() );
                 return strict_dynamic_cast< ObjectDecl * >( params.front() );
         }
@@ -353 +362 @@
                         assert( expr );
                         if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                return varExpr->get_var();
+                                return varExpr->var;
                         } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( expr ) ) {
-                                return memberExpr->get_member();
+                                return memberExpr->member;
                         } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-                                return getCalledFunction( castExpr->get_arg() );
+                                return getCalledFunction( castExpr->arg );
                         } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
                                 return handleDerefCalledFunction( untypedExpr );
@@ -363 +372 @@
                                 return handleDerefCalledFunction( appExpr );
                         } else if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
-                                return getCalledFunction( addrExpr->get_arg() );
+                                return getCalledFunction( addrExpr->arg );
+                        } else if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( expr ) ) {
+                                return getCalledFunction( commaExpr->arg2 );
                         }
                         return nullptr;
@@ -578 +589 @@
         FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname ) {
                 FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
-                if ( ! function ) return 0;
-                if ( function->get_name() != fname ) return 0;
-                FunctionType * ftype = function->get_functionType();
-                if ( ftype->get_parameters().size() != 2 ) return 0;
+                if ( ! function ) return nullptr;
+                if ( function->name != fname ) return nullptr;
+                FunctionType * ftype = function->type;
+                if ( ftype->parameters.size() != 2 ) return nullptr;
 
                 Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
-                Type * t2 = ftype->get_parameters().back()->get_type();
+                Type * t2 = ftype->parameters.back()->get_type();
                 assert( t1 );
 
@@ -604 +615 @@
         }
         FunctionDecl * isDefaultConstructor( Declaration * decl ) {
-                if ( isConstructor( decl->get_name() ) ) {
+                if ( isConstructor( decl->name ) ) {
                         if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
-                                if ( func->get_functionType()->get_parameters().size() == 1 ) {
+                                if ( func->type->parameters.size() == 1 ) {
                                         return func;
                                 }