mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

org.eclipse.cdt.core

Browse source 
Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=47797

org.eclipse.cdt.core.tests
	Added ScannerTestCase::testBug47797().
This commit is contained in:
John Camelon 2004-04-06 05:11:00 +00:00
parent 3f436ae1eb
commit 70aaf923d3
4 changed files with 157 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core.tests/ChangeLog
View file

@ -1,3 +1,6 @@
2004-04-06 John Camelon
Added ScannerTestCase::testBug47797().
2004-04-05 Andrew Niefer
added search/org/eclipse/cdt/core/search/tests/ClassDeclarationPatternTests.testBug54169()

12
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
View file

@ -1605,4 +1605,16 @@ public class ScannerTestCase extends BaseScannerTest
validateDefinition( "bar", "" );
}
public void testBug47797() throws Exception
{
initializeScanner( "\"\\uABCD\" \'\\uABCD\' \\uABCD_ident \\u001A01BC_ident ident\\U01AF ident\\u01bc00AF");
validateString( "\\uABCD");
validateChar( "\\uABCD");
validateIdentifier( "\\uABCD_ident");
validateIdentifier( "\\u001A01BC_ident");
validateIdentifier( "ident\\U01AF" );
validateIdentifier( "ident\\u01bc00AF" );
validateEOF();
}
}

3
core/org.eclipse.cdt.core/parser/ChangeLog-parser
View file

@ -1,3 +1,6 @@
2004-04-06 John Camelon
Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=47797
2004-04-05 Andrew Niefer
- performance improvements originally from Dave Daoust:
- create new TraceUtil to handle logging trace messages

157
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java
View file

@ -1426,28 +1426,115 @@ public class Scanner implements IScanner {
}
}
public IToken processKeywordOrLiteral(int c, boolean pasting) throws ScannerException, EndOfFileException
{
// buff contains \\u or \\U
protected StringBuffer processUniversalCharacterName( StringBuffer buff ) throws ScannerException
{
// first octet is mandatory
for( int i = 0; i < 4; ++i )
{
int c = getChar();
if( ! isHex( c ))
return null;
buff.append( (char) c );
}
Vector v = new Vector();
Overall: for( int i = 0; i < 4; ++i )
{
int c = getChar();
if( ! isHex( c ))
{
ungetChar( c );
break;
}
v.add( new Character((char) c ));
}
if( v.size() == 4 )
{
for( int i = 0; i < 4; ++i )
buff.append( (char)((Character)v.get(i)).charValue());
}
else
{
for( int i = v.size() - 1; i >= 0; --i )
ungetChar( (char) ((Character)v.get(i)).charValue() );
}
return buff;
}
/**
* @param c
* @return
*/
private boolean isHex(int c) {
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':
return true;
default:
return false;
}
}
protected IToken processKeywordOrIdentifier(StringBuffer buff, boolean pasting) throws ScannerException, EndOfFileException
{
int baseOffset = lastContext.getOffset() - lastContext.undoStackSize() - 1;
// String buffer is slow, we need a better way such as memory mapped files
StringBuffer buff = new StringBuffer();
buff.append((char) c);
c = getChar();
int c = getChar();
// do the least expensive tests first!
while ( ( scannerExtension.offersDifferentIdentifierCharacters() &&
scannerExtension.isValidIdentifierCharacter(c) ) ||
isValidIdentifierCharacter(c) ) {
buff.append((char) c);
c = getChar();
if (c == '\\') {
c = consumeNewlineAfterSlash();
for( ; ; )
{
// do the least expensive tests first!
while ( ( scannerExtension.offersDifferentIdentifierCharacters() &&
scannerExtension.isValidIdentifierCharacter(c) ) ||
isValidIdentifierCharacter(c) ) {
buff.append((char) c);
c = getChar();
if (c == '\\') {
c = consumeNewlineAfterSlash();
}
}
if( c == '\\')
{
int next = getChar();
if( next == 'u' || next == 'U')
{
buff.append( '\\');
buff.append( (char)next );
buff = processUniversalCharacterName(buff);
if( buff == null ) return null;
continue; // back to top of loop
}
else
ungetChar( next );
}
break;
}
ungetChar(c);
String ident = buff. toString();
@ -1822,7 +1909,7 @@ public class Scanner implements IScanner {
{
// This is not a wide literal -- it must be a token or keyword
ungetChar(c);
token = processKeywordOrLiteral('L', pasting);
token = processKeywordOrIdentifier(new StringBuffer( "L"), pasting);
}
if (token == null)
{
@ -1857,7 +1944,9 @@ public class Scanner implements IScanner {
scannerExtension.isValidIdentifierStartCharacter(c) ) ||
isValidIdentifierStartCharacter(c) )
{
token = processKeywordOrLiteral(c, pasting);
StringBuffer startBuffer = new StringBuffer( );
startBuffer.append( (char) c );
token = processKeywordOrIdentifier(startBuffer, pasting);
if (token == null)
{
c = getChar();
@ -1865,6 +1954,38 @@ public class Scanner implements IScanner {
}
return token;
}
else if( c == '\\' )
{
int next = getChar();
StringBuffer ucnBuffer = new StringBuffer( "\\");
ucnBuffer.append( (char) next );
if( next == 'u' || next =='U' )
{
StringBuffer secondBuffer = processUniversalCharacterName(ucnBuffer);
if( secondBuffer == null )
{
handleProblem( IProblem.SCANNER_BAD_CHARACTER, ucnBuffer.toString(), getCurrentOffset(), false, true, throwExceptionOnBadCharacterRead );
c = getChar();
continue;
}
else
{
token = processKeywordOrIdentifier( secondBuffer, pasting );
if (token == null)
{
c = getChar();
continue;
}
return token;
}
}
else
{
ungetChar( next );
handleProblem( IProblem.SCANNER_BAD_CHARACTER, ucnBuffer.toString(), getCurrentOffset(), false, true, throwExceptionOnBadCharacterRead );
}
}
handleProblem( IProblem.SCANNER_BAD_CHARACTER, new Character( (char)c ).toString(), getCurrentOffset(), false, true, throwExceptionOnBadCharacterRead );
c = getChar();