Changeset 8f7cea1 for src/ResolvExpr

Timestamp:

Sep 11, 2016, 9:58:25 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:

6eb8948

Parents:

908cc83

git-author:

Rob Schluntz <rschlunt@…> (09/11/16 09:56:02)

git-committer:

Rob Schluntz <rschlunt@…> (09/11/16 09:58:25)

Message:

remove NameMatcher? code

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (5 diffs)
• AlternativeFinder.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -39 +39 @@
 #include "SymTab/Validate.h"
 #include "Tuples/TupleAssignment.h"
-#include "Tuples/NameMatcher.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
@@ -265 +264 @@
 
         Cost computeConversionCost( Alternative &alt, const SymTab::Indexer &indexer ) {
-                ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( alt.expr );
-                assert( appExpr );
-                PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
-                assert( pointer );
-                FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
-                assert( function );
+                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( alt.expr );
+                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
 
                 Cost convCost( 0, 0, 0 );
@@ -397 +393 @@
                 resultEnv.extractOpenVars( openVars );
 
-                /*
-                  Tuples::NameMatcher matcher( formals );
-                  try {
-                  matcher.match( actuals );
-                  } catch ( Tuples::NoMatch &e ) {
-                  std::cerr << "Alternative doesn't match: " << e.message << std::endl;
-                  }
-                */
                 std::list< DeclarationWithType* >::iterator formal = formals.begin();
 
@@ -707 +695 @@
 
                         PRINT(
-                                ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( withFunc->expr );
-                                assert( appExpr );
-                                PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
-                                assert( pointer );
-                                FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
-                                assert( function );
+                                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( withFunc->expr );
+                                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
                                 std::cerr << "Case +++++++++++++" << std::endl;
                                 std::cerr << "formals are:" << std::endl;
@@ -1068 +1053 @@
                 }
         }
+
+        void AlternativeFinder::visit( TupleIndexExpr *tupleExpr ) {
+                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+        }
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativeFinder.h

@@ -67 +67 @@
                 virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
                 virtual void visit( ConstructorExpr * ctorExpr );
+                virtual void visit( TupleIndexExpr *tupleExpr );
                 /// Runs a new alternative finder on each element in [begin, end)
                 /// and writes each alternative finder to out.