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

Further Scanner2 work.

Browse source
This commit is contained in:
John Camelon 2004-07-18 21:17:10 +00:00
parent 99b80a6206
commit 1b2ac0d808
2 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1714,7 +1714,7 @@ public class QuickParseASTTests extends BaseASTTest
public void testBug39553() throws Exception public void testBug39553() throws Exception
{ {
parse("#define COMP_INC \"foobar.h\" \n" + "#include COMP_INC"); //$NON-NLS-1$ //$NON-NLS-2$ parse("#define COMP_INC \"foobar.h\" \n" + "#include COMP_INC\n"); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue( quickParseCallback.getInclusions().hasNext() ); assertTrue( quickParseCallback.getInclusions().hasNext() );
} }

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

@ -349,6 +349,8 @@ public class Scanner2 implements IScanner, IScannerData {
case 'L': case 'L':
if (pos + 1 < limit && buffer[pos + 1] == '"') if (pos + 1 < limit && buffer[pos + 1] == '"')
return scanString(); return scanString();
if (pos + 1 < limit && buffer[pos + 1] == '\'')
return scanCharLiteral();
IToken t = scanIdentifier(); IToken t = scanIdentifier();
if (t instanceof MacroExpansionToken) if (t instanceof MacroExpansionToken)
@ -768,8 +770,14 @@ public class Scanner2 implements IScanner, IScannerData {
int start = bufferPos[bufferStackPos] + 1; int start = bufferPos[bufferStackPos] + 1;
int limit = bufferLimit[bufferStackPos]; int limit = bufferLimit[bufferStackPos];
int tokenType = IToken.tCHAR;
if (buffer[bufferPos[bufferStackPos]] == 'L') {
++bufferPos[bufferStackPos];
tokenType = IToken.tLCHAR;
}
if (start >= limit) { if (start >= limit) {
return new ImagedToken(IToken.tCHAR, new String(emptyCharArray)); return new ImagedToken(tokenType, new String(emptyCharArray));
} }
int length = 0; int length = 0;
@ -940,34 +948,22 @@ public class Scanner2 implements IScanner, IScannerData {
case 'u': case 'u':
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': case 'L':
if (++bufferPos[bufferStackPos] < limit) { case 'l':
// unsigned suffix
suffixLoop:
while(++bufferPos[bufferStackPos] < limit) {
switch (buffer[bufferPos[bufferStackPos]]) { switch (buffer[bufferPos[bufferStackPos]]) {
case 'U':
case 'u':
case 'l': case 'l':
case 'L': case 'L':
// long long break;
++bufferPos[bufferStackPos]; default:
break suffixLoop;
} }
} }
// long or long long
break; break;
default: default:
@ -1207,6 +1203,8 @@ public class Scanner2 implements IScanner, IScannerData {
char[] buffer = bufferStack[bufferStackPos]; char[] buffer = bufferStack[bufferStackPos];
int limit = bufferLimit[bufferStackPos]; int limit = bufferLimit[bufferStackPos];
int startingOffset = bufferPos[bufferStackPos]; //TODO this is wrong
int startingLine = 0, endingLine = 0, nameLine = 0;
skipOverWhiteSpace(); skipOverWhiteSpace();
// get the Identifier // get the Identifier
@ -1305,10 +1303,12 @@ public class Scanner2 implements IScanner, IScannerData {
text = removedEscapedNewline( text ); text = removedEscapedNewline( text );
// Throw it in // Throw it in
definitions.put(name, definitions.put(name, arglist == null
arglist == null
? new ObjectStyleMacro(name, text) ? new ObjectStyleMacro(name, text)
: new FunctionStyleMacro(name, text, arglist)); : new FunctionStyleMacro(name, text, arglist) );
requestor.acceptMacro( getASTFactory().createMacro( new String( name ), startingOffset, startingLine, idstart, idstart + idlen, nameLine, textstart + textlen, endingLine, null )); //TODO - IMacroDescriptor?
} }
@ -2136,6 +2136,10 @@ public class Scanner2 implements IScanner, IScannerData {
"__attribute__".toCharArray(), //$NON-NLS-1$ "__attribute__".toCharArray(), //$NON-NLS-1$
emptyCharArray, emptyCharArray,
new char[][] { "arg".toCharArray() }); //$NON-NLS-1$ new char[][] { "arg".toCharArray() }); //$NON-NLS-1$
private static final FunctionStyleMacro _Pragma = new FunctionStyleMacro(
"_Pragma".toCharArray(), //$NON-NLS-1$
emptyCharArray,
new char[][] { "arg".toCharArray() } ); //$NON-NLS-1$
private IASTFactory astFactory; private IASTFactory astFactory;
@ -2154,6 +2158,8 @@ public class Scanner2 implements IScanner, IScannerData {
definitions.put(__volatile__.name, __volatile__); definitions.put(__volatile__.name, __volatile__);
if( language == ParserLanguage.CPP ) if( language == ParserLanguage.CPP )
definitions.put(__asm__.name, __asm__); definitions.put(__asm__.name, __asm__);
else
definitions.put(_Pragma.name, _Pragma );
/* /*