From dfc14ef0f33943f6dae46f34d1e3a1aa090dc0b8 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Mon, 20 Jun 2005 20:50:57 +0000
Subject: [PATCH] [100398] Added handling of content assist inside of namespace
 declarations.

---
 .../core/dom/parser/cpp/GNUCPPSourceParser.java       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 08c57de0cfb..7f9bfc91801 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -2583,12 +2583,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
             name.setParent(namespaceDefinition);
             name.setPropertyInParent(ICPPASTNamespaceDefinition.NAMESPACE_NAME);
 
-            namespaceDeclarationLoop: while (LT(1) != IToken.tRBRACE) {
-                int checkToken = LA(1).hashCode();
+            namespaceDeclarationLoop: while (true) {
                 switch (LT(1)) {
                 case IToken.tRBRACE:
+                case IToken.tEOC:
                     break namespaceDeclarationLoop;
                 default:
+                    int checkToken = LA(1).hashCode();
                     try {
                         IASTDeclaration d = declaration();
                         d.setParent(namespaceDefinition);
@@ -2610,13 +2611,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
                         if (checkToken == LA(1).hashCode())
                             errorHandling();
                     }
+                    if (checkToken == LA(1).hashCode())
+                        failParseWithErrorHandling();
                 }
-                if (checkToken == LA(1).hashCode())
-                    failParseWithErrorHandling();
             }
 
             // consume the }
-            int end = consume(IToken.tRBRACE).getEndOffset();
+            int end = consume().getEndOffset();
             ((CPPASTNode) namespaceDefinition).setLength(end
                     - first.getOffset());
             return namespaceDefinition;