Changeset 727cf70f for src

Timestamp:

Apr 3, 2017, 12:00:50 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

a6af031

Parents:

23063ea (diff), 1d29d46 (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

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• ResolvExpr/PtrsCastable.cc (modified) (3 diffs)
• ResolvExpr/Unify.cc (modified) (2 diffs)
• libcfa/stdlib (modified) (2 diffs)
• libcfa/stdlib.c (modified) (2 diffs)
• tests/.expect/searchsort.txt (modified) (2 diffs)
• tests/searchsort.c (modified) (6 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -255 +255 @@
                 }
 
-                assert( baseParam == baseParams.end() && param == params.end() && "Type parameters should match type variables" );
+                assertf( baseParam == baseParams.end() && param == params.end(), "Type parameters should match type variables" );
                 return gt;
         }

src/ResolvExpr/PtrsCastable.cc

@@ -68 +68 @@
                 return 1;
         }
+        int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+        }
 
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
@@ -106 +109 @@
 
         void PtrsCastable::visit(FunctionType *functionType) {
-                result = -1;
+                // result = -1;
+                result = functionCast( dest, env, indexer );
         }
 
@@ -136 +140 @@
 
         void PtrsCastable::visit(TypeInstType *inst) {
-                result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
+                //result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
+                result = objectCast( inst, env, indexer ) == objectCast( dest, env, indexer ) ? 1 : -1;
         }
 

src/ResolvExpr/Unify.cc

@@ -134 +134 @@
                   case TypeDecl::Ftype:
                         return isFtype( type, indexer );
-                        case TypeDecl::Ttype:
+                  case TypeDecl::Ttype:
                         // ttype unifies with any tuple type
                         return dynamic_cast< TupleType * >( type ) || Tuples::isTtype( type );
@@ -592 +592 @@
                 for ( ; it != params.end() && jt != otherParams.end(); ++it, ++jt ) {
                         TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
-                        assert(param && "Aggregate parameters should be type expressions");
+                        assertf(param, "Aggregate parameters should be type expressions");
                         TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
-                        assert(otherParam && "Aggregate parameters should be type expressions");
-
-                        if ( ! unifyExact( param->get_type(), otherParam->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
+                        assertf(otherParam, "Aggregate parameters should be type expressions");
+                        
+                        Type* paramTy = param->get_type();
+                        Type* otherParamTy = otherParam->get_type();
+
+                        bool tupleParam = Tuples::isTtype( paramTy );
+                        bool otherTupleParam = Tuples::isTtype( otherParamTy );
+
+                        if ( tupleParam && otherTupleParam ) {
+                                ++it; ++jt;  // skip ttype parameters for break
+                        } else if ( tupleParam ) {
+                                // bundle other parameters into tuple to match
+                                TupleType* binder = new TupleType{ paramTy->get_qualifiers() };
+
+                                do {
+                                        binder->get_types().push_back( otherParam->get_type()->clone() );
+                                        ++jt;
+
+                                        if ( jt == otherParams.end() ) break;
+
+                                        otherParam = dynamic_cast< TypeExpr* >(*jt);
+                                        assertf(otherParam, "Aggregate parameters should be type expressions");
+                                } while (true);
+
+                                otherParamTy = binder;
+                                ++it;  // skip ttype parameter for break
+                        } else if ( otherTupleParam ) {
+                                // bundle parameters into tuple to match other
+                                TupleType* binder = new TupleType{ otherParamTy->get_qualifiers() };
+
+                                do {
+                                        binder->get_types().push_back( param->get_type()->clone() );
+                                        ++it;
+
+                                        if ( it == params.end() ) break;
+
+                                        param = dynamic_cast< TypeExpr* >(*it);
+                                        assertf(param, "Aggregate parameters should be type expressions");
+                                } while (true);
+
+                                paramTy = binder;
+                                ++jt;  // skip ttype parameter for break
+                        }
+
+                        if ( ! unifyExact( paramTy, otherParamTy, env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
                                 result = false;
                                 return;
                         }
+
+                        // ttype parameter should be last
+                        if ( tupleParam || otherTupleParam ) break;
                 }
                 result = ( it == params.end() && jt == otherParams.end() );

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  4 22:03:54 2017
-// Update Count     : 102
+// Last Modified On : Sat Apr  1 17:35:24 2017
+// Update Count     : 104
 //
 
@@ -84 +84 @@
 forall( otype T | { int ?<?( T, T ); } )
 T * bsearch( T key, const T * arr, size_t dimension );
+forall( otype T | { int ?<?( T, T ); } )
+unsigned int bsearch( T key, const T * arr, size_t dimension );
 
 forall( otype T | { int ?<?( T, T ); } )

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  4 22:02:22 2017
-// Update Count     : 172
+// Last Modified On : Sat Apr  1 18:31:26 2017
+// Update Count     : 181
 //
 
@@ -228 +228 @@
 
 forall( otype T | { int ?<?( T, T ); } )
+unsigned int bsearch( T key, const T * arr, size_t dimension ) {
+        int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }
+        T *result = (T *)bsearch( &key, arr, dimension, sizeof(T), comp );
+        return result ? result - arr : dimension;                       // pointer subtraction includes sizeof(T)
+} // bsearch
+
+forall( otype T | { int ?<?( T, T ); } )
 void qsort( const T * arr, size_t dimension ) {
         int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }

src/tests/.expect/searchsort.txt

@@ -1 @@
-10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
-1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
+
+1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
@@ -10 +14 @@
 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 
 10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, 
+10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, 
 
 10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
 1 2, 2 3, 3 4, 4 5, 5 6, 6 7, 7 8, 8 9, 9 10, 10 11, 
 10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
+10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
 

src/tests/searchsort.c

@@ -10 +10 @@
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:06:07 2016
-// Update Count     : 56
+// Last Modified On : Sun Apr  2 11:29:30 2017
+// Update Count     : 76
 // 
 
 #include <fstream>
 #include <stdlib>                                                                               // bsearch, qsort
+#include <stdlib.h>                                                                             // C version of bsearch
+
+int comp( const void * t1, const void * t2 ) { return *(int *)t1 < *(int *)t2 ? -1 : *(int *)t2 < *(int *)t1 ? 1 : 0; }
 
 int main( void ) {
@@ -25 +28 @@
                 sout | iarr[i] | ", ";
         } // for
-        sout | endl;
+        sout | endl | endl;
+
+        // ascending sort/search by changing < to >
         qsort( iarr, size );
         for ( unsigned int i = 0; i < size; i += 1 ) {
@@ -31 +36 @@
         } // for
         sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {          // C version
+                int key = size - i;
+                int *v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
+                sout | *v | ", ";
+        } // for
+        sout | endl;
         for ( unsigned int i = 0; i < size; i += 1 ) {
                 int *v = bsearch( size - i, iarr, size );
                 sout | *v | ", ";
+        } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                unsigned int posn = bsearch( size - i, iarr, size );
+                sout | iarr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -54 +70 @@
                         sout | *v | ", ";
                 } // for
+                sout | endl;
+                for ( unsigned int i = 0; i < size; i += 1 ) {
+                        unsigned int posn = bsearch( size - i, iarr, size );
+                        sout | iarr[posn] | ", ";
+                } // for
         }
         sout | endl | endl;
@@ -71 +92 @@
                 double *v = bsearch( size - i + 0.5, darr, size );
                 sout | *v | ", ";
+        } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                unsigned int posn = bsearch( size - i + 0.5, darr, size );
+                sout | darr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -93 +119 @@
                 sout | *v | ", ";
         } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                S temp = { size - i, size - i + 1 };
+                unsigned int posn = bsearch( temp, sarr, size );
+                sout | sarr[posn] | ", ";
+        } // for
         sout | endl | endl;
 } // main