misc changes

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
index d234618..42da00f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
@@ -11,10 +11,14 @@
 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.lookup.BaseTypeBinding;
+import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 public class ConditionalExpression extends OperatorExpression {
 
@@ -377,13 +381,13 @@ public class ConditionalExpression extends OperatorExpression {
                                valueIfFalseType);
                        return null;
                }
-               if (scope.areTypesCompatible(valueIfFalseType, valueIfTrueType)) {
+               if (BlockScope.areTypesCompatible(valueIfFalseType, valueIfTrueType)) {
                        valueIfTrue.implicitWidening(valueIfTrueType, valueIfTrueType);
                        valueIfFalse.implicitWidening(valueIfTrueType, valueIfFalseType);
                        this.typeBinding = valueIfTrueType;
                        return valueIfTrueType;
                }
-               if (scope.areTypesCompatible(valueIfTrueType, valueIfFalseType)) {
+               if (BlockScope.areTypesCompatible(valueIfTrueType, valueIfFalseType)) {
                        valueIfTrue.implicitWidening(valueIfFalseType, valueIfTrueType);
                        valueIfFalse.implicitWidening(valueIfFalseType, valueIfFalseType);
                        this.typeBinding = valueIfFalseType;