Changeset 1d29d46 for src

Timestamp:

Apr 3, 2017, 11:24:44 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

5995116, 727cf70f

Parents:

fc19129

Message:

Function pointer casts allowed by resolver

File:

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

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;
         }