mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-14 03:35:37 +02:00
Code Issues Wiki Activity

Fix for 181942, parsing 'char x= *"a";'

Browse source
This commit is contained in:
Markus Schorn 2007-04-11 16:28:34 +00:00
parent d0407f36ab
commit d70bbc8768
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -3640,9 +3640,9 @@ public class AST2Tests extends AST2BaseTest {
} }
// void test() { // void test() {
// const char d= *"b"; // char d= *"b";
// } // }
public void _testBug181942() throws Exception { public void testBug181942() throws Exception {
StringBuffer buffer = getContents(1)[0]; StringBuffer buffer = getContents(1)[0];
for (int i = 0; i < LANGUAGES.length; i++) for (int i = 0; i < LANGUAGES.length; i++)
parse( buffer.toString(), LANGUAGES[i], true, true ); parse( buffer.toString(), LANGUAGES[i], true, true );

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
View file

@ -2910,10 +2910,14 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
IToken mark = mark(); IToken mark = mark();
int offset = consume().getOffset(); int offset = consume().getOffset();
IASTExpression castExpression = castExpression(); IASTExpression castExpression = castExpression();
if( castExpression instanceof IASTLiteralExpression && ( operator == IASTUnaryExpression.op_amper || operator == IASTUnaryExpression.op_star ) ) if( castExpression instanceof IASTLiteralExpression ) {
{ IASTLiteralExpression lit= (IASTLiteralExpression) castExpression;
backup( mark ); if ( operator == IASTUnaryExpression.op_amper ||
throwBacktrack( mark ); (operator == IASTUnaryExpression.op_star && lit.getKind() != IASTLiteralExpression.lk_string_literal) )
{
backup( mark );
throwBacktrack( mark );
}
} }
return buildUnaryExpression(operator, castExpression, offset, return buildUnaryExpression(operator, castExpression, offset,
calculateEndOffset(castExpression)); calculateEndOffset(castExpression));

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
View file

@ -5460,13 +5460,15 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IToken mark = mark(); IToken mark = mark();
int offset = consume().getOffset(); int offset = consume().getOffset();
IASTExpression castExpression = castExpression(); IASTExpression castExpression = castExpression();
if( castExpression instanceof IASTLiteralExpression && ( operator == IASTUnaryExpression.op_amper || operator == IASTUnaryExpression.op_star ) ) if (castExpression instanceof IASTLiteralExpression) {
{ IASTLiteralExpression literal = (IASTLiteralExpression) castExpression;
IASTLiteralExpression literal = (IASTLiteralExpression) castExpression; if( literal.getKind() != ICPPASTLiteralExpression.lk_this ) {
if( literal.getKind() != ICPPASTLiteralExpression.lk_this ) if ( operator == IASTUnaryExpression.op_amper ||
{ (operator == IASTUnaryExpression.op_star &&
backup( mark ); literal.getKind() != IASTLiteralExpression.lk_string_literal) ) {
throwBacktrack( mark ); backup( mark );
throwBacktrack( mark );
}
} }
} }
return buildUnaryExpression(operator, castExpression, offset, return buildUnaryExpression(operator, castExpression, offset,