Changes in / [d2ded3e7:4673385]

Location:

src

Files:

• ResolvExpr/CastCost.cc (modified) (3 diffs)
• ResolvExpr/PtrsAssignable.cc (modified) (2 diffs)
• ResolvExpr/PtrsCastable.cc (modified) (2 diffs)
• ResolvExpr/Unify.cc (modified) (6 diffs)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/ObjectDecl.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 06:59:10 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Oct 05 14:48:45 2015
+// Update Count     : 5
 //
 
@@ -56 +56 @@
                                 return Cost::infinity;
                         } else {
+                                // xxx - why are we adding cost 0 here?
                                 return converter.get_cost() + Cost( 0, 0, 0 );
                         } // if
@@ -82 +83 @@
                                 newEnv.add( pointerType->get_forall() );
                                 newEnv.add( pointerType->get_base()->get_forall() );
-                                int assignResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
-                                if ( assignResult > 0 ) {
+                                int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
+                                if ( castResult > 0 ) {
                                         cost = Cost( 0, 0, 1 );
-                                } else if ( assignResult < 0 ) {
+                                } else if ( castResult < 0 ) {
                                         cost = Cost( 1, 0, 0 );
                                 } // if

src/ResolvExpr/PtrsAssignable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:44:11 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 11:47:36 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Sep 21 14:34:58 2015
+// Update Count     : 7
 //
 
@@ -106 +106 @@
         void PtrsAssignable::visit( TypeInstType *inst ) {
                 EqvClass eqvClass;
-                if ( env.lookup( inst->get_name(), eqvClass ) ) {
+                if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type ) {
                         result = ptrsAssignable( eqvClass.type, dest, env );
                 } else {

src/ResolvExpr/PtrsCastable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:48:00 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 11:51:17 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Oct 05 14:49:12 2015
+// Update Count     : 7
 //
 
@@ -133 +133 @@
 
         void PtrsCastable::visit(TypeInstType *inst) {
-                result = objectCast( inst, env, indexer ) && objectCast( dest, env, indexer ) ? 1 : -1;
+                result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
         }
 

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 14:57:05 2015
-// Update Count     : 7
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Sep 02 14:43:22 2015
+// Update Count     : 36
 //
 
@@ -28 +28 @@
 
 
-//#define DEBUG
+// #define DEBUG
 
 namespace ResolvExpr {
@@ -80 +80 @@
         bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 TypeEnvironment newEnv;
-                OpenVarSet openVars;
+                OpenVarSet openVars, closedVars; // added closedVars
                 AssertionSet needAssertions, haveAssertions;
                 Type *newFirst = first->clone(), *newSecond = second->clone();
                 env.apply( newFirst );
                 env.apply( newSecond );
+
+                // do we need to do this? Seems like we do, types should be able to be compatible if they
+                // have free variables that can unify
+                findOpenVars( newFirst, openVars, closedVars, needAssertions, haveAssertions, false );
+                findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true );
+
                 bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 delete newFirst;
@@ -425 +431 @@
 
         void Unify::visit(ArrayType *arrayType) {
-                // XXX -- compare array dimension
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
-                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
+                // to unify, array types must both be VLA or both not VLA
+                // and must both have a dimension expression or not have a dimension
+                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() 
+                                && ((arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0)
+                                        || (arrayType->get_dimension() == 0 && otherArray->get_dimension() == 0))) {
+
+                        // not positive this is correct in all cases, but it's needed for typedefs
+                        if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) {
+                                return;
+                        }
+
+                        if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() &&
+                                arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) {
+                                ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() );
+                                ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( otherArray->get_dimension() );
+                                assert(ce1 && ce2);
+
+                                Constant * c1 = ce1->get_constant();
+                                Constant * c2 = ce2->get_constant();
+
+                                if ( c1->get_value() != c2->get_value() ) {
+                                        // does not unify if the dimension is different
+                                        return;
+                                }
+                        }
+
                         result = unifyExact( arrayType->get_base(), otherArray->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 } // if
@@ -435 +465 @@
         bool unifyDeclList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
                 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
+                        // Type * commonType;
+                        // if ( ! unifyInexact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) {
                         if ( ! unifyExact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ) ) {
                                 return false;
@@ -449 +481 @@
                 FunctionType *otherFunction = dynamic_cast< FunctionType* >( type2 );
                 if ( otherFunction && functionType->get_isVarArgs() == otherFunction->get_isVarArgs() ) {
-  
+
                         if ( unifyDeclList( functionType->get_parameters().begin(), functionType->get_parameters().end(), otherFunction->get_parameters().begin(), otherFunction->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
         

src/SymTab/Validate.cc

@@ -54 +54 @@
 #include "MakeLibCfa.h"
 #include "TypeEquality.h"
+#include "ResolvExpr/typeops.h"
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
@@ -851 +852 @@
                         Type * t1 = tyDecl->get_base();
                         Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
-                        if ( ! typeEquals( t1, t2, true ) ) {
+                        if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
                         }

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:08:27 2015
-// Update Count     : 16
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Sep 29 14:13:01 2015
+// Update Count     : 18
 //
 
@@ -52 +52 @@
                 get_type()->print( os, indent );
         } else {
-                os << "untyped entity ";
+                os << " untyped entity ";
         } // if
 
         if ( init ) {
-                os << "with initializer ";
+                os << " with initializer ";
                 init->print( os, indent );
         } // if
 
         if ( bitfieldWidth ) {
-                os << "with bitfield width ";
+                os << " with bitfield width ";
                 bitfieldWidth->print( os );
         } // if