Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve preprocessor number decoding #967

Merged
merged 1 commit into from
Oct 6, 2016
Merged

improve preprocessor number decoding #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cxx-squid/src/main/java/org/sonar/cxx/lexer/CxxLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static Lexer create(Preprocessor... preprocessors) { //@todo deprecated P
}

private static final String EXP = "([Ee][+-]?+[0-9_]([']?+[0-9_]++)*+)";
//private static final String INTEGER_SUFFIX = "(((U|u)(LL|ll|L|l)?)|((LL|ll|L|l)(u|U)?))";
//private static final String INTEGER_SUFFIX = "(((U|u)(i64|LL|ll|L|l)?)|((i64|LL|ll|L|l)(u|U)?))";
//private static final String FLOAT_SUFFIX = "(f|l|F|L)";
private static final String UD_SUFFIX = "([_a-zA-Z]([_a-zA-Z0-9]*+))"; // ud-suffix: identifier (including INTEGER_SUFFIX, FLOAT_SUFFIX)

Expand Down
79 changes: 61 additions & 18 deletions cxx-squid/src/main/java/org/sonar/cxx/preprocessor/ExpressionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import java.math.BigInteger;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
Expand All @@ -40,7 +38,6 @@
public final class ExpressionEvaluator {

private static final BigInteger UINT64_MAX = new BigInteger("FFFFFFFFFFFFFFFF", 16);
private static final String HEX_REGEX = "0[xX]([0-9A-Fa-f]+)(ui64)?";
public static final Logger LOG = Loggers.get(ExpressionEvaluator.class);

private final Parser<Grammar> parser;
Expand Down Expand Up @@ -459,28 +456,74 @@ private BigInteger evalFunctionlikeMacro(AstNode exprAst) {
return evalToInt(value, exprAst);
}

public static String stripSuffix(String number) {
return number.replaceAll("[LlUu]", "");
}
public static BigInteger decode(String number) {

private static BigInteger decode(String number) {
// This fuction is only responsible for providing a string and a radix to BigInteger.
// The lexer ensures that the number has a valid format.

int radix = 10;
int begin = 0;
if (number.length() > 2) {
if (number.charAt(0) == '0') {
radix = 8; // 0...
try {
Pattern p = Pattern.compile(HEX_REGEX);
Matcher m = p.matcher(number);
if (m.find()) {
radix = 16;
number = m.group(1);
}
} catch (java.lang.IllegalStateException e) {
// ignore "No match found"
switch (number.charAt(1)) {
case 'x':
case 'X':
radix = 16; // 0x...
begin = 2;
break;
case 'b':
case 'B':
radix = 2; // 0b...
begin = 2;
break;
default:
radix = 8; // 0...
break;
}
}
}

return new BigInteger(stripSuffix(number), radix);
StringBuilder sb = new StringBuilder(number.length());
Boolean suffix = false;
for (int index = begin; index < number.length() && !suffix; index++) {
char c = number.charAt(index);
switch (c) {
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':

case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':

case 'A':
case 'B':
case 'C':
case 'D':
case 'E':
case 'F':
sb.append(c);
break;

case '\'': // ignore digit separator
break;

default: // suffix
suffix = true;
break;
}
}

return new BigInteger(sb.toString(), radix);
}
}
20 changes: 20 additions & 0 deletions cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ public void decimal_integer_literals() {
assertThat(lexer.lex("7llU"), hasToken("7llU", CxxTokenType.NUMBER));
assertThat(lexer.lex("7LLu"), hasToken("7LLu", CxxTokenType.NUMBER));
assertThat(lexer.lex("7LLU"), hasToken("7LLU", CxxTokenType.NUMBER));

// With Micosoft specific 64-bit integer-suffix: i64
assertThat(lexer.lex("7i64"), hasToken("7i64", CxxTokenType.NUMBER));
assertThat(lexer.lex("7ui64"), hasToken("7ui64", CxxTokenType.NUMBER));
}

/**
Expand Down Expand Up @@ -159,6 +163,10 @@ public void octal_integer_literals() {
assertThat(lexer.lex("07llU"), hasToken("07llU", CxxTokenType.NUMBER));
assertThat(lexer.lex("07LLu"), hasToken("07LLu", CxxTokenType.NUMBER));
assertThat(lexer.lex("07LLU"), hasToken("07LLU", CxxTokenType.NUMBER));

// With Micosoft specific 64-bit integer-suffix: i64
assertThat(lexer.lex("07i64"), hasToken("07i64", CxxTokenType.NUMBER));
assertThat(lexer.lex("07ui64"), hasToken("07ui64", CxxTokenType.NUMBER));
}

/**
Expand Down Expand Up @@ -204,6 +212,10 @@ public void hex_integer_literals() {
assertThat(lexer.lex("0x7llU"), hasToken("0x7llU", CxxTokenType.NUMBER));
assertThat(lexer.lex("0x7LLu"), hasToken("0x7LLu", CxxTokenType.NUMBER));
assertThat(lexer.lex("0x7LLU"), hasToken("0x7LLU", CxxTokenType.NUMBER));

// With Micosoft specific 64-bit integer-suffix: i64
assertThat(lexer.lex("0x7i64"), hasToken("0x7i64", CxxTokenType.NUMBER));
assertThat(lexer.lex("0x7ui64"), hasToken("0x7ui64", CxxTokenType.NUMBER));
}

/**
Expand Down Expand Up @@ -260,6 +272,10 @@ public void hex_integer_literals_bigX() {
assertThat(lexer.lex("0X7llU"), hasToken("0X7llU", CxxTokenType.NUMBER));
assertThat(lexer.lex("0X7LLu"), hasToken("0X7LLu", CxxTokenType.NUMBER));
assertThat(lexer.lex("0X7LLU"), hasToken("0X7LLU", CxxTokenType.NUMBER));

// With Micosoft specific 64-bit integer-suffix: i64
assertThat(lexer.lex("0X7i64"), hasToken("0X7i64", CxxTokenType.NUMBER));
assertThat(lexer.lex("0X7ui64"), hasToken("0X7ui64", CxxTokenType.NUMBER));
}

/**
Expand Down Expand Up @@ -305,6 +321,10 @@ public void bin_integer_literals_bigX() {
assertThat(lexer.lex("0B1llU"), hasToken("0B1llU", CxxTokenType.NUMBER));
assertThat(lexer.lex("0B1LLu"), hasToken("0B1LLu", CxxTokenType.NUMBER));
assertThat(lexer.lex("0B1LLU"), hasToken("0B1LLU", CxxTokenType.NUMBER));

// With Micosoft specific 64-bit integer-suffix: i64
assertThat(lexer.lex("0B1i64"), hasToken("0B1i64", CxxTokenType.NUMBER));
assertThat(lexer.lex("0B1ui64"), hasToken("0B1ui64", CxxTokenType.NUMBER));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion cxx-squid/src/test/java/org/sonar/cxx/parser/CxxParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class CxxParserTest extends ParserBaseTest {

String errSources = "/parser/bad/error_recovery_declaration.cc";
String[] goodFiles = {"own", "examples", "cli", "cuda"};
String[] goodFiles = {"own", "VC", "cli", "cuda", "examples"};
String[] preprocessorFiles = {"preprocessor"};
String[] cCompatibilityFiles = {"C", "C99"};
String rootDir = "src/test/resources/parser";
Expand Down
29 changes: 24 additions & 5 deletions cxx-squid/src/test/java/org/sonar/cxx/preprocessor/ExpressionEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package org.sonar.cxx.preprocessor;

import java.math.BigInteger;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -317,11 +318,29 @@ public void defined_false_with_parantheses() {
}

@Test
public void stripping_suffix_from_numbers() {
assertEquals(evaluator.stripSuffix("1L"), "1");
assertEquals(evaluator.stripSuffix("1l"), "1");
assertEquals(evaluator.stripSuffix("1U"), "1");
assertEquals(evaluator.stripSuffix("1u"), "1");
public void decode_numbers() {
assertEquals(ExpressionEvaluator.decode("1"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("067"), new BigInteger("67", 8));
assertEquals(ExpressionEvaluator.decode("0b11"), new BigInteger("11", 2));
assertEquals(ExpressionEvaluator.decode("0xab"), new BigInteger("ab", 16));

assertEquals(ExpressionEvaluator.decode("1L"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1l"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1U"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1u"), new BigInteger("1", 10));

assertEquals(ExpressionEvaluator.decode("1ul"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1ll"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1i64"), new BigInteger("1", 10));
assertEquals(ExpressionEvaluator.decode("1ui64"), new BigInteger("1", 10));

assertEquals(ExpressionEvaluator.decode("067ll"), new BigInteger("67", 8));
assertEquals(ExpressionEvaluator.decode("0b11ul"), new BigInteger("11", 2));
assertEquals(ExpressionEvaluator.decode("0xabui64"), new BigInteger("ab", 16));

assertEquals(ExpressionEvaluator.decode("1'234"), new BigInteger("1234", 10));
assertEquals(ExpressionEvaluator.decode("0b1111'0000'1111"), new BigInteger("111100001111", 2));
assertEquals(ExpressionEvaluator.decode("0xAAAA'bbbb"), new BigInteger("AAAAbbbb", 16));
}

@Test(expected = EvaluationException.class)
Expand Down
10 changes: 10 additions & 0 deletions cxx-squid/src/test/resources/parser/VC/64-bit-integer-suffix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
long long i1 = 7i64;
long long i2 = 7ll;
long long i3 = 7LL;

unsigned long long ui1 = 7ui64;
unsigned long long ui2 = 7ull;
unsigned long long ui3 = 7ULL;

// real life samples
long long r1 = 9223372036854775807i64;
0 .../parser/own/VC/exception-specification.cc → ...rces/parser/VC/exception-specification.cc
View file
Open in desktop
File renamed without changes.