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

[100398] Added handling of content assist inside of namespace declarations.

Browse source
This commit is contained in:
Doug Schaefer 2005-06-20 20:50:57 +00:00
parent 77121513be
commit dfc14ef0f3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2583,12 +2583,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
name.setParent(namespaceDefinition); name.setParent(namespaceDefinition);
name.setPropertyInParent(ICPPASTNamespaceDefinition.NAMESPACE_NAME); name.setPropertyInParent(ICPPASTNamespaceDefinition.NAMESPACE_NAME);
namespaceDeclarationLoop: while (LT(1) != IToken.tRBRACE) { namespaceDeclarationLoop: while (true) {
int checkToken = LA(1).hashCode();
switch (LT(1)) { switch (LT(1)) {
case IToken.tRBRACE: case IToken.tRBRACE:
case IToken.tEOC:
break namespaceDeclarationLoop; break namespaceDeclarationLoop;
default: default:
int checkToken = LA(1).hashCode();
try { try {
IASTDeclaration d = declaration(); IASTDeclaration d = declaration();
d.setParent(namespaceDefinition); d.setParent(namespaceDefinition);
@ -2610,13 +2611,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
if (checkToken == LA(1).hashCode()) if (checkToken == LA(1).hashCode())
errorHandling(); errorHandling();
} }
if (checkToken == LA(1).hashCode())
failParseWithErrorHandling();
} }
if (checkToken == LA(1).hashCode())
failParseWithErrorHandling();
} }
// consume the } // consume the }
int end = consume(IToken.tRBRACE).getEndOffset(); int end = consume().getEndOffset();
((CPPASTNode) namespaceDefinition).setLength(end ((CPPASTNode) namespaceDefinition).setLength(end
- first.getOffset()); - first.getOffset());
return namespaceDefinition; return namespaceDefinition;