Changes in src/ResolvExpr/PtrsCastable.cc [4040425:843054c2]

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (4 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 11:48:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:18 2016
-// Update Count     : 8
+// Last Modified On : Sun May 17 11:51:17 2015
+// Update Count     : 2
 //
 
@@ -36 +36 @@
                 virtual void visit(UnionInstType *inst);
                 virtual void visit(EnumInstType *inst);
-                virtual void visit(TraitInstType *inst);
+                virtual void visit(ContextInstType *inst);
                 virtual void visit(TypeInstType *inst);
                 virtual void visit(TupleType *tupleType);
-                virtual void visit(VarArgsType *varArgsType);
           private:
                 Type *dest;
@@ -116 +115 @@
 
         void PtrsCastable::visit(EnumInstType *inst) {
-                if ( dynamic_cast< EnumInstType* >( dest ) ) {
+                if ( dynamic_cast< EnumInstType* >( inst ) ) {
                         result = 1;
-                } else if ( BasicType *bt = dynamic_cast< BasicType* >( dest ) ) {
+                } else if ( BasicType *bt = dynamic_cast< BasicType* >( inst ) ) {
                         if ( bt->get_kind() == BasicType::SignedInt ) {
                                 result = 0;
@@ -129 +128 @@
         }
 
-        void PtrsCastable::visit(TraitInstType *inst) {
+        void PtrsCastable::visit(ContextInstType *inst) {
                 // I definitely don't think we should be doing anything here
         }
 
         void PtrsCastable::visit(TypeInstType *inst) {
-                result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
+                result = objectCast( inst, env, indexer ) && objectCast( dest, env, indexer ) ? 1 : -1;
         }
 
         void PtrsCastable::visit(TupleType *tupleType) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::visit(VarArgsType *varArgsType) {
                 result = objectCast( dest, env, indexer );
         }