Changeset 0b150ec for src/ResolvExpr

Timestamp:

May 24, 2017, 4:12:28 PM (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:

7f623d6f

Parents:

6e206cb

Message:

minor zero_t/one_t prelude changes, simplify prelude generation, memory error fixes

Location:

src/ResolvExpr

Files:

• CastCost.cc (modified) (3 diffs)
• ConversionCost.cc (modified) (1 diff)
• Resolver.cc (modified) (2 diffs)
• Unify.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CastCost.cc -- 
+// CastCost.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
           public:
                 CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-  
+
                 virtual void visit( BasicType *basicType );
                 virtual void visit( PointerType *pointerType );
@@ -36 +36 @@
                         NamedTypeDecl *namedType;
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                return castCost( src, eqvClass.type, indexer, env );
+                                if ( eqvClass.type ) {
+                                        return castCost( src, eqvClass.type, indexer, env );
+                                } else {
+                                        return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );

src/ResolvExpr/ConversionCost.cc

@@ -30 +30 @@
 ///     std::cout << "type inst " << destAsTypeInst->get_name();
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                return conversionCost( src, eqvClass.type, indexer, env );
+                                if ( eqvClass.type ) {
+                                        return conversionCost( src, eqvClass.type, indexer, env );
+                                } else {
+                                        return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
 ///       std::cout << " found" << std::endl;

src/ResolvExpr/Resolver.cc

@@ -124 +124 @@
                         } // if
 #endif
-                        assert( finder.get_alternatives().size() == 1 );
+                        assertf( finder.get_alternatives().size() == 1, "findSingleExpression: must have exactly one alternative at the end." );
                         Alternative &choice = finder.get_alternatives().front();
                         Expression *newExpr = choice.expr->clone();
@@ -397 +397 @@
                         // //   cerr << type << endl;
                         // // } // for
-                        
+
                         // // O(N^2) checks of d-types with f-types
                         // // find the minimum cost

src/ResolvExpr/Unify.cc

@@ -344 +344 @@
                 std::cerr << "unifyInexact type 1 is ";
                 type1->print( std::cerr );
-                std::cerr << "type 2 is ";
+                std::cerr << " type 2 is ";
                 type2->print( std::cerr );
                 std::cerr << std::endl;
@@ -595 +595 @@
                         TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
                         assertf(otherParam, "Aggregate parameters should be type expressions");
-                        
+
                         Type* paramTy = param->get_type();
                         Type* otherParamTy = otherParam->get_type();