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

Scanner2 - final changes to scan the trilogy.

Browse source
This commit is contained in:
Doug Schaefer 2004-06-23 11:36:05 +00:00
parent dbaa2dcea9
commit b97efa10b3
3 changed files with 79 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1676,4 +1676,10 @@ public class Scanner2Test extends BaseScanner2Test
validateIdentifier("__n");
validateEOF();
}
public void testStringify() throws Exception {
initializeScanner("#define xS(s) #s\n#define S(s) xS(s)#define X hi\nS(X)");
validateString("hi");
validateEOF();
}
}

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/SpeedTest2.java
View file

@ -54,7 +54,7 @@ public class SpeedTest2 extends TestCase {
totalTime += time;
}
if (n > 0) {
if (n > 1) {
System.out.println("Average Time: " + (totalTime / (n - 1)) + " millisecs");
}
}

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

@ -240,8 +240,9 @@ public class Scanner2 implements IScanner, IScannerData {
}
IToken token = nextToken;
nextToken = fetchToken();
token.setNext(nextToken);
if (nextToken == null)
finished = true;
else if (nextToken.getType() == IToken.tPOUNDPOUND) {
@ -277,7 +278,7 @@ public class Scanner2 implements IScanner, IScannerData {
// Return null to signify end of file
private IToken fetchToken() throws ScannerException {
++count;
contextLoop:
while (bufferStackPos >= 0) {
@ -841,6 +842,7 @@ public class Scanner2 implements IScanner, IScannerData {
continue;
// must be float suffix
++bufferPos[bufferStackPos];
break;
case 'p':
@ -886,12 +888,26 @@ public class Scanner2 implements IScanner, IScannerData {
case 'u':
case 'U':
// unsigned suffix
if (++bufferPos[bufferStackPos] < limit) {
switch (buffer[bufferPos[bufferStackPos]]) {
case 'l':
case 'L':
if (++bufferPos[bufferStackPos] < limit) {
switch (buffer[bufferPos[bufferStackPos]]) {
case 'l':
case 'L':
// long long
++bufferPos[bufferStackPos];
}
}
}
}
break;
case 'l':
case 'L':
if (pos + 1 < limit) {
switch (buffer[pos + 1]) {
if (++bufferPos[bufferStackPos] < limit) {
switch (buffer[bufferPos[bufferStackPos]]) {
case 'l':
case 'L':
// long long
@ -912,7 +928,8 @@ public class Scanner2 implements IScanner, IScannerData {
--bufferPos[bufferStackPos];
return new ImagedToken(isFloat ? IToken.tFLOATINGPT : IToken.tINTEGER,
new String(buffer, start, bufferPos[bufferStackPos] - start + 1));
new String(buffer, start,
bufferPos[bufferStackPos] - start + 1));
}
private void handlePPDirective() throws ScannerException {
@ -1754,8 +1771,8 @@ public class Scanner2 implements IScanner, IScannerData {
} else if (c == '#') {
c = expansion[++pos];
if (c == '#') {
if (pos + 1 < limit && expansion[pos + 1] == '#') {
++pos;
// skip whitespace
if (wsstart < 0)
wsstart = pos - 1;
@ -1800,6 +1817,51 @@ public class Scanner2 implements IScanner, IScannerData {
} else {
// stringify
// copy what we haven't so far
if (++lastcopy < pos) {
int n = pos - lastcopy;
if (result != null)
System.arraycopy(expansion, lastcopy, result, outpos, n);
outpos += n;
}
++pos;
// skip whitespace
while (++pos < limit) {
switch (expansion[pos]) {
case ' ':
case '\t':
continue;
//TODO handle comments
}
break;
}
--pos;
// grab the identifier
c = expansion[pos];
int idstart = pos;
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'X') || c == '_') {
while (++pos < limit) {
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'X')
|| (c >= '0' && c <= '9') || c == '_')
break;
}
} // else TODO something
--pos;
int idlen = pos - idstart + 1;
char[] argvalue = (char[])argmap.get(expansion, idstart, idlen);
if (argvalue != null) {
if (result != null) {
result[outpos] = '"';
System.arraycopy(argvalue, 0, result, outpos + 1, argvalue.length);
result[outpos + argvalue.length + 1] = '"';
}
outpos += argvalue.length + 2;
}
lastcopy = pos;
}
} else {
@ -1836,6 +1898,8 @@ public class Scanner2 implements IScanner, IScannerData {
= new ObjectStyleMacro("__restrict__".toCharArray(), "restrict".toCharArray());
private static final ObjectStyleMacro __restrict
= new ObjectStyleMacro("__restrict".toCharArray(), "restrict".toCharArray());
private static final ObjectStyleMacro __volatile__
= new ObjectStyleMacro("__volatile__".toCharArray(), "volatile".toCharArray());
private static final FunctionStyleMacro __attribute__
= new FunctionStyleMacro(
"__attribute__".toCharArray(),
@ -1854,6 +1918,7 @@ public class Scanner2 implements IScanner, IScannerData {
definitions.put(__attribute__.name, __attribute__);
definitions.put(__restrict__.name, __restrict__);
definitions.put(__restrict.name, __restrict);
definitions.put(__volatile__.name, __volatile__);
if( language == ParserLanguage.CPP )
definitions.put(__asm__.name, __asm__);