Changeset 413f7f8 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Jul 7, 2015, 1:49:58 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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:software/cfa/cfa-cc

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 22 17:19:54 2015
-// Update Count     : 17
+// Last Modified On : Fri Jul  3 17:58:39 2015
+// Update Count     : 22
 //
 
@@ -543 +543 @@
 
                 AlternativeFinder funcFinder( indexer, env ); {
-                        NameExpr *fname;
+                        NameExpr *fname = 0;;
                         if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
                                  && ( fname->get_name() == std::string("&&")) ) {
-                                alternatives.push_back( Alternative( untypedExpr->clone(), env, Cost()) );
+                                VoidType v = Type::Qualifiers();                // resolve to type void *
+                                PointerType pt( Type::Qualifiers(), v.clone() );
+                                UntypedExpr *vexpr = untypedExpr->clone();
+                                vexpr->get_results().push_front( pt.clone() );
+                                alternatives.push_back( Alternative( vexpr, env, Cost()) );
                                 return;
                         }