mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00
Code Issues Wiki Activity

Fixed Bug 88662 - [DOM] Problem parsing postfix expression

Browse source
This commit is contained in:
John Camelon 2005-04-05 17:38:30 +00:00
parent e2e1f585eb
commit 17481123ab
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
View file

@ -55,6 +55,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTOperatorName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTOperatorName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPointerToMember; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPointerToMember;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleTypeConstructorExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTWhileStatement; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTWhileStatement;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBlockScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBlockScope;
@ -3267,6 +3268,12 @@ public class AST2CPPTests extends AST2BaseTest {
assertTrue(((ICPPASTQualifiedName)col.getName(16)).isConversionOrOperator()); assertTrue(((ICPPASTQualifiedName)col.getName(16)).isConversionOrOperator());
} }
public void testBug88662() throws Exception {
IASTTranslationUnit tu = parse( "int foo() { return int();}", ParserLanguage.CPP ); //$NON-NLS-1$
IASTReturnStatement returnStatement = (IASTReturnStatement) ((IASTCompoundStatement)((IASTFunctionDefinition)tu.getDeclarations()[0]).getBody()).getStatements()[0];
ICPPASTSimpleTypeConstructorExpression expression = (ICPPASTSimpleTypeConstructorExpression) returnStatement.getReturnValue();
assertEquals( expression.getInitialValue(), null );
assertEquals( expression.getSimpleType(), ICPPASTSimpleTypeConstructorExpression.t_int );
}
} }

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

@ -1623,15 +1623,20 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
int startingOffset = LA(1).getOffset(); int startingOffset = LA(1).getOffset();
consume(); consume();
consume(IToken.tLPAREN); consume(IToken.tLPAREN);
IASTExpression operand = expression(); IASTExpression operand = null;
if( LT(1) != IToken.tRPAREN )
operand = expression();
int l = consume(IToken.tRPAREN).getEndOffset(); int l = consume(IToken.tRPAREN).getEndOffset();
ICPPASTSimpleTypeConstructorExpression result = createSimpleTypeConstructorExpression(); ICPPASTSimpleTypeConstructorExpression result = createSimpleTypeConstructorExpression();
((ASTNode) result).setOffsetAndLength(startingOffset, l - startingOffset); ((ASTNode) result).setOffsetAndLength(startingOffset, l - startingOffset);
result.setSimpleType(operator); result.setSimpleType(operator);
result.setInitialValue(operand); if( operand != null )
operand.setParent(result); {
operand result.setInitialValue(operand);
.setPropertyInParent(ICPPASTSimpleTypeConstructorExpression.INITIALIZER_VALUE); operand.setParent(result);
operand
.setPropertyInParent(ICPPASTSimpleTypeConstructorExpression.INITIALIZER_VALUE);
}
return result; return result;
} }