Changeset fd782b2 for src/InitTweak

Timestamp:

Sep 15, 2016, 10:55:52 AM (8 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:

aa8f9df

Parents:

f006f01 (diff), 1eba452 (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 tuples

Conflicts:

src/Parser/ParseNode.h

File:

• src/InitTweak/InitTweak.cc (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -387 +387 @@
                         } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( func ) ) {
                                 return memberExpr->get_member()->get_name();
+                        } else if ( UntypedMemberExpr * memberExpr = dynamic_cast< UntypedMemberExpr * > ( func ) ) {
+                                return funcName( memberExpr->get_member() );
                         } else {
                                 assertf( false, "Unexpected expression type being called as a function in call expression" );