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 restructuring of simple declaration grammar.

Browse source
This commit is contained in:
John Camelon 2005-05-17 19:44:26 +00:00
parent 693f2a4708
commit c1232687c2
3 changed files with 343 additions and 445 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/prefix/BasicCompletionTest.java
View file

@ -42,7 +42,7 @@ public class BasicCompletionTest extends CompletionTestBase {
ASTCompletionNode node = getGPPCompletionNode(code.toString());
IASTName[] names = node.getNames();
// There are three names, one as an expression, one that isn't connected, one as a declaration
assertEquals(4, names.length);
assertEquals(3, names.length);
// The expression points to our functions
IBinding[] bindings = names[0].resolvePrefix();
// There should be two since they both start with fu
@ -79,9 +79,9 @@ public class BasicCompletionTest extends CompletionTestBase {
// C++
ASTCompletionNode node = getGPPCompletionNode(code.toString());
IASTName[] names = node.getNames();
assertEquals(3, names.length);
assertEquals(2, names.length);
assertNull(names[0].getTranslationUnit());
IBinding[] bindings = names[2].resolvePrefix();
IBinding[] bindings = names[1].resolvePrefix();
assertEquals(1, bindings.length);
assertEquals("blah", ((ITypedef)bindings[0]).getName());

145
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
View file

@ -121,7 +121,9 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
protected ASTCompletionNode completionNode;
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.eclipse.cdt.internal.core.dom.parser.ISourceCodeParser#getCompletionNode()
*/
public ASTCompletionNode getCompletionNode() {
@ -134,6 +136,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
completionNode = new ASTCompletionNode(token, getTranslationUnit());
return completionNode;
}
/**
* Look Ahead in the token list to see what is coming.
*
@ -267,7 +270,6 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
*
* @param mark
* The point that we wish to restore to.
*
*/
protected void backup(IToken mark) {
currToken = mark;
@ -417,8 +419,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return result;
}
protected void resolveAmbiguities()
{
protected void resolveAmbiguities() {
getTranslationUnit().accept(createVisitor());
}
@ -644,8 +645,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
protected abstract IASTExpression multiplicativeExpression()
throws BacktrackException, EndOfFileException;
protected abstract IASTTypeId typeId(boolean forNewExpression) throws BacktrackException,
EndOfFileException;
protected abstract IASTTypeId typeId(boolean forNewExpression)
throws BacktrackException, EndOfFileException;
protected abstract IASTExpression castExpression()
throws BacktrackException, EndOfFileException;
@ -1036,7 +1037,6 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
* Parses a function body.
*
* @return TODO
*
* @throws BacktrackException
* request a backtrack
*/
@ -1045,8 +1045,9 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return compoundStatement();
}
protected abstract IASTDeclarator initDeclarator() throws EndOfFileException,
BacktrackException;
protected abstract IASTDeclarator initDeclarator()
throws EndOfFileException, BacktrackException;
/**
* @param flags
* input flags that are used to make our decision
@ -1055,20 +1056,16 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
* @throws EndOfFileException
* we could encounter EOF while looking ahead
*/
protected boolean lookAheadForDeclarator(Flags flags)
{
if( flags.typeId ) return false;
protected boolean lookAheadForDeclarator(Flags flags) {
if (flags.typeId)
return false;
IToken mark = null;
try
{
try {
mark = mark();
}
catch( EndOfFileException eof )
{
} catch (EndOfFileException eof) {
return false;
}
try
{
try {
IASTDeclarator d = initDeclarator();
IToken la = LA(1);
backup(mark);
@ -1079,20 +1076,20 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
final int offset = n.getOffset();
if (length == 0)
return false;
if( flags.parm )
{
if (flags.parm) {
ASTNode name = (ASTNode) d.getName();
if (name.getOffset() == offset && name.getLength() == length)
return false;
if( d.getInitializer() != null )
{
if (d.getInitializer() != null) {
ASTNode init = (ASTNode) d.getInitializer();
if( name.getOffset() == offset && n.getOffset() + n.getLength() == init.getOffset() + init.getLength() )
if (name.getOffset() == offset
&& n.getOffset() + n.getLength() == init
.getOffset()
+ init.getLength())
return false;
}
switch( la.getType() )
{
switch (la.getType()) {
case IToken.tCOMMA:
case IToken.tRPAREN:
return true;
@ -1101,8 +1098,18 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
}
}
switch( la.getType() )
{
return checkTokenVsDeclarator(la, d);
} catch (BacktrackException bte) {
backup(mark);
return false;
} catch (EndOfFileException e) {
backup(mark);
return false;
}
}
protected boolean checkTokenVsDeclarator(IToken la, IASTDeclarator d) {
switch (la.getType()) {
case IToken.tCOMMA:
case IToken.tLBRACE:
return true;
@ -1114,15 +1121,6 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return false;
}
}
catch( BacktrackException bte )
{
backup( mark );
return false;
} catch (EndOfFileException e) {
backup( mark );
return false;
}
}
public static class Flags {
private boolean encounteredTypename = false;
@ -1135,6 +1133,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
// is this for a simpleDeclaration or parameterDeclaration?
boolean constructor = false;
boolean typeId = false;
// are we attempting the constructor strategy?
@ -1198,17 +1197,14 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
/**
* Parse an enumeration specifier, as according to the ANSI specs in C &
* C++.
*
* enumSpecifier: "enum" (name)? "{" (enumerator-list) "}" enumerator-list:
* enumerator-definition enumerator-list , enumerator-definition
* enumerator-definition: enumerator enumerator = constant-expression
* enumerator: identifier
* C++. enumSpecifier: "enum" (name)? "{" (enumerator-list) "}"
* enumerator-list: enumerator-definition enumerator-list ,
* enumerator-definition enumerator-definition: enumerator enumerator =
* constant-expression enumerator: identifier
*
* @param owner
* IParserCallback object that represents the declaration that
* owns this type specifier.
*
* @throws BacktrackException
* request a backtrack
*/
@ -1570,8 +1566,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
return ds;
}
if( lhs instanceof IASTFunctionCallExpression )
{
if (lhs instanceof IASTFunctionCallExpression) {
// lvalue - makes no sense
return ds;
}
@ -1600,11 +1595,12 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
.getDeclSpecifier() instanceof IASTNamedTypeSpecifier)
{
final IASTDeclarator[] declarators = ((IASTSimpleDeclaration) ds.getDeclaration()).getDeclarators();
if( declarators.length == 0 ||
( declarators.length == 1 &&
( declarators[0].getName().toCharArray().length == 0 && declarators[0].getNestedDeclarator() == null ) ) )
{
final IASTDeclarator[] declarators = ((IASTSimpleDeclaration) ds
.getDeclaration()).getDeclarators();
if (declarators.length == 0
|| (declarators.length == 1 && (declarators[0].getName()
.toCharArray().length == 0 && declarators[0]
.getNestedDeclarator() == null))) {
backup(mark);
while (true) {
if (consume() == lastTokenOfExpression)
@ -1615,14 +1611,14 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
}
}
IASTAmbiguousStatement statement = createAmbiguousStatement();
statement.addStatement(ds);
ds.setParent(statement);
ds.setPropertyInParent(IASTAmbiguousStatement.STATEMENT);
statement.addStatement(expressionStatement);
expressionStatement.setParent(statement);
expressionStatement.setPropertyInParent( IASTAmbiguousStatement.STATEMENT );
expressionStatement
.setPropertyInParent(IASTAmbiguousStatement.STATEMENT);
((ASTNode) statement).setOffsetAndLength((ASTNode) ds);
return statement;
}
@ -1896,7 +1892,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
calculateEndOffset(while_body) - startOffset);
while_statement.setCondition(while_condition);
while_condition.setParent(while_statement);
while_condition.setPropertyInParent(IASTWhileStatement.CONDITIONEXPRESSION);
while_condition
.setPropertyInParent(IASTWhileStatement.CONDITIONEXPRESSION);
while_statement.setBody(while_body);
while_condition.setParent(while_statement);
while_condition.setPropertyInParent(IASTWhileStatement.BODY);
@ -1949,8 +1946,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
} else {
ASTNode then_clause = (ASTNode) current.getThenClause();
if (then_clause != null)
r.setLength(then_clause.getOffset() + then_clause.getLength()
- r.getOffset());
r.setLength(then_clause.getOffset()
+ then_clause.getLength() - r.getOffset());
}
if (current.getParent() != null
&& current.getParent() instanceof IASTIfStatement)
@ -2017,7 +2014,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
* @param declarators
* @return
*/
protected int figureEndOffset(IASTDeclSpecifier declSpec, IASTDeclarator [] declarators) {
protected int figureEndOffset(IASTDeclSpecifier declSpec,
IASTDeclarator[] declarators) {
if (declarators.length == 0)
return calculateEndOffset(declSpec);
return calculateEndOffset(declarators[declarators.length - 1]);
@ -2042,18 +2040,17 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
throwBacktrack(token.getOffset(), token.getLength());
}
protected IASTNode[] parseTypeIdOrUnaryExpression(boolean typeIdWithParentheses ) throws EndOfFileException {
protected IASTNode[] parseTypeIdOrUnaryExpression(
boolean typeIdWithParentheses) throws EndOfFileException {
IASTTypeId typeId = null;
IASTExpression unaryExpression = null;
IToken typeIdLA = null, unaryExpressionLA = null;
IToken mark = mark();
try
{
try {
if (typeIdWithParentheses)
consume(IToken.tLPAREN);
typeId = typeId(false);
if( typeIdWithParentheses )
{
if (typeIdWithParentheses) {
switch (LT(1)) {
case IToken.tRPAREN:
case IToken.tEOC:
@ -2065,38 +2062,31 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
}
typeIdLA = LA(1);
}
catch( BacktrackException bte )
{
} catch (BacktrackException bte) {
typeId = null;
}
backup(mark);
try
{
try {
unaryExpression = unaryExpression();
unaryExpressionLA = LA(1);
}
catch( BacktrackException bte )
{
} catch (BacktrackException bte) {
unaryExpression = null;
}
IASTNode[] result;
if( unaryExpression == null && typeId != null )
{
if (unaryExpression == null && typeId != null) {
backup(typeIdLA);
result = new IASTNode[1];
result[0] = typeId;
return result;
}
if( unaryExpression != null && typeId == null )
{
if (unaryExpression != null && typeId == null) {
backup(unaryExpressionLA);
result = new IASTNode[1];
result[0] = unaryExpression;
return result;
}
if( unaryExpression != null && typeId != null && typeIdLA == unaryExpressionLA )
{
if (unaryExpression != null && typeId != null
&& typeIdLA == unaryExpressionLA) {
result = new IASTNode[2];
result[0] = typeId;
result[1] = unaryExpression;
@ -2108,7 +2098,8 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
protected abstract IASTAmbiguousExpression createAmbiguousExpression();
protected IASTExpression parseSizeofExpression() throws BacktrackException, EndOfFileException {
protected IASTExpression parseSizeofExpression() throws BacktrackException,
EndOfFileException {
int startingOffset = consume(IToken.t_sizeof).getOffset();
IASTNode[] choice = parseTypeIdOrUnaryExpression(true);
switch (choice.length) {

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

@ -159,8 +159,6 @@ import org.eclipse.cdt.internal.core.parser.token.TokenFactory;
*/
public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
private static final String COMPL = "~"; //$NON-NLS-1$
private static final String CONST_CAST = "const_cast"; //$NON-NLS-1$
private static final String REINTERPRET_CAST = "reinterpret_cast"; //$NON-NLS-1$
@ -544,13 +542,11 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (LT(1) == IToken.tIDENTIFIER || LT(1) == IToken.tCOLONCOLON) {
try {
nameDuple = name();
if( nameDuple.length() == 1 )
{
if (nameDuple.length() == 1) {
backup(mark);
return;
}
if( nameDuple.getLastToken().getType() != IToken.tCOLONCOLON )
{
if (nameDuple.getLastToken().getType() != IToken.tCOLONCOLON) {
backup(mark);
return;
}
@ -945,10 +941,11 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IASTDeclarator declarator = null;
try {
declSpecifier = declSpecifierSeq(true, true, true);
declSpecifier = declSpecifierSeq(true, true);
if (LT(1) != IToken.tEOC)
declarator = declarator(
SimpleDeclarationStrategy.TRY_CONSTRUCTOR, forNewExpression);
SimpleDeclarationStrategy.TRY_FUNCTION,
forNewExpression);
} catch (BacktrackException bt) {
backup(mark);
throwBacktrack(startingOffset, figureEndOffset(declSpecifier,
@ -1926,8 +1923,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IParserLogService log, ICPPParserExtensionConfiguration config) {
super(scanner, log, mode, config.supportStatementsInExpressions(),
config.supportTypeofUnaryExpressions(), config
.supportAlignOfUnaryExpression(), config.
supportKnRC(), config.supportGCCOtherBuiltinSymbols());
.supportAlignOfUnaryExpression(), config.supportKnRC(),
config.supportGCCOtherBuiltinSymbols());
allowCPPRestrict = config.allowRestrictPointerOperators();
supportExtendedTemplateSyntax = config.supportExtendedTemplateSyntax();
supportMinAndMaxOperators = config.supportMinAndMaxOperators();
@ -2430,51 +2427,21 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
protected IASTDeclaration simpleDeclarationStrategyUnion()
throws EndOfFileException, BacktrackException {
simpleDeclarationMark = mark();
IASTProblem firstFailure = null;
IASTProblem secondFailure = null;
try {
IASTDeclaration d = simpleDeclaration(
SimpleDeclarationStrategy.TRY_CONSTRUCTOR, false);
throwAwayMarksForInitializerClause();
return d;
} catch (BacktrackException bt) {
if (simpleDeclarationMark == null)
throwBacktrack(bt);
firstFailure = bt.getProblem();
// did not work
backup(simpleDeclarationMark);
try {
IASTDeclaration d = simpleDeclaration(
SimpleDeclarationStrategy.TRY_FUNCTION, false);
throwAwayMarksForInitializerClause();
return d;
} catch (BacktrackException bt2) {
if (simpleDeclarationMark == null) {
if (firstFailure != null && (bt2.getProblem() == null))
throwBacktrack(firstFailure);
else
throwBacktrack(bt2);
}
secondFailure = bt2.getProblem();
} catch (BacktrackException bt) {
if (simpleDeclarationMark == null)
throwBacktrack(bt);
// did not work
backup(simpleDeclarationMark);
throwAwayMarksForInitializerClause();
try {
return simpleDeclaration(
SimpleDeclarationStrategy.TRY_VARIABLE, false);
} catch (BacktrackException b3) {
backup(simpleDeclarationMark); // TODO - necessary?
if (firstFailure != null)
throwBacktrack(firstFailure);
else if (secondFailure != null)
throwBacktrack(secondFailure);
else
throwBacktrack(b3);
return null;
}
}
IASTDeclaration d = simpleDeclaration(
SimpleDeclarationStrategy.TRY_VARIABLE, false);
throwAwayMarksForInitializerClause();
return d;
}
}
@ -2758,8 +2725,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
throwBacktrack(firstOffset, firstToken.getLength());
firstToken = null; // necessary for scalability
ICPPASTDeclSpecifier declSpec = declSpecifierSeq(false,
strategy == SimpleDeclarationStrategy.TRY_CONSTRUCTOR, false);
ICPPASTDeclSpecifier declSpec = declSpecifierSeq(false, false);
IASTDeclarator[] declarators = new IASTDeclarator[2];
if (LT(1) != IToken.tSEMI && LT(1) != IToken.tEOC) {
declarators = (IASTDeclarator[]) ArrayUtil
@ -3023,7 +2989,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
protected ICPPASTParameterDeclaration parameterDeclaration()
throws BacktrackException, EndOfFileException {
IToken current = LA(1);
IASTDeclSpecifier declSpec = declSpecifierSeq(true, false, false);
IASTDeclSpecifier declSpec = declSpecifierSeq(true, false);
IASTDeclarator declarator = null;
if (LT(1) != IToken.tSEMI)
declarator = initDeclarator(SimpleDeclarationStrategy.TRY_FUNCTION);
@ -3054,83 +3020,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
return new CPPASTParameterDeclaration();
}
/**
* @param flags
* input flags that are used to make our decision
* @return whether or not this looks like a constructor (true or false)
* @throws EndOfFileException
* we could encounter EOF while looking ahead
*/
protected boolean lookAheadForConstructorOrOperator(Flags flags)
throws EndOfFileException {
if (flags.isForParameterDeclaration())
return false;
if (LT(2) == IToken.tLPAREN && flags.isForConstructor())
return true;
IToken mark = mark();
IASTName name = null;
try {
name = consumeTemplatedOperatorName();
} catch (BacktrackException e) {
backup(mark);
return false;
} catch (EndOfFileException eof) {
backup(mark);
return false;
}
if (name == null) {
backup(mark);
return false;
}
// constructor/conversion must be an ICPPASTQualifiedName (i.e. can't be
// defined for the global scope)
if (name instanceof ICPPASTQualifiedName) {
IASTName[] segments = ((ICPPASTQualifiedName) name).getNames();
int len = segments.length;
if (len >= 2) {
if (segments[0].toString().length() == 0) {
backup(mark);
return false;
}
if (((ICPPASTQualifiedName) name).isConversionOrOperator()) { // conversion
// or
// operator
backup(mark);
return true;
}
if (segments[len - 1].toString().equals(
segments[len - 2].toString())) { // constructor
backup(mark);
return true;
}
StringBuffer destructorName = new StringBuffer();
destructorName.append(COMPL);
destructorName.append(segments[len - 2]);
if (segments[len - 1].toString().equals(
destructorName.toString())) { // destructor
backup(mark);
return true;
}
} else {
backup(mark);
return false;
}
} else {
backup(mark);
return false;
}
backup(mark);
return false;
}
/**
* This function parses a declaration specifier sequence, as according to
* the ANSI C++ spec. declSpecifier : "auto" | "register" | "static" |
@ -3141,22 +3030,20 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
* enumSpecifier Notes: - folded in storageClassSpecifier, typeSpecifier,
* functionSpecifier - folded elaboratedTypeSpecifier into classSpecifier
* and enumSpecifier - find template names in name
*
* @param parm
* Is this for a parameter declaration (true) or simple
* declaration (false)
* @param tryConstructor
* true for constructor, false for pointer to function strategy
* @param forTypeId TODO
*
* @param forTypeId
* TODO
* @return TODO
* @throws BacktrackException
* request a backtrack
*/
protected ICPPASTDeclSpecifier declSpecifierSeq(boolean parm,
boolean tryConstructor, boolean forTypeId) throws BacktrackException,
EndOfFileException {
boolean forTypeId) throws BacktrackException, EndOfFileException {
IToken firstToken = LA(1);
Flags flags = new Flags(parm, tryConstructor, forTypeId );
Flags flags = new Flags(parm, false, forTypeId);
IToken last = null;
boolean isInline = false, isVirtual = false, isExplicit = false, isFriend = false;
@ -3318,16 +3205,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
case IToken.tCOLONCOLON:
case IToken.tIDENTIFIER:
case IToken.tCOMPLETION:
// TODO - Kludgy way to handle constructors/destructors
if (flags.haveEncounteredRawType())
break declSpecifiers;
if (flags.haveEncounteredTypename())
break declSpecifiers;
if (lookAheadForConstructorOrOperator(flags))
break declSpecifiers;
if (lookAheadForDeclarator(flags))
break declSpecifiers;
@ -3548,9 +3431,11 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
return new CPPASTElaboratedTypeSpecifier();
}
protected IASTDeclarator initDeclarator() throws EndOfFileException, BacktrackException {
protected IASTDeclarator initDeclarator() throws EndOfFileException,
BacktrackException {
return initDeclarator(SimpleDeclarationStrategy.TRY_FUNCTION);
}
/**
* Parses the initDeclarator construct of the ANSI C++ spec. initDeclarator :
* declarator ("=" initializerClause | "(" expressionList ")")?
@ -3698,18 +3583,17 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
* (constantExpression)? "]" | "(" declarator")" | directDeclarator "("
* parameterDeclarationClause ")" (oldKRParameterDeclaration)* declaratorId :
* name
*
* @param forNewTypeId
* TODO
* @param container
* IParserCallback object that represents the owner declaration.
*
* @return declarator that this parsing produced.
* @throws BacktrackException
* request a backtrack
*/
protected IASTDeclarator declarator(SimpleDeclarationStrategy strategy,
boolean forNewTypeId)
throws EndOfFileException, BacktrackException {
boolean forNewTypeId) throws EndOfFileException, BacktrackException {
IToken la = LA(1);
int startingOffset = la.getOffset();
@ -4505,7 +4389,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (supportGCCOtherBuiltinSymbols) {
IScope tuScope = translationUnit.getScope();
IBinding[] bindings = new GCCBuiltinSymbolProvider(translationUnit.getScope(), ParserLanguage.CPP).getBuiltinBindings();
IBinding[] bindings = new GCCBuiltinSymbolProvider(
translationUnit.getScope(), ParserLanguage.CPP)
.getBuiltinBindings();
for (int i = 0; i < bindings.length; i++) {
tuScope.addBinding(bindings[i]);
}
@ -5095,7 +4981,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
* @throws EndOfFileException
* @throws BacktrackException
*/
protected IASTStatement parseIfStatement() throws EndOfFileException, BacktrackException {
protected IASTStatement parseIfStatement() throws EndOfFileException,
BacktrackException {
ICPPASTIfStatement result = null;
ICPPASTIfStatement if_statement = null;
int start = LA(1).getOffset();
@ -5104,14 +4991,17 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
consume(IToken.tLPAREN);
IASTNode condition = null;
try {
condition = cppStyleCondition(); //TODO should be while condition
condition = cppStyleCondition(); // TODO should be while
// condition
if (LT(1) == IToken.tEOC) {
// Completing in the condition
ICPPASTIfStatement new_if = createIfStatement();
if (condition instanceof IASTExpression)
new_if.setConditionExpression((IASTExpression) condition);
new_if
.setConditionExpression((IASTExpression) condition);
else if (condition instanceof IASTDeclaration)
new_if.setConditionDeclaration((IASTDeclaration) condition);
new_if
.setConditionDeclaration((IASTDeclaration) condition);
condition.setParent(new_if);
condition.setPropertyInParent(IASTIfStatement.CONDITION);
@ -5134,12 +5024,10 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
condition = ps;
if (LT(1) == IToken.tRPAREN)
consume();
else if( LT(2) == IToken.tRPAREN )
{
else if (LT(2) == IToken.tRPAREN) {
consume();
consume();
}
else
} else
failParseWithErrorHandling();
}
@ -5147,9 +5035,19 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
ICPPASTIfStatement new_if_statement = createIfStatement();
((ASTNode) new_if_statement).setOffset(so);
if( condition != null && condition instanceof IASTExpression ) // shouldn't be possible but failure in condition() makes it so
if (condition != null && condition instanceof IASTExpression) // shouldn't
// be
// possible
// but
// failure
// in
// condition()
// makes
// it
// so
{
new_if_statement.setConditionExpression((IASTExpression) condition);
new_if_statement
.setConditionExpression((IASTExpression) condition);
condition.setParent(new_if_statement);
condition.setPropertyInParent(IASTIfStatement.CONDITION);
}
@ -5227,4 +5125,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
return result;
}
protected boolean checkTokenVsDeclarator(IToken la, IASTDeclarator d) {
switch (la.getType()) {
case IToken.tCOLON:
case IToken.t_try:
return true;
default:
return super.checkTokenVsDeclarator(la, d);
}
}
}