misc changes

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EqualExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EqualExpression.java
index e2385de..2a6fe06 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EqualExpression.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EqualExpression.java
@@ -11,10 +11,18 @@
 package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.impl.*;
-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.codegen.Label;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
+import net.sourceforge.phpdt.internal.compiler.impl.Constant;
+import net.sourceforge.phpdt.internal.compiler.impl.NullConstant;
+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 EqualExpression extends BinaryExpression {
 
@@ -124,10 +132,10 @@ public final boolean areTypesCastCompatible(BlockScope scope, TypeBinding castTb
                        return false;
                }
                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;
@@ -135,7 +143,7 @@ public final boolean areTypesCastCompatible(BlockScope scope, TypeBinding castTb
                }
                if (castTb.isInterface()) { // ----- (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 {
@@ -161,7 +169,7 @@ public final boolean areTypesCastCompatible(BlockScope scope, TypeBinding castTb
                        if (scope.isJavaLangObject(castTb))
                                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;