Changes in / [fda7e90:3874269]

Location:

src

Files:

• ResolvExpr/CommonType.cc (modified) (2 diffs)
• ResolvExpr/Unify.cc (modified) (1 diff)
• ResolvExpr/Unify.h (modified) (1 diff)
• libcfa/prelude.cf (modified) (1 diff)

src/ResolvExpr/CommonType.cc

@@ -42 +42 @@
                 virtual void visit( OneType *oneType );
 
-                void getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
 
@@ -146 +145 @@
         }
 
-        void CommonType::getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer ) {
-                if ( TypeInstType* var = dynamic_cast< TypeInstType* >( otherPointer->get_base() ) ) {
-                        OpenVarSet::const_iterator entry = openVars.find( var->get_name() );
-                        if ( entry != openVars.end() ) {
-                                AssertionSet need, have;
-                                WidenMode widen( widenFirst, widenSecond );
-                                if ( entry != openVars.end() && ! bindVar(var, voidPointer->get_base(), entry->second, env, need, have, openVars, widen, indexer ) ) return;
-                        }
-                }
-                result = voidPointer->clone();
-                result->get_qualifiers() += otherPointer->get_qualifiers();
-        }
-        
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
-                                getCommonWithVoidPointer( otherPointer, pointerType );
+                                result = otherPointer->clone();
+                                result->get_qualifiers() += pointerType->get_qualifiers();
                         } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
-                                getCommonWithVoidPointer( pointerType, otherPointer );
+                                result = pointerType->clone();
+                                result->get_qualifiers() += otherPointer->get_qualifiers();
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
                                            && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {

src/ResolvExpr/Unify.cc

@@ -31 +31 @@
 
 namespace ResolvExpr {
+        struct WidenMode {
+                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
+                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
+                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
+                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
+                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
+                operator bool() { return widenFirst && widenSecond; }
+
+                bool widenFirst : 1, widenSecond : 1;
+        };
 
         class Unify : public Visitor {

src/ResolvExpr/Unify.h

@@ -27 +27 @@
 
 namespace ResolvExpr {
-        struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
-
-                bool widenFirst : 1, widenSecond : 1;
-        };
-        
-        bool bindVar( TypeInstType *typeInst, Type *other, TypeDecl::Kind kind, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );

src/libcfa/prelude.cf

@@ -273 +273 @@
 forall( ftype FT ) signed int ?!=?( FT *, FT * );
 
-// forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
-// forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
-// forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
-// forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
+forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
+forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
+forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
+forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
 
 // forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );