Changeset 2871210 for src/ResolvExpr

Timestamp:

Jul 3, 2015, 6:08:20 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f6d7e0f

Parents:

0df292b

Message:

include file with keywords, fix type of label address expressions, fix computed goto to any expressions, generic types first attempt

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• Resolver.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;
                         }

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:20:35 2015
-// Update Count     : 156
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  3 16:18:20 2015
+// Update Count     : 159
 //
 
@@ -274 +274 @@
                 // must resolve the argument for a computed goto
                 if ( branchStmt->get_type() == BranchStmt::Goto ) { // check for computed goto statement
-                        if ( NameExpr * arg = dynamic_cast< NameExpr * >( branchStmt->get_computedTarget() ) ) {
+                        if ( Expression * arg = branchStmt->get_computedTarget() ) {
                                 VoidType v = Type::Qualifiers();                // cast to void * for the alternative finder
                                 PointerType pt( Type::Qualifiers(), v.clone() );