import eclipse 3.1 M4 compiler

[org.ibex.tool.git] / src / org / eclipse / jdt / internal / compiler / ast / UnaryExpression.java

diff --git a/src/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java b/src/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
index 1e3a2fc..7e38c26 100644 (file)
--- a/src/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
+++ b/src/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
@@ -71,7 +71,7 @@ public class UnaryExpression extends OperatorExpression {
                }
                switch ((bits & OperatorMASK) >> OperatorSHIFT) {
                        case NOT :
-                               switch (this.expression.implicitConversion >> 4) /* runtime type */ {
+                               switch ((this.expression.implicitConversion & IMPLICIT_CONVERSION_MASK) >> 4) /* runtime type */ {
                                        case T_boolean :
                                                // ! <boolean>
                                                // Generate code for the condition
@@ -97,8 +97,7 @@ public class UnaryExpression extends OperatorExpression {
                                }
                                break;
                        case TWIDDLE :
-                               switch (this.expression.implicitConversion >> 4 /* runtime */
-                                       ) {
+                               switch ((this.expression.implicitConversion & IMPLICIT_CONVERSION_MASK) >> 4 /* runtime */) {
                                        case T_int :
                                                // ~int
                                                this.expression.generateCode(currentScope, codeStream, valueRequired);
@@ -119,7 +118,7 @@ public class UnaryExpression extends OperatorExpression {
                                // - <num>
                                if (this.constant != NotAConstant) {
                                        if (valueRequired) {
-                                               switch (this.expression.implicitConversion >> 4){ /* runtime */
+                                               switch ((this.expression.implicitConversion & IMPLICIT_CONVERSION_MASK) >> 4){ /* runtime */
                                                        case T_int :
                                                                codeStream.generateInlinedValue(this.constant.intValue() * -1);
                                                                break;
@@ -136,7 +135,7 @@ public class UnaryExpression extends OperatorExpression {
                                } else {
                                        this.expression.generateCode(currentScope, codeStream, valueRequired);
                                        if (valueRequired) {
-                                               switch (expression.implicitConversion >> 4){ /* runtime type */
+                                               switch ((expression.implicitConversion & IMPLICIT_CONVERSION_MASK) >> 4){ /* runtime type */
                                                        case T_int :
                                                                codeStream.ineg();
                                                                break;
@@ -213,8 +212,16 @@ public class UnaryExpression extends OperatorExpression {
                        this.constant = NotAConstant;
                        return null;
                }
-               int expressionTypeId = expressionType.id;
-               if (expressionTypeId > 15) {
+               int expressionTypeID = expressionType.id;
+               // autoboxing support
+               LookupEnvironment env = scope.environment();
+               boolean use15specifics = env.options.sourceLevel >= JDK1_5;
+               if (use15specifics) {
+                       if (!expressionType.isBaseType()) {
+                               expressionTypeID = env.computeBoxingType(expressionType).id;
+                       }
+               }               
+               if (expressionTypeID > 15) {
                        this.constant = NotAConstant;
                        scope.problemReporter().invalidOperator(this, expressionType);
                        return null;
@@ -236,8 +243,8 @@ public class UnaryExpression extends OperatorExpression {
                // (cast)  left   Op (cast)  rigth --> result
                //  0000   0000       0000   0000      0000
                //  <<16   <<12       <<8    <<4       <<0
-               int operatorSignature = OperatorSignatures[tableId][(expressionTypeId << 4) + expressionTypeId];
-               this.expression.implicitConversion = operatorSignature >>> 12;
+               int operatorSignature = OperatorSignatures[tableId][(expressionTypeID << 4) + expressionTypeID];
+               this.expression.computeConversion(scope, TypeBinding.wellKnownType(scope, (operatorSignature >>> 16) & 0x0000F), expressionType);
                this.bits |= operatorSignature & 0xF;
                switch (operatorSignature & 0xF) { // only switch on possible result type.....
                        case T_boolean :
@@ -263,7 +270,7 @@ public class UnaryExpression extends OperatorExpression {
                                break;
                        default : //error........
                                this.constant = Constant.NotAConstant;
-                               if (expressionTypeId != T_undefined)
+                               if (expressionTypeID != T_undefined)
                                        scope.problemReporter().invalidOperator(this, expressionType);
                                return null;
                }
@@ -272,7 +279,7 @@ public class UnaryExpression extends OperatorExpression {
                        this.constant =
                                Constant.computeConstantOperation(
                                        this.expression.constant,
-                                       expressionTypeId,
+                                       expressionTypeID,
                                        (bits & OperatorMASK) >> OperatorSHIFT);
                } else {
                        this.constant = Constant.NotAConstant;
@@ -284,7 +291,7 @@ public class UnaryExpression extends OperatorExpression {
                }
                if (expressionIsCast) {
                // check need for operand cast
-                       CastExpression.checkNeedForArgumentCast(scope, tableId, operatorSignature, this.expression, expressionTypeId);
+                       CastExpression.checkNeedForArgumentCast(scope, tableId, operatorSignature, this.expression, expressionTypeID);
                }
                return this.resolvedType;
        }