Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 5f2f2d75adcd9f673ef8bda86f25d409347089be)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:53:58 2015
-// Update Count     : 14
+// Last Modified On : Mon Jun 22 17:19:54 2015
+// Update Count     : 17
 //
 
@@ -545,6 +545,6 @@
 			NameExpr *fname;
 			if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
-				 && ( fname->get_name() == std::string("LabAddress")) ) {
-				alternatives.push_back( Alternative( untypedExpr, env, Cost()) );
+				 && ( fname->get_name() == std::string("&&")) ) {
+				alternatives.push_back( Alternative( untypedExpr->clone(), env, Cost()) );
 				return;
 			}
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 5f2f2d75adcd9f673ef8bda86f25d409347089be)
+++ src/ResolvExpr/Resolver.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 21:50:37 2015
-// Update Count     : 23
+// Last Modified On : Wed Jun 24 15:47:16 2015
+// Update Count     : 50
 //
 
@@ -45,4 +45,5 @@
 		virtual void visit( ChooseStmt *switchStmt );
 		virtual void visit( CaseStmt *caseStmt );
+		virtual void visit( BranchStmt *branchStmt );
 		virtual void visit( ReturnStmt *returnStmt );
 
@@ -260,4 +261,17 @@
 	void Resolver::visit( CaseStmt *caseStmt ) {
 		Visitor::visit( caseStmt );
+	}
+
+	void Resolver::visit( BranchStmt *branchStmt ) {
+		// 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() ) ) {
+				VoidType v = Type::Qualifiers();		// cast to void * for the alternative finder
+				PointerType pt( Type::Qualifiers(), v.clone() );
+				CastExpr * castExpr = new CastExpr( arg, pt.clone() );
+				Expression * newExpr = findSingleExpression( castExpr, *this ); // find best expression
+				branchStmt->set_target( newExpr );
+			} // if
+		} // if
 	}