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

Fix for a bogus c++-syntax-error and 2 exceptions, bug 223777.

Browse source
This commit is contained in:
Markus Schorn 2008-03-26 11:35:43 +00:00
parent 064d4429ba
commit 9f5748de37
4 changed files with 165 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5838,4 +5838,15 @@ public class AST2CPPTests extends AST2BaseTest {
assertTrue(td instanceof ITypedef); assertTrue(td instanceof ITypedef);
assertTrue(((ITypedef) td).getType() instanceof ICPPBasicType); assertTrue(((ITypedef) td).getType() instanceof ICPPBasicType);
} }
// void func() {
// int a, b;
// a < b || (a==b && a < b);
// if (a > b) {
// }
// }
public void testResettingTemplateIdScopesStack_Bug223777() throws Exception{
final String code = getContents(1)[0].toString();
parseAndCheckBindings(code);
}
} }

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java
View file

@ -835,13 +835,16 @@ public class CPPVisitor {
IScope scope= getContainingScopeOrNull(name); IScope scope= getContainingScopeOrNull(name);
if (scope == null) { if (scope == null) {
return new CPPScope.CPPScopeProblem(name, IProblemBinding.SEMANTIC_BAD_SCOPE, return new CPPScope.CPPScopeProblem(name, IProblemBinding.SEMANTIC_BAD_SCOPE,
name.toCharArray()); name == null ? CharArrayUtils.EMPTY : name.toCharArray());
} }
return scope; return scope;
} }
private static IScope getContainingScopeOrNull(IASTName name) { private static IScope getContainingScopeOrNull(IASTName name) {
if (name == null) {
return null;
}
IASTNode parent = name.getParent(); IASTNode parent = name.getParent();
try { try {
if (parent instanceof ICPPASTTemplateId) { if (parent instanceof ICPPASTTemplateId) {

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

@ -282,8 +282,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
boolean completedArg = false; boolean completedArg = false;
boolean failed = false; boolean failed = false;
final int initialTemplateIdScopesSize= templateIdScopes.size();
templateIdScopes.push(IToken.tLT); templateIdScopes.push(IToken.tLT);
try {
while (LT(1) != IToken.tGT && LT(1) != IToken.tEOC) { while (LT(1) != IToken.tGT && LT(1) != IToken.tEOC) {
completedArg = false; completedArg = false;
@ -318,9 +319,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
break; break;
} }
} }
}
finally {
do {
templateIdScopes.pop(); templateIdScopes.pop();
} while (templateIdScopes.size() > initialTemplateIdScopesSize);
}
if (failed) if (failed)
throwBacktrack(startingOffset, endOffset - startingOffset); throwBacktrack(startingOffset, endOffset - startingOffset);
@ -407,6 +411,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
} }
@Override
protected IASTExpression conditionalExpression() throws BacktrackException, EndOfFileException { protected IASTExpression conditionalExpression() throws BacktrackException, EndOfFileException {
final IASTExpression expr= super.conditionalExpression(); final IASTExpression expr= super.conditionalExpression();
if (templateArgListCount > 0) { if (templateArgListCount > 0) {
@ -912,10 +917,11 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IToken mark = mark(); IToken mark = mark();
consume(); consume();
if (templateIdScopes.size() > 0) final int initialSize= templateIdScopes.size();
if (initialSize > 0)
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);
boolean popped = false; try {
IASTTypeId typeId = null; IASTTypeId typeId = null;
IToken startCastExpression=null; IToken startCastExpression=null;
@ -926,9 +932,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (typeId != null && LT(1) == IToken.tRPAREN) { if (typeId != null && LT(1) == IToken.tRPAREN) {
consume(); consume();
startCastExpression=mark(); startCastExpression=mark();
if (templateIdScopes.size() > 0) { if (initialSize > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
popped = true;
} }
try { try {
IASTExpression castExpression = castExpression(); IASTExpression castExpression = castExpression();
@ -952,7 +957,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
} }
} }
backup(mark); backup(mark);
if (templateIdScopes.size() > 0 && !popped) { templateIdScopes.pop(); } }
finally {
while (templateIdScopes.size() > initialSize) {
templateIdScopes.pop();
}
}
} }
return unaryExpression(); return unaryExpression();
@ -1395,14 +1405,20 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
IASTName name = createName(nestedName); IASTName name = createName(nestedName);
consume(IToken.tLPAREN); consume(IToken.tLPAREN);
int lastOffset;
IASTExpression expressionList;
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);
} }
IASTExpression expressionList = expression(); try {
int lastOffset = consume(IToken.tRPAREN).getEndOffset(); expressionList = expression();
lastOffset = consume(IToken.tRPAREN).getEndOffset();
}
finally {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
} }
}
ICPPASTTypenameExpression result = createTypenameExpression(); ICPPASTTypenameExpression result = createTypenameExpression();
((ASTNode) result).setOffsetAndLength(o, lastOffset - o); ((ASTNode) result).setOffsetAndLength(o, lastOffset - o);
@ -1460,11 +1476,16 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);
} }
IASTNode[] n = parseTypeIdOrUnaryExpression(false); IASTNode[] n;
try {
n= parseTypeIdOrUnaryExpression(false);
lastOffset = consume(IToken.tRPAREN).getEndOffset(); lastOffset = consume(IToken.tRPAREN).getEndOffset();
}
finally {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
} }
}
switch (n.length) { switch (n.length) {
case 0: case 0:
@ -1509,8 +1530,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLBRACKET); templateIdScopes.push(IToken.tLBRACKET);
} }
secondExpression = expression();
int lastOffset; int lastOffset;
try {
secondExpression = expression();
switch (LT(1)) { switch (LT(1)) {
case IToken.tRBRACKET: case IToken.tRBRACKET:
case IToken.tEOC: case IToken.tEOC:
@ -1519,9 +1541,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
default: default:
throw backtrack; throw backtrack;
} }
}
finally {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
} }
}
IASTArraySubscriptExpression s = createArraySubscriptExpression(); IASTArraySubscriptExpression s = createArraySubscriptExpression();
((ASTNode) s).setOffsetAndLength(((ASTNode) firstExpression) ((ASTNode) s).setOffsetAndLength(((ASTNode) firstExpression)
@ -1537,6 +1562,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);
} }
try {
if (LT(1) != IToken.tRPAREN) if (LT(1) != IToken.tRPAREN)
secondExpression = expression(); secondExpression = expression();
else else
@ -1549,10 +1575,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
default: default:
throw backtrack; throw backtrack;
} }
}
finally {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
} }
}
IASTFunctionCallExpression fce = createFunctionCallExpression(); IASTFunctionCallExpression fce = createFunctionCallExpression();
((ASTNode) fce).setOffsetAndLength(((ASTNode) firstExpression) ((ASTNode) fce).setOffsetAndLength(((ASTNode) firstExpression)
@ -1743,17 +1771,22 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);
} }
IASTExpression lhs = expression();
int finalOffset= 0; int finalOffset= 0;
IASTExpression lhs;
try {
lhs = expression();
if (LT(1) == IToken.tRPAREN) { if (LT(1) == IToken.tRPAREN) {
finalOffset = consume().getEndOffset(); finalOffset = consume().getEndOffset();
} else { } else {
// missing parenthesis, assume it's there and keep going. // missing parenthesis, assume it's there and keep going.
finalOffset = LA(1).getOffset(); finalOffset = LA(1).getOffset();
} }
}
finally {
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.pop(); templateIdScopes.pop();
} }
}
return buildUnaryExpression(IASTUnaryExpression.op_bracketedPrimary, lhs, t.getOffset(), finalOffset); return buildUnaryExpression(IASTUnaryExpression.op_bracketedPrimary, lhs, t.getOffset(), finalOffset);
case IToken.tIDENTIFIER: case IToken.tIDENTIFIER:
case IToken.tCOLONCOLON: case IToken.tCOLONCOLON:

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
View file

@ -89,12 +89,13 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
IParameter[] sParams= sFunc.getParameters(); IParameter[] sParams= sFunc.getParameters();
IType[] sParamTypes= sFunc.getType().getParameterTypes(); IType[] sParamTypes= sFunc.getType().getParameterTypes();
final int length= Math.min(sParamTypes.length, params.length); final int length= Math.min(sParams.length, params.length);
db.putInt(record + NUM_PARAMS, length); db.putInt(record + NUM_PARAMS, length);
for (int i=0; i<length; ++i) { for (int i=0; i<length; ++i) {
int typeRecord= i<paramTypes.length && paramTypes[i]!=null ? ((PDOMNode)paramTypes[i]).getRecord() : 0; int typeRecord= i<paramTypes.length && paramTypes[i]!=null ? ((PDOMNode)paramTypes[i]).getRecord() : 0;
//TODO shouldn't need to make new parameter (find old one) //TODO shouldn't need to make new parameter (find old one)
PDOMCPPParameter sParam = new PDOMCPPParameter(pdom, this, sParams[i], sParamTypes[i]); final IType type= i<sParamTypes.length ? sParamTypes[i] : null;
PDOMCPPParameter sParam = new PDOMCPPParameter(pdom, this, sParams[i], type);
setFirstParameter(new PDOMCPPParameterSpecialization(pdom, this, (ICPPParameter) params[i], sParam, typeRecord)); setFirstParameter(new PDOMCPPParameterSpecialization(pdom, this, (ICPPParameter) params[i], sParam, typeRecord));
} }
db.putByte(record + ANNOTATION, PDOMCPPAnnotation.encodeAnnotation(function)); db.putByte(record + ANNOTATION, PDOMCPPAnnotation.encodeAnnotation(function));