Fixed defects 71094 & 68528.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java

@@ -2079,4 +2079,35 @@ public class CompleteParseASTTest extends CompleteParseBaseTest
         
         parse( writer.toString() );
     }
+    
+    
+    public void testBug68528() throws Exception
+	{
+    	Writer writer = new StringWriter();
+    	writer.write( "namespace N526026\n" );
+    	writer.write( "{\n" );
+    	writer.write( "template <typename T>\n" );
+    	writer.write( "class T526026\n" );
+    	writer.write( "{\n" );
+    	writer.write( "typedef int diff;\n" );
+    	writer.write( "};\n" );
+    	writer.write( "\n" );
+    	writer.write( "template<typename T>\n" );
+    	writer.write( "inline T526026< T >\n" ); 
+    	writer.write( "operator+(typename T526026<T>::diff d, const T526026<T> & x )\n" ); 
+    	writer.write( "{ return T526026< T >(); }\n" );
+    	writer.write( "}\n" );
+    	parse( writer.toString(), false );
+	}
+    
+    public void testBug71094() throws Exception
+	{
+    	Writer writer = new StringWriter();
+    	writer.write( "using namespace DOESNOTEXIST;\n" ); 
+    	writer.write( "class A { int x; };\n" );
+    	Iterator i = parse( writer.toString(), false ).getDeclarations();
+    	assertTrue( i.hasNext() );
+    	assertTrue( i.next() instanceof IASTAbstractTypeSpecifierDeclaration );
+    	assertFalse( i.hasNext() );
+	}
 }

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java

@@ -504,6 +504,7 @@ public class CompleteParseBaseTest extends TestCase
          */
         public void exitCompilationUnit(IASTCompilationUnit cu )
         {
+        	popScope();
         }
     
         
@@ -525,12 +526,14 @@ public class CompleteParseBaseTest extends TestCase
         {
         	Scope s = (Scope)scopes.pop();
         	h.put( s.getScope(), s );
+        	--depth;
         	return s; 
         }
         
         protected void pushScope( IASTScope scope )
         {
         	scopes.push( new Scope( scope ));
+        	++depth;
         }
         
         Hashtable h = new Hashtable();
@@ -547,6 +550,7 @@ public class CompleteParseBaseTest extends TestCase
         
     
     	List problems = new ArrayList();
+		private int depth = 0;
     	
     	public Iterator getProblems() { 
     		return problems.iterator(); 
@@ -709,6 +713,7 @@ public class CompleteParseBaseTest extends TestCase
         protected void pushCodeScope(IASTCodeScope scope)
         {
 			scopes.push( new CodeScope( scope ) );
+			++depth;
         }
 
         /* (non-Javadoc)
@@ -757,6 +762,13 @@ public class CompleteParseBaseTest extends TestCase
 		public void acceptFriendDeclaration(IASTDeclaration declaration) {
 			getCurrentScope().addDeclaration( declaration );
 		}
+
+		/**
+		 * @return
+		 */
+		public boolean isBalanced() {
+			return depth == 0;
+		}
     }
     
     protected Iterator getNestedScopes( IASTCodeScope scope )
@@ -797,7 +809,10 @@ public class CompleteParseBaseTest extends TestCase
     	// throw exception if there are generated IProblems
 		if( (! parseResult || callback.getProblems().hasNext() ) && throwOnError ) throw new ParserException( "FAILURE"); //$NON-NLS-1$
 		if( parseResult  )
+		{
 			assertTrue( ((CompleteParser)parser).validateCaches());
+			assertTrue( callback.isBalanced() );
+		}
         return callback.getCompilationUnit();
     }
         

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java

@@ -2896,7 +2896,8 @@ public class ExpressionParser implements IExpressionParser, IParserData {
 	 */
 	protected void errorHandling() throws EndOfFileException {
 		int depth = ( LT(1) == IToken.tLBRACE ) ? 1 : 0;
-	    consume();    
+	    int type = consume().getType();
+	    if( type == IToken.tSEMI ) return;
 	    while (!((LT(1) == IToken.tSEMI && depth == 0)
 	        || (LT(1) == IToken.tRBRACE && depth == 1)))
 	    {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java

@@ -319,6 +319,11 @@ public abstract class Parser extends ExpressionParser implements IParser
                 {
                     astUD = astFactory.createUsingDirective(scope, duple, firstToken.getOffset(), firstToken.getLineNumber(), last.getEndOffset(), last.getLineNumber());
                 }
+                catch( ASTSemanticException ase )
+				{
+                	backup( last );
+                	throwBacktrack( ase.getProblem() );
+				}
                 catch (Exception e1)
                 {
                 	logException( "usingClause:createUsingDirective", e1 ); //$NON-NLS-1$
@@ -420,6 +425,8 @@ public abstract class Parser extends ExpressionParser implements IParser
             }
             
             linkage.enterScope( requestor, astFactory.getReferenceManager() );
+            try
+			{
 	            linkageDeclarationLoop : while (LT(1) != IToken.tRBRACE)
 	            {
 	                int checkToken = LA(1).hashCode();
@@ -446,7 +453,11 @@ public abstract class Parser extends ExpressionParser implements IParser
 	            // consume the }
 	            IToken lastTokenConsumed = consume();
 	            linkage.setEndingOffsetAndLineNumber(lastTokenConsumed.getEndOffset(), lastTokenConsumed.getLineNumber());
+			}
+            finally
+			{
             	linkage.exitScope( requestor, astFactory.getReferenceManager() );
+			}
             return linkage;
         }
         // single declaration
@@ -468,8 +479,14 @@ public abstract class Parser extends ExpressionParser implements IParser
             return null;
         }
 		linkage.enterScope( requestor, astFactory.getReferenceManager() );
+		try
+		{
 			declaration(linkage, null, null, KeywordSetKey.DECLARATION);
+		}
+		finally
+		{
 			linkage.exitScope( requestor, astFactory.getReferenceManager() );
+		}
 		return linkage;
 
     }
@@ -522,9 +539,14 @@ public abstract class Parser extends ExpressionParser implements IParser
                 return null;
             }
             templateInstantiation.enterScope( requestor, astFactory.getReferenceManager() );
+            try
+			{
             	declaration(templateInstantiation, templateInstantiation, null, KeywordSetKey.DECLARATION);
             	templateInstantiation.setEndingOffsetAndLineNumber(lastToken.getEndOffset(), lastToken.getLineNumber());
+			} finally
+			{
 				templateInstantiation.exitScope( requestor, astFactory.getReferenceManager() );
+			}
  
             return templateInstantiation;
         }
@@ -550,10 +572,16 @@ public abstract class Parser extends ExpressionParser implements IParser
                 return null;
             }
 			templateSpecialization.enterScope(requestor, astFactory.getReferenceManager());
+			try
+			{
 				declaration(templateSpecialization, templateSpecialization, null, KeywordSetKey.DECLARATION);
 				templateSpecialization.setEndingOffsetAndLineNumber(
 						lastToken.getEndOffset(), lastToken.getLineNumber());
+			}
+			finally
+			{
 				templateSpecialization.exitScope(requestor, astFactory.getReferenceManager());
+			}
             return templateSpecialization;
         }
 
@@ -581,13 +609,11 @@ public abstract class Parser extends ExpressionParser implements IParser
             templateDecl.enterScope( requestor, astFactory.getReferenceManager() );
             try{
             	declaration(templateDecl, templateDecl, null, KeywordSetKey.DECLARATION );
-            } catch( EndOfFileException e ){
             	templateDecl.setEndingOffsetAndLineNumber( lastToken.getEndOffset(), lastToken.getLineNumber() );
+            } finally
+			{
     			templateDecl.exitScope( requestor, astFactory.getReferenceManager() );
-    			throw e;
             }
-            templateDecl.setEndingOffsetAndLineNumber( lastToken.getEndOffset(), lastToken.getLineNumber() );
-			templateDecl.exitScope( requestor, astFactory.getReferenceManager() );
 			return templateDecl;
         }
         catch (BacktrackException bt)
@@ -998,6 +1024,8 @@ public abstract class Parser extends ExpressionParser implements IParser
                 return null;
             }
             namespaceDefinition.enterScope( requestor, astFactory.getReferenceManager() );
+            try
+			{
 	            setCompletionValues(scope,CompletionKind.VARIABLE_TYPE, KeywordSetKey.DECLARATION );
 	            endDeclaration( namespaceDefinition );
 	            namespaceDeclarationLoop : while (LT(1) != IToken.tRBRACE)
@@ -1030,7 +1058,11 @@ public abstract class Parser extends ExpressionParser implements IParser
 	            namespaceDefinition.setEndingOffsetAndLineNumber(
 	                last.getOffset() + last.getLength(), last.getLineNumber());
 	            setCompletionValues(scope, kind, KeywordSetKey.DECLARATION );
+			} 
+            finally
+			{
             	namespaceDefinition.exitScope( requestor, astFactory.getReferenceManager() );
+			}
             return namespaceDefinition;
         }
         else if( LT(1) == IToken.tASSIGN )
@@ -1244,6 +1276,8 @@ public abstract class Parser extends ExpressionParser implements IParser
 			    IASTDeclaration declaration = (IASTDeclaration)l.get(0);
 			    endDeclaration( declaration );
 			    declaration.enterScope( requestor, astFactory.getReferenceManager() );
+			    try
+				{
 				    if( sdw.getTypeSpecifier() instanceof IASTSimpleTypeSpecifier )
 				    	((IASTSimpleTypeSpecifier)sdw.getTypeSpecifier()).releaseReferences( astFactory.getReferenceManager() );
 	
@@ -1253,8 +1287,11 @@ public abstract class Parser extends ExpressionParser implements IParser
 					handleFunctionBody((IASTScope)declaration );
 					((IASTOffsetableElement)declaration).setEndingOffsetAndLineNumber(
 						lastToken.getEndOffset(), lastToken.getLineNumber());
-  
+				}
+			    finally
+				{
 			    	declaration.exitScope( requestor, astFactory.getReferenceManager() );
+				}
 					
 				if( hasFunctionTryBlock )
 					catchHandlerSequence( scope );
@@ -2791,14 +2828,19 @@ public abstract class Parser extends ExpressionParser implements IParser
 		if (LT(1) == IToken.tCOLON) {
 			baseSpecifier(astClassSpecifier);
 		}
+
 		if (LT(1) == IToken.tLBRACE) {
 			consume(IToken.tLBRACE);
 			setCompletionValues(astClassSpecifier, CompletionKind.FIELD_TYPE,
 					KeywordSetKey.MEMBER);
 			astClassSpecifier.enterScope(requestor, astFactory
 					.getReferenceManager());
+			
+			try
+			{
 				handleClassSpecifier(astClassSpecifier);
-			memberDeclarationLoop : while (LT(1) != IToken.tRBRACE) {
+				memberDeclarationLoop : while (LT(1) != IToken.tRBRACE) 
+				{
 					int checkToken = LA(1).hashCode();
 					switch (LT(1)) {
 						case IToken.t_public :
@@ -2839,7 +2881,6 @@ public abstract class Parser extends ExpressionParser implements IParser
 				IToken lt = consume(IToken.tRBRACE);
 				astClassSpecifier.setEndingOffsetAndLineNumber(lt.getEndOffset(),
 						lt.getLineNumber());
-
 				try {
 					astFactory.signalEndOfClassSpecifier(astClassSpecifier);
 				} catch (Exception e1) {
@@ -2847,8 +2888,14 @@ public abstract class Parser extends ExpressionParser implements IParser
 					throwBacktrack(lt.getOffset(), lt.getEndOffset(), lt.getLineNumber(), lt.getFilename());
 				}
 
+			}
+			finally
+			{
 				astClassSpecifier.exitScope(requestor, astFactory
 						.getReferenceManager());				
+			}
+
+
 
 		}
 	}
@@ -3270,6 +3317,8 @@ public abstract class Parser extends ExpressionParser implements IParser
 			newScope.enterScope(requestor, astFactory.getReferenceManager());
 		}
 
+		try
+		{
 			setCompletionValues((createNewScope ? newScope : scope),
 					CompletionKind.SINGLE_NAME_REFERENCE, KeywordSetKey.STATEMENT);
 	
@@ -3288,10 +3337,13 @@ public abstract class Parser extends ExpressionParser implements IParser
 			}
 	
 			consume(IToken.tRBRACE);
-
+		}
+		finally
+		{	
 			if (createNewScope)
 				newScope.exitScope(requestor, astFactory.getReferenceManager());
 		}
+	}
 
 	protected IASTCompilationUnit compilationUnit;
 	protected IToken simpleDeclarationMark;