Attachment 117193 Details for Bug 253690 – the fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] the fix

253690.txt (text/plain), 79.42 KB, created by Markus Schorn

on 2008-11-06 08:34:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Schorn

Created: 2008-11-06 08:34:48 EST

Size: 79.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui.tests
>Index: ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java,v
>retrieving revision 1.17
>diff -u -r1.17 CPPSelectionTestsNoIndexer.java
>--- ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java	29 Oct 2008 10:17:19 -0000	1.17
>+++ ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java	6 Nov 2008 09:57:38 -0000
>@@ -266,7 +266,7 @@
>             if (sel instanceof ITextSelection) {
>             	final ITextSelection textSel = (ITextSelection)sel;
>             	ITranslationUnit tu= CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput());
>-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_YES, monitor, new ASTRunnable() {
>+        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() {
>         			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
>         				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());        	
>         				return Status.OK_STATUS;
>Index: ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java,v
>retrieving revision 1.13
>diff -u -r1.13 CSelectionTestsNoIndexer.java
>--- ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java	18 Jun 2008 12:16:12 -0000	1.13
>+++ ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java	6 Nov 2008 09:57:38 -0000
>@@ -288,7 +288,7 @@
>             if (sel instanceof ITextSelection) {
>             	final ITextSelection textSel = (ITextSelection)sel;
>             	ITranslationUnit tu = (ITranslationUnit)CoreModel.getDefault().create(file);
>-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_YES, monitor, new ASTRunnable() {
>+        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() {
>         			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
>         				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
>         				return Status.OK_STATUS;
>Index: ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java,v
>retrieving revision 1.11
>diff -u -r1.11 BaseSelectionTestsIndexer.java
>--- ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java	6 Mar 2008 09:57:22 -0000	1.11
>+++ ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java	6 Nov 2008 09:57:38 -0000
>@@ -74,6 +74,7 @@
> 		super(name);
> 	}
> 	
>+	@Override
> 	protected void setUp() throws Exception {
> 		super.setUp();
> 		OpenDeclarationsAction.sIsJUnitTest= true;
>@@ -219,7 +220,7 @@
>             if (sel instanceof ITextSelection) {
>             	final ITextSelection textSel = (ITextSelection)sel;
>             	ITranslationUnit tu = (ITranslationUnit)CoreModel.getDefault().create(file);
>-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_YES, monitor, new ASTRunnable() {
>+        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() {
>         			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
>         				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
>         				return Status.OK_STATUS;
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java,v
>retrieving revision 1.15
>diff -u -r1.15 CElementHyperlinkDetector.java
>--- src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java	31 Mar 2008 07:53:16 -0000	1.15
>+++ src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java	6 Nov 2008 09:57:39 -0000
>@@ -68,7 +68,7 @@
> 		}
> 
> 		final IHyperlink[] result= {null};
>-		IStatus status= ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_YES, null, new ASTRunnable() {
>+		IStatus status= ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_ACTIVE_ONLY, null, new ASTRunnable() {
> 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
> 				if (ast != null) {
> 					final int offset= region.getOffset();
>Index: src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java,v
>retrieving revision 1.15
>diff -u -r1.15 ASTProvider.java
>--- src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java	2 Oct 2008 10:57:09 -0000	1.15
>+++ src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java	6 Nov 2008 09:57:39 -0000
>@@ -65,17 +65,19 @@
> 
> 	/**
> 	 * Wait flag indicating that a client requesting an AST
>-	 * wants to wait until an AST is ready.
>+	 * wants to wait until an AST is ready. If the translation unit is not open no ast will
>+	 * be provided.
> 	 * <p>
>-	 * An AST will be created by this AST provider if the shared
>-	 * AST is not for the given C element.
>+	 * If not yet cached and if the translation unit is open, an AST will be created by 
>+	 * this AST provider.
> 	 * </p>
> 	 */
>-	public static final WAIT_FLAG WAIT_YES= new WAIT_FLAG("wait yes"); //$NON-NLS-1$
>+	public static final WAIT_FLAG WAIT_IF_OPEN= new WAIT_FLAG("wait if open"); //$NON-NLS-1$
> 
> 	/**
> 	 * Wait flag indicating that a client requesting an AST
>-	 * only wants to wait for the shared AST of the active editor.
>+	 * only wants to wait for the shared AST of the active editor. 
>+	 * If the translation unit is not open no ast will be provided.
> 	 * <p>
> 	 * No AST will be created by the AST provider.
> 	 * </p>
>@@ -262,17 +264,6 @@
> 	}
> 
> 	/**
>-	 * Returns whether this AST provider is active on the given
>-	 * translation unit.
>-	 *
>-	 * @param tu the translation unit
>-	 * @return <code>true</code> if the given translation unit is the active one
>-	 */
>-	public boolean isActive(ITranslationUnit tu) {
>-		return fCache.isActiveElement(tu) && tu.isOpen();
>-	}
>-
>-	/**
> 	 * Informs that reconciling for the given element is about to be started.
> 	 *
> 	 * @param cElement the C element
>@@ -339,13 +330,17 @@
> 	public IStatus runOnAST(ICElement cElement, WAIT_FLAG waitFlag, IProgressMonitor monitor,
> 			ASTCache.ASTRunnable astRunnable) {
> 		Assert.isTrue(cElement instanceof ITranslationUnit);
>-		boolean isActive= isActive((ITranslationUnit)cElement);
>+		final ITranslationUnit tu = (ITranslationUnit)cElement;
>+		if (!tu.isOpen())
>+			return Status.CANCEL_STATUS;
>+		
>+		final boolean isActive= fCache.isActiveElement(tu);
> 		if (waitFlag == WAIT_ACTIVE_ONLY && !isActive) {
> 			return Status.CANCEL_STATUS;
> 		}
> 		if (isActive && updateModificationStamp()) {
> 			fCache.disposeAST();
> 		}
>-		return fCache.runOnAST((ITranslationUnit)cElement, waitFlag != WAIT_NO, monitor, astRunnable);
>+		return fCache.runOnAST(tu, waitFlag != WAIT_NO, monitor, astRunnable);
> 	}
> }
>Index: src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java,v
>retrieving revision 1.26
>diff -u -r1.26 SemanticHighlightingReconciler.java
>--- src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java	5 Nov 2008 10:26:57 -0000	1.26
>+++ src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java	6 Nov 2008 09:57:39 -0000
>@@ -10,7 +10,6 @@
>  *     Anton Leherbauer (Wind River Systems) - Adapted for CDT
>  *     Markus Schorn (Wind River Systems)
>  *******************************************************************************/
>-
> package org.eclipse.cdt.internal.ui.editor;
> 
> import java.util.ArrayList;
>@@ -513,7 +512,7 @@
> 						
> 						final Job me= this;
> 						ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider();
>-						IStatus status= astProvider.runOnAST(element, ASTProvider.WAIT_YES, monitor, new ASTCache.ASTRunnable() {
>+						IStatus status= astProvider.runOnAST(element, ASTProvider.WAIT_IF_OPEN, monitor, new ASTCache.ASTRunnable() {
> 							public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
> 								reconciled(ast, true, monitor);
> 								synchronized (fJobLock) {
>Index: src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java,v
>retrieving revision 1.16
>diff -u -r1.16 InactiveCodeHighlighting.java
>--- src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java	11 Apr 2008 09:26:58 -0000	1.16
>+++ src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java	6 Nov 2008 09:57:39 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
>+ * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -9,7 +9,6 @@
>  *     Anton Leherbauer (Wind River Systems) - initial API and implementation
>  *     Markus Schorn (Wind River Systems)
>  *******************************************************************************/
>-
> package org.eclipse.cdt.internal.ui.editor;
> 
> import java.util.ArrayList;
>@@ -108,7 +107,7 @@
> 						IStatus result = Status.OK_STATUS;
> 						if (fTranslationUnit != null) {
> 							final ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider();
>-							result= astProvider.runOnAST(fTranslationUnit, ASTProvider.WAIT_YES, monitor, new ASTCache.ASTRunnable() {
>+							result= astProvider.runOnAST(fTranslationUnit, ASTProvider.WAIT_IF_OPEN, monitor, new ASTCache.ASTRunnable() {
> 								public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
> 									reconciled(ast, true, monitor);
> 									return Status.OK_STATUS;
>Index: src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java,v
>retrieving revision 1.6
>diff -u -r1.6 CorrectionCommandHandler.java
>--- src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java	12 Aug 2008 03:39:53 -0000	1.6
>+++ src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java	6 Nov 2008 09:57:40 -0000
>@@ -9,7 +9,6 @@
>  *     IBM Corporation - initial API and implementation
>  * 	   Sergey Prigogin (Google)
>  *******************************************************************************/
>-
> package org.eclipse.cdt.internal.ui.text.correction;
> 
> import java.util.ArrayList;
>@@ -120,7 +119,7 @@
> 	private ICompletionProposal getLocalRenameProposal(final IInvocationContext context) {
> 		final ICCompletionProposal[] proposals= new ICCompletionProposal[1];
> 
>-		ASTProvider.getASTProvider().runOnAST(context.getTranslationUnit(), ASTProvider.WAIT_YES,
>+		ASTProvider.getASTProvider().runOnAST(context.getTranslationUnit(), ASTProvider.WAIT_ACTIVE_ONLY,
> 				new NullProgressMonitor(), new ASTRunnable() {
> 
> 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit astRoot) throws CoreException {
>Index: src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java,v
>retrieving revision 1.4
>diff -u -r1.4 QuickAssistLightBulbUpdater.java
>--- src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java	12 Aug 2008 03:39:53 -0000	1.4
>+++ src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java	6 Nov 2008 09:57:40 -0000
>@@ -170,7 +170,7 @@
> 				if (workingCopy != null) {
> 					installSelectionListener();
> 					final Point point= fViewer.getSelectedRange();
>-					ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_YES, null, new ASTRunnable() {
>+					ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_IF_OPEN, null, new ASTRunnable() {
> 						public IStatus runOnAST(ILanguage lang, IASTTranslationUnit astRoot) {
> 							if (astRoot != null) {
> 								doSelectionChanged(point.x, point.y, astRoot);
>Index: src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java,v
>retrieving revision 1.16
>diff -u -r1.16 PDOMSearchTextSelectionQuery.java
>--- src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java	29 Apr 2008 08:43:08 -0000	1.16
>+++ src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java	6 Nov 2008 09:57:39 -0000
>@@ -52,7 +52,7 @@
> 
> 	@Override
> 	protected IStatus runWithIndex(final IIndex index, IProgressMonitor monitor) {
>-		return ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_YES, monitor, new ASTRunnable() {
>+		return ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_ACTIVE_ONLY, monitor, new ASTRunnable() {
> 			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
> 				if (ast != null) {
> 					IASTName searchName= ast.getNodeSelector(null).findEnclosingName(selection.getOffset(), selection.getLength());
>Index: src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java,v
>retrieving revision 1.2
>diff -u -r1.2 LinkedNamesAssistProposal.java
>--- src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java	22 Sep 2008 03:58:58 -0000	1.2
>+++ src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java	6 Nov 2008 09:57:40 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -14,17 +14,10 @@
> import java.util.Arrays;
> import java.util.Comparator;
> 
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.VerifyEvent;
>-import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.graphics.Point;
>-
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Status;
>-import org.eclipse.jface.viewers.StyledString;
>-
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.DocumentEvent;
> import org.eclipse.jface.text.IDocument;
>@@ -39,7 +32,12 @@
> import org.eclipse.jface.text.link.LinkedPositionGroup;
> import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
> import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
>-
>+import org.eclipse.jface.viewers.StyledString;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.VerifyEvent;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.graphics.Point;
> import org.eclipse.ui.IEditorPart;
> import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
> 
>@@ -136,10 +134,13 @@
> 			final int secectionOffset = selection.x;
> 			final int selectionLength = selection.y;
> 
>-			ASTProvider.getASTProvider().runOnAST(fTranslationUnit, ASTProvider.WAIT_YES,
>+			ASTProvider.getASTProvider().runOnAST(fTranslationUnit, ASTProvider.WAIT_ACTIVE_ONLY,
> 					new NullProgressMonitor(), new ASTRunnable() {
> 
> 				public IStatus runOnAST(ILanguage lang, IASTTranslationUnit astRoot) throws CoreException {
>+					if (astRoot == null)
>+						return Status.CANCEL_STATUS;
>+					
> 					IASTNodeSelector selector= astRoot.getNodeSelector(null);
> 					IASTName name= selector.findEnclosingName(secectionOffset, selectionLength);
> 					if (name != null) {
>@@ -249,7 +250,7 @@
> 	public String getDisplayString() {
> 		String shortCutString= CorrectionCommandHandler.getShortCutString(getCommandId());
> 		if (shortCutString != null) {
>-			return CorrectionMessages.bind(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut,
>+			return NLS.bind(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut,
> 					fLabel, shortCutString);
> 		}
> 		return fLabel;
>@@ -263,7 +264,7 @@
> 		
> 		String shortCutString= CorrectionCommandHandler.getShortCutString(getCommandId());
> 		if (shortCutString != null) {
>-			String decorated= CorrectionMessages.bind(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut,
>+			String decorated= NLS.bind(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut,
> 					fLabel, shortCutString);
> 			return ColoringLabelProvider.decorateStyledString(str, decorated, StyledString.QUALIFIER_STYLER); 
> 		}
>Index: src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java,v
>retrieving revision 1.27
>diff -u -r1.27 IndexUI.java
>--- src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java	7 Oct 2008 12:49:21 -0000	1.27
>+++ src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java	6 Nov 2008 09:57:40 -0000
>@@ -393,7 +393,7 @@
> 			return null;
> 		
> 		final IASTName[] result= {null};
>-		ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_YES, null, new ASTRunnable() {
>+		ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_ACTIVE_ONLY, null, new ASTRunnable() {
> 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
> 				if (ast != null) {
> 					final IASTNodeSelector nodeSelector = ast.getNodeSelector(null);
>Index: src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java,v
>retrieving revision 1.6
>diff -u -r1.6 CreateParserLogAction.java
>--- src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java	30 Jul 2008 07:38:12 -0000	1.6
>+++ src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java	6 Nov 2008 09:57:39 -0000
>@@ -188,9 +188,11 @@
> 	}
> 
> 	private void createLog(final PrintStream out, final ITranslationUnit tu, IProgressMonitor pm) {
>-		ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_YES, pm, new ASTCache.ASTRunnable() {
>+		ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, pm, new ASTCache.ASTRunnable() {
> 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
>-				return createLog(out, tu, lang, ast);
>+				if (ast != null)
>+					return createLog(out, tu, lang, ast);
>+				return Status.CANCEL_STATUS;
> 			}
> 		});
> 	}
>Index: src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java,v
>retrieving revision 1.76
>diff -u -r1.76 OpenDeclarationsAction.java
>--- src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java	29 Oct 2008 10:17:24 -0000	1.76
>+++ src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java	6 Nov 2008 09:57:40 -0000
>@@ -136,7 +136,7 @@
> 		}
> 
> 		try {
>-			return ASTProvider.getASTProvider().runOnAST(fWorkingCopy, ASTProvider.WAIT_YES, monitor, this);
>+			return ASTProvider.getASTProvider().runOnAST(fWorkingCopy, ASTProvider.WAIT_ACTIVE_ONLY, monitor, this);
> 		} finally {
> 			fIndex.releaseReadLock();
> 		}
>#P org.eclipse.cdt.core.tests
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SpecBaseTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SpecBaseTest.java,v
>retrieving revision 1.16
>diff -u -r1.16 AST2SpecBaseTest.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SpecBaseTest.java	30 Jun 2008 13:06:07 -0000	1.16
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SpecBaseTest.java	6 Nov 2008 09:57:41 -0000
>@@ -100,7 +100,7 @@
> 	private IASTTranslationUnit parse(CodeReader codeReader, ParserLanguage lang, boolean useGNUExtensions, 
> 			boolean expectNoProblems, boolean checkBindings, int expectedProblemBindings, String[] problems) throws ParserException {
>         ScannerInfo scannerInfo = new ScannerInfo();
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
>         
>         ISourceCodeParser parser2 = null;
>         if( lang == ParserLanguage.CPP )
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java,v
>retrieving revision 1.196
>diff -u -r1.196 AST2Tests.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java	3 Nov 2008 10:12:13 -0000	1.196
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java	6 Nov 2008 09:57:43 -0000
>@@ -5500,4 +5500,35 @@
> 			parseAndCheckBindings(code, lang);
> 		}
> 	}
>+	
>+	// int a[]= {
>+	
>+	// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
>+	
>+	// };
>+	public void testScalabilityOfLargeTrivialInitializer_Bug252970() throws Exception {
>+		final StringBuffer[] input = getContents(3);
>+		StringBuilder buf= new StringBuilder();
>+		buf.append(input[0].toString());
>+		final String line= input[1].toString();
>+		for (int i = 0; i < 25000; i++) { // 250K values
>+			buf.append(line);
>+		}
>+		buf.append(input[2].toString());
>+		final String code= buf.toString();
>+		long mem= memoryUsed();
>+		for (ParserLanguage lang : ParserLanguage.values()) {
>+			IASTTranslationUnit tu= parse(code, lang, false, true, true);
>+			long diff= memoryUsed()-mem;
>+			final int expected = 1024*10 + code.length()*2; // a copy of the buffer + some
>+			assertTrue(String.valueOf(diff) + " expected < " + expected, diff < expected);
>+		}
>+	}
>+
>+	private long memoryUsed() {
>+		System.gc();System.gc();System.gc();
>+		final Runtime runtime = Runtime.getRuntime();
>+		return runtime.totalMemory()-runtime.freeMemory();
>+	}
>+
> }
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java,v
>retrieving revision 1.59
>diff -u -r1.59 AST2BaseTest.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java	26 Oct 2008 21:14:41 -0000	1.59
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java	6 Nov 2008 09:57:41 -0000
>@@ -54,7 +54,6 @@
> import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification;
> import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition;
> import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
>-import org.eclipse.cdt.core.dom.parser.ISourceCodeParser;
> import org.eclipse.cdt.core.dom.parser.c.ANSICParserExtensionConfiguration;
> import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
> import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
>@@ -75,6 +74,7 @@
> import org.eclipse.cdt.core.testplugin.CTestPlugin;
> import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
> import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
>+import org.eclipse.cdt.internal.core.dom.parser.AbstractGNUSourceCodeParser;
> import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
> import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
> import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
>@@ -116,17 +116,17 @@
>     }
>     
>     protected IASTTranslationUnit parse(String code, ParserLanguage lang, boolean useGNUExtensions,
>-    		boolean expectNoProblems, boolean parseComments) throws ParserException {
>+    		boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException {
>         IScanner scanner = createScanner(new CodeReader(code.toCharArray()), lang, ParserMode.COMPLETE_PARSE, 
>-        		new ScannerInfo(), parseComments);
>-        ISourceCodeParser parser2 = null;
>+        		new ScannerInfo());
>+        AbstractGNUSourceCodeParser parser = null;
>         if (lang == ParserLanguage.CPP) {
>             ICPPParserExtensionConfiguration config = null;
>             if (useGNUExtensions)
>             	config = new GPPParserExtensionConfiguration();
>             else
>             	config = new ANSICPPParserExtensionConfiguration();
>-            parser2 = new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, NULL_LOG,config, null);
>+            parser = new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, NULL_LOG,config, null);
>         } else {
>             ICParserExtensionConfiguration config = null;
> 
>@@ -135,12 +135,14 @@
>             else
>             	config = new ANSICParserExtensionConfiguration();
>             
>-            parser2 = new GNUCSourceParser(scanner, ParserMode.COMPLETE_PARSE, NULL_LOG, config, null);
>+            parser = new GNUCSourceParser(scanner, ParserMode.COMPLETE_PARSE, NULL_LOG, config, null);
>         }
>+        if (skipTrivialInitializers)
>+        	parser.setSkipTrivialExpressionsInAggregateInitializers(true);
>         
>-        IASTTranslationUnit tu = parser2.parse();
>+        IASTTranslationUnit tu = parser.parse();
> 
>-        if (parser2.encounteredError() && expectNoProblems)
>+        if (parser.encounteredError() && expectNoProblems)
>             throw new ParserException("FAILURE"); //$NON-NLS-1$
>          
>         if (lang == ParserLanguage.C && expectNoProblems) {
>@@ -157,7 +159,7 @@
>     }
> 
> 	public static IScanner createScanner(CodeReader codeReader, ParserLanguage lang, ParserMode mode,
>-			IScannerInfo scannerInfo, boolean parseComments) {
>+			IScannerInfo scannerInfo) {
> 		IScannerExtensionConfiguration configuration = null;
>         if (lang == ParserLanguage.C)
>             configuration= GCCScannerExtensionConfiguration.getInstance();
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java,v
>retrieving revision 1.14
>diff -u -r1.14 QuickParser2Tests.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java	24 Jun 2008 12:50:43 -0000	1.14
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java	6 Nov 2008 09:57:44 -0000
>@@ -1355,7 +1355,7 @@
> 
>         CodeReader codeReader = new CodeReader( code.toCharArray() );
>         IScannerInfo scannerInfo = new ScannerInfo();
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
>         ISourceCodeParser parser2 = null;
>         if (lang == ParserLanguage.CPP) {
>             ICPPParserExtensionConfiguration config = null;
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 ASTNodeSelectorTest.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java	7 Oct 2008 12:49:24 -0000	1.4
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java	6 Nov 2008 09:57:43 -0000
>@@ -55,7 +55,7 @@
> 		fCode= getContents(1)[0].toString();
>         CodeReader codeReader = new CodeReader(fCode.toCharArray());
>         ScannerInfo scannerInfo = new ScannerInfo();
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, ParserLanguage.CPP, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, ParserLanguage.CPP, ParserMode.COMPLETE_PARSE, scannerInfo);
>         GNUCPPSourceParser parser= new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, new NullLogService(), new GPPParserExtensionConfiguration());
>         fTu= parser.parse();
>         fSelector= fTu.getNodeSelector(null);
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SelectionParseBaseTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SelectionParseBaseTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 AST2SelectionParseBaseTest.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SelectionParseBaseTest.java	27 Mar 2008 18:31:16 -0000	1.8
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/AST2SelectionParseBaseTest.java	6 Nov 2008 09:57:41 -0000
>@@ -83,7 +83,7 @@
>         CodeReader codeReader = new CodeReader(code
>                 .toCharArray());
>         ScannerInfo scannerInfo = new ScannerInfo();
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
>         
>         ISourceCodeParser parser2 = null;
>         if( lang == ParserLanguage.CPP )
>Index: parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java,v
>retrieving revision 1.38
>diff -u -r1.38 CompleteParser2Tests.java
>--- parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java	26 Jun 2008 10:06:46 -0000	1.38
>+++ parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java	6 Nov 2008 09:57:43 -0000
>@@ -180,7 +180,7 @@
>                 .toCharArray());
>         ScannerInfo scannerInfo = new ScannerInfo();
>         ISourceCodeParser parser2 = null;
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
>         if (lang == ParserLanguage.CPP) {
>             ICPPParserExtensionConfiguration config = null;
>             if (gcc)
>Index: parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 ASTWriterTest.java
>--- parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java	7 Mar 2008 12:13:35 -0000	1.1
>+++ parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ASTWriterTest.java	6 Nov 2008 09:57:44 -0000
>@@ -95,7 +95,7 @@
>         ParserLanguage language = getLanguage(testFile);
>     	boolean useGNUExtensions = getGNUExtension(testFile);
>                 
>-        IScanner scanner = AST2BaseTest.createScanner(codeReader, language, ParserMode.COMPLETE_PARSE, scannerInfo, true);
>+        IScanner scanner = AST2BaseTest.createScanner(codeReader, language, ParserMode.COMPLETE_PARSE, scannerInfo);
>         
>         ISourceCodeParser parser2 = null;
>         if( language == ParserLanguage.CPP ) {
>Index: parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java,v
>retrieving revision 1.6
>diff -u -r1.6 CompletionTestBase.java
>--- parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java	6 Nov 2007 16:41:44 -0000	1.6
>+++ parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java	6 Nov 2008 09:57:44 -0000
>@@ -43,7 +43,7 @@
> 	protected IASTCompletionNode getCompletionNode(String code, ParserLanguage lang, boolean useGNUExtensions) throws ParserException {
>         CodeReader codeReader = new CodeReader(code.toCharArray());
>         ScannerInfo scannerInfo = new ScannerInfo();
>-        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo, false);
>+        IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
>         
>         ISourceCodeParser parser = null;
>         if( lang == ParserLanguage.CPP )
>Index: parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java,v
>retrieving revision 1.64
>diff -u -r1.64 IndexBugsTests.java
>--- parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java	30 Oct 2008 11:07:19 -0000	1.64
>+++ parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java	6 Nov 2008 09:57:44 -0000
>@@ -1370,7 +1370,8 @@
> 		TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/header.h", "#define ID three\n");
> 		TestSourceReader.createFile(fCProject.getProject(), "f1/g/source.cpp", contents + "int CONCAT(one, ID);\n");
> 		TestSourceReader.createFile(fCProject.getProject(), "f2/g/source.cpp", contents + "int CONCAT(two, ID);\n");
>-		TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/source.cpp", contents + "int CONCAT(three, ID);\n");
>+		IFile f= TestSourceReader.createFile(fCProject.getProject(), "f1/g/h/source.cpp", contents + "int CONCAT(three, ID);\n");
>+		waitUntilFileIsIndexed(f, 4000);
> 		indexManager.reindex(fCProject);
> 		waitForIndexer();
> 		fIndex.acquireReadLock();
>#P org.eclipse.cdt.core
>Index: model/org/eclipse/cdt/internal/core/model/TranslationUnit.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java,v
>retrieving revision 1.95
>diff -u -r1.95 TranslationUnit.java
>--- model/org/eclipse/cdt/internal/core/model/TranslationUnit.java	16 Oct 2008 19:50:31 -0000	1.95
>+++ model/org/eclipse/cdt/internal/core/model/TranslationUnit.java	6 Nov 2008 09:57:45 -0000
>@@ -822,6 +822,9 @@
> 				if ((style & AST_CREATE_COMMENT_NODES) != 0) {
> 					options |= ILanguage.OPTION_ADD_COMMENTS;
> 				}
>+				if ((style & AST_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS) != 0) {
>+					options |= ILanguage.OPTION_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS;
>+				}
> 				if (isSourceUnit()) {
> 					options |= ILanguage.OPTION_IS_SOURCE_UNIT;
> 				}
>Index: model/org/eclipse/cdt/internal/core/model/ASTCache.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java,v
>retrieving revision 1.11
>diff -u -r1.11 ASTCache.java
>--- model/org/eclipse/cdt/internal/core/model/ASTCache.java	24 Apr 2008 16:09:34 -0000	1.11
>+++ model/org/eclipse/cdt/internal/core/model/ASTCache.java	6 Nov 2008 09:57:45 -0000
>@@ -40,7 +40,8 @@
> 	/** Full parse mode (no PDOM) */
> 	public static int PARSE_MODE_FULL= ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT;
> 	/** Fast parse mode (use PDOM) */
>-	public static int PARSE_MODE_FAST= ITranslationUnit.AST_SKIP_ALL_HEADERS | ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT;
>+	public static int PARSE_MODE_FAST= ITranslationUnit.AST_SKIP_ALL_HEADERS | ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT
>+		| ITranslationUnit.AST_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS;
> 
> 	/**
> 	 * Do something with an AST.
>Index: model/org/eclipse/cdt/internal/core/model/CModelBuilder2.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder2.java,v
>retrieving revision 1.39
>diff -u -r1.39 CModelBuilder2.java
>--- model/org/eclipse/cdt/internal/core/model/CModelBuilder2.java	19 Jun 2008 14:54:15 -0000	1.39
>+++ model/org/eclipse/cdt/internal/core/model/CModelBuilder2.java	6 Nov 2008 09:57:45 -0000
>@@ -135,7 +135,7 @@
> 			else {
> 				parseFlags |= ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT;
> 			}
>-			
>+			parseFlags |= ITranslationUnit.AST_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS;
> 			final IASTTranslationUnit ast;
> 			try {
> 				ast= fTranslationUnit.getAST(index, parseFlags, fProgressMonitor);
>Index: parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java,v
>retrieving revision 1.117
>diff -u -r1.117 AbstractGNUSourceCodeParser.java
>--- parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java	3 Nov 2008 10:12:16 -0000	1.117
>+++ parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java	6 Nov 2008 09:57:46 -0000
>@@ -6,7 +6,7 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *    IBM Rational Software - Initial API and implementation
>+ *    John Camelon (IBM Rational Software) - Initial API and implementation
>  *    Markus Schorn (Wind River Systems)
>  *    Ed Swartz (Nokia)
>  *    Mike Kucera (IBM) - bug #206952
>@@ -81,10 +81,52 @@
> import org.eclipse.cdt.internal.core.parser.scanner.ILocationResolver;
> 
> /**
>- * @author jcamelon
>+ * Base class for the c- and c++ parser.
>  */
> public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
>-    protected static final int DEFAULT_DESIGNATOR_LIST_SIZE = 4;
>+	protected static class FoundAggregateInitializer extends Exception {
>+		public final IASTDeclarator fDeclarator;
>+		public IASTDeclSpecifier fDeclSpec;
>+		public FoundAggregateInitializer(IASTDeclarator d) {
>+			fDeclarator= d;
>+		}
>+	}
>+    protected static class FoundDeclaratorException extends Exception {
>+    	private static final long serialVersionUID = 0;
>+    	
>+        public IASTDeclSpecifier declSpec;
>+        public IASTDeclarator declarator;
>+
>+		public IASTDeclSpecifier altSpec;
>+		public IASTDeclarator altDeclarator;
>+        
>+        public IToken currToken;
>+
>+        public FoundDeclaratorException(IASTDeclarator d, IToken t) {
>+            this.declarator = d;
>+            this.currToken =t;
>+        }
>+    }
>+
>+	protected static class NameChecker extends ASTVisitor {
>+		private boolean fFound;
>+		protected NameChecker() {
>+			shouldVisitNames= true;
>+		}
>+		@Override
>+		public int visit(IASTName name) {
>+			fFound= true;
>+			return PROCESS_ABORT;
>+		}
>+		public boolean containsName(IASTNode node) {
>+			fFound= false;
>+			node.accept(this);
>+			return fFound;
>+		}
>+	}
>+	protected NameChecker NAME_CHECKER= new NameChecker();
>+
>+	protected static final int DEFAULT_DESIGNATOR_LIST_SIZE = 4;
>     protected static int parseCount = 0;
> 
> 	protected final AbstractParserLogService log;
>@@ -103,6 +145,8 @@
>     protected final IBuiltinBindingsProvider builtinBindingsProvider;
>     
>     protected boolean functionCallCanBeLValue= false;
>+	protected boolean skipTrivialExpressionsInAggregateInitializers= false; 
>+
>     
>     /**
>      *  Marks the beginning of the current declaration. It is important to clear the mark whenever we
>@@ -141,6 +185,14 @@
>         this.builtinBindingsProvider= builtinBindingsProvider;
>     }
>     
>+	/**
>+	 * Instructs the parser not to create ast nodes for expressions within aggregate initializers
>+	 * when they do not contain names.
>+	 */
>+	public void setSkipTrivialExpressionsInAggregateInitializers(boolean val) {
>+		skipTrivialExpressionsInAggregateInitializers= val;
>+	}
>+
>     private AbstractParserLogService wrapLogService(IParserLogService logService) {
> 		if (logService instanceof AbstractParserLogService) {
> 			return (AbstractParserLogService) logService;
>@@ -1225,13 +1277,17 @@
>         return compoundStatement();
>     }
> 
>-    protected abstract IASTDeclarator initDeclarator(DeclarationOptions option) throws EndOfFileException, BacktrackException;
>+    protected abstract IASTDeclarator initDeclarator(DeclarationOptions option) 
>+    		throws EndOfFileException, BacktrackException, FoundAggregateInitializer;
> 
>     /**
>      * @param option the options with which to parse the declaration
>      * @throws FoundDeclaratorException encountered EOF while looking ahead
>+     * @throws FoundAggregateInitializer found aggregate initializer, needs special treatment
>+     *   because of scalability.
>      */
>-    protected void lookAheadForDeclarator(final DeclarationOptions option) throws FoundDeclaratorException {
>+    protected void lookAheadForDeclarator(final DeclarationOptions option) 
>+    		throws FoundDeclaratorException, FoundAggregateInitializer {
>         IToken mark = null;
>         try {
>             mark = mark();
>@@ -1251,23 +1307,6 @@
>     }
> 
> 	protected abstract boolean verifyLookaheadDeclarator(DeclarationOptions option, IASTDeclarator d, IToken nextToken);
>-
>-    public static class FoundDeclaratorException extends Exception {
>-    	private static final long serialVersionUID = 0;
>-    	
>-        public IASTDeclSpecifier declSpec;
>-        public IASTDeclarator declarator;
>-
>-		public IASTDeclSpecifier altSpec;
>-		public IASTDeclarator altDeclarator;
>-        
>-        public IToken currToken;
>-
>-        public FoundDeclaratorException(IASTDeclarator d, IToken t) {
>-            this.declarator = d;
>-            this.currToken =t;
>-        }
>-    }
>     
>     /**
>      * Parse an enumeration specifier, as according to the ANSI specs in C &
>@@ -1439,7 +1478,7 @@
>     protected abstract IASTCaseStatement createCaseStatement();
> 
>     protected abstract IASTDeclaration declaration(DeclarationOptions option) throws BacktrackException, EndOfFileException;
>-    protected abstract IASTDeclSpecifier declSpecifierSeq(DeclarationOptions option) throws BacktrackException, EndOfFileException, FoundDeclaratorException;
>+    protected abstract IASTDeclSpecifier declSpecifierSeq(DeclarationOptions option) throws BacktrackException, EndOfFileException, FoundDeclaratorException, FoundAggregateInitializer;
> 
>     protected IASTDeclaration[] problemDeclaration(int offset, BacktrackException bt, DeclarationOptions option) {
>     	failParse();
>@@ -1523,7 +1562,7 @@
> 	protected IASTDeclaration functionStyleAsmDeclaration() throws BacktrackException, EndOfFileException {
> 
> 		final int offset= LA(1).getOffset();
>-		IASTDeclSpecifier declSpec;
>+		IASTDeclSpecifier declSpec= null;
> 		IASTDeclarator dtor;
>     	try {
> 			declSpec = declSpecifierSeq(DeclarationOptions.FUNCTION_STYLE_ASM);
>@@ -1537,6 +1576,10 @@
>         		dtor= e.declarator;
>         	}
>             backup( e.currToken );
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= lie.fDeclSpec;
>+        	dtor= addInitializer(lie);
>     	}
> 
>     	if (LT(1) != IToken.tLBRACE)
>@@ -1561,6 +1604,8 @@
>     	return funcDefinition;
> 	}
> 
>+	protected abstract IASTDeclarator addInitializer(FoundAggregateInitializer lie) throws EndOfFileException;
>+
> 	protected IToken asmExpression(StringBuilder content) throws EndOfFileException, BacktrackException {
> 		IToken t= consume(IToken.tLPAREN);
>     	boolean needspace= false;
>Index: parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java,v
>retrieving revision 1.7
>diff -u -r1.7 AbstractCLikeLanguage.java
>--- parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java	30 Apr 2008 15:16:41 -0000	1.7
>+++ parser/org/eclipse/cdt/core/dom/parser/AbstractCLikeLanguage.java	6 Nov 2008 09:57:46 -0000
>@@ -38,6 +38,7 @@
> import org.eclipse.cdt.core.parser.ParserLanguage;
> import org.eclipse.cdt.core.parser.ParserMode;
> import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
>+import org.eclipse.cdt.internal.core.dom.parser.AbstractGNUSourceCodeParser;
> import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor;
> import org.eclipse.cdt.internal.core.parser.token.KeywordSets;
> import org.eclipse.cdt.internal.core.util.ICancelable;
>@@ -181,7 +182,13 @@
> 		else
> 			mode= ParserMode.COMPLETE_PARSE;
> 
>-		return createParser(scanner, mode, log, index);
>+		ISourceCodeParser parser= createParser(scanner, mode, log, index);
>+		if ((options & OPTION_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS) != 0) {
>+			if (parser instanceof AbstractGNUSourceCodeParser) {
>+				((AbstractGNUSourceCodeParser) parser).setSkipTrivialExpressionsInAggregateInitializers(true);
>+			}
>+		}
>+		return parser;
> 	}
> 	
> 	
>Index: model/org/eclipse/cdt/core/model/ITranslationUnit.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java,v
>retrieving revision 1.27
>diff -u -r1.27 ITranslationUnit.java
>--- model/org/eclipse/cdt/core/model/ITranslationUnit.java	16 Apr 2008 08:27:25 -0000	1.27
>+++ model/org/eclipse/cdt/core/model/ITranslationUnit.java	6 Nov 2008 09:57:45 -0000
>@@ -30,6 +30,8 @@
>  * If a <code>.c</code> file cannot be parsed, its structure remains unknown.
>  * Use <code>ICElement.isStructureKnown</code> to determine whether this is 
>  * the case.
>+ * 
>+ * @noimplement This interface is not intended to be implemented by clients.
>  */
> public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISourceReference, ISourceManipulation {
> 	
>@@ -38,21 +40,21 @@
> 	 * Meaning: Skip function and method bodies.
> 	 * @since 4.0
> 	 */
>-	public static final int AST_SKIP_FUNCTION_BODIES= 1;
>+	public static final int AST_SKIP_FUNCTION_BODIES= 0x1;
> 
> 	/**
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
> 	 * Meaning: Skip over headers that are found in the index, parse all others.
> 	 * Macro definitions and bindings are taken from index for skipped files.
> 	 */
>-	public static final int AST_SKIP_INDEXED_HEADERS = 2;
>+	public static final int AST_SKIP_INDEXED_HEADERS = 0x2;
> 
> 	/**
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
> 	 * Meaning: Skip headers even if they are not found in the index. 
> 	 * Makes practically only sense in combination with {@link #AST_SKIP_INDEXED_HEADERS}.
> 	 */
>-	public static final int AST_SKIP_NONINDEXED_HEADERS = 4;
>+	public static final int AST_SKIP_NONINDEXED_HEADERS = 0x4;
> 
> 	/**
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
>@@ -66,14 +68,14 @@
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
> 	 * Meaning: Don't parse the file if there is no build information for it.
> 	 */
>-	public static final int AST_SKIP_IF_NO_BUILD_INFO = 8;
>+	public static final int AST_SKIP_IF_NO_BUILD_INFO = 0x8;
> 
> 	/**
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
> 	 * Meaning: Add nodes for comments to the ast.
> 	 * @since 4.0
> 	 */
>-	public static final int AST_CREATE_COMMENT_NODES = 16;
>+	public static final int AST_CREATE_COMMENT_NODES = 0x10;
> 	
> 	/**
> 	 * Style constant for {@link #getAST(IIndex, int)}. 
>@@ -82,7 +84,15 @@
> 	 * the flag is ignored.
> 	 * @since 4.0
> 	 */
>-	public static final int AST_CONFIGURE_USING_SOURCE_CONTEXT= 32;
>+	public static final int AST_CONFIGURE_USING_SOURCE_CONTEXT= 0x20;
>+
>+	/**
>+	 * Style constant for {@link #getAST(IIndex, int)}. 
>+	 * Instructs the parser not to create ast nodes for expressions within aggregate initializers
>+	 * when they do not contain names.
>+	 * @since 5.1
>+	 */
>+	public final static int AST_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS= 0x40;
> 
> 	/**
> 	 * Creates and returns an include declaration in this translation unit
>Index: model/org/eclipse/cdt/core/model/ILanguage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java,v
>retrieving revision 1.18
>diff -u -r1.18 ILanguage.java
>--- model/org/eclipse/cdt/core/model/ILanguage.java	18 Apr 2008 09:23:05 -0000	1.18
>+++ model/org/eclipse/cdt/core/model/ILanguage.java	6 Nov 2008 09:57:45 -0000
>@@ -6,7 +6,7 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *    QNX - Initial API and implementation
>+ *    Doug Schaefer (QNX) - Initial API and implementation
>  *    Markus Schorn (Wind River Systems)
>  *    IBM Corporation
>  *******************************************************************************/
>@@ -27,7 +27,8 @@
> /**
>  * Models differences between languages. The interface is not supposed to be implemented directly.
>  * Rather than that clients may subclass {@link AbstractLanguage}.
>- * @author Doug Schaefer
>+ * 
>+ * @noimplement This interface is not intended to be implemented by clients.
>  */
> public interface ILanguage extends IAdaptable {
> 
>@@ -35,27 +36,35 @@
> 	 * Option for {@link #getASTTranslationUnit(CodeReader, IScannerInfo, ICodeReaderFactory, IIndex, int, IParserLogService)}
> 	 * Instructs the parser to skip function and method bodies.
> 	 */
>-	public final static int OPTION_SKIP_FUNCTION_BODIES= 1;
>+	public final static int OPTION_SKIP_FUNCTION_BODIES= 0x1;
> 
> 	/**
> 	 * Option for {@link #getASTTranslationUnit(CodeReader, IScannerInfo, ICodeReaderFactory, IIndex, int, IParserLogService)}
> 	 * Instructs the parser to add comment nodes to the ast.
> 	 */
>-	public final static int OPTION_ADD_COMMENTS= 2;
>+	public final static int OPTION_ADD_COMMENTS= 0x2;
> 
> 	/**
> 	 * Option for {@link #getASTTranslationUnit(CodeReader, IScannerInfo, ICodeReaderFactory, IIndex, int, IParserLogService)}
> 	 * Performance optimization, instructs the parser not to create image-locations. 
> 	 * When using this option {@link IASTName#getImageLocation()} will always return <code>null</code>.
> 	 */
>-	public final static int OPTION_NO_IMAGE_LOCATIONS= 4;
>+	public final static int OPTION_NO_IMAGE_LOCATIONS= 0x4;
> 
> 	/**
> 	 * Option for {@link #getASTTranslationUnit(CodeReader, IScannerInfo, ICodeReaderFactory, IIndex, int, IParserLogService)}
> 	 * Marks the ast as being based on a source-file rather than a header-file. This makes a difference
> 	 * when bindings from the AST are used for searching the index, e.g. for static variables. 
> 	 */
>-	public final static int OPTION_IS_SOURCE_UNIT= 8;
>+	public final static int OPTION_IS_SOURCE_UNIT= 0x8;
>+
>+	/**
>+	 * Option for {@link #getASTTranslationUnit(CodeReader, IScannerInfo, ICodeReaderFactory, IIndex, int, IParserLogService)}
>+	 * Instructs the parser not to create ast nodes for expressions within aggregate initializers
>+	 * when they do not contain names.
>+	 * @since 5.1
>+	 */
>+	public final static int OPTION_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS= 0x10;
> 
> 	/**
> 	 * Return the language id for this language.
>Index: parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java,v
>retrieving revision 1.186
>diff -u -r1.186 GNUCPPSourceParser.java
>--- parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java	3 Nov 2008 10:12:16 -0000	1.186
>+++ parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java	6 Nov 2008 09:57:47 -0000
>@@ -874,6 +874,9 @@
>         	declSpecifier= e.declSpec;
>         	declarator= e.declarator;
>         	backup(e.currToken);
>+        } catch (FoundAggregateInitializer lie) {
>+            // type-ids have no initializers
>+        	return null;
>         } catch (BacktrackException bt) {
>         	return null;
>         }
>@@ -2245,24 +2248,33 @@
>         
>         final int firstOffset= LA(1).getOffset();
>         int endOffset= firstOffset;
>+        boolean insertSemi= false;
>+        boolean parseDtors= true;
> 
>-        ICPPASTDeclSpecifier declSpec;
>+        ICPPASTDeclSpecifier declSpec= null;
>         IASTDeclarator dtor= null;
>         IToken markBeforDtor= null;
>         try {
>             declSpec = declSpecifierSeq(declOption);
>-            switch(LTcatchEOF(1)) {
>+            final int lt1= LTcatchEOF(1);
>+            switch(lt1) {
>             case 0: // eof
>+            case IToken.tEOC:
>             case IToken.tSEMI:
>-            	if (!validWithoutDtor(declOption, declSpec)) {
>+            	if (lt1 != IToken.tEOC && !validWithoutDtor(declOption, declSpec)) 
>                 	throwBacktrack(LA(1));
>-            	}
>+            	
>+            	parseDtors= false;
>+            	insertSemi= lt1==0;
>+            	if (lt1 == IToken.tSEMI)
>+            		endOffset= consume().getEndOffset();
>+            	else 
>+            		endOffset= calculateEndOffset(declSpec);
>             	break;
>+
>             case IToken.tCOMMA:
>             	throwBacktrack(LA(1));
>             	break;
>-            case IToken.tEOC:
>-            	break;
>             default:
>             	markBeforDtor= mark();
>             	try {
>@@ -2278,6 +2290,13 @@
>             	}
>             	break;
>             }
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= (ICPPASTDeclSpecifier) lie.fDeclSpec;
>+        	// scalability: don't keep references to tokens, initializer may be large
>+        	declarationMark= null;
>+        	markBeforDtor= null;
>+        	dtor= addInitializer(lie);
>         } catch (FoundDeclaratorException e) {
>         	declSpec= (ICPPASTDeclSpecifier) e.declSpec;
>         	dtor= e.declarator;
>@@ -2293,51 +2312,56 @@
>         	throw e;
>         }
>         
>-        IASTDeclarator[] declarators= {dtor};
>-        while (LTcatchEOF(1) == IToken.tCOMMA) {
>-        	consume();
>-        	declarators= (IASTDeclarator[]) ArrayUtil.append( IASTDeclarator.class, declarators, initDeclarator(declSpec, declOption));
>-        }
>-
>-        declarators= (IASTDeclarator[]) ArrayUtil.removeNulls( IASTDeclarator.class, declarators );
>-
>-        boolean insertSemi= false;
>-        final int lt1= LTcatchEOF(1);
>-        switch (lt1) {
>-        case IToken.tEOC:
>-        	endOffset= figureEndOffset(declSpec, declarators);
>-            break;
>-        case IToken.tSEMI:
>-            endOffset= consume().getEndOffset();
>-            break;
>-        case IToken.t_try:
>-        case IToken.tCOLON:
>-        case IToken.tLBRACE:
>-            return functionDefinition(firstOffset, declSpec, declarators);
>-        default:
>-        	if (declOption != DeclarationOptions.LOCAL) {
>-        		insertSemi= true;
>-        		if (validWithoutDtor(declOption, declSpec)) {
>-        			// class definition without semicolon
>-        			if (markBeforDtor == null || !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
>-        				if (markBeforDtor != null) {
>+        IASTDeclarator[] declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>+        if (parseDtors) {
>+        	declarators= new IASTDeclarator[]{dtor};
>+        	while (LTcatchEOF(1) == IToken.tCOMMA) {
>+        		consume();
>+        		try {
>+        			dtor= initDeclarator(declSpec, declOption);
>+        		} catch (FoundAggregateInitializer e) {
>+        	        // scalability: don't keep references to tokens, initializer may be large
>+        			declarationMark= null;
>+        			markBeforDtor= null;
>+        			dtor= addInitializer(e);
>+        		}
>+        		declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, dtor);
>+        	}
>+        	declarators = (IASTDeclarator[]) ArrayUtil.removeNulls(IASTDeclarator.class, declarators);
>+        
>+        	final int lt1= LTcatchEOF(1);
>+        	switch (lt1) {
>+        	case IToken.tEOC:
>+        		endOffset= figureEndOffset(declSpec, declarators);
>+        		break;
>+        	case IToken.tSEMI:
>+        		endOffset= consume().getEndOffset();
>+        		break;
>+        	case IToken.t_try:
>+        	case IToken.tCOLON:
>+        	case IToken.tLBRACE:
>+        		return functionDefinition(firstOffset, declSpec, declarators);
>+        	default:	
>+        		if (declOption != DeclarationOptions.LOCAL) {
>+    				insertSemi= true;
>+        			if (validWithoutDtor(declOption, declSpec)) {
>+        				if (markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
>         					backup(markBeforDtor);
>+        					declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>+        					endOffset= calculateEndOffset(declSpec);
>+        					break;
>         				}
>-        				declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>-        				endOffset= calculateEndOffset(declSpec);
>+        			}
>+        			endOffset= figureEndOffset(declSpec, declarators);
>+        			if (lt1 == 0 || !isOnSameLine(endOffset, LA(1).getOffset())) {
>+        				break;
>+        			}
>+        			if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) {
>         				break;
>         			}
>-        		} 
>-        		endOffset= figureEndOffset(declSpec, declarators);
>-        		if (lt1 == 0 || !isOnSameLine(endOffset, LA(1).getOffset())) {
>-        			insertSemi= true;
>-        			break;
>-        		}
>-        		if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) {
>-        			break;
>         		}
>+        		throwBacktrack(LA(1));
>         	}
>-        	throwBacktrack(LA(1));
>         }
> 
>         // no function body
>@@ -2515,7 +2539,7 @@
> 			skipBrackets(IToken.tLBRACKET, IToken.tRBRACKET);
> 		}
> 		
>-        IASTDeclSpecifier declSpec;
>+        IASTDeclSpecifier declSpec= null;
>         IASTDeclarator declarator;
>         try {
>         	declSpec= declSpecifierSeq(DeclarationOptions.PARAMETER);
>@@ -2524,6 +2548,10 @@
>         	declSpec= e.declSpec;
>         	declarator= e.declarator;
>         	backup(e.currToken);
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= lie.fDeclSpec;
>+        	declarator= addInitializer(lie);
>         }
> 
>         final ICPPASTParameterDeclaration parm = createParameterDeclaration();
>@@ -2558,10 +2586,11 @@
>      * 		("typename")? name | 
>      * 		{ "class" | "struct" | "union" } classSpecifier | 
>      * 		{"enum"} enumSpecifier
>+     * @throws FoundAggregateInitializer 
>      */
>     @Override
> 	protected ICPPASTDeclSpecifier declSpecifierSeq(final DeclarationOptions option)
>-    		throws BacktrackException, EndOfFileException, FoundDeclaratorException {
>+    		throws BacktrackException, EndOfFileException, FoundDeclaratorException, FoundAggregateInitializer {
>         int storageClass = IASTDeclSpecifier.sc_unspecified;
>         int simpleType = IASTSimpleDeclSpecifier.t_unspecified;
>         int options= 0;
>@@ -2748,7 +2777,10 @@
>                 	if (option.fAllowEmptySpecifier && LT(1) != IToken.tCOMPLETION) {
>                 		lookAheadForDeclarator(option);
>                 	}
>-                } catch (FoundDeclaratorException e) {
>+                } catch (FoundAggregateInitializer e) {
>+                	e.fDeclSpec= createSimpleDeclSpec(storageClass, simpleType, options, isLong, typeofExpression, offset, endOffset);
>+                	throw e;
>+                }catch (FoundDeclaratorException e) {
>                 	if (e.currToken.getType() == IToken.tEOC || option == DeclarationOptions.FUNCTION_STYLE_ASM 
>                 			|| canBeConstructorDestructorOrConversion(option, storageClass, options, e.declarator)) {
>                 		e.declSpec= createSimpleDeclSpec(storageClass, simpleType, options, isLong, typeofExpression, offset, endOffset);
>@@ -3046,12 +3078,14 @@
>     }
> 
>     @Override
>-	protected IASTDeclarator initDeclarator(DeclarationOptions option) throws EndOfFileException, BacktrackException {
>+	protected IASTDeclarator initDeclarator(DeclarationOptions option) 
>+    		throws EndOfFileException, BacktrackException, FoundAggregateInitializer {
>     	// called from the lookahead, only.
>     	return initDeclarator(DtorStrategy.PREFER_FUNCTION, option);
>     }
>     
>-	protected IASTDeclarator initDeclarator(IASTDeclSpecifier declspec, DeclarationOptions option) throws EndOfFileException, BacktrackException {
>+	protected IASTDeclarator initDeclarator(IASTDeclSpecifier declspec, DeclarationOptions option) 
>+			throws EndOfFileException, BacktrackException, FoundAggregateInitializer {
>     	final IToken mark= mark();
>     	IASTDeclarator dtor1= null;
>     	IToken end1= null;
>@@ -3076,7 +3110,7 @@
>     		}
>     	} catch (BacktrackException e) {
>     		bt= e;
>-    	}
>+    	} 
>     	
>     	if (!option.fAllowConstructorInitializer || !canHaveConstructorInitializer(declspec)) {
>     		if (bt != null)
>@@ -3096,7 +3130,7 @@
>     			return dtor1;
>     		}
>     		throw e;
>-    	}
>+    	} 
>     	
> 		// we have an ambiguity
> 		if (end1 != null && LA(1).getEndOffset() != end1.getEndOffset()) {
>@@ -3144,11 +3178,15 @@
>      * @return declarator that this parsing produced.
>      * @throws BacktrackException
>      *             request a backtrack
>+	 * @throws FoundAggregateInitializer 
>      */
>     protected IASTDeclarator initDeclarator(DtorStrategy strategy, DeclarationOptions option)
>-            throws EndOfFileException, BacktrackException {
>+            throws EndOfFileException, BacktrackException, FoundAggregateInitializer {
>     	final IASTDeclarator dtor= declarator(strategy, option);
>         if (option.fAllowInitializer) {
>+            if (LT(1) == IToken.tASSIGN && LT(2) == IToken.tLBRACE) 
>+            	throw new FoundAggregateInitializer(dtor);
>+
>         	IASTInitializer initializer= optionalCPPInitializer(dtor);
>         	if (initializer != null) {
>         		dtor.setInitializer(initializer);
>@@ -3157,6 +3195,21 @@
>         }
>         return dtor;
>     }
>+    
>+    @Override
>+	protected IASTDeclarator addInitializer(FoundAggregateInitializer e) throws EndOfFileException {
>+	    final IASTDeclarator d = e.fDeclarator;
>+        try {
>+			IASTInitializer i = optionalCPPInitializer(e.fDeclarator);
>+			if (i != null) {
>+				d.setInitializer(i);
>+			    ((ASTNode) d).setLength(calculateEndOffset(i) - ((ASTNode) d).getOffset());
>+			}
>+		} catch (BacktrackException e1) {
>+			// mstodo add problem node
>+		}
>+		return d;
>+    }
> 
>     protected IASTInitializer optionalCPPInitializer(IASTDeclarator d)
>             throws EndOfFileException, BacktrackException {
>@@ -3165,7 +3218,7 @@
>         if (LT(1) == IToken.tASSIGN) {
>             consume();
>             try {
>-                return initializerClause();
>+                return initializerClause(false);
>             } catch (EndOfFileException eof) {
>                 failParse();
>                 throw eof;
>@@ -3200,7 +3253,7 @@
>     }
> 
> 
>-    protected IASTInitializer initializerClause() throws EndOfFileException, BacktrackException {
>+    protected IASTInitializer initializerClause(boolean inAggregateInitializer) throws EndOfFileException, BacktrackException {
>         if (LT(1) == IToken.tLBRACE) {
>             int startingOffset = consume().getOffset();
> 
>@@ -3219,7 +3272,7 @@
>                 if (LT(1) == IToken.tRBRACE)
>                     break;
> 
>-                IASTInitializer clause = initializerClause();
>+                IASTInitializer clause = initializerClause(true);
>                 if (clause != null) {
>                     result.addInitializer(clause);
>                 }
>@@ -3236,6 +3289,11 @@
>         // try this now instead
>         // assignmentExpression
>         IASTExpression assignmentExpression = assignmentExpression();
>+        if (inAggregateInitializer && skipTrivialExpressionsInAggregateInitializers) {
>+        	if (!NAME_CHECKER.containsName(assignmentExpression))
>+        		return null;
>+        }
>+
>         IASTInitializerExpression result = createInitializerExpression();
>         ((ASTNode) result).setOffsetAndLength(((ASTNode) assignmentExpression));
>         result.setExpression(assignmentExpression);
>@@ -3975,7 +4033,7 @@
> 
> 	private IASTSimpleDeclaration simpleSingleDeclaration(DeclarationOptions options) throws BacktrackException,	EndOfFileException {
>         final int startOffset= LA(1).getOffset();
>-    	IASTDeclSpecifier declSpec;
>+    	IASTDeclSpecifier declSpec= null;
>     	IASTDeclarator declarator;
> 
>     	try {
>@@ -3985,6 +4043,10 @@
>     		declSpec= e.declSpec;
>     		declarator= e.declarator;
>     		backup(e.currToken);
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= lie.fDeclSpec;
>+        	declarator= addInitializer(lie);
>     	}
> 
>     	final int endOffset = figureEndOffset(declSpec, declarator);
>Index: parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java,v
>retrieving revision 1.122
>diff -u -r1.122 GNUCSourceParser.java
>--- parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java	3 Nov 2008 10:12:16 -0000	1.122
>+++ parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java	6 Nov 2008 09:57:46 -0000
>@@ -159,12 +159,12 @@
>         if (LT(1) == IToken.tASSIGN) {
>             consume();
>             final List<IASTNode> empty= Collections.emptyList();
>-            return cInitializerClause(empty);
>+            return cInitializerClause(empty, false);
>         }
>         return null;
>     }
> 
>-    protected IASTInitializer cInitializerClause(List<IASTNode> designators)
>+    protected IASTInitializer cInitializerClause(List<IASTNode> designators, boolean inAggregateInitializer)
>             throws EndOfFileException, BacktrackException {
>         IToken la = LA(1);
>         int startingOffset = la.getOffset();
>@@ -190,10 +190,12 @@
>                     if (LT(1) == IToken.tASSIGN)
>                         consume();
> 
>-                IASTInitializer initializer = cInitializerClause(newDesignators);
>+                IASTInitializer initializer = cInitializerClause(newDesignators, true);
> 
>                 if (newDesignators.isEmpty()) {
>-                    result.addInitializer(initializer);
>+                    // depending on value of skipTrivialItemsInCompoundInitializers initializer may be null
>+                	if (initializer != null)
>+                		result.addInitializer(initializer);
>                 } else {
>                     ICASTDesignatedInitializer desigInitializer = createDesignatorInitializer();
>                     ((ASTNode) desigInitializer).setOffsetAndLength(
>@@ -232,6 +234,10 @@
>         // try this now instead
>         // assignmentExpression
>         IASTExpression assignmentExpression = assignmentExpression();
>+        if (inAggregateInitializer && skipTrivialExpressionsInAggregateInitializers) {
>+        	if (!NAME_CHECKER.containsName(assignmentExpression))
>+        		return null;
>+        }
>         IASTInitializerExpression result = createInitializerExpression();
>         result.setExpression(assignmentExpression);
>         ((ASTNode) result).setOffsetAndLength(
>@@ -387,17 +393,27 @@
>         
>         final int firstOffset= LA(1).getOffset();
>         int endOffset= firstOffset;
>+        boolean insertSemi= false;
>+        boolean parseDtors= true;
> 
>-        IASTDeclSpecifier declSpec;
>+        IASTDeclSpecifier declSpec= null;
>         IASTDeclarator dtor= null;
>         IToken markBeforDtor= null;
>         try {
>             declSpec = declSpecifierSeq(declOption);
>-            switch(LTcatchEOF(1)) {
>+            final int lt1= LTcatchEOF(1);
>+            switch(lt1) {
>             case 0: // eof
>-            case IToken.tSEMI:
>             case IToken.tEOC:
>+            case IToken.tSEMI:
>+            	parseDtors= false;
>+            	insertSemi= lt1==0;
>+            	if (lt1 == IToken.tSEMI)
>+            		endOffset= consume().getEndOffset();
>+            	else 
>+            		endOffset= calculateEndOffset(declSpec);
>             	break;
>+            	
>             default:
>             	markBeforDtor= mark();
>             	try {
>@@ -408,6 +424,13 @@
>             		backup(markBeforDtor);
>             	}
>             }
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= lie.fDeclSpec;
>+        	// scalability: don't keep references to tokens, initializer may be large
>+        	declarationMark= null;
>+        	markBeforDtor= null;
>+        	dtor= addInitializer(lie);
>         } catch (FoundDeclaratorException e) {
>         	if (e.altSpec != null) {
>         		declSpec= e.altSpec;
>@@ -428,45 +451,53 @@
>         	throw e;
>         }
>         
>-        IASTDeclarator[] declarators= {dtor};
>-        while (LTcatchEOF(1) == IToken.tCOMMA) {
>-        	consume();
>-        	declarators= (IASTDeclarator[]) ArrayUtil.append( IASTDeclarator.class, declarators, initDeclarator(declOption));
>-        }
>-        declarators= (IASTDeclarator[]) ArrayUtil.removeNulls( IASTDeclarator.class, declarators );
>+        IASTDeclarator[] declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>+        if (parseDtors) {
>+        	declarators= new IASTDeclarator[]{dtor};
>+        	while (LTcatchEOF(1) == IToken.tCOMMA) {
>+        		consume();
>+        		try {
>+        			dtor= initDeclarator(declOption);
>+        		} catch (FoundAggregateInitializer e) {
>+        	        // scalability: don't keep references to tokens, initializer may be large
>+        			declarationMark= null;
>+        			markBeforDtor= null;
>+        			dtor= addInitializer(e);
>+        		}
>+        		declarators= (IASTDeclarator[]) ArrayUtil.append( IASTDeclarator.class, declarators, dtor);
>+        	}
>+        	declarators= (IASTDeclarator[]) ArrayUtil.removeNulls( IASTDeclarator.class, declarators );
> 
>-        boolean insertSemi= false;
>-        final int lt1= LTcatchEOF(1);
>-        switch (lt1) {
>-        case IToken.tLBRACE:
>-            return functionDefinition(firstOffset, declSpec, declarators);
>+        	final int lt1= LTcatchEOF(1);
>+        	switch (lt1) {
>+        	case IToken.tLBRACE:
>+        		return functionDefinition(firstOffset, declSpec, declarators);
> 
>-        case IToken.tSEMI:
>-            endOffset= consume().getEndOffset();
>-            break;
>-        case IToken.tEOC:
>-        	endOffset= figureEndOffset(declSpec, declarators);
>-            break;
>-        default:
>-        	if (declOption != DeclarationOptions.LOCAL) {
>-        		insertSemi= true;
>-        		if (markBeforDtor == null || !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
>-        			if (markBeforDtor != null) {
>+        	case IToken.tSEMI:
>+        		endOffset= consume().getEndOffset();
>+        		break;
>+        	case IToken.tEOC:
>+        		endOffset= figureEndOffset(declSpec, declarators);
>+        		break;
>+        	default:
>+        		if (declOption != DeclarationOptions.LOCAL) {
>+        			insertSemi= true;
>+        			if (markBeforDtor != null && !isOnSameLine(calculateEndOffset(declSpec), markBeforDtor.getOffset())) {
>         				backup(markBeforDtor);
>+        				declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>+        				endOffset= calculateEndOffset(declSpec);
>+        				break;
>+        			}
>+        			endOffset= figureEndOffset(declSpec, declarators);
>+        			if (lt1 == 0 || !isOnSameLine(endOffset, LA(1).getOffset())) {
>+        				break;
>+        			}
>+        			if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) {
>+        				break;
>         			}
>-        			declarators= IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
>-        			endOffset= calculateEndOffset(declSpec);
>-        			break;
>-        		}
>-        		endOffset= figureEndOffset(declSpec, declarators);
>-        		if (lt1 == 0 || !isOnSameLine(endOffset, LA(1).getOffset())) {
>-        			break;
>-        		}
>-        		if (declarators.length == 1 && declarators[0] instanceof IASTFunctionDeclarator) {
>-        			break;
>         		}
>+        		throwBacktrack(LA(1));
>         	}
>-        	throwBacktrack(LA(1));
>         }
> 
>         // no function body
>@@ -657,7 +688,7 @@
>         			consume(IToken.tRPAREN).getEndOffset();
>                 	if (LT(1) == IToken.tLBRACE) {
>         				final List<IASTNode> emptyList = Collections.emptyList();
>-						IASTInitializer i = cInitializerClause(emptyList);
>+						IASTInitializer i = cInitializerClause(emptyList, false);
>         				firstExpression = buildTypeIdInitializerExpression(t, i, offset, calculateEndOffset(i));
>         				break;        
>                 	}
>@@ -896,6 +927,9 @@
>             	declSpecifier= e.declSpec;
>             	declarator= e.declarator;
>             	backup(e.currToken);
>+            } catch (FoundAggregateInitializer lie) {
>+                // type-ids have not compound initializers
>+            	return null;
>             }
>         } catch (BacktrackException bt) {
>         	return null;
>@@ -982,7 +1016,7 @@
> 
>     @Override
> 	protected IASTDeclSpecifier declSpecifierSeq(final DeclarationOptions declOption)
>-            throws BacktrackException, EndOfFileException, FoundDeclaratorException {
>+            throws BacktrackException, EndOfFileException, FoundDeclaratorException, FoundAggregateInitializer {
> 
>         final int offset= LA(1).getOffset();
>         int endOffset= offset;
>@@ -1141,6 +1175,9 @@
>                 	if (endOffset != offset || declOption.fAllowEmptySpecifier) {
>                 		lookAheadForDeclarator(declOption);
>                 	}
>+                } catch (FoundAggregateInitializer e) {
>+                	e.fDeclSpec= createSimpleDeclSpec(storageClass, simpleType, options, isLong, typeofExpression, offset, endOffset);
>+                	throw e;
>                 } catch (FoundDeclaratorException e) {
>                 	e.declSpec= createSimpleDeclSpec(storageClass, simpleType, options, isLong, typeofExpression, offset, endOffset);
> 
>@@ -1152,6 +1189,9 @@
> 							e.altDeclarator= altDtor;
>                 			e.altSpec= createNamedTypeSpecifier(idToken, storageClass, options, offset, idToken.getEndOffset());
>                 		}
>+                	} catch (FoundAggregateInitializer lie) {
>+                		lie.fDeclSpec= e.declSpec;
>+                		throw lie;
>                 	} catch (BacktrackException bt) {
>                 	} finally {
>                 		backup(mark);
>@@ -1485,9 +1525,13 @@
>     }
> 
>     @Override
>-	protected IASTDeclarator initDeclarator(final DeclarationOptions option) throws EndOfFileException, BacktrackException {
>+	protected IASTDeclarator initDeclarator(final DeclarationOptions option) 
>+    		throws EndOfFileException, BacktrackException, FoundAggregateInitializer {
>         IASTDeclarator d = declarator(option);
> 
>+        if (LT(1) == IToken.tASSIGN && LT(2) == IToken.tLBRACE) 
>+        	throw new FoundAggregateInitializer(d);
>+       
>         IASTInitializer i = optionalCInitializer();
>         if (i != null) {
>             d.setInitializer(i);
>@@ -1495,6 +1539,21 @@
>         }
>         return d;
>     }
>+    
>+    @Override
>+	protected IASTDeclarator addInitializer(FoundAggregateInitializer e) throws EndOfFileException {
>+	    final IASTDeclarator d = e.fDeclarator;
>+        try {
>+			IASTInitializer i = optionalCInitializer();
>+			if (i != null) {
>+				d.setInitializer(i);
>+			    ((ASTNode) d).setLength(calculateEndOffset(i) - ((ASTNode) d).getOffset());
>+			}
>+		} catch (BacktrackException e1) {
>+			// mstodo add problem node
>+		}
>+		return d;
>+    }
> 
>     protected IASTDeclarator declarator(DeclarationOptions option) throws EndOfFileException, BacktrackException {
>         final int startingOffset = LA(1).getOffset();
>@@ -1968,6 +2027,10 @@
>         	altDeclSpec= fd.altSpec;
>         	altDeclarator= fd.altDeclarator;
>         	backup(fd.currToken);
>+        } catch (FoundAggregateInitializer lie) {
>+        	if (declSpec == null)
>+        		declSpec= lie.fDeclSpec;
>+        	declarator= addInitializer(lie);
>         } finally {
>         	fPreventKnrCheck--;
>         }
>Index: parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java,v
>retrieving revision 1.19
>diff -u -r1.19 AbstractIndexerTask.java
>--- parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java	1 Oct 2008 09:59:42 -0000	1.19
>+++ parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java	6 Nov 2008 09:57:47 -0000
>@@ -219,7 +219,8 @@
> 		}
> 		fTodoTaskUpdater= createTodoTaskUpdater();
> 		
>-		fASTOptions= ILanguage.OPTION_ADD_COMMENTS | ILanguage.OPTION_NO_IMAGE_LOCATIONS;
>+		fASTOptions= ILanguage.OPTION_ADD_COMMENTS | ILanguage.OPTION_NO_IMAGE_LOCATIONS 
>+				| ILanguage.OPTION_SKIP_TRIVIAL_EXPRESSIONS_IN_AGGREGATE_INITIALIZERS;
> 		if (getSkipReferences() == SKIP_ALL_REFERENCES) {
> 			fASTOptions |= ILanguage.OPTION_SKIP_FUNCTION_BODIES;
> 		}

Actions: View | Diff

Attachments on bug 253690: 116932 | 117176 | 117193 | 117194 | 117293 | 117297 | 117439