mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Patch for Devin Steffler.

Browse source 
Fixed 79787 - [Scanner] #error has extra \r character at the end
	Fixed 79490 - [Scanner] char constants not evaluated properly with #if
This commit is contained in:
John Camelon 2004-11-30 18:51:49 +00:00
parent 371b6dba53
commit 053748815b
4 changed files with 71 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java
View file

@ -2498,5 +2498,21 @@ public class CompleteParseASTTest extends CompleteParseBaseTest
writer.write("if(VAL > VAL) { /* Syntax error is here */\n}\n}\n"); //$NON-NLS-1$ writer.write("if(VAL > VAL) { /* Syntax error is here */\n}\n}\n"); //$NON-NLS-1$
parse(writer.toString()); parse(writer.toString());
} }
public void testBug79787() throws Exception {
try {
parse("#error what?\r\n");
} catch (ParserException pe) {
// expected IProblem
} finally {
Iterator probs = callback.getProblems();
assertTrue(probs.hasNext());
Object ipo = probs.next();
assertTrue(ipo instanceof IProblem);
IProblem ip = (IProblem) ipo;
assertEquals(ip.getArguments(), "what?");
}
}
} }

28
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/Scanner2Test.java
View file

@ -2266,4 +2266,32 @@ public class Scanner2Test extends BaseScanner2Test
validateToken( IToken.tSEMI ); validateToken( IToken.tSEMI );
validateEOF(); validateEOF();
} }
public void testBug79490A() throws Exception {
Writer writer = new StringWriter();
writer.write("#define TEST 'n'\n"); //$NON-NLS-1$
writer.write("#if TEST == 'y'\n"); //$NON-NLS-1$
writer.write("#define TRUE 1\n"); //$NON-NLS-1$
writer.write("#else\n"); //$NON-NLS-1$
writer.write("#define FALSE 1\n"); //$NON-NLS-1$
writer.write("#endif\n"); //$NON-NLS-1$
initializeScanner( writer.toString() );
validateEOF();
validateDefinition("TEST", "'n'"); //$NON-NLS-1$ //$NON-NLS-2$
validateDefinition("FALSE", "1"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testBug79490B() throws Exception {
Writer writer = new StringWriter();
writer.write("#define TEST 'y'\n"); //$NON-NLS-1$
writer.write("#if TEST == 'y'\n"); //$NON-NLS-1$
writer.write("#define TRUE 1\n"); //$NON-NLS-1$
writer.write("#else\n"); //$NON-NLS-1$
writer.write("#define FALSE 1\n"); //$NON-NLS-1$
writer.write("#endif\n"); //$NON-NLS-1$
initializeScanner( writer.toString() );
validateEOF();
validateDefinition("TEST", "'y'"); //$NON-NLS-1$ //$NON-NLS-2$
validateDefinition("TRUE", "1"); //$NON-NLS-1$ //$NON-NLS-2$
}
} }

23
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ExpressionEvaluator.java
View file

@ -254,6 +254,8 @@ public class ExpressionEvaluator {
} }
handleProblem(IProblem.SCANNER_MISSING_R_PAREN, pos); handleProblem(IProblem.SCANNER_MISSING_R_PAREN, pos);
throw new EvalException("missing )"); //$NON-NLS-1$ throw new EvalException("missing )"); //$NON-NLS-1$
case tCHAR:
return getChar();
default: default:
handleProblem(IProblem.SCANNER_EXPRESSION_SYNTAX_ERROR, pos); handleProblem(IProblem.SCANNER_EXPRESSION_SYNTAX_ERROR, pos);
throw new EvalException("expression syntax error"); //$NON-NLS-1$ throw new EvalException("expression syntax error"); //$NON-NLS-1$
@ -332,6 +334,21 @@ public class ExpressionEvaluator {
return value; return value;
} }
private long getChar() throws EvalException {
long value = 0;
// if getting a character then make sure it's in '' otherwise leave it as 0
if (bufferPos[bufferStackPos] - 1 >= 0 &&
bufferPos[bufferStackPos] + 1 < bufferStack[bufferStackPos].length
&& bufferStack[bufferStackPos][bufferPos[bufferStackPos] - 1] == '\''
&& bufferStack[bufferStackPos][bufferPos[bufferStackPos] + 1] == '\'')
value = bufferStack[bufferStackPos][bufferPos[bufferStackPos]];
if (tokenType != tEOF)
nextToken();
return value;
}
private static char[] _defined = "defined".toCharArray(); //$NON-NLS-1$ private static char[] _defined = "defined".toCharArray(); //$NON-NLS-1$
private void nextToken() throws EvalException { private void nextToken() throws EvalException {
@ -472,6 +489,11 @@ public class ExpressionEvaluator {
continue; continue;
} }
if (len == 1) { // is a character
tokenType = tCHAR;
return;
}
// undefined macro, assume 0 // undefined macro, assume 0
tokenValue = 0; tokenValue = 0;
tokenType = tNUMBER; tokenType = tNUMBER;
@ -878,6 +900,7 @@ public class ExpressionEvaluator {
private static final int tQUESTION = 25; private static final int tQUESTION = 25;
private static final int tCOLON = 26; private static final int tCOLON = 26;
private static final int t_defined = 27; private static final int t_defined = 27;
private static final int tCHAR = 28;
private void pushContext(char[] buffer, Object data) { private void pushContext(char[] buffer, Object data) {
if (++bufferStackPos == bufferStack.length) { if (++bufferStackPos == bufferStack.length) {

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
View file

@ -1538,6 +1538,9 @@ public class Scanner2 implements IScanner, IScannerData {
skipOverWhiteSpace(); skipOverWhiteSpace();
start = bufferPos[bufferStackPos] + 1; start = bufferPos[bufferStackPos] + 1;
skipToNewLine(); skipToNewLine();
if (bufferPos[bufferStackPos] - 1 > 0 && buffer[bufferPos[bufferStackPos] - 1] == '\r')
len = bufferPos[bufferStackPos] - start - 1;
else
len = bufferPos[bufferStackPos] - start; len = bufferPos[bufferStackPos] - start;
handleProblem( IProblem.PREPROCESSOR_POUND_ERROR, start, CharArrayUtils.extract( buffer, start, len )); handleProblem( IProblem.PREPROCESSOR_POUND_ERROR, start, CharArrayUtils.extract( buffer, start, len ));
break; break;