misc changes

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / ast / InstanceOfExpression.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InstanceOfExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InstanceOfExpression.java
index db4cd45..27c5e24 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InstanceOfExpression.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InstanceOfExpression.java
@@ -11,9 +11,15 @@
 package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.codegen.*;
-import net.sourceforge.phpdt.internal.compiler.flow.*;
-import net.sourceforge.phpdt.internal.compiler.lookup.*;
+import net.sourceforge.phpdt.internal.compiler.codegen.CodeStream;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
+import net.sourceforge.phpdt.internal.compiler.lookup.ArrayBinding;
+import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding;
+import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
+import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
+import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 public class InstanceOfExpression extends OperatorExpression {
 
@@ -118,10 +124,10 @@ public class InstanceOfExpression extends OperatorExpression {
                                        }
                                }
                                if (castTb.isClass()) { // ----- (castTb.isClass) expressionTb.isClass ------ 
-                                       if (scope.areTypesCompatible(expressionTb, castTb))
+                                       if (BlockScope.areTypesCompatible(expressionTb, castTb))
                                                return true;
                                        else {
-                                               if (scope.areTypesCompatible(castTb, expressionTb)) {
+                                               if (BlockScope.areTypesCompatible(castTb, expressionTb)) {
                                                        return true;
                                                }
                                                return false;
@@ -131,7 +137,7 @@ public class InstanceOfExpression extends OperatorExpression {
                                        // ----- (castTb.isInterface) expressionTb.isClass -------  
                                        if (((ReferenceBinding) expressionTb).isFinal()) {
                                                //no subclass for expressionTb, thus compile-time check is valid
-                                               if (scope.areTypesCompatible(expressionTb, castTb))
+                                               if (BlockScope.areTypesCompatible(expressionTb, castTb))
                                                        return true;
                                                return false;
                                        } else {
@@ -158,7 +164,7 @@ public class InstanceOfExpression extends OperatorExpression {
                                                return true;
                                        if (((ReferenceBinding) castTb).isFinal()) {
                                                //no subclass for castTb, thus compile-time check is valid
-                                               if (scope.areTypesCompatible(castTb, expressionTb)) {
+                                               if (BlockScope.areTypesCompatible(castTb, expressionTb)) {
                                                        return true;
                                                }
                                                return false;