mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-21 12:26:00 -07:00
parent b7de8668c6
commit bfdbec1453
1 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser; package org.eclipse.cdt.internal.core.dom.parser;
@ -69,7 +69,7 @@ public class Value implements IValue {
new Value(new char[] {'5'}, ICPPUnknownBinding.EMPTY_UNKNOWN_BINDING_ARRAY), new Value(new char[] {'5'}, ICPPUnknownBinding.EMPTY_UNKNOWN_BINDING_ARRAY),
new Value(new char[] {'6'}, ICPPUnknownBinding.EMPTY_UNKNOWN_BINDING_ARRAY)}; new Value(new char[] {'6'}, ICPPUnknownBinding.EMPTY_UNKNOWN_BINDING_ARRAY)};
private static class Reevaluation { private static class Reevaluation {
public final char[] fExpression; public final char[] fExpression;
private int fPackOffset; private int fPackOffset;
@ -99,6 +99,7 @@ public class Value implements IValue {
pos= idx; pos= idx;
} }
} }
private static class UnknownValueException extends Exception {} private static class UnknownValueException extends Exception {}
private static UnknownValueException UNKNOWN_EX= new UnknownValueException(); private static UnknownValueException UNKNOWN_EX= new UnknownValueException();
private static int sUnique=0; private static int sUnique=0;
@ -130,7 +131,7 @@ public class Value implements IValue {
buf.append(fExpression); buf.append(fExpression);
buf.append('['); buf.append('[');
for (int i = 0; i < fUnknownBindings.length; i++) { for (int i = 0; i < fUnknownBindings.length; i++) {
if (i>0) if (i > 0)
buf.append(','); buf.append(',');
buf.append(getSignatureForUnknown(fUnknownBindings[i])); buf.append(getSignatureForUnknown(fUnknownBindings[i]));
} }
@ -451,10 +452,9 @@ public class Value implements IValue {
case IASTLiteralExpression.lk_char_constant: case IASTLiteralExpression.lk_char_constant:
try { try {
final char[] image= litEx.getValue(); final char[] image= litEx.getValue();
if (image.length > 1) if (image.length > 1 && image[0] == 'L')
if (image[0] == 'L') return ExpressionEvaluator.getChar(image, 2);
return ExpressionEvaluator.getChar(image, 2); return ExpressionEvaluator.getChar(image, 1);
return ExpressionEvaluator.getChar(image, 1);
} catch (EvalException e1) { } catch (EvalException e1) {
throw UNKNOWN_EX; throw UNKNOWN_EX;
} }
@ -481,7 +481,7 @@ public class Value implements IValue {
IValue value= null; IValue value= null;
if (b instanceof IInternalVariable) { if (b instanceof IInternalVariable) {
value= ((IInternalVariable) b).getInitialValue(maxdepth-1); value= ((IInternalVariable) b).getInitialValue(maxdepth - 1);
} else if (b instanceof IVariable) { } else if (b instanceof IVariable) {
value= ((IVariable) b).getInitialValue(); value= ((IVariable) b).getInitialValue();
} else if (b instanceof IEnumerator) { } else if (b instanceof IEnumerator) {
@ -523,7 +523,7 @@ public class Value implements IValue {
final char c= expr[i]; final char c= expr[i];
switch(c) { switch(c) {
case REFERENCE_CHAR: { case REFERENCE_CHAR: {
int idx= parseNonNegative(expr, i+1); int idx= parseNonNegative(expr, i + 1);
if (idx >= oldUnknowns.length) if (idx >= oldUnknowns.length)
throw UNKNOWN_EX; throw UNKNOWN_EX;
final IBinding old = oldUnknowns[idx]; final IBinding old = oldUnknowns[idx];
@ -570,7 +570,7 @@ public class Value implements IValue {
case IASTUnaryExpression.op_prefixIncr: case IASTUnaryExpression.op_prefixIncr:
case IASTUnaryExpression.op_postFixIncr: case IASTUnaryExpression.op_postFixIncr:
return ++v; return ++v;
case IASTUnaryExpression.op_prefixDecr : case IASTUnaryExpression.op_prefixDecr:
case IASTUnaryExpression.op_postFixDecr: case IASTUnaryExpression.op_postFixDecr:
return --v; return --v;
case IASTUnaryExpression.op_minus: case IASTUnaryExpression.op_minus:
@ -586,7 +586,7 @@ public class Value implements IValue {
switch (unaryOp) { switch (unaryOp) {
case IASTUnaryExpression.op_prefixIncr: case IASTUnaryExpression.op_prefixIncr:
case IASTUnaryExpression.op_postFixIncr: case IASTUnaryExpression.op_postFixIncr:
case IASTUnaryExpression.op_prefixDecr : case IASTUnaryExpression.op_prefixDecr:
case IASTUnaryExpression.op_postFixDecr: case IASTUnaryExpression.op_postFixDecr:
case IASTUnaryExpression.op_minus: case IASTUnaryExpression.op_minus:
case IASTUnaryExpression.op_tilde: case IASTUnaryExpression.op_tilde:
@ -611,7 +611,7 @@ public class Value implements IValue {
long v2= ((Number) o2).longValue(); long v2= ((Number) o2).longValue();
switch(op) { switch(op) {
case IASTBinaryExpression.op_multiply: case IASTBinaryExpression.op_multiply:
return v1*v2; return v1 * v2;
case IASTBinaryExpression.op_divide: case IASTBinaryExpression.op_divide:
if (v2 == 0) if (v2 == 0)
throw UNKNOWN_EX; throw UNKNOWN_EX;
@ -732,13 +732,13 @@ public class Value implements IValue {
final char c= buf[idx]; final char c= buf[idx];
switch(c) { switch(c) {
case BINARY_OP_CHAR: case BINARY_OP_CHAR:
int op= parseNonNegative(buf, idx+1); int op= parseNonNegative(buf, idx + 1);
reeval.nextSeperator(); reeval.nextSeperator();
Object o1= reevaluate(reeval, maxdepth); Object o1= reevaluate(reeval, maxdepth);
Object o2= reevaluate(reeval, maxdepth); Object o2= reevaluate(reeval, maxdepth);
return combineBinary(op, o1, o2); return combineBinary(op, o1, o2);
case UNARY_OP_CHAR: case UNARY_OP_CHAR:
op= parseNonNegative(buf, idx+1); op= parseNonNegative(buf, idx + 1);
reeval.nextSeperator(); reeval.nextSeperator();
o1= reevaluate(reeval, maxdepth); o1= reevaluate(reeval, maxdepth);
return combineUnary(op, o1); return combineUnary(op, o1);
@ -756,7 +756,7 @@ public class Value implements IValue {
} }
return "" + CONDITIONAL_CHAR + SEPARATOR + cond.toString() + SEPARATOR + po.toString() + SEPARATOR + neg.toString(); //$NON-NLS-1$ return "" + CONDITIONAL_CHAR + SEPARATOR + cond.toString() + SEPARATOR + po.toString() + SEPARATOR + neg.toString(); //$NON-NLS-1$
case REFERENCE_CHAR: case REFERENCE_CHAR:
int num= parseNonNegative(buf, idx+1); int num= parseNonNegative(buf, idx + 1);
final IBinding[] resolvedUnknowns= reeval.fResolvedUnknown; final IBinding[] resolvedUnknowns= reeval.fResolvedUnknown;
if (num >= resolvedUnknowns.length) if (num >= resolvedUnknowns.length)
throw UNKNOWN_EX; throw UNKNOWN_EX;
@ -764,7 +764,7 @@ public class Value implements IValue {
return evaluateBinding(resolvedUnknowns[num], reeval.fUnknownSigs, reeval.fUnknowns, maxdepth); return evaluateBinding(resolvedUnknowns[num], reeval.fUnknownSigs, reeval.fUnknowns, maxdepth);
case TEMPLATE_PARAM_CHAR: case TEMPLATE_PARAM_CHAR:
num= parseHex(buf, idx+1); num= parseHex(buf, idx + 1);
reeval.nextSeperator(); reeval.nextSeperator();
ICPPTemplateArgument arg = reeval.fMap.getArgument(num); ICPPTemplateArgument arg = reeval.fMap.getArgument(num);
if (arg != null) { if (arg != null) {
@ -776,7 +776,7 @@ public class Value implements IValue {
return createTemplateParamExpression(num, false); return createTemplateParamExpression(num, false);
case TEMPLATE_PARAM_PACK_CHAR: case TEMPLATE_PARAM_PACK_CHAR:
num= parseHex(buf, idx+1); num= parseHex(buf, idx + 1);
reeval.nextSeperator(); reeval.nextSeperator();
arg= null; arg= null;
if (reeval.fPackOffset >= 0) { if (reeval.fPackOffset >= 0) {
@ -807,14 +807,14 @@ public class Value implements IValue {
final int len= value.length; final int len= value.length;
int result = 0; int result = 0;
boolean ok= false; boolean ok= false;
for(; offset< len; offset++) { for(; offset < len; offset++) {
final int digit= (value[offset]- '0'); final int digit= (value[offset] - '0');
if (digit < 0 || digit > 9) if (digit < 0 || digit > 9)
break; break;
if (result > maxvalue) if (result > maxvalue)
return -1; return -1;
result= result*10 + digit; result= result * 10 + digit;
ok= true; ok= true;
} }
if (!ok) if (!ok)
@ -829,12 +829,12 @@ public class Value implements IValue {
int result = 0; int result = 0;
boolean ok= false; boolean ok= false;
final int len= value.length; final int len= value.length;
for(; offset< len; offset++) { for(; offset < len; offset++) {
int digit= (value[offset]- '0'); int digit= (value[offset] - '0');
if (digit < 0 || digit > 9) { if (digit < 0 || digit > 9) {
digit += '0'-'a'+10; digit += '0' - 'a' + 10;
if (digit < 10 || digit > 15) { if (digit < 10 || digit > 15) {
digit += 'a'-'A'; digit += 'a' - 'A';
if (digit < 10 || digit > 15) { if (digit < 10 || digit > 15) {
break; break;
} }
@ -867,14 +867,14 @@ public class Value implements IValue {
offset++; offset++;
} }
for(; offset < len; offset++) { for(; offset < len; offset++) {
final int digit= (value[offset]- '0'); final int digit= (value[offset] - '0');
if (digit < 0 || digit > 9) if (digit < 0 || digit > 9)
break; break;
if (result > maxvalue) if (result > maxvalue)
throw UNKNOWN_EX; throw UNKNOWN_EX;
result= result*10 + digit; result= result * 10 + digit;
ok= true; ok= true;
} }
if (!ok) if (!ok)
@ -897,17 +897,17 @@ public class Value implements IValue {
negative = true; negative = true;
i++; i++;
} }
if (i==len) if (i == len)
return null; return null;
for(; i< len; i++) { for(; i < len; i++) {
if (result > maxvalue) if (result > maxvalue)
return null; return null;
final int digit= (value[i]- '0'); final int digit= (value[i] - '0');
if (digit < 0 || digit > 9) if (digit < 0 || digit > 9)
return null; return null;
result= result*10 + digit; result= result * 10 + digit;
} }
return negative ? -result : result; return negative ? -result : result;
} }
@ -924,7 +924,6 @@ public class Value implements IValue {
} }
return binding.getName(); return binding.getName();
} }
/** /**
* Converts long to a char array * Converts long to a char array