Changeset 11a2d9b for src/InitTweak

Timestamp:

Oct 2, 2017, 6:02:32 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

21b7161

Parents:

3096ec1 (diff), 617b4b2 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/InitTweak

Files:

• InitTweak.cc (modified) (1 diff)
• InitTweak.h (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -270 +270 @@
         }
 
-        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() );
         }

src/InitTweak/InitTweak.h

@@ -31 +31 @@
 
         /// returns the base type of the first parameter to a constructor/destructor/assignment function
-        Type * getThisType( FunctionType * ftype );
+        Type * getTypeofThis( FunctionType * ftype );
 
         /// returns the first parameter of a constructor/destructor/assignment function
-        ObjectDecl * getThisParam( FunctionType * ftype );
+        ObjectDecl * getParamThis( FunctionType * ftype );
 
         /// transform Initializer into an argument list that can be passed to a call expression