From 895e0aa394c19d6f10d2743b9a0b267a2b55e1da Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 15 Feb 2013 16:32:12 -0500 Subject: [PATCH 01/27] Bug 398913 - 'Connect' button remains disabled after being used Change-Id: I301e897b5c4c76e3edbcd6f517c15793e4323d04 Reviewed-on: https://git.eclipse.org/r/10345 Reviewed-by: Mikhail Khodjaiants IP-Clean: Mikhail Khodjaiants Tested-by: Mikhail Khodjaiants --- .../ui/commands/GdbConnectCommand.java | 9 +-- .../GdbDebugNewExecutableCommand.java | 7 +- .../ui/commands/RefreshableDebugCommand.java | 67 +++++++++++++++++++ 3 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/RefreshableDebugCommand.java diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java index 5a50b774632..aab89ed89c5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java @@ -40,8 +40,8 @@ import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.actions.IConnect; import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin; import org.eclipse.cdt.dsf.gdb.internal.ui.actions.ProcessInfo; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.NewExecutableInfo; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.LaunchUIMessages; +import org.eclipse.cdt.dsf.gdb.internal.ui.launching.NewExecutableInfo; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.ProcessPrompter; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.ProcessPrompter.PrompterInfo; import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch; @@ -61,7 +61,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.IRequest; -import org.eclipse.debug.core.commands.AbstractDebugCommand; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.swt.SWT; @@ -70,7 +69,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.progress.UIJob; -public class GdbConnectCommand extends AbstractDebugCommand implements IConnectHandler, IConnect { +public class GdbConnectCommand extends RefreshableDebugCommand implements IConnectHandler, IConnect { private final GdbLaunch fLaunch; private final DsfExecutor fExecutor; @@ -279,7 +278,9 @@ public class GdbConnectCommand extends AbstractDebugCommand implements IConnectH // cancelled it. } catch (RejectedExecutionException e) { // Can be thrown if the session is shutdown - } + } finally { + updateEnablement(); + } } /* diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java index 4631445ea5c..b7b4305c1e1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java @@ -29,8 +29,8 @@ import org.eclipse.cdt.dsf.debug.service.IProcesses; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.NewExecutableInfo; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.NewExecutableDialog; +import org.eclipse.cdt.dsf.gdb.internal.ui.launching.NewExecutableInfo; import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch; import org.eclipse.cdt.dsf.gdb.service.IGDBBackend; import org.eclipse.cdt.dsf.gdb.service.SessionType; @@ -43,12 +43,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.IRequest; -import org.eclipse.debug.core.commands.AbstractDebugCommand; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.jface.window.Window; import org.eclipse.ui.progress.UIJob; -public class GdbDebugNewExecutableCommand extends AbstractDebugCommand implements IDebugNewExecutableHandler { +public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implements IDebugNewExecutableHandler { private class PromptJob extends UIJob { @@ -188,6 +187,8 @@ public class GdbDebugNewExecutableCommand extends AbstractDebugCommand implement } catch( RejectedExecutionException e ) { // Can be thrown if the session is shutdown + } finally { + updateEnablement(); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/RefreshableDebugCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/RefreshableDebugCommand.java new file mode 100644 index 00000000000..c2f72c0d156 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/RefreshableDebugCommand.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2013 Mentor Graphics 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mentor Graphics - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.cdt.dsf.gdb.internal.ui.commands; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.commands.AbstractDebugCommand; +import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.UIJob; + +/** + * The enablement of a {@link AbstractDebugCommand} is updated only when the current + * debug context is changed. In some cases we need to force an update without changing + * the context. This class provides such a functionality. + * The proper way is to modify {@link AbstractDebugCommand}. + */ +public abstract class RefreshableDebugCommand extends AbstractDebugCommand { + + protected class UpdateEnablementJob extends UIJob { + + protected UpdateEnablementJob() { + super("Update enablement job"); //$NON-NLS-1$ + } + + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + // Reseting the current selection in the Debug view will force the enablement update + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if (window != null) { + IWorkbenchPage page = window.getActivePage(); + if (page != null) { + IViewPart view = page.findView(IDebugUIConstants.ID_DEBUG_VIEW); + if (view != null) { + IWorkbenchPartSite site = view.getSite(); + if (site != null) { + ISelectionProvider selProvider = site.getSelectionProvider(); + if (selProvider != null) { + selProvider.setSelection(selProvider.getSelection()); + } + } + } + } + } + return Status.OK_STATUS; + } + } + + protected void updateEnablement() { + new UpdateEnablementJob().schedule(); + } +} From f0a597bc2bf3d70f51eb6995e6582de099917ea0 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 21 Feb 2013 05:03:49 -0500 Subject: [PATCH 02/27] Bug 401400 - Another error involving variadic non-type template parameters Change-Id: Ic5c64de6d32a203d13274053da61923d9d8e2ad3 Reviewed-on: https://git.eclipse.org/r/10559 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../parser/tests/ast2/AST2TemplateTests.java | 22 +++++++++++++++++++ .../dom/ast/cpp/ICPPTemplateParameterMap.java | 9 ++++++++ .../parser/cpp/CPPTemplateParameterMap.java | 1 + .../dom/parser/cpp/semantics/EvalBinding.java | 9 +++++++- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java index 57a89c6ff7b..10fb36e671f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java @@ -7312,4 +7312,26 @@ public class AST2TemplateTests extends AST2TestBase { public void testVariadicNonTypeTemplateParameter_401142() throws Exception { parseAndCheckBindings(); } + + // template + // struct ice_or; + // template <> + // struct ice_or<> { + // static const bool value = false; + // }; + // template + // struct ice_or { + // static const bool value = ice_or::value; + // }; + // template struct S {}; + // template <> + // struct S { + // typedef int type; + // }; + // int main() { + // S::value>::type t; + // } + public void testVariadicNonTypeTemplateParameter_401400() throws Exception { + parseAndCheckBindings(); + } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateParameterMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateParameterMap.java index 2a4b0a11e40..45db3a318da 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateParameterMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateParameterMap.java @@ -44,6 +44,15 @@ public interface ICPPTemplateParameterMap { */ public ICPPTemplateArgument[] getPackExpansion(ICPPTemplateParameter param); + /** + * If 'param' is not a parameter pack, returns the value for 'param' in the map. + * If 'param' is a parmameter pack, returns the value at position 'packOffset' + * in the pack of values for 'param' in the map. + * Returns null is 'param' is not mapped. + * @since 5.5 + */ + public ICPPTemplateArgument getArgument(ICPPTemplateParameter param, int packOffset); + /** * Returns the array of template parameter positions, for which a mapping exists. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java index c1c7c5db9fa..2cc251a30d4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java @@ -114,6 +114,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { return null; } + @Override public ICPPTemplateArgument getArgument(ICPPTemplateParameter tpar, int packOffset) { return getArgument(tpar.getParameterID(), packOffset); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java index 17a09e84790..a59760b7055 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java @@ -27,6 +27,7 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPParameter; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPParameterPackType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition; @@ -246,6 +247,12 @@ public class EvalBinding extends CPPDependentEvaluation { } if (binding instanceof ICPPTemplateNonTypeParameter) { IType type= ((ICPPTemplateNonTypeParameter) binding).getType(); + // If the binding is a non-type parameter pack, it must have been + // referenced from inside the expansion pattern of a pack expansion. + // In such a context, the type of the binding is the type of each + // parameter in the parameter pack, not the type of the pack itself. + if (type instanceof ICPPParameterPackType) + type = ((ICPPParameterPackType) type).getType(); return prvalueType(type); } if (binding instanceof IVariable) { @@ -329,7 +336,7 @@ public class EvalBinding extends CPPDependentEvaluation { ICPPClassSpecialization within, int maxdepth, IASTNode point) { IBinding origBinding = getBinding(); if (origBinding instanceof ICPPTemplateNonTypeParameter) { - ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding); + ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding, packOffset); if (argument != null && argument.isNonTypeValue()) { return argument.getNonTypeEvaluation(); } From b502c8ab5da4c672cca9bd833b38abc34755b3ce Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Fri, 22 Feb 2013 18:52:14 -0500 Subject: [PATCH 03/27] Bug 400955: move some styling into css classes The edit menu docs will be updated in a later patch. Change-Id: I5a8975d1159e39e580e87f502160d3f46d71b3f0 Reviewed-on: https://git.eclipse.org/r/10604 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- doc/org.eclipse.cdt.doc.user/help.css | 3 + .../reference/cdt_u_m_file.htm | 148 +++++++++--------- .../reference/cdt_u_m_navigate.htm | 98 ++++++------ .../reference/cdt_u_m_project.htm | 24 +-- .../reference/cdt_u_m_refactor.htm | 20 +-- .../reference/cdt_u_m_run.htm | 66 ++++---- .../reference/cdt_u_m_search.htm | 10 +- .../reference/cdt_u_m_window.htm | 26 +-- 8 files changed, 199 insertions(+), 196 deletions(-) mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/help.css mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm diff --git a/doc/org.eclipse.cdt.doc.user/help.css b/doc/org.eclipse.cdt.doc.user/help.css old mode 100644 new mode 100755 index 797473964ab..fc9c54455aa --- a/doc/org.eclipse.cdt.doc.user/help.css +++ b/doc/org.eclipse.cdt.doc.user/help.css @@ -42,6 +42,9 @@ th { font-weight: bold } display: none; } +.menu td { vertical-align: top; } +td.menu_name {font-weight: bold;} + /* Mike Behm's addition to the style sheet */ .userinput { font-family: monospace; } .guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm old mode 100644 new mode 100755 index 2ef7d4914e5..e796bb266de --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm @@ -14,122 +14,122 @@

Selecting File Menu

- +
- - - - - - - - - - + + + + - - + + + + + + + - + - - + - + - - + - + - - - + + + - - + - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + +
NameFunctionKeyboard Shortcut
NewCreate a new project, folder, or file.Alt+Shift+N
Open File...Open existing file. 
NewCreate a new project, folder, or file.Alt+Shift+N
CloseClose the current editor. + Open File...Open existing file. 
CloseClose the current editor. If the editor contains unsaved data, a save request dialog is shown.Ctrl+F4Ctrl+F4
Close AllClose all editors. + Close AllClose all editors. If editors contains unsaved data, a save request dialog will be shown.Ctrl+Shift+F4Ctrl+Shift+F4
SaveSave the content of the current editor. + SaveSave the content of the current editor. Disabled if the editor does not contain unsaved changes.Ctrl+SCtrl+S
Save AsSave the content of the current editor under a new name. Save AsSave the content of the current editor under a new name. 
Save AllSave the content of the current editor. + Save AllSave the content of the current editor. Disabled if no editor contains unsaved changes.Ctrl+Shift+S
RevertRevert the content of the current editor back to the content of the saved file. - Disabled if the editor does not contain unsaved changes. 
MoveMove a resource. 
RenameRenames a resource.F2Ctrl+Shift+S
RefreshRefreshes the content of the selected element with the local file system. + RevertRevert the content of the current editor back to the content of the saved file. + Disabled if the editor does not contain unsaved changes. 
MoveMove a resource. 
RenameRenames a resource.F2
RefreshRefreshes the content of the selected element with the local file system. When launched from no specific selection, this command refreshes all projects.F5F5
Convert Line Delimiters to (submenu)Changes line delimiters either to Windows, or UNIX, or Mac OS9 format. 
Convert Line Delimiters to (submenu)Changes line delimiters either to Windows, or UNIX, or Mac OS9 format. 
PrintPrints the content of the current editor. Enabled when an editor has the focus.Ctrl+PPrintPrints the content of the current editor. Enabled when an editor has the focus.Ctrl+P
Switch workspace...Relaunches Eclipse with a new workspace. 
Switch workspace...Relaunches Eclipse with a new workspace. 
ImportOpens the Import dialog and shows all import wizards. ImportOpens the Import dialog and shows all import wizards. 
ExportOpens the Export dialog and shows all export wizards. 
ExportOpens the Export dialog and shows all export wizards. 
PropertiesOpens the property pages of the select elements.Alt+Enter
PropertiesOpens the property pages of the select elements.Alt+Enter
ExitExit Eclipse 
ExitExit Eclipse 

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm old mode 100644 new mode 100755 index bad8cc190da..040681fcade --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm @@ -13,21 +13,21 @@

Selecting Navigate Menu

- +
- - - + + + - - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + - + - - - + + + - - - + + + - - - + + + - - + - + - - + - + - - + - + - - + - + - - + - + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm old mode 100644 new mode 100755 index 3ee5ce890cd..143baaaa5ad --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm @@ -14,31 +14,31 @@

Selecting Project Menu

-

NameFunctionKeyboard Shortcut
Go IntoSets the view input to the currently selected element. Go IntoSets the view input to the currently selected element. 
Go To
    +
Go To
  • Back:  This command displays the hierarchy that was displayed immediately prior to the current display.  For example, if you Go Into a resource, then the Back command in the resulting display returns the view to the same hierarchy from which you activated the Go Into command.  This command is similar to the Back button in an HTML browser.
    • @@ -38,100 +38,100 @@
  • Resource: This command allows you to navigate quickly to a resource. For more information see the links to related tasks below.
  
Open Type HierarchyOpens Type Hierarchy view for selected objectF4Open Type HierarchyOpens Type Hierarchy view for selected objectF4
Open Call HierarchyOpens Call Hierarchy view for selected objectCtrl+Alt+HOpen Call HierarchyOpens Call Hierarchy view for selected objectCtrl+Alt+H
Open DeclarationOpens Declaration for selected object (class, variable...)F3Open DeclarationOpens Declaration for selected object (class, variable...)F3
Toggle Source/HeaderSwitches between source and corresponding header files. Toggle Source/HeaderSwitches between source and corresponding header files. 
Open Element...Brings up the Open Element selection dialog to open an element in the editor. This dialog shows all types existing in the workspace. Ctrl+Shift+TOpen Element...Brings up the Open Element selection dialog to open an element in the editor. This dialog shows all types existing in the workspace. Ctrl+Shift+T
Open ResourceThis command displays a dialog that lets you select any resource in the workspace to open it in an editor. +Open ResourceThis command displays a dialog that lets you select any resource in the workspace to open it in an editor. Ctrl+Shift+RCtrl+Shift+R
Show InThis sub-menu is used to find and select the currently selected resource in another view. If an editor is active, these commands are used to select the resource currently being edited in another view.Ctrl+Shift+WShow InThis sub-menu is used to find and select the currently selected resource in another view. If an editor is active, these commands are used to select the resource currently being edited in another view.Ctrl+Shift+W
Quick OutlineDisplays outline view for current source file. Quick OutlineDisplays outline view for current source file. 
NextThe "next" definition is based on where the focus is. For example, during a search this entry becomes Next Match.Ctrl+.NextThe "next" definition is based on where the focus is. For example, during a search this entry becomes Next Match.Ctrl+.
PreviousThe "previous" definition is based on +PreviousThe "previous" definition is based on where the focus is. For example, during a search this entry becomes Previous Match.Ctrl+,Ctrl+,
Last Edit LocationMoves the cursor to the line that contains the last edit. +Last Edit LocationMoves the cursor to the line that contains the last edit. Editor only.Ctrl+QCtrl+Q
Go to LineOpen a dialog where you can specify the line number +Go to LineOpen a dialog where you can specify the line number to which to move the cursor. Editor only.Ctrl+LCtrl+L
BackMoves the focus to the previous file. +BackMoves the focus to the previous file. Editor only.Ctrl+QCtrl+Q
ForwardReturns the focus from the previous file. +ForwardReturns the focus from the previous file. Editor only.Ctrl+QCtrl+Q
+

- + - + - + - + - + - + - + - + - + - + - +
NameFunctionKeyboard Shortcut
Open ProjectOpen Project Shows a dialog that can be used to select a closed project and open it.  
Close ProjectClose Project Closes the currently selected projects.  
Build AllBuild All Builds all projects in the workspace. This is a full build; all files are built. Ctrl+B
Build parallelBuild parallel Builds all (or selected) configurations of given project(s). Each configuration is built as separate parallel task.  
Build ConfigurationsBuild Configurations Submenu which allows to:
  • Delete resource configuration for file/folder @@ -49,32 +49,32 @@
 
Build ProjectBuild Project Builds the currently selected project. This is a full build; all files in the project are built.  
Build Working SetBuild Working Set Builds the current working set.  
CleanClean Invokes the make clean defined in the makefile  
Build AutomaticallyBuild Automatically When checked, the CDT will perform a build whenever a file in a project is saved. You should turn this feature off for very large projects.  
Make TargetMake Target Submenu which allows create or build a target in the Make Targets view.  
PropertiesProperties Displays the Properties dialog. From that dialog you can display the properties of resources in Info, External Tools Builders, C/C++ Build (managed only) File Types, Indexer options, C/C++ Make Project (standard only), C/C++ Project Paths (standard only), diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm index c648d84e533..f0f4f98b40f 100755 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm @@ -17,55 +17,55 @@ alt="Selecting Refactor Menu">

- +
- + - + - + - + - + - + - + - + - + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm old mode 100644 new mode 100755 index 8bb92c2fecb..2a3a5731794 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm @@ -14,61 +14,61 @@

Run Menu

-

Name Function Keyboard Shortcut
Apply Script...Apply Script... Applies a previously saved list of refactorings.  
Create Script...Create Script... Exports a list of previously done refactorings for later use.  
History...History... Displays a history of refactorings.  
Rename...Rename... Renames selected object (variable, method, etc...) and propagates changes to other files in project. Alt+Shift+R
Extract Local Variable...Extract Local Variable... Extracts selected subexpression into a new local variable. Alt+Shift+L
Extract Constant...Extract Constant... Replaces all instances of selected literal with a named constant. Alt+C
Extract Function...Extract Function... Replaces selected statements with a call to a new function containing them. Alt+Shift+M
Toggle Function DefinitionToggle Function Definition Moves selected function definition from a header file (in- or outside a class definition) to an implementation file, or back. Alt+Shift+T
Hide Method...Hide Method... Makes selected method private.  
+

- - - - - - - - - - + + + + - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + +
NameFunctionKeyboard Shortcut
Run This command allows you to quickly repeat the most recent launch in run mode. Ctrl+F11
Debug This command allows you to quickly repeat the most recent launch in debug mode. F11
Run This command allows you to quickly repeat the most recent launch in run mode. Ctrl+F11
Run History Presents a sub menu of the recent history of launch configurations launched in run mode.  Debug This command allows you to quickly repeat the most recent launch in debug mode. F11
Run History Presents a sub menu of the recent history of launch configurations launched in run mode.  
Run As Presents a sub menu of registered run launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.  Run As Presents a sub menu of registered run launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.  
Open Run Dialog... This command realizes the launch configuration dialog to manage run mode launch configurations.  Open Run Dialog... This command realizes the launch configuration dialog to manage run mode launch configurations.  
Debug History Presents a sub menu of the recent history of launch configurations launched in debug mode.  Debug History Presents a sub menu of the recent history of launch configurations launched in debug mode.  
Debug As Presents a sub menu of registered debug launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.  Debug As Presents a sub menu of registered debug launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.  
Open Debug Dialog... This command realizes the launch configuration dialog to manage debug mode launch configurations.  Open Debug Dialog... This command realizes the launch configuration dialog to manage debug mode launch configurations.  
External Tools Presents a sub menu of links to external run configuration dialogs to manage run mode launch configurations.  
External Tools Presents a sub menu of links to external run configuration dialogs to manage run mode launch configurations.  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm old mode 100644 new mode 100755 index c9fac4ae3ec..bf9efbca87c --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm @@ -19,29 +19,29 @@

Selecting Search Menu

- +
- + - + - + - + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm old mode 100644 new mode 100755 index 00118d4304c..eb02caa34f3 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm @@ -12,23 +12,23 @@

Window Menu

-

Name Function Keyboard Shortcut
C/C++...C/C++... Opens the search dialog on the C/C++ search page  
Search...Search... Opens the search dialog for your current editor Ctrl + H
File...File... Opens the search dialog on the File search page  
TextText Opens the submenu for full-text search in given scope (workspace, project, file or working set)  
+
- + - + - + - + - + - + - + - + - + - + - + - + From 3fc0510ecda32a5306c6fb0519c6060958a10303 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Fri, 15 Feb 2013 13:50:56 -0500 Subject: [PATCH 04/27] Bug 400955: update Edit menu docs Change-Id: I743c5ca8a412eb059bba478aaecc223dd04b2080 Reviewed-on: https://git.eclipse.org/r/10541 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../images/cdt_menu_edit.png | Bin 26847 -> 48403 bytes .../reference/cdt_u_m_edit.htm | 394 +++++++++--------- 2 files changed, 208 insertions(+), 186 deletions(-) mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/images/cdt_menu_edit.png mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_edit.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_edit.png old mode 100644 new mode 100755 index e319b2302059f23a1dfdeaaac698bc376a6ee335..fa85205cb5254b4c30717e7214d4ad12aa1f3a1c GIT binary patch literal 48403 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 z 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 G@c#lO)^5%K literal 26847 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 UA2gmV9`JKt%Sf|X{o(Wf0IS5C6#xJL diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm old mode 100644 new mode 100755 index 2e5fe91a171..8e9e789c43e --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm @@ -1,6 +1,5 @@ - @@ -8,189 +7,212 @@ -

Edit Menu actions

- -

Selecting Edit Menu

-

-

NameFunctionKeyboard Shortcut
New WindowNew Window Opens new Window  
New EditorNew Editor This command opens a new empty editor in this Workbench window.  
Open PerspectiveOpen Perspective This command opens a new perspective in this Workbench window. This preference can be changed in the Window > Preferences > Workbench > Perspectives page. All of the perspectives that are open within the Workbench window are shown on the shortcut bar. @@ -37,7 +37,7 @@  
Show ViewShow View This command displays the selected view in the current perspective. You can configure how views are opened in the Window > Preferences > Workbench > Perspectives page. Views you are likely to want to open are listed first.This list is dependent on the current perspective. @@ -47,7 +47,7 @@
Customize PerspectiveCustomize Perspective Each perspective includes a predefined set of actions that are accessible from the menu bar and Workbench toolbar. Related actions are grouped into action sets. This command allows you to customize the current perspective by showing or hiding various action sets. @@ -57,32 +57,32 @@
Save Perspective AsSave Perspective As This command allows you to save the current perspective, creating your own custom perspective. You can open more perspectives of this type using the Window > Open Perspective > Other menu item once you have saved a perspective.  
Reset PerspectiveReset Perspective This command changes the layout of the current perspective to its original configuration.  
Close PerspectiveClose Perspective This command closes the active perspective.  
Close All PerspectivesClose All Perspectives This command closes all open perspectives in the Workbench window.  
NavigationNavigation This submenu contains shortcut keys for navigating between the views, perspectives, and editors in the Workbench window.
  • Show System Menu: Shows the menu that is used for resizing, closing or pinning the current view or editor.
    • @@ -100,13 +100,13 @@
Working setsWorking sets Dialog displayed to edit working sets  
PreferencesPreferences This command allows you to indicate your preferences for using the Workbench. There are a wide variety of preferences for configuring the appearance of the Workbench and its views, and for customizing the behavior of all tools that are installed in the Workbench. See the C/C++ Page Preference Window section for more details on the CDT preferences.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameFunctionKeyboard Shortcut
UndoRevert the last change in the editor Ctrl+Z
Redo Revert an undone change Ctrl+Y
CutCopies the currently selected text or element to the clipboard and removes the element. On elements, the remove is not performed before the clipboard is pasted. Ctrl+X
CopyCopies the currently selected text or elements to the clipboard Ctrl+C
Paste Paste the current content as text to the editor, or as a sibling or child element to the a currently selected element.  Ctrl+V
Delete Delete the current text or element selection. Delete
Select AllSelect all the editor content.. Ctrl+A
Find / ReplaceOpen the Find / Replace dialog. Editor only. Ctrl+F
Find NextFinds the next occurrence of the currently selected text. Editor only. Ctrl+K
Find PreviousFinds the previous occurrence of the currently selected text. Editor only. Ctrl+Shift+K
Incremental Find NextStarts the incremental find mode. After invocation, enter the search text as instructed in the status bar. Editor only. Ctrl+J
Incremental Find PreviousStarts the incremental find mode. After invocation, enter the search text as instructed in the status bar. Editor only. Ctrl+Shift+J
Add Bookmark...Add a bookmark to the current text selection or selected element. 
Add Task...Add a user defined task to the current text selection or selected element. Alt+Enter
Add to working setAdd current resource to selected Working Set Ctrl+I
Remove from working setRemove current resource from Working Set Ctrl+Shift+I
Smart Insert ModeToggles editor's Smart Insert Mode Ctrl+Shift+Insert
Show Tooltip DescriptionDisplays tooltip description, where applicable.F2
Word CompletionCompletes current word in editor.Alt+/
Quick fixCall quick fix dialog for selected warning/error. Ctrl+1
Content AssistOpens a context assist dialog at the current cursor position to bring up Java code assist proposals and templates. See the Templates preference page for available templates - Window > Preferences > C/C++ > Editor > Templates and go to the Editor preference page - Window > Preferences > C/C++ > Editor > Content Assist for configuring the behavior of content assist. Ctrl+Space
Parameter HintsOpens Parameter Hints dialog. Editor onlyCtrl+Shift+Space
Shift RightShifts text Right. Editor only 
Shift LeftShifts text Right. Editor only 
FormatFormats text. Editor onlyCtrl+Shift+F
Add IncludeAdd include to current file. Editor only Ctrl+Shift+N
Set Encoding... Toggles the encoding of the currently shown text content. 
-

- - -

Note: Other Edit options are used with the JDT. Refer to the Java Development User Guide for details.

- -

-IBM Copyright Statement -

- +
+

Edit Menu actions

+

+ Selecting Edit Menu +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameFunctionKeyboard Shortcut
UndoRevert the last change made in the + editorCtrl+Z
RedoRedo a change previously reverted with + UndoCtrl+Y
CutCopy the currently selected text to the + clipboard and remove it from the editorCtrl+X
CopyCopy the currently selected text to the + clipboardCtrl+C
PastePaste the contents of the clipboard, as + text, to the currently active editor windowCtrl+V
DeleteDelete the currently selected textDelete
Select AllSelect all the text in the currently + active editor windowCtrl+A
Expand + Selection To

Expand the selection (or create + a selection starting from the cursor) in the following ways:

Alt+Shift+Arrow Keys
+
+
Enclosing Element
+
Add the enclosing expression or block to the selection + (It relies on the embedded parser, so may fail when syntax + errors are present.)
+
+ 		Alt+Shift+Up
+
+
Next Element
+
Add the following element to the selection
+
+ 		Alt+Shift+Right
+
+
Previous Element
+
Add the preceding element to the selection
+
+ 		Alt+Shift+Left
+
+
Restore Last Selection
+
+ Restores the previous selection after an invocation of Expand + Selection To. +
+
+ 		Alt+Shift+Down
Find / Replace...Open the basic in-editor Find / Replace + dialogCtrl+F
Find WordFind the next occurrence of either the + word containing the cursor, or the first word of the current + selection, if it covers multiple words (Added for Visual Studio + compatibility.) 
Find NextFind the next occurrence of the + currently selected text, or the last text searched for, if there + is no selectionCtrl+K
Find PreviousFind the previous occurrence of the + currently selected text, or the last text searched for, if there + is no selectionCtrl+Shift+K
Incremental Find NextStart the incremental find mode + (Whatever is typed afterward will be searched for.)Ctrl+J
Incremental Find PreviousStart the incremental find mode, + looking backwardCtrl+Shift+J
Add Bookmark...Add a bookmark pointing to the current + cursor position or selected text 
Add Task...Add a user defined task located at the + current line 
Smart Insert ModeToggle the Smart Insert mode (i.e. the + auto-completion features defined in C/C++ > + Editor > Typing) + Ctrl+Shift+Insert
Show Tooltip DescriptionDisplay the tooltip appropriate to the + cursor position.F2
Word CompletionComplete the word containing the cursor + using the next available completion (Invoke it repeatedly to cycle + through them.)Alt+/
Quick FixDisplay the Quick Fix dialog + appropriate to the cursor position.Ctrl+1
Content AssistDisplay the Content Assist dialog + appropriate to the cursor position (Invoke it repeatedly to cycle + through the available proposal types.)Ctrl+Space
Parameter HintsWhen invoked in a parameter list, + display the possible signatures in a tooltipCtrl+Shift+Space
Set Encoding...Display a dialog in which the active + editor's encoding can be specified 
+

+ IBM Copyright Statement +

+
+ \ No newline at end of file From 8da0b43d309d36e47f3e16eb55bfc7fd22020738 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Fri, 15 Feb 2013 13:50:56 -0500 Subject: [PATCH 05/27] Bug 400955: add Source menu docs Some of the descriptions are not very good, and will be improved in a future commit. Change-Id: I1150a76c504fe0cf71911acb3c0a1c6e72ee3686 Reviewed-on: https://git.eclipse.org/r/10557 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../images/cdt_menu_source.png | Bin 0 -> 19480 bytes .../images/cdt_menubar.png | Bin 7940 -> 19281 bytes .../reference/cdt_o_menu.htm | 6 +- .../reference/cdt_u_m_source.htm | 110 ++++++++++++++++++ 4 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 doc/org.eclipse.cdt.doc.user/images/cdt_menu_source.png mode change 100644 => 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_o_menu.htm create mode 100755 doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_source.htm diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_source.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_source.png new file mode 100755 index 0000000000000000000000000000000000000000..d293d2bb8cb0cc7190e0a1c5819f42358057fad4 GIT binary patch literal 19480 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 literal 0 HcmV?d00001 diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menubar.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menubar.png index a1bbe79d1a8e189580fa7d7aa355a61d4cbc611b..44a91de3a73a6d4a7993b95bb05f0b68146de0e1 100644 GIT binary patch literal 19281 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 literal 7940 zcmYLObzGE9*Iq)F?i6sB&LyS6UAjA^k(82H1gQn2lnyCDNk;{yNyB2^UyJpcf6`r%y&7xUrCKvKj1 z&|rA$Da!$>Mj3V=I@pe~nz8^uZ2|$x=FvkRY^$QD2>|%B0{|i60Km2IzX#2vD6Q%%sk^_tp}>A7F`Mfqk`@UZ#aCto7}_@Qw_gUIUFJmwgW z$Z)x^rGJ^UhU3C1F`1^7#_1F~y#k|B0(Xo%B^KBAn=Q;44O3wPOjDs&S)PIBn!<}jqsE-xXFR77EM(^`{WR+`$a*Q$ zL>>HISamvlIF0Ut%Y z&N~PIk3L2F2tz{UND}slSZOOc^q$?gl?@Y=iU`3uPQZ%__h9bkj2@Cx(6KXu=qlo+ zbg~T@*sb+s65}(I%HgJ_aB)Thm_u;Em`kJpe;ZOQ5sh;>8(RD^Kx9`01+g_fxaL6U z7Zdh?^1TH(43W5RS=gZ*Nc0iPiq>U4BWdR=e80jrNM&a#VTh$0B;vvRfngPcdAt_) z%Q*uHY3R6Yh&Ht@X(*`zEY7j>k`R*7wMO^2XI5KD4b$N5ur)hOD#XKM_ez2aO#j=x zuws3!fA$-{ajT*>kx#fX9TJFb=7f5S@J1(@=jULbVo<1IodM8fl5X@e|JnweN`~8| z3$&1oBHf`hPW<|{qH!;^b$`l(5I?U^wMP49jMC?EZ#TU!;|^sT)P8PaZOB3UGWVu- z3aq3Mf;dO&jX{HxG~E}~kE~B9oW2OCYVu;eAhY2IrCVMfl>^(~2ye&y?zo%J{R*;b zbvp?oDgKFUe03^T&-EyfF`DmD=rbC^VE6$gNMHH?eFcV1iLLjkdVv2~o3)$mq>$r6 zF8z_EIn-75ZspB|*jVYl55nTAv>zy~Q*(7|sX9yo2KD|a-+!E&ab_TedLuzJKq z2koS{E8Td1#C%&*sE~C}B$J+!MCdizvleCb4d??ZTZCEb3_uN4z$}u2+MAt%tKFE(pVt1Me@9%3>XJJ5DLz@d3~nH-^KYXXv4C9F_s?{)ZG)+CL%p>*rsg8a$cwW~onG!Bq$? zc*2#fJ9m{+F={>S?GX}KaRLLd)bhHjA&-Fsr}ant^Jef3ooS9aDC%zW)qUqc{{e6* z`_s9z9O}l?*7zcB4sIhC+6^t+!4h=_vsN+72mFYPgExtsOEBax3|E8@a0r+1*DW6C z@FP76yR-sO8|}Lb)bWPD=Huulq!NwBu9bbZ&PD2bCr?Zog8wu$)cklX+-Pspwdwb6 znK_$lE_ft7zrS_(6RjSiG^r>fcj5wKh2Pr&C%X3Y=n+n4d~L`TWT8^aCj3+851Pim z9Bh~;lj{o{pFywvFsP0;+#wGQO%lD0#3XrS?C!i#txo?^uBpp-OEGZPwkGm zrwF(8SjX(a;hgn!(O7c>sE4~7|Lw$ZLBm8PZAEDLP1-(}WY7v|;!&PayItQq&GM#T z`##jy?{u39>}R>kUmu zp0u#pZ)K|`wwq#dvPL|2LrXq!keOV1vGLle+R()pT$WS|i(fuzS5TvRYNubvcu3iT zhN;9CZf%oyp7|sN^+BI}xCV|D7CAMz;tXH9YAKr+J>PdLG?4CE(WB>0dE;Ygm?$Io zc@+Et^|tuS+(yGd#9DyYlc%=OdLIjCeS&69*Bh4~39I_6p!mvGOz(Vj3riACyojjT z#&4NjSCM-ilhXVTG9NY9u!}-&dKQ+3c2#yoN3E#PwSlD&(@c(Wax3TkM^~R{a)cZx z$i%ftLn3pJ?XUzAHt$_cPt|PqhWdVRuPj!CLs z4MO2Jopc2;u*!q{@VyJ|@|z+8^6B-kcUYJ4M{UR%o-cR#NV{=_0xtH9RkPiA3S3ZW z6Li4FL^e1bZ_Kz{dF#3ly|i;%x|(dRPM5yH;B65&tqoof2ZM$~1J6M<8)dRC%*oEM z6(Uvx@-o#IagttB?SJEY&RGZcScrH2D%IMu2a1<)1R&(d?;4X_^Tuf_N*#7XjUV*_ z7cEXzxoGOmyzHXr?yZSA49XQkyB1Tsw36W^p*>1g^yY;&;&p8Tz+nkrCBgm*LIj+Gfie9zM+)>IquJjfo zH=>a5cEv7YlA=zdxCBNK1`x|70Iyx$-$cgyq%kXBsu;>2zxWA+0YF*vz^mluZ zQ*YlZ=45)|_OaxQKH^)f)aSC4<+DP%3ZD&X#Ha`dZcMRRtUUu92m) z)wkj-d!Qv%ILS>5oa4hP^%_Wx@AGv(pU`v8)Ye?pmor|?gg6XL^24~{JTrfutUJ}L zkfU)DV0weCo4=2e{Uq!9Hat2Ycxm0f% zIqB@R@V*eq+a9Wk$`px!iTHu0zv{YM)166ACgXIEi>-Uw4TjOhopt0w5 zG9~HoxH$~x)+c2*9@gVg!jg9xYUKKO90^*CdY3vc<_b#fNwf`daE&J#pD6d62iTd9 zwFdY*5FMx;CUCO&GUQWk^aTz<`EGe+R6`J*TtiT9aU@`He&af@w||$U=Tm~O^&HzA zTCH25d7FjXxpyUB`;xxqvvIECV)aMgxjK?5ny*6m%q9aAKOf)IDlZQ@b6qmRHHvy5 z@Icgb<&#&es-qfN`sLb|ENzP)!wzuXDDrxEc(X}m<8a74f7|tS%)QsFo}JuKBl$5h zPvzD(iLCMaXnlBLSG?G*i2upG43;&&KN#1BSOy9Gt>j?x(_49S(IY%8V z)N&i|PWO3z(+5-8dtL7H6TRTl_8adUx3)DL${Wr>8Hsmfy_1mVIMBm+dX2+;wzoI@ zdih04ke#tua^v2%r&aZ%qLyB;9t>?}%;?U!IKb00^tb&NPs%%9z3lk`mFkBs9U~B~ zw8ttvB4^o)!N12Lbya3wgJVbNa6OEfW5XbEft?<@9Q4k*-MOdub3d#5wdaCGBukDv z@oIf=Daqz}^p5+hWt6Zp=o*NtAPYxfg)yZf3=#u)B#K{{ZNNV-|n~Ji`o&= z6U-+G?8$aqKV3B-pSu#ic;&C(^?8|r>Iuifhy<{mzxB8BYh5Y&&aiG#t-H+J zrU+v0U!#wk6$_v4^Az{t_BXQM5??88z)OSbc)xJ;{ff9>8KEwUt-xnfU4bbJg$(E@ zb>j}dY#oT_iDE7eXUhokOxKEYAoX%vjnq^6!$zFW&CFyY3oMLMzwzHe>`rOC+^nK5 zcwsbJXt2Z0YqTW#(PVU&aG*GC z!2tuBQa-4d2liy}jTplgAP-I5vS5uaYj5 zWlRy;S>6i%JrMQmJd$+yji<q& zl2A)_<%6vrs*n_u3yzFRA^}s-8*id-d&g#YgMB3xp3P42>FN$EZmf&N1ix8)YiurZ zi{Q_lkhtlIZsH?FUrDT%Iu0BN?+v)clsGmfij9gdjmMWFmfa(AJoES|0~>Wk*p!?G z+p|cuhrfkYxW3Ww*6kGtuR+%QZPMz)c#X3a6V$;vJj%%`Unu(`)B2tN%eF(+-D^WF zMr+#QCY*__lfncpE~E6x+Hk>de#JVbn%d*4d;Vr$2eRstpkD$szp(epdV95LekR7^ zP|uP5F_6fK>Dgz_NeCQ*cBc5AuUVcC)j7y|%a;rMu`p#@rPAmj z;@z>9-bGIeR!3B^xf$LR95tP(jTV~kM4}!O++|eqS3<-7=w(AM4C)p{zRX!G+c4?a zDibjHm6k%}czsX(dnJw}CwL^#?A%R%IrAMpf?*EXN)K_81jA`JT}yh-yEzE~&-shm z)o?8N+c%;hl*~7dd|l*yHOO zb+YH1O1Qbnj~???|F#rrc7VFOLN#IG!~~^NCOUqHd4Qjxuy$=KdMn8?uQHHPqNJv0 zB*SvLLC2%e@7a2{%)Z&n*CSBuo^nasZ3!wS&PO&Y8o*eTyqb!QYoJ|RdJrk@t+=(x zS8WRQnSf3DdjUTl;V186KM6RPmzp{x9}XGrv?xTo^{Ca2KQ64#@-(WpODq0ieJZ?A z^9Cd(uc1Rf@*2s`1$1E zm3t_{10NG5AA{II0!zST!XNd~=80`xCzsw*G)3*AUK>_7L@Mh6&w{mBKwQw>Ti1=$ zdxcRctQWGfM`IssyWx3@>GCYIDIqzHP8)gInmd1KQX?p6hAbAAzwGJMsqzj$2mM+c z`ag!b{tVREYW{xR&xkZjIy$O1RZ|7bYL@+O37Gx^qSlw_39R|mF?!VNX464a4Qg;=bVMF z*c;mXwBA&30LPD0ZM8;a0*!|#p}R{x-XYrt`S*YC(*6csIF3JVXP9TSe{o-$Mn=u| zg6_m)@TyAIAy~*1#`hesl~KFk?d^J2CURW421;h^H6sg~tU6{>d~71bvHHR=WQ-4jV1^b0no^@g? z;nL%q(nr5Fcv>ed15Y;A2#$F0=*?6Lyjl|ONSm2H5iDOw+;dhrBOMI*``s)Uda4$@ zw?zVun$aygE~f=mBlP~BOAwksU;WvVwm~!b=C?s!uX5rM(c4z6XbiK>Y0?Lr!Qn46 zxkD}a&IBX-tb7-QPj{`Zg0J`Xw=9D7ad=x`8$FCj9f$YK^%aMc))U0f9(~55{W$(n zomkT9Nvh}q?S_!iV&dDUcC`CH*v1B(PU0yxsmNSEup-qjZ-DE9ptg+#IvDumMGGFu zNByAQc6Y(yI5G(f&z23my1wAO<(K&pJiG*oJ)z2{R0Ip4BZ0Bf1Bkq8YhYNUn;pyn zF%~p#rjr)h%3PswvdNF1# ztkpFphLE@St#YO&MzH!Hp|tN|5dD`jzm)TIh{#~ra&)1o7Z(yy&iV@?_@6gu;Uvg@;SzNE(h5VGSYUeK*q;Z_3Y1;Ryt2R+A_J(d3=0`PiK$9#P$1enwq{1JSzROT@9SpGMW@s|)MUM9Js~ zg%qj9g))$vt-;N1G+NGF;%}jhpibFizr=?9g)!pJd=L|XDH^g@Dl_y52159r# zYy9ggdIS2_)u8_}T(XLJ`a`9Z_8-#)Q9py_JFzHXaaXoW7v-iQ-f*=F4m_Z`aaeFeh#9Y@9AlOCp;tiI1=GI~H(DK}4wl4krb$lY0O9lbeLZMq^=PFFhZ! zpJh5p$px-DuFx;l6Jx$I-mbRTzQ4!R=z-kRHbtG1D9IX7cQ-}LHeym4S~csol$HHM z`{m=pdLPh9jtFA{aXL!zz|<09|EbM9zRGnT>wqs#z3I#!)-UIez0EH}f${$}%755L zw|GEPOC;elg{nD)X5K=QUeXQFK=c2&(7YTn7&=t&$wQ?6mm7Tu*rJ#N(6Bhak5M(_ z;Qy-fm|+@cN7;HyKF`p^64{dtAld8EPTJ)3wU-XnKImJx9JMAr09Mw7CDIJDO7gw^ z{^^+76CM56>9&fF;au)#?#jkveOYYDC!v6A;8WvWVNd%{GlTVp>N6a&DmSmO^oqmt z`hUM!WBJ-5ruFNT{QlHE0Skxoc2FAge28Y7PQf&79{=Hv+TivYJ5&EydwyZ2(1%BG zVw!03@<>$&h+AP*_d8u})6((wVUtWfOyvi(gvGSSUek~=Dlsao zw9118(5vq5zl|VsYv0Ne4mY*H|{&*uKZBg5YGF!+AwAu6Y^L-0{_7Aq-h&O-MjkJ+bRYtD)7NKj!8m0 zucP`fXT_bjKwh^bu92+OC&xA6(zc>SvpB*k>bHTcTf#nK6)MV@za;Lq;5&Kt)o@)G z5s2v5oBm8c3<5{qf$)dyt%kxkg00D|ShkFjaiEfS?Jali6bWQ$#5q$4R>J=bpDSAz z(=^m|peB}YhoX*8Up|F!r$;;z_?AwZ}rNcmKtVod> z9MTL%`PXpDiDl*)d>xRruJF)TS;o673n!W|FO_A6Y&tfL_-vYDQKgbtpYGc$(#q2lna)u%YD6FM>#C2cWj*m`|E{H}tYL4!B{gl$lF;3Q8L{Gt% z*bBTPnF=9wCgR1sZYl~o-|{dBSl%m39erI#knJ0Z!K)2wVV3i}a^DNYPOx^BaN0Lt zbo{k_M}m^aPQzYGo8|r+J0XT$SbpQb#`DP2EI_7#@}+vpUnd>SrmPbs?!(2Cuj96x z$yIGT6DcNI;Oco#iu>{O^q2b4Rr4p_LmQxE$J?4vGz+F%7z}{IGW*jM1JFpnvvh&_ zP8@##W{~1~h>|I1Hc)CO&giFk zJAX=ZmI0_-Dc2kN<}foc(#+Sg0HktD=X*D-|6&6STN)gK!a@T7iwhyR*z_11pe`kb zU4j3}{MJBxC@|)KAn2hPC&sl#VXcGyCn0sk=DqIM#$jlduDj`O1PMrnKh(5K%6MqKXt>0Ww7XYx7ILrqnv~`NLQvG)>*@%HH*RY z{~BmXbuxhrVDW9d2PjKK{6{aG7IQ#)l%n2dl>Ib;*u`htEvF}z<)0CqWGfq3wokSl zgC4LD^`F1Z!y?6HM_&6bp+%lcQCAO20_}SD=U)fiE=s_jCnDgmaw*^*kpsp*dlNbX zCe=8_D7

C/C++ Menubar

This section describes the menubar options available from the C/C++ perspective.

-

CDT main menu

@@ -19,6 +19,8 @@ alt="CDT main menu"> Edit Menu actions
+Source Menu actions
+ Refactor Menu actions
Navigate Menu actions
@@ -30,7 +32,7 @@ alt="CDT main menu"> Run Menu actions
Window Menu actions
-

IBM Copyright Statement +

IBM Copyright Statement

\ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_source.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_source.htm new file mode 100755 index 00000000000..eb2d37202a7 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_source.htm @@ -0,0 +1,110 @@ + + + + + +Source Menu actions + + + +
+

Source Menu actions

+

+ Selecting Source Menu +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameFunctionKeyboard Shortcut
Toggle CommentAdd or remove single-line, C++-style, + comment markers on each line in the selection, or the line + containing the cursor, if there is no selectionCtrl+/
Add Block CommentAdd a block comment around the + selectionCtrl+Shift+/
Remove Block CommentIf the selection contains one or more + block comments, remove themCtrl+Shift+\
Shift RightIncrease indentation on each line in + the selection, or the line containing the cursor, if there is no + selection 
Shift LeftDecrease indentation on each line in + the selection, or the line containing the cursor, if there is no + selectionShift+Tab
Correct IndentationApply simple indentation rules to the + current selection, or the line containing the cursor, if there is + no selectionCtrl+I
FormatApply the full C/C++ + > Code Style > Formatter preferences to the entire contents + of the active editor, or to the selection if there is one + Ctrl+Shift+F
Add IncludeAdd an include statement and, + optionally, a "using" declaration for the currently selected nameCtrl+Shift+N
Sort LinesSort the selected linesCtrl+Alt+S
Implement Method...Open the Implement Method dialog 
Generate Getters and + Setters...Open the Generate Getters and Setters + dialog that allows you to create Getters and Setters for fields in + the current type. Available on fields and types or on a text + selection inside a type 
Surround WithSurround the selected statements with a + code templateAlt+Shift+Z
+

+ Intel Copyright Statement +

+
+ + \ No newline at end of file From fffc3a13e357dff2755f39e5b88055cb886321da Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sat, 23 Feb 2013 10:35:02 -0500 Subject: [PATCH 06/27] bug 348781: Problem adding environment variables to preferences --- .../src/org/eclipse/cdt/ui/newui/EnvironmentTab.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java index 175be00e0b0..f7121612144 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java @@ -593,6 +593,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { } vars = null; super.performOK(); + updateData(); } @Override From 6e5ac901f4c2d0af7882887dcf0ddff3cdcd6824 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 24 Feb 2013 09:59:18 -0500 Subject: [PATCH 07/27] bug 355488: Cannot delete variables from C/C++ build environment --- .../core/envvar/UserDefinedEnvironmentSupplier.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java index 73152183612..ae89d9ef715 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java @@ -283,11 +283,15 @@ public class UserDefinedEnvironmentSupplier extends } public boolean setWorkspaceEnvironment(StorableEnvironment env) { - StorableEnvironment oldEnv = getEnvironment(null); + IEnvironmentVariable[] oldVariables = fWorkspaceVariables.getVariables(); + IEnvironmentVariable[] newVariables = env.getVariables(); - fWorkspaceVariables = new StorableEnvironment(env, false); + fWorkspaceVariables.deleteAll(); + fWorkspaceVariables.setVariales(newVariables); + fWorkspaceVariables.setAppendEnvironment(env.appendEnvironment()); + fWorkspaceVariables.setAppendContributedEnvironment(env.appendContributedEnvironment()); - EnvironmentChangeEvent event = createEnvironmentChangeEvent(fWorkspaceVariables.getVariables(), oldEnv.getVariables()); + EnvironmentChangeEvent event = createEnvironmentChangeEvent(newVariables, oldVariables); storeWorkspaceEnvironment(true); From d24992f0a6fec633594890ed755effb2540aaafc Mon Sep 17 00:00:00 2001 From: Thomas Corbat Date: Mon, 25 Feb 2013 14:18:07 +0100 Subject: [PATCH 08/27] Bug 401661 - CPPClassType.getScope() at split definition and declaration Now CPPClassType.getScope() returns the scope of the surrounding class or namespace independent of the location of the definition. --- .../core/parser/tests/ast2/AST2CPPTests.java | 66 +++++++++++++++++++ .../core/dom/parser/cpp/CPPClassType.java | 16 +++-- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java index ef945c40951..17636abb0f8 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java @@ -10195,4 +10195,70 @@ public class AST2CPPTests extends AST2TestBase { long BSize = SizeofCalculator.getSizeAndAlignment(B, nameB).size; assertEquals(pointerSize, BSize); } + + // namespace NS { + // class Enclosing { + // class Inner {}; + // }; + // } + public void testNestedClassScopeInlineDefinition_401661() throws Exception { + String code = getAboveComment(); + parseAndCheckBindings(code); + + BindingAssertionHelper bh = new BindingAssertionHelper(code, true); + + ICPPClassType Enclosing = bh.assertNonProblem("Enclosing", 9); + ICPPClassType Inner = bh.assertNonProblem("Inner", 5); + + assertEquals(Enclosing.getCompositeScope(), Inner.getScope()); + } + + // namespace NS { + // class Enclosing { + // class Inner; + // }; + // } + // class NS::Enclosing::Inner{}; + public void testNestedClassScopeSeparateDefinition_401661() throws Exception { + String code = getAboveComment(); + parseAndCheckBindings(code); + + BindingAssertionHelper bh = new BindingAssertionHelper(code, true); + + ICPPClassType Enclosing = bh.assertNonProblem("Enclosing", 9); + ICPPClassType Inner = bh.assertNonProblem("Inner;", 5); + + assertEquals(Enclosing.getCompositeScope(), Inner.getScope()); + } + + // namespace NS { + // class Inner {}; + // } + public void testClassScopeInlineDefinition_401661() throws Exception { + String code = getAboveComment(); + parseAndCheckBindings(code); + + BindingAssertionHelper bh = new BindingAssertionHelper(code, true); + + ICPPNamespace NamespaceNS = bh.assertNonProblem("NS {", 2); + ICPPClassType Inner = bh.assertNonProblem("Inner", 5); + + assertEquals(NamespaceNS.getNamespaceScope(), Inner.getScope()); + } + + // namespace NS { + // class Inner; + // } + // class NS::Inner{}; + public void testClassScopeSeparateDefinition_401661() throws Exception { + String code = getAboveComment(); + parseAndCheckBindings(code); + + BindingAssertionHelper bh = new BindingAssertionHelper(code, true); + + ICPPNamespace NamespaceNS = bh.assertNonProblem("NS {", 2); + ICPPClassType Inner = bh.assertNonProblem("Inner;", 5); + + assertEquals(NamespaceNS.getNamespaceScope(), Inner.getScope()); + } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java index 7d88b8900a2..d5cee05e031 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java @@ -117,10 +117,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp private ICPPClassType typeInIndex; public CPPClassType(IASTName name, IBinding indexBinding) { - if (name instanceof ICPPASTQualifiedName) { - IASTName[] ns = ((ICPPASTQualifiedName) name).getNames(); - name = ns[ns.length - 1]; - } + name = stripQualifier(name); IASTNode parent = name.getParent(); while (parent instanceof IASTName) parent = parent.getParent(); @@ -195,7 +192,8 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp @Override public IScope getScope() { IASTName name = definition != null ? definition : declarations[0]; - + name = stripQualifier(name); + IScope scope = CPPVisitor.getContainingScope(name); if (definition == null && name.getPropertyInParent() != ICPPASTQualifiedName.SEGMENT_NAME) { IASTNode node = declarations[0].getParent().getParent(); @@ -406,4 +404,12 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp } return false; } + + private IASTName stripQualifier(IASTName name) { + if (name instanceof ICPPASTQualifiedName) { + IASTName[] ns = ((ICPPASTQualifiedName)name).getNames(); + name = ns[ ns.length - 1 ]; + } + return name; + } } From 3ef0d403ac51283ffc7244d9d14fac3a4ae3497f Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Mon, 25 Feb 2013 14:32:31 -0500 Subject: [PATCH 09/27] Bug 307542 - [Accessibility] Error Parser Options is not accessible by keyboard --- .../dialogs/RegexErrorParserOptionPage.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java index 62505a1fe5e..b3953ac2777 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Andrew Gvozdev and others. + * Copyright (c) 2009, 2013 Andrew Gvozdev 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 @@ -7,6 +7,7 @@ * * Contributors: * Andrew Gvozdev - Initial API and implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; @@ -24,12 +25,18 @@ import org.eclipse.jface.text.FindReplaceDocumentAdapterContentProposalProvider; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLabelProvider; +import org.eclipse.jface.viewers.ColumnViewerEditor; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ComboBoxCellEditor; import org.eclipse.jface.viewers.EditingSupport; +import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.TableViewerEditor; +import org.eclipse.jface.viewers.TableViewerFocusCellManager; import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; @@ -326,7 +333,23 @@ public final class RegexErrorParserOptionPage extends AbstractCOptionPage { fTableViewer = new TableViewer(fTable); fTableViewer.setUseHashlookup(true); fTableViewer.setContentProvider(new ArrayContentProvider()); - + + //Bug 307542 - [Accessibility] Error Parser Options table should be accessible by keyboard + TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(fTableViewer,new FocusCellOwnerDrawHighlighter(fTableViewer)); + ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(fTableViewer) { + @Override + protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) { + return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL + || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION + || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && (event.keyCode == SWT.CR || event.character == ' ')) + || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC; + } + }; + + TableViewerEditor.create(fTableViewer, focusCellManager, actSupport, ColumnViewerEditor.TABBING_HORIZONTAL + | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR + | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION); + createSeverityColumn(); createPatternColumn(); createFileColumn(); From 185fe357cfddaa3e68a091147702fdc3b6a10aa0 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Feb 2013 15:59:00 -0800 Subject: [PATCH 10/27] Cosmetics. --- .../composite/cpp/CompositeCPPFunctionSpecialization.java | 4 ++-- .../composite/cpp/CompositeCPPTypedefSpecialization.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java index fede76028e2..c9fd5d36780 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation - * Markus Schorn (Wind River Systems) + * Andrew Ferguson (Symbian) - Initial implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.index.composite.cpp; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java index 3e6b2e1069c..75a711eb54c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation - * Markus Schorn (Wind River Systems) + * Andrew Ferguson (Symbian) - Initial implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.index.composite.cpp; From f331210279e5e97b4d35cb0fd6a6083f7ef4efeb Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Feb 2013 16:10:24 -0800 Subject: [PATCH 11/27] Bug 389009 - Enumerator with dependent value. Fixed issues described in comments #24 and #25. --- .../cdt/internal/core/dom/parser/Value.java | 2 + .../composite/cpp/CPPCompositesFactory.java | 4 ++ ...CompositeCPPEnumerationSpecialization.java | 45 +++++++++++++++++++ .../CompositeCPPEnumeratorSpecialization.java | 45 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerationSpecialization.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeratorSpecialization.java diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java index 5a5673d05f8..dbb79403e81 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java @@ -280,6 +280,8 @@ public class Value implements IValue { } public static IValue incrementedValue(IValue value, int increment) { + if (value == UNKNOWN) + return UNKNOWN; Long val = value.numericalValue(); if (val != null) { return create(val.longValue() + increment); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java index 3589b59cfa7..476aa1d9f30 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java @@ -535,6 +535,10 @@ public class CPPCompositesFactory extends AbstractCompositeFactory { return new CompositeCPPTypedefSpecialization(this, (ICPPBinding) binding); } else if (binding instanceof ICPPUsingDeclaration) { return new CompositeCPPUsingDeclarationSpecialization(this, (ICPPUsingDeclaration) binding); + } else if (binding instanceof ICPPEnumeration) { + return new CompositeCPPEnumerationSpecialization(this, (ICPPEnumeration) binding); + } else if (binding instanceof IEnumerator) { + return new CompositeCPPEnumeratorSpecialization(this, (IEnumerator) binding); } else { throw new CompositingNotImplementedError("Composite binding unavailable for " + binding + " " + binding.getClass()); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerationSpecialization.java new file mode 100644 index 00000000000..139f53ecf68 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerationSpecialization.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2013 Google, 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Sergey Prigogin (Google) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.core.index.composite.cpp; + +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; +import org.eclipse.cdt.core.parser.util.ObjectMap; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap; +import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory; + +class CompositeCPPEnumerationSpecialization extends CompositeCPPEnumeration implements ICPPSpecialization { + public CompositeCPPEnumerationSpecialization(ICompositesFactory cf, ICPPEnumeration delegate) { + super(cf, delegate); + } + + @Override + public IBinding getSpecializedBinding() { + return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding); + } + + @Override + public ICPPTemplateParameterMap getTemplateParameterMap() { + IBinding owner= getOwner(); + if (owner instanceof ICPPSpecialization) { + return ((ICPPSpecialization) owner).getTemplateParameterMap(); + } + return CPPTemplateParameterMap.EMPTY; + } + + @Override + @Deprecated + public ObjectMap getArgumentMap() { + return TemplateInstanceUtil.getArgumentMap(cf, rbinding); + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeratorSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeratorSpecialization.java new file mode 100644 index 00000000000..bc6ad7c1ec6 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeratorSpecialization.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2013 Google, 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Sergey Prigogin (Google) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.core.index.composite.cpp; + +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.IEnumerator; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; +import org.eclipse.cdt.core.parser.util.ObjectMap; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap; +import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory; + +class CompositeCPPEnumeratorSpecialization extends CompositeCPPEnumerator implements ICPPSpecialization { + public CompositeCPPEnumeratorSpecialization(ICompositesFactory cf, IEnumerator delegate) { + super(cf, delegate); + } + + @Override + public IBinding getSpecializedBinding() { + return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding); + } + + @Override + public ICPPTemplateParameterMap getTemplateParameterMap() { + IBinding owner= getOwner(); + if (owner instanceof ICPPSpecialization) { + return ((ICPPSpecialization) owner).getTemplateParameterMap(); + } + return CPPTemplateParameterMap.EMPTY; + } + + @Override + @Deprecated + public ObjectMap getArgumentMap() { + return TemplateInstanceUtil.getArgumentMap(cf, rbinding); + } +} From 29efae531167786ab6e563c67c29a948525ff73e Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Feb 2013 16:36:23 -0800 Subject: [PATCH 12/27] Reverted commit 2279927: Bug 400020: Allow tagging of IBindings --- .../pdom/tests/PDOMStringSetTests.java | 78 ----- .../pdom/tests/PDOMTagIndexTests.java | 135 -------- .../cdt/internal/pdom/tests/PDOMTests.java | 4 +- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 4 - .../cdt/core/dom/ast/tag/IBindingTagger.java | 34 -- .../eclipse/cdt/core/dom/ast/tag/ITag.java | 41 --- .../cdt/core/dom/ast/tag/ITagReader.java | 33 -- .../cdt/core/dom/ast/tag/ITagService.java | 30 -- .../cdt/core/dom/ast/tag/ITagWriter.java | 34 -- .../cdt/core/dom/ast/tag/IWritableTag.java | 31 -- .../core/dom/ast/tag/NonCachedTaggable.java | 96 ------ .../cdt/internal/core/dom/ast/tag/Tag.java | 78 ----- .../internal/core/dom/ast/tag/TagManager.java | 107 ------ .../internal/core/dom/ast/tag/TagService.java | 35 -- .../core/dom/ast/tag/TaggerDescriptor.java | 202 ------------ .../dom/parser/cpp/semantics/CPPVisitor.java | 6 +- .../core/pdom/AbstractIndexerTask.java | 5 - .../eclipse/cdt/internal/core/pdom/PDOM.java | 16 +- .../internal/core/pdom/db/PDOMStringSet.java | 205 ------------ .../internal/core/pdom/dom/PDOMBinding.java | 10 - .../core/pdom/dom/c/PDOMCLinkage.java | 14 +- .../core/pdom/dom/cpp/PDOMCPPLinkage.java | 24 +- .../internal/core/pdom/tag/BTreeIterable.java | 78 ----- .../cdt/internal/core/pdom/tag/PDOMTag.java | 312 ------------------ .../internal/core/pdom/tag/PDOMTagIndex.java | 279 ---------------- .../core/pdom/tag/PDOMTagSynchronizer.java | 104 ------ .../internal/core/pdom/tag/PDOMTaggable.java | 51 --- core/org.eclipse.cdt.core/plugin.properties | 1 - core/org.eclipse.cdt.core/plugin.xml | 1 - core/org.eclipse.cdt.core/schema/tagger.exsd | 139 -------- .../src/org/eclipse/cdt/core/CCorePlugin.java | 11 - 31 files changed, 10 insertions(+), 2188 deletions(-) delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java delete mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java delete mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java delete mode 100644 core/org.eclipse.cdt.core/schema/tagger.exsd diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java deleted file mode 100644 index 1ba161f81ad..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.pdom.tests; - -import java.io.File; - -import junit.framework.Test; - -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.internal.core.pdom.db.ChunkCache; -import org.eclipse.cdt.internal.core.pdom.db.Database; -import org.eclipse.cdt.internal.core.pdom.db.PDOMStringSet; - -// copy/pasted from BTreeTests -public class PDOMStringSetTests extends BaseTestCase -{ - protected File dbFile; - protected Database db; - protected PDOMStringSet stringSet; - protected int rootRecord; - - public static Test suite() - { - return suite( PDOMStringSetTests.class ); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - dbFile = File.createTempFile( "pdomstringsettest", "db" ); - db = new Database( dbFile, new ChunkCache(), 0, false ); - db.setExclusiveLock(); - rootRecord = Database.DATA_AREA; - stringSet = new PDOMStringSet( db, rootRecord ); - } - - @Override - protected void tearDown() throws Exception - { - db.close(); - dbFile.deleteOnExit(); - - super.tearDown(); - } - - // Quick tests to exercise the basic functionality. - public void testInterface() throws Exception - { - long val1_rec_a = stringSet.add( "val1" ); - long val2_rec_a = stringSet.add( "val2" ); - long val1_rec_b = stringSet.add( "val1" ); - assertTrue( val1_rec_a != 0 ); - assertTrue( val2_rec_a != 0 ); - assertEquals( val1_rec_a, val1_rec_b ); - - long val1_find = stringSet.find( "val1" ); - long val2_find = stringSet.find( "val2" ); - assertEquals( val1_rec_a, val1_find ); - assertEquals( val2_rec_a, val2_find ); - - long val1_rm = stringSet.remove( "val1" ); - assertEquals( val1_rec_a, val1_rm ); - assertEquals( 0, stringSet.find( "val1" ) ); - assertEquals( val2_rec_a, stringSet.find( "val2" ) ); - - stringSet.clearCaches(); - assertEquals( val2_rec_a, stringSet.find( "val2" ) ); - assertEquals( 0, stringSet.find( "val1" ) ); - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java deleted file mode 100644 index 34df365853e..00000000000 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.pdom.tests; - -import java.io.File; -import java.util.Arrays; - -import junit.framework.Test; - -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexLocationConverter; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.internal.core.dom.ast.tag.Tag; -import org.eclipse.cdt.internal.core.pdom.PDOM; -import org.eclipse.cdt.internal.core.pdom.WritablePDOM; -import org.eclipse.cdt.internal.core.pdom.tag.PDOMTag; -import org.eclipse.cdt.internal.core.pdom.tag.PDOMTagIndex; - -// copy/pasted from BTreeTests -public class PDOMTagIndexTests extends BaseTestCase -{ - private PDOM pdom; - - public static Test suite() - { - return suite( PDOMTagIndexTests.class ); - } - - private static class MockIndexLocationConverter implements IIndexLocationConverter - { - @Override public IIndexFileLocation fromInternalFormat( String raw ) { return null; } - @Override public String toInternalFormat( IIndexFileLocation location ) { return null; } - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - File tmpFile = File.createTempFile( getClass().getSimpleName() + '.' + Double.toString( Math.random() ).substring( 2 ), null ); - pdom = new WritablePDOM( tmpFile, new MockIndexLocationConverter(), LanguageManager.getInstance().getPDOMLinkageFactoryMappings() ); - } - - @Override - protected void tearDown() throws Exception - { - pdom.close(); - super.tearDown(); - } - - // return the nearest valid record that is less than the specified base - private static long lastRecordBase = 1000; - private static long computeValidRecord() - { - lastRecordBase += 1000; - return ( lastRecordBase & ~7L ) | 2; - } - - // A quick sanity test to confirm basic functionality. - public void testSimple() throws Exception - { - String tagger = "tagger_a"; - long rec = computeValidRecord(); - - assertNotNull( PDOMTagIndex.createTag( pdom, rec, tagger, 1 ) ); - assertNotNull( PDOMTagIndex.getTag( pdom, rec, tagger ) ); - } - - public void testMultipleTaggers() throws Exception - { - String tagger_a = "tagger_a"; - String tagger_b = "tagger_b"; - long rec1 = computeValidRecord(); - long rec2 = computeValidRecord(); - - assertNotNull( PDOMTagIndex.createTag( pdom, rec1, tagger_a, 1 ) ); - assertNotNull( PDOMTagIndex.createTag( pdom, rec1, tagger_b, 1 ) ); - assertNotNull( PDOMTagIndex.createTag( pdom, rec2, tagger_a, 1 ) ); - - assertNotNull( PDOMTagIndex.getTag( pdom, rec2, tagger_a ) ); - assertNull( PDOMTagIndex.getTag( pdom, rec2, tagger_b ) ); - - Iterable tags1 = PDOMTagIndex.getTags( pdom, rec1 ); - int tag_count = 0; - for( ITag tag : tags1 ) - { - ++tag_count; - assertTrue( tag.getTaggerId().equals( tagger_a ) || tag.getTaggerId().equals( tagger_b ) ); - assertEquals( 1, tag.getDataLen() ); - } - assertEquals( 2, tag_count ); - } - - public void testReplaceTags() throws Exception - { - String tagger_a = "tagger_a"; - String tagger_b = "tagger_b"; - long rec = computeValidRecord(); - - ITag taga = PDOMTagIndex.createTag( pdom, rec, tagger_a, 2 ); - assertNotNull( taga ); - assertTrue( taga instanceof PDOMTag ); - PDOMTag taga_pdom = (PDOMTag)taga; - ITag tagb = PDOMTagIndex.createTag( pdom, rec, tagger_a, 2 ); - assertNotNull( tagb ); - - // replacement should delete tags for taggers that are no longer present and shorter tags - // should be modified in place - PDOMTagIndex.setTags( pdom, rec, Arrays.asList( new Tag( tagger_a, 1 ) ) ); - assertNull( PDOMTagIndex.getTag( pdom, rec, tagger_b ) ); - ITag shorter_ = PDOMTagIndex.getTag( pdom, rec, tagger_a ); - assertNotNull( shorter_ ); - assertTrue( shorter_ instanceof PDOMTag ); - PDOMTag shorter_pdom = (PDOMTag)shorter_; - assertEquals( taga_pdom.getRecord(), shorter_pdom.getRecord() ); - - // longer tags should create a new record - PDOMTagIndex.setTags( pdom, rec, Arrays.asList( new Tag( tagger_a, 4 ) ) ); - ITag longer_ = PDOMTagIndex.getTag( pdom, rec, tagger_a ); - assertNotNull( longer_ ); - assertTrue( longer_ instanceof PDOMTag ); - PDOMTag longer_pdom = (PDOMTag)longer_; - assertTrue( taga_pdom.getRecord() != longer_pdom.getRecord() ); - - // TODO figure out how to confirm that the original tag was free'd - } -} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java index 3640bbe7339..f244ec3925c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java @@ -38,9 +38,7 @@ public class PDOMTests extends TestSuite { suite.addTest(OverloadsWithinSingleTUTests.suite()); suite.addTest(OverloadsWithinCommonHeaderTests.suite()); suite.addTest(BTreeTests.suite()); - suite.addTest(PDOMStringSetTests.suite()); - suite.addTest(PDOMTagIndexTests.suite()); - suite.addTest(FilesOnReindexTests.suite()); + suite.addTest(FilesOnReindexTests.suite()); suite.addTest(GeneratePDOMApplicationTest.suite()); suite.addTest(CPPFieldTests.suite()); diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index b4de8014640..9130967645b 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.core.dom.ast.gnu, org.eclipse.cdt.core.dom.ast.gnu.c, org.eclipse.cdt.core.dom.ast.gnu.cpp, - org.eclipse.cdt.core.dom.ast.tag, org.eclipse.cdt.core.dom.parser, org.eclipse.cdt.core.dom.parser.c, org.eclipse.cdt.core.dom.parser.cpp, @@ -53,7 +52,6 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.internal.core.browser;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.cdtvariables;x-internal:=true, org.eclipse.cdt.internal.core.dom;x-internal:=true, - org.eclipse.cdt.internal.core.dom.ast.tag;x-internal:=true, org.eclipse.cdt.internal.core.dom.parser;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.dom.parser.c;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.dom.parser.cpp;x-friends:="org.eclipse.cdt.ui", @@ -86,7 +84,6 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.internal.core.pdom.dom.cpp;x-internal:=true, org.eclipse.cdt.internal.core.pdom.export;x-internal:=true, org.eclipse.cdt.internal.core.pdom.indexer;x-friends:="org.eclipse.cdt.ui", - org.eclipse.cdt.internal.core.pdom.tag;x-internal:=true, org.eclipse.cdt.internal.core.resources;x-friends:="org.eclipse.cdt.ui,org.eclipse.cdt.make.core,org.eclipse.cdt.codan.ui.cxx", org.eclipse.cdt.internal.core.settings.model;x-internal:=true, org.eclipse.cdt.internal.core.util;x-internal:=true, @@ -114,7 +111,6 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.utils.xcoff, org.eclipse.cdt.utils.xcoff.parser Require-Bundle: org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java deleted file mode 100644 index e5a31f14b72..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IBinding; - -/** - * Implementations are contributed with the org.eclipse.cdt.core.tagger extension-point. The implementation - * is responsible for populating the tag's data using a given input binding. - * - * @see #process(ITagWriter, IBinding, IASTName) - * @since 5.5 - */ -public interface IBindingTagger -{ - /** - * Examine the given input binding to decide if a tag should be created. Use the given tagWriter - * to create data if needed. Return the tag if one was created and null otherwise. A tagger (as - * identified by it's unique id string) is allowed to create only one tag for each binding. - * - * @param tagWriter the writer to use for creating new tags - * @param binding the binding to examine when populating the tag (if needed) - * @param ast the AST name from which the binding was created - * @return the tag if one was created and null otherwise - */ - public ITag process( ITagWriter tagWriter, IBinding binding, IASTName ast ); -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java deleted file mode 100644 index 00c0ec9fcf5..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - -/** - * Tags are used to annotate {@link ITagReader}'s with extra information. They are created - * by implementations of {@link IBindingTagger} which are contributed using the - * org.eclipse.cdt.core.tagger extension point. The base tag interface is read-only, it - * is extended by the writable {@link IWritableTag}. - * - * @see IBindingTagger - * @see ITagReader - * @see IWritableTag - * @since 5.5 - */ -public interface ITag -{ - /** A constant that is returned to indicate a read failure. */ - public static final int Fail = -1; - - /** Return the number of bytes in the tag's data payload. */ - public int getDataLen(); - - /** Return the globally unique id of the tagger that created the receiver. */ - public String getTaggerId(); - - /** Return the byte from the specified offset or {@link #Fail} on failure. */ - public int getByte( int offset ); - - /** Return the specified number of bytes from the specified offset. Specify len of -1 to read all - * bytes from the specified offset to the end of the payload. Return null on failure. */ - public byte[] getBytes( int offset, int len ); - - // TODO read methods for all the other types -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java deleted file mode 100644 index fb9d6ca3f58..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - - -/** - * An interface that provides read-only access to the tags associated with a particular binding. - * - * @see ITag - * @see ITagService - * @since 5.5 - */ -public interface ITagReader -{ - /** - * Look for a tag for the receiver, returns null if there is no such tag. - * - * @param id A string that uniquely identifies the tag to be returned. This value was provided by the contributor - * when the tag was created (see {@link ITagWriter#createTag(String, int)}). - */ - public ITag getTag( String id ); - - /** - * Return all tags known to the receiver. Does not return null. - */ - public Iterable getTags(); -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java deleted file mode 100644 index 05e12af7a4b..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - -import org.eclipse.cdt.core.dom.ast.IBinding; - -/** - * Provides ITagReaders for specific bindings. The kind of the reader will vary based on - * the kind of the input binding. - * - * @see ITag - * @see ITagReader - * @since 5.5 - */ -public interface ITagService -{ - /** - * Finds or creates a tag reader for the specified binding or null if a reader cannot - * be associated with this binding. - * - * @param binding could be null - */ - public ITagReader findTagReader( IBinding binding ); -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java deleted file mode 100644 index 34849ba59fe..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - -/** - * An interface that allows tag creation and modification. - * - * @see ITag - * @see ITagService - * @since 5.5 - */ -public interface ITagWriter -{ - /** - * Create and return a new tag for the receiver. E.g., if this writer is associated with a persistent binding, - * then returned tag will read and write from the PDOM database. - * - * @param id A string that uniquely identifies the tag to be returned. This value will be used by the contributor - * when to find the tag (see {@link ITagReader#getTag(String)}). - * @param len The number of bytes that should be allocated to store the tag's data. - */ - public IWritableTag createTag( String id, int len ); - - /** - * Sets the receiver's tags to only the ones provided. Deletes existing tags that are not in the argument list. - */ - public boolean setTags( Iterable tags ); -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java deleted file mode 100644 index bb6a8eecb33..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.core.dom.ast.tag; - -/** - * Tags are used to annotate {@link ITagWriter}'s with extra information. They are created - * by implementations of {@link IBindingTagger} which are contributed using the - * org.eclipse.cdt.core.tagger extension point. - * - * @see IBindingTagger - * @see ITagReader - * @see ITagWriter - * @since 5.5 - */ -public interface IWritableTag extends ITag -{ - /** Write the given byte to the given offset in the tag. Return true if successful and false otherwise. */ - public boolean putByte( int offset, byte data ); - - /** Write the argument buffer into the receiver's payload starting at the specified offset. Write the specified - * number of bytes or the full buffer when len is -1. Return true if successful and false otherwise. */ - public boolean putBytes( int offset, byte data[], int len ); - - // TODO write for all types -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java deleted file mode 100644 index c74ea936709..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.dom.ast.tag; - -import org.eclipse.cdt.core.dom.ast.IASTDeclarator; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.ITagReader; -import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; -import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; -import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; - -public class NonCachedTaggable implements ITagReader, ITagWriter -{ - private final IBinding binding; - private IASTName ast; - - public NonCachedTaggable( IBinding binding ) - { - this.binding = binding; - } - - @Override - public IWritableTag createTag( String id, int len ) - { - return new Tag( id, len ); - } - - @Override - public ITag getTag( String id ) - { - return TagManager.getInstance().process( id, this, binding, getAST() ); - } - - @Override - public Iterable getTags() - { - return TagManager.getInstance().process( this, binding, getAST() ); - } - - @Override - public boolean setTags( Iterable tags ) - { - // this non-caching implementation has nothing to set, the tags will be regenerated - // when they are queried - return true; - } - - private IASTName getAST() - { - if( ast != null ) - return ast; - - if( ! ( binding instanceof ICPPInternalBinding ) ) - return null; - - IASTNode node = getPhysicalNode( (ICPPInternalBinding)binding ); - if( node == null ) - return null; - - return ast = getName( node ); - } - - private static IASTNode getPhysicalNode( ICPPInternalBinding binding ) - { - IASTNode node = binding.getDefinition(); - if( node != null ) - return node; - - IASTNode[] nodes = binding.getDeclarations(); - if( nodes == null - || nodes.length <= 0 ) - return null; - return nodes[0]; - } - - private static IASTName getName( IASTNode node ) - { - if( node instanceof IASTName ) - return (IASTName)node; - if( node instanceof ICPPASTCompositeTypeSpecifier ) - return ( (ICPPASTCompositeTypeSpecifier)node ).getName(); - if( node instanceof IASTDeclarator ) - return ( (IASTDeclarator)node ).getName(); - return null; - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java deleted file mode 100644 index d0979f421dd..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.dom.ast.tag; - -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; - -/** - * A trivial implementation that stores all data in memory. - * - * @see NonCachedTaggable - */ -public class Tag implements IWritableTag -{ - private final String taggerId; - private final byte[] buff; - - public Tag( String taggerId, int dataLen ) - { - this.taggerId = taggerId; - this.buff = new byte[dataLen]; - } - - @Override public String getTaggerId() { return taggerId; } - @Override public int getDataLen() { return buff.length; } - - private boolean isInBounds( int offset, int len ) - { - return offset >= 0 - && offset < buff.length - && ( offset + len ) <= buff.length; - } - - @Override - public boolean putByte( int offset, byte b ) - { - if( ! isInBounds( offset, 1 ) ) - return false; - - buff[offset] = b; - return true; - } - - @Override - public boolean putBytes( int offset, byte[] data, int len ) - { - len = len >= 0 ? len : data.length; - if( ! isInBounds( offset, len ) ) - return false; - - System.arraycopy( data, 0, buff, offset, len ); - return true; - } - - @Override - public int getByte( int offset ) - { - return isInBounds( offset, 1 ) ? buff[offset] : ITag.Fail; - } - - @Override - public byte[] getBytes( int offset, int len ) - { - len = len >= 0 ? len : buff.length - offset; - if( ! isInBounds( offset, len ) ) - return null; - - byte[] data = new byte[len]; - System.arraycopy( buff, offset, data, 0, len ); - return data; - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java deleted file mode 100644 index c302fae7e28..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.dom.ast.tag; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.tag.IBindingTagger; -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.ITagReader; -import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; -import org.eclipse.cdt.internal.core.pdom.dom.IPDOMBinding; -import org.eclipse.cdt.internal.core.pdom.tag.PDOMTaggable; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; - -public class TagManager -{ - private static TagManager INSTANCE; - - private Map taggers; - - public static TagManager getInstance() - { - if( INSTANCE == null ) - INSTANCE = new TagManager(); - return INSTANCE; - } - - private TagManager() - { - taggers = loadExtensions(); - } - - private static final String ExtensionPoint = "tagger"; //$NON-NLS-1$ - - private static Map loadExtensions() - { - Map taggers = new HashMap(); - - // load the extensions - IConfigurationElement[] elements - = Platform.getExtensionRegistry().getConfigurationElementsFor( CCorePlugin.PLUGIN_ID, ExtensionPoint ); - for (IConfigurationElement element : elements) - { - TaggerDescriptor desc = new TaggerDescriptor( element ); - taggers.put( desc.getId(), desc ); - } - - return taggers; - } - - /** Provide an opportunity for the specified tagger to process the given values. The tagger will only - * run if its enablement expression returns true for the arguments. */ - public ITag process( String taggerId, ITagWriter tagWriter, IBinding binding, IASTName ast ) - { - TaggerDescriptor desc = taggers.get( taggerId ); - if( desc == null ) - return null; - - IBindingTagger tagger = desc.getBindingTaggerFor( binding, ast ); - return tagger == null ? null : tagger.process( tagWriter, binding, ast ); - } - - /** Provide an opportunity for all enabled taggers to process the given values. */ - public Iterable process( ITagWriter tagWriter, IBinding binding, IASTName ast ) - { - List tags = new LinkedList(); - for( TaggerDescriptor desc : taggers.values() ) - { - IBindingTagger tagger = desc.getBindingTaggerFor( binding, ast ); - if( tagger != null ) - { - ITag tag = tagger.process( tagWriter, binding, ast ); - if( tag != null ) - tags.add( tag ); - } - } - - return tags; - } - - /** Add or remove tags from the destination to ensure that it has the same tag information as the source. */ - public void syncTags( IPDOMBinding dst, IBinding src ) - { - if( dst == null ) - return; - - ITagReader tagReader = CCorePlugin.getTagService().findTagReader( src ); - if( tagReader == null ) - return; - - ITagWriter tagWriter = new PDOMTaggable( dst.getPDOM(), dst.getRecord() ); - tagWriter.setTags( tagReader.getTags() ); - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java deleted file mode 100644 index dad4d60895c..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.dom.ast.tag; - -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.tag.ITagReader; -import org.eclipse.cdt.core.dom.ast.tag.ITagService; - -public class TagService implements ITagService -{ - /** - * First gives the IBinding instance a chance to convert itself, by calling IAdaptable#getAdapter( ITagReader.class ) - * on the binding. If the binding doesn't provide an implementation then a simple, in-memory, non-cached - * implementation is created and returned. - */ - @Override - public ITagReader findTagReader( IBinding binding ) - { - if( binding == null ) - return null; - - // let the binding adapt to its own tag reader - ITagReader tagReader = (ITagReader)binding.getAdapter( ITagReader.class ); - if( tagReader != null ) - return tagReader; - - return new NonCachedTaggable( binding ); - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java deleted file mode 100644 index c0386142f80..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.dom.ast.tag; - -import java.util.Arrays; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.tag.IBindingTagger; -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.core.expressions.EvaluationContext; -import org.eclipse.core.expressions.EvaluationResult; -import org.eclipse.core.expressions.Expression; -import org.eclipse.core.expressions.ExpressionConverter; -import org.eclipse.core.expressions.ExpressionTagNames; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; - -/** - * Internal container for extensions of org.eclipse.cdt.core.tagger. The implementation of the - * tagger is instantiated only after checking the enablement expression (if present) for the - * specified binding. This avoids activating the contributing plugin until it is actually needed. - */ -public class TaggerDescriptor -{ - private static final String Attr_LocalId = "local-id"; //$NON-NLS-1$ - private static final String Attr_Class = "class"; //$NON-NLS-1$ - - private final IConfigurationElement element; - private final Expression enablementExpression; - private Boolean fStatus = null; - - private String id; - private IBindingTagger tagger; - - private static final String Var_projectNature = "projectNatures"; //$NON-NLS-1$ - private static final String Var_languageId = "languageId"; //$NON-NLS-1$ - - /** An empty implementation of the tagger used as a placeholder in descriptors that are unable to - * load the contributed class. */ - private static final IBindingTagger NullTagger = new IBindingTagger() - { - @Override public ITag process(ITagWriter tagWriter, IBinding binding, IASTName ast) { return null; } - }; - - public TaggerDescriptor( IConfigurationElement element ) - { - this.element = element; - - Expression expr = null; - IConfigurationElement[] children = element.getChildren( ExpressionTagNames.ENABLEMENT ); - switch (children.length) { - case 0: - fStatus = Boolean.TRUE; - break; - case 1: - try { - ExpressionConverter parser = ExpressionConverter.getDefault(); - expr = parser.perform( children[0] ); - } catch (CoreException e) { - CCorePlugin.log( "Error in enablement expression of " + id, e ); //$NON-NLS-1$ - } - break; - default: - CCorePlugin.log( "Too many enablement expressions for " + id ); //$NON-NLS-1$ - fStatus = Boolean.FALSE; - break; - } - enablementExpression = expr; - } - - public String getId() - { - if( id != null ) - return id; - - String globalId = element.getContributor().getName(); - String localId = element.getAttribute( Attr_LocalId ); - - // there must be a valid local id - if( localId == null ) - { - String extId = element.getDeclaringExtension().getSimpleIdentifier(); - CCorePlugin.log( "Invalid extension " + globalId + '.' + extId + " must provide tagger's local-id" ); //$NON-NLS-1$ //$NON-NLS-2$ - return null; - } - - // the extension should not include the plugin id, but return immediately if it does - if( localId.startsWith( globalId ) - && localId.length() > globalId.length() ) - return localId; - - // make sure the local id has real content - if( localId.isEmpty() ) - { - String extId = element.getDeclaringExtension().getSimpleIdentifier(); - CCorePlugin.log( "Invalid extension " + globalId + '.' + extId + " must provide value for tagger's local-id" ); //$NON-NLS-1$ //$NON-NLS-2$ - return null; - } - - // otherwise prepend with the globalId, and ensure a dot between them - if( localId.charAt( 0 ) == '.' ) - return globalId + localId; - return globalId + '.' + localId; - } - - private boolean matches( ITranslationUnit tu ) - { - // if the enablement expression is missing or structurally invalid, then return immediately - if( fStatus != null ) - return fStatus.booleanValue(); - - // if there is no tu, then the enablement expression cannot be evaluated, assume that all taggers - // are needed - if( tu == null ) - return true; - - if( enablementExpression != null ) - try - { - IProject project = null; - ICProject cProject = tu.getCProject(); - if( cProject != null ) - project = cProject.getProject(); - - EvaluationContext evalContext = new EvaluationContext( null, project ); - - // if the project is not accessible, then only taggers that don't care about it will - // get a chance to run - if( project != null ) - { - String[] natures = project.getDescription().getNatureIds(); - evalContext.addVariable( Var_projectNature, Arrays.asList( natures ) ); - } - - ILanguage language = tu.getLanguage(); - if( language != null ) - evalContext.addVariable( Var_languageId, language.getId() ); - - return enablementExpression.evaluate( evalContext ) == EvaluationResult.TRUE; - } - catch( CoreException e ) - { - CCorePlugin.log( "Error while evaluating enablement expression for " + id, e ); //$NON-NLS-1$ - } - - fStatus = Boolean.FALSE; - return false; - } - - private IBindingTagger getTagger() - { - if( tagger == null ) - synchronized( this ) - { - if( tagger == null ) - { - try { tagger = (IBindingTagger)element.createExecutableExtension( Attr_Class ); } - catch( CoreException e ) - { - String id = element.getDeclaringExtension().getNamespaceIdentifier() + '.' - + element.getDeclaringExtension().getSimpleIdentifier(); - CCorePlugin.log( "Error in class attribute of " + id, e ); //$NON-NLS-1$ - - // mark the tagger with an empty implementation to prevent future load attempts - tagger = NullTagger; - } - } - } - - return tagger; - } - - // Activates the plugin if needed. - public IBindingTagger getBindingTaggerFor( IBinding binding, IASTName ast ) - { - // If there isn't an ast with an AST-TU accessible, then there is no way to defer processing, - // just return the tagger and let it try to sort things out. E.g., this happens for built-in - // things. - if( ast == null ) - return getTagger(); - IASTTranslationUnit astTU = ast.getTranslationUnit(); - if( astTU == null ) - return getTagger(); - - // Otherwise evaluate the enablement expression for this TU - return matches( astTU.getOriginatingTranslationUnit() ) ? getTagger() : null; - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 403516e53a8..d306479aaf5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -340,10 +340,10 @@ public class CPPVisitor extends ASTQueries { return false; } } - + if (inScope == null) return false; - + IBinding pb= names[names.length-2].resolvePreBinding(); if (pb instanceof IProblemBinding) return false; @@ -357,7 +357,7 @@ public class CPPVisitor extends ASTQueries { } else if (pb instanceof ICPPNamespace) { scope= ((ICPPNamespace)pb).getNamespaceScope(); } - + return scope == inScope; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index df417262095..cf628dbf052 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -41,7 +41,6 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.AbstractLanguage; import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.FileContent; import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -49,7 +48,6 @@ import org.eclipse.cdt.core.parser.ISignificantMacros; import org.eclipse.cdt.core.parser.IncludeFileContentProvider; import org.eclipse.cdt.core.parser.ParserUtil; import org.eclipse.cdt.internal.core.dom.IIncludeFileResolutionHeuristics; -import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; import org.eclipse.cdt.internal.core.index.FileContentKey; import org.eclipse.cdt.internal.core.index.IIndexFragment; import org.eclipse.cdt.internal.core.index.IIndexFragmentFile; @@ -1006,9 +1004,6 @@ public abstract class AbstractIndexerTask extends PDOMWriter { IASTTranslationUnit ast= createAST(lang, codeReader, scanInfo, isSource, fASTOptions, ctx, pm); fStatistics.fParsingTime += System.currentTimeMillis() - start; if (ast != null) { - // Give the new AST-TU a chance to recognize its translation unit before it is written - // to the index. - ( (ASTTranslationUnit)ast ).setOriginatingTranslationUnit( (ITranslationUnit)tu ); writeToIndex(lang.getLinkageID(), ast, codeReader, ctx, pm); } } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index 387ee12009b..8b8d7092bcc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -89,7 +89,6 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMMacroReferenceName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNamedNode; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; -import org.eclipse.cdt.internal.core.pdom.tag.PDOMTagIndex; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -231,7 +230,6 @@ public class PDOM extends PlatformObject implements IPDOM { * 138.0 - Constexpr functions, bug 395238. * 139.0 - More efficient and robust storage of types and template arguments, bug 395243. * 140.0 - Enumerators with dependent values, bug 389009. - * 140.1 - Mechanism for tagging nodes with extended data, bug TODO * 141.0 - Storing enclosing template bindings for evaluations, bug 399829 */ private static final int MIN_SUPPORTED_VERSION= version(141, 0); @@ -272,8 +270,7 @@ public class PDOM extends PlatformObject implements IPDOM { public static final int INDEX_OF_DEFECTIVE_FILES = Database.DATA_AREA + 8; public static final int INDEX_OF_FILES_WITH_UNRESOLVED_INCLUDES = Database.DATA_AREA + 12; public static final int PROPERTIES = Database.DATA_AREA + 16; - public static final int TAG_INDEX = Database.DATA_AREA + 20; - public static final int END= Database.DATA_AREA + 24; + public static final int END= Database.DATA_AREA + 20; static { assert END <= Database.CHUNK_SIZE; } @@ -335,7 +332,6 @@ public class PDOM extends PlatformObject implements IPDOM { // Local caches protected Database db; private BTree fileIndex; - private PDOMTagIndex tagIndex; private BTree indexOfDefectiveFiles; private BTree indexOfFiledWithUnresolvedIncludes; private final Map fLinkageIDCache = new HashMap(); @@ -464,15 +460,6 @@ public class PDOM extends PlatformObject implements IPDOM { return fileIndex; } - public PDOMTagIndex getTagIndex() throws CoreException { - if (tagIndex == null) - { - // tag index can only be stored in database versions 139.1 or greater - tagIndex = new PDOMTagIndex( db.getVersion() >= version( 139, 1 ) ? db : null, TAG_INDEX ); - } - return tagIndex; - } - /** * Returns the index of files that were read with I/O errors. */ @@ -1371,7 +1358,6 @@ public class PDOM extends PlatformObject implements IPDOM { private void clearCaches() { fileIndex= null; - tagIndex = null; indexOfDefectiveFiles= null; indexOfFiledWithUnresolvedIncludes= null; fLinkageIDCache.clear(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java deleted file mode 100644 index 976278d06e7..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.db; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.CoreException; - -/** - * A container for storing a set of strings in the Database. The container allows only one - * instance of each string to be stored. - *

- * This implementation should only be used when the set is expected to be small. It uses a - * singly linked list for storing strings in Database. Which means that a linear lookup is needed - * to find strings in the list. An in-memory, lazily-loaded, cache is provided so the list will - * only be fully retrieved once in the lifetime of this instance. A BTree will be more efficient - * for larger sets. - */ -public class PDOMStringSet -{ - private final Database db; - - private long ptr; - private long head; - private long loaded; - - private Map lazyCache; - - public PDOMStringSet( Database db, long ptr ) throws CoreException - { - this.db = db; - this.ptr = ptr; - - head = 0; - loaded = 0; - } - - public void clearCaches() - { - head = 0; - loaded = 0; - - if( lazyCache != null ) - lazyCache = null; - } - - private long getHead() throws CoreException - { - if( head == 0 ) - head = db.getRecPtr( ptr ); - return head; - } - - // A simple enum describing the type of the information that is stored in the Database. Each - // enumerator represents a single field in the persistent structure and is able to answer its - // offset in that structure. - private static enum NodeType - { - Next, - Item, - _last; - - // NOTE: All fields are pointers, if that changes then these initializations will need - // to be updated. - public final long offset = ordinal() * Database.PTR_SIZE; - public static final int sizeof = (int)_last.offset; - - /** Return the value of the pointer stored in this field in the given instance. */ - public long get( Database db, long instance ) throws CoreException - { - return db.getRecPtr( instance + offset ); - } - - /** Store the given pointer into this field in the given instance. */ - public void put( Database db, long instance, long value ) throws CoreException - { - db.putRecPtr( instance + offset, value ); - } - } - - /** - * Adds the given string to the receiving set. May cause the entire list to be loaded from the - * Database while testing for uniqueness. Returns the record of the string that was inserted into - * the list. - */ - public long add( String str ) throws CoreException - { - long record = find( str ); - if( record != 0 ) - return record; - - IString string = db.newString( str ); - record = string.getRecord(); - - long new_node = db.malloc( NodeType.sizeof ); - NodeType.Next.put( db, new_node, getHead() ); - NodeType.Item.put( db, new_node, record ); - - if( lazyCache == null ) - lazyCache = new HashMap(); - lazyCache.put( str, record ); - - // If the Database has already been partially searched, then the loaded pointer will be after the - // head. Since we've already put this new record into the lazy cache, there is no reason to try to - // load it again. We put the new node at the start of the list so that it will be before the loaded - // pointer. - head = new_node; - if( loaded == 0 ) - loaded = new_node; - db.putRecPtr( ptr, new_node ); - return record; - } - - /** - * Search for the given string in the receiver. This could cause the entire list to be loaded from - * the Database. The results are cached, so the list will only be loaded one time during the lifetime - * of this instance. Returns the record of the String. - */ - public long find( String str ) throws CoreException - { - if( lazyCache != null ) - { - Long l = lazyCache.get( str ); - if( l != null ) - return l.longValue(); - } - - // if there is nothing in the Database, then there is nothing to load - if( getHead() == 0 ) - return 0; - - // otherwise prepare the cache for the data that is about to be loaded - if( lazyCache == null ) - lazyCache = new HashMap(); - - // if nothing has been loaded, then start loading with the head node, otherwise continue - // loading from whatever is after the last loaded node - long curr = loaded == 0 ? getHead() : NodeType.Next.get( db, loaded ); - while( curr != 0 ) - { - long next = NodeType.Next.get( db, curr ); - long item = NodeType.Item.get( db, curr ); - - IString string = db.getString( item ); - - // put the value into the cache - lazyCache.put( string.getString(), Long.valueOf( item ) ); - - // return immediately if this is the target - if( string.compare( str, true ) == 0 ) - return item; - - // otherwise keep looking - loaded = curr; - curr = next; - } - - return 0; - } - - /** - * Return a pointer to the record of the String that was removed. - */ - public long remove( String str ) throws CoreException - { - if( lazyCache != null ) - lazyCache.remove( str ); - - long prev = 0; - long curr = getHead(); - while( curr != 0 ) - { - long next = NodeType.Next.get( db, curr ); - long item = NodeType.Item.get( db, curr ); - - IString string = db.getString( item ); - - if( string.compare( str, true ) == 0 ) - { - if( head != curr ) - NodeType.Next.put( db, prev, next ); - else - { - db.putRecPtr( ptr, next ); - head = next; - } - - db.free( curr ); - return item; - } - - prev = curr; - curr = next; - } - - return 0; - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java index 233bda56d5a..769d7a0071f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java @@ -26,7 +26,6 @@ import org.eclipse.cdt.core.dom.ast.IScope.ScopeLookupData; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; -import org.eclipse.cdt.core.dom.ast.tag.ITagReader; import org.eclipse.cdt.core.index.IIndexFileSet; import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; @@ -37,7 +36,6 @@ import org.eclipse.cdt.internal.core.index.IIndexScope; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.IString; -import org.eclipse.cdt.internal.core.pdom.tag.PDOMTaggable; import org.eclipse.core.runtime.CoreException; /** @@ -69,14 +67,6 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding if (adapter.isAssignableFrom(PDOMBinding.class)) return this; - // Any PDOMBinding can have a persistent tag. These tags should be deleted when the PDOMBinding - // is deleted. However, PDOMBinding's don't get deleted, so there is no way to trigger deleting - // of the tags. If the implementation is changed so that PDOMBindings do get deleted, then call: - // PDOMTagIndex.setTags( getPDOM(), pdomBinding.record, Collections.emptyList() ); - // to clear out all tags for the binding. - if (adapter == ITagReader.class) - return new PDOMTaggable( getPDOM(), getRecord() ); - return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index 77608c1b493..dd7be434ab3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -25,7 +25,6 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.index.IIndexBinding; -import org.eclipse.cdt.internal.core.dom.ast.tag.TagManager; import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation; import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; import org.eclipse.cdt.internal.core.dom.parser.ProblemType; @@ -98,11 +97,6 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { if (pdomBinding != null) { getPDOM().putCachedResult(inputBinding, pdomBinding); } - - // Synchronize the tags associated with the persistent binding to match the set that is - // associated with the input binding. - TagManager.getInstance().syncTags( pdomBinding, inputBinding ); - return pdomBinding; } @@ -110,13 +104,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { } if (shouldUpdate(pdomBinding, fromName)) { - IBinding fromBinding = fromName.getBinding(); - - pdomBinding.update(this, fromBinding); - - // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but - // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, fromBinding ); + pdomBinding.update(this, fromName.getBinding()); } return pdomBinding; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 3d85ab48e7f..656dfb02abd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -75,7 +75,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.parser.util.ArrayUtil; import org.eclipse.cdt.internal.core.Util; -import org.eclipse.cdt.internal.core.dom.ast.tag.TagManager; import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation; import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; @@ -359,10 +358,6 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { if (inputBinding instanceof CPPClosureType) { addImplicitMethods(pdomBinding, (ICPPClassType) binding, fromName); } - - // Synchronize the tags associated with the persistent binding to match the set that is - // associated with the input binding. - TagManager.getInstance().syncTags( pdomBinding, inputBinding ); } } catch (DOMException e) { throw new CoreException(Util.createStatus(e)); @@ -372,15 +367,8 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { } if (shouldUpdate(pdomBinding, fromName)) { - IBinding fromBinding = fromName.getBinding(); - - pdomBinding.update(this, fromBinding); - - // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but - // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, fromBinding ); + pdomBinding.update(this, fromName.getBinding()); } - return pdomBinding; } @@ -420,7 +408,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { // template parameters are created directly by their owners. if (binding instanceof ICPPTemplateParameter) return null; - if (binding instanceof ICPPUnknownBinding) + if (binding instanceof ICPPUnknownBinding) return null; if (binding instanceof ICPPSpecialization) { @@ -573,10 +561,6 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { } else if (!getPDOM().hasLastingDefinition(pdomBinding)) { pdomBinding.update(this, method); old.remove(pdomBinding); - - // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but - // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, method ); } } } @@ -707,7 +691,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { if (result != null) { return result; } - + // Assign names to anonymous types. IBinding binding= PDOMASTAdapter.getAdapterForAnonymousASTBinding(inputBinding); if (binding == null) { @@ -1127,7 +1111,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { return CPPPointerToMemberType.unmarshal(firstByte, buffer); case ITypeMarshalBuffer.DEPENDENT_EXPRESSION_TYPE: return TypeOfDependentExpression.unmarshal(firstByte, buffer); - case ITypeMarshalBuffer.UNKNOWN_MEMBER: + case ITypeMarshalBuffer.UNKNOWN_MEMBER: IBinding binding= CPPUnknownMember.unmarshal(getPDOM(), firstByte, buffer); if (binding instanceof IType) return (IType) binding; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java deleted file mode 100644 index 1ea29d1fff7..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.tag; - -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.internal.core.pdom.db.BTree; -import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; -import org.eclipse.core.runtime.CoreException; - -public class BTreeIterable implements Iterable -{ - public static interface Descriptor - { - public int compare( long record ) throws CoreException; - public T create( long record ); - } - - private final BTree btree; - private final Descriptor descriptor; - - public BTreeIterable( BTree btree, Descriptor descriptor ) - { - this.btree = btree; - this.descriptor = descriptor; - } - - @Override - public Iterator iterator() - { - Visitor v = new Visitor(); - try { btree.accept( v ); } - catch( CoreException e ) { CCorePlugin.log( e ); return Collections.emptyList().iterator(); } - return new BTreeIterator( v.records ); - } - - private class Visitor implements IBTreeVisitor - { - public final List records = new LinkedList(); - - @Override - public int compare( long record ) throws CoreException - { - return BTreeIterable.this.descriptor.compare( record ); - } - - @Override - public boolean visit( long record ) throws CoreException - { - records.add( Long.valueOf( record ) ); - return true; - } - } - - private class BTreeIterator implements Iterator - { - private final Iterator records; - - public BTreeIterator( Iterable records ) - { - this.records = records.iterator(); - } - - @Override public void remove() { } - @Override public boolean hasNext() { return records.hasNext(); } - @Override public T next() { return BTreeIterable.this.descriptor.create( records.next() ); } - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java deleted file mode 100644 index ed7bfe63347..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.tag; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; -import org.eclipse.cdt.internal.core.pdom.db.Database; -import org.eclipse.cdt.internal.core.pdom.db.IBTreeComparator; -import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; -import org.eclipse.core.runtime.CoreException; - -public class PDOMTag implements IWritableTag -{ - private final Database db; - private final long record; - - private String taggerId; - private int dataLen = -1; - - private static enum Fields - { - Node, - TaggerId, - DataLen, - Data; - - public final long offset = ordinal() * Database.PTR_SIZE; - public static int sizeof( int datalen ) { return (int)Data.offset + datalen; } - - public long getRecPtr( Database db, long instance, long data_offset ) throws CoreException - { - return db.getRecPtr( instance + offset + data_offset ); - } - - public void putRecPtr( Database db, long instance, long data_offset, long value ) throws CoreException - { - db.putRecPtr( instance + offset + data_offset, value ); - } - - public void put( Database db, long instance, long data_offset, byte value ) throws CoreException - { - db.putByte( instance + offset + data_offset, value ); - } - - public void put( Database db, long instance, byte[] data, long data_offset, int len ) throws CoreException - { - db.putBytes( instance + offset + data_offset, data, len ); - } - - public byte getByte( Database db, long instance, long data_offset ) throws CoreException - { - return db.getByte( instance + offset + data_offset ); - } - - public byte[] getBytes( Database db, long instance, long data_offset, int len ) throws CoreException - { - byte[] data = new byte[len]; - db.getBytes( instance + offset + data_offset, data ); - return data; - } - - public void put( Database db, long instance, long data_offset, int value ) throws CoreException - { - db.putInt( instance + offset + data_offset, value ); - } - - public int getInt( Database db, long instance, long data_offset ) throws CoreException - { - return db.getInt( instance + offset + data_offset ); - } - } - - public PDOMTag( Database db, long record ) - { - this.db = db; - this.record = record; - } - - public PDOMTag( Database db, int dataLen ) throws CoreException - { - this.db = db; - this.record = db.malloc( Fields.sizeof( dataLen ) ); - this.dataLen = dataLen; - Fields.DataLen.put( db, record, 0, dataLen ); - } - - public long getNode() throws CoreException - { - return Fields.Node.getRecPtr( db, record, 0 ); - } - - @Override - public String getTaggerId() - { - if( taggerId == null ) - try - { - long taggerIdRecord = Fields.TaggerId.getRecPtr( db, record, 0 ); - taggerId = taggerIdRecord == 0L ? new String() : db.getString( taggerIdRecord ).getString(); - } - catch( CoreException e ) - { - CCorePlugin.log( e ); - } - - return taggerId; - } - - @Override - public int getDataLen() - { - if( dataLen < 0 ) - try { dataLen = Fields.DataLen.getInt( db, record, 0 ); } - catch( CoreException e ) { CCorePlugin.log( e ); return 0; } - - return dataLen; - } - - public long getRecord() { return record; } - - /** - * Create and return a new PDOMTag that has the same node/taggerId as the receiver but with the - * specified data. Return null on failure. - */ - public PDOMTag cloneWith( byte[] data ) throws CoreException - { - PDOMTag partialTag = null; - try - { - long existing_node = Fields.Node.getRecPtr( db, record, 0 ); - long existing_id = Fields.TaggerId.getRecPtr( db, record, 0 ); - - partialTag = new PDOMTag( db, data.length ); - Fields.Node.putRecPtr( db, partialTag.record, 0, existing_node ); - Fields.TaggerId.putRecPtr( db, partialTag.record, 0, existing_id ); - if( partialTag.putBytes( 0, data, data.length ) ) - { - PDOMTag tag = partialTag; - partialTag = null; - return tag; - } - } - finally - { - if( partialTag != null ) - partialTag.delete(); - } - - return null; - } - - public void delete() - { - if( db != null - && record != 0 ) - try { db.free( record ); } - catch( CoreException e ) { CCorePlugin.log( e ); } - } - - public static class BTreeComparator implements IBTreeComparator - { - private final Database db; - public BTreeComparator( Database db ) { this.db = db; } - - @Override - public int compare(long record1, long record2) throws CoreException - { - if( record1 == record2 ) - return 0; - - long node1 = Fields.Node.getRecPtr( db, record1, 0 ); - long node2 = Fields.Node.getRecPtr( db, record2, 0 ); - if( node1 < node2 ) - return -1; - if( node1 > node2 ) - return 1; - - long tagger1 = Fields.TaggerId.getRecPtr( db, record1, 0 ); - long tagger2 = Fields.TaggerId.getRecPtr( db, record2, 0 ); - if( tagger1 < tagger2 ) - return -1; - if( tagger1 > tagger2 ) - return 1; - - return 0; - } - } - - public static class BTreeVisitor implements IBTreeVisitor - { - private final Database db; - private final long node2; - private final long tagger2; - - public boolean hasResult = false; - public long tagRecord = 0; - - public BTreeVisitor( Database db, long node2, long tagger2 ) - { - this.db = db; - this.node2 = node2; - this.tagger2 = tagger2; - } - - @Override - public int compare(long record1) throws CoreException { - long node1 = Fields.Node.getRecPtr( db, record1, 0 ); - if( node1 < node2 ) - return -1; - if( node1 > node2 ) - return 1; - - long tagger1 = Fields.TaggerId.getRecPtr( db, record1, 0 ); - if( tagger1 < tagger2 ) - return -1; - if( tagger1 > tagger2 ) - return 1; - - return 0; - } - - @Override - public boolean visit(long record) throws CoreException { - tagRecord = record; - hasResult = true; - return false; - } - } - - public void setNode( long node ) throws CoreException - { - Fields.Node.putRecPtr( db, record, 0, node ); - } - - public void setTaggerId( long idRecord ) throws CoreException - { - Fields.TaggerId.putRecPtr( db, record, 0, idRecord ); - } - - private boolean isInBounds( int offset, int len ) - { - int data_len = getDataLen(); - return offset >= 0 - && offset < data_len - && ( offset + len ) <= data_len; - } - - @Override - public boolean putByte( int offset, byte data ) - { - if( ! isInBounds( offset, 1 ) ) - return false; - - try { Fields.Data.put( db, record, offset, data ); return true; } - catch( CoreException e ) { CCorePlugin.log( e ); return false; } - } - - @Override - public boolean putBytes( int offset, byte[] data, int len ) - { - boolean fullWrite = len < 0; - if( fullWrite ) - len = data.length; - if( ! isInBounds( offset, len ) ) - return false; - - try - { - Fields.Data.put( db, record, data, offset, len ); - - // if the new buffer replaces all of the existing one, then modify the receiver's stored length - int currLen = getDataLen(); - if( fullWrite - && offset == 0 - && currLen > len ) - { - Fields.DataLen.put( db, record, 0, len ); - dataLen = len; - } - - return true; - } - catch( CoreException e ) { CCorePlugin.log( e ); return false; } - } - - @Override - public int getByte( int offset ) - { - if( ! isInBounds( offset, 1 ) ) - return Fail; - - try { return Fields.Data.getByte( db, record, offset ); } - catch( CoreException e ) { CCorePlugin.log( e ); return Fail; } - } - - @Override - public byte[] getBytes( int offset, int len ) - { - len = len >= 0 ? len : getDataLen() - offset; - if( ! isInBounds( offset, len ) ) - return null; - - try { return Fields.Data.getBytes( db, record, offset, len ); } - catch( CoreException e ) { CCorePlugin.log( e ); return null; } - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java deleted file mode 100644 index 8cd0c86c9f9..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.tag; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; -import org.eclipse.cdt.internal.core.pdom.PDOM; -import org.eclipse.cdt.internal.core.pdom.db.BTree; -import org.eclipse.cdt.internal.core.pdom.db.Database; -import org.eclipse.cdt.internal.core.pdom.db.PDOMStringSet; -import org.eclipse.core.runtime.CoreException; - -/** - * Not thread-safe. - */ -public class PDOMTagIndex -{ - private final Database db; - private final long ptr; - private long rootRecord; - - private static enum Fields - { - TaggerIds, - Tags, - _last; - - public final long offset = ordinal() * Database.PTR_SIZE; - public static int sizeof = _last.ordinal() * Database.PTR_SIZE; - } - - private PDOMStringSet taggerIds; - private BTree tags; - - public PDOMTagIndex( Database db, long ptr ) throws CoreException - { - this.db = db; - this.ptr = ptr; - this.rootRecord = 0; - } - - private long getFieldAddress( Fields field ) throws CoreException - { - if( rootRecord == 0 ) - rootRecord = db.getRecPtr( ptr ); - - if( rootRecord == 0 ) - { - rootRecord = db.malloc( Fields.sizeof ); - db.putRecPtr( ptr, rootRecord ); - } - - return rootRecord + field.offset; - } - - private PDOMStringSet getTaggerIds() throws CoreException - { - if( taggerIds == null ) - taggerIds = new PDOMStringSet( db, getFieldAddress( Fields.TaggerIds ) ); - return taggerIds; - } - - private BTree getTagsBTree() throws CoreException - { - if( tags == null ) - tags = new BTree( db, getFieldAddress( Fields.Tags ), new PDOMTag.BTreeComparator( db ) ); - return tags; - } - - /** - * Return the record storing the specified tagger id. Create a new record if needed. - */ - private long getIdRecord( String taggerId, boolean createIfNeeded ) - { - assert taggerId != null; - assert ! taggerId.isEmpty(); - - if( db == null - || taggerId == null - || taggerId.isEmpty() - || ( taggerIds == null && ! createIfNeeded ) ) - return 0L; - - try - { - long record = getTaggerIds().find( taggerId ); - if( record == 0 - && createIfNeeded ) - record = getTaggerIds().add( taggerId ); - return record; - } - catch( CoreException e ) - { - CCorePlugin.log( e ); - } - - return 0L; - } - - private IWritableTag createTag( long record, String id, int len ) - { - if( db == null ) - return null; - - long idRecord = getIdRecord( id, true ); - if( idRecord == 0L ) - return null; - - try - { - PDOMTag tag = new PDOMTag( db, len ); - tag.setNode( record ); - tag.setTaggerId( idRecord ); - - // return the tag if it was properly inserted - long inserted = getTagsBTree().insert( tag.getRecord() ); - if( inserted == tag.getRecord() ) - return tag; - - // TODO check that the existing record has the same length - - // otherwise destroy this provisional one and return the tag that was actually inserted - // TODO figure out what this case means - tag.delete(); - return inserted == 0 ? null : new PDOMTag( db, inserted ); - } - catch( CoreException e ) - { - CCorePlugin.log( e ); - } - - return null; - } - - private ITag getTag( long record, String id ) - { - if( db == null ) - return null; - - long idRecord = getIdRecord( id, false ); - if( idRecord == 0L ) - return null; - - PDOMTag.BTreeVisitor v = new PDOMTag.BTreeVisitor( db, record, idRecord ); - try { getTagsBTree().accept( v ); } - catch( CoreException e ) { CCorePlugin.log( e ); } - - return v.hasResult ? new PDOMTag( db, v.tagRecord ) : null; - } - - private Iterable getTags( long binding_record ) - { - BTree btree = null; - try { btree = getTagsBTree(); } - catch( CoreException e ) { CCorePlugin.log( e ); return Collections.emptyList(); } - - final Long bindingRecord = Long.valueOf( binding_record ); - return - new BTreeIterable( - btree, - new BTreeIterable.Descriptor() - { - @Override public ITag create( long record ) { return new PDOMTag( db, record ); } - @Override - public int compare( long test_record ) throws CoreException - { - long test_node = new PDOMTag( db, test_record ).getNode(); - - // -1 if record < key, 0 if record == key, 1 if record > key - return Long.valueOf( test_node ).compareTo( bindingRecord ); - } - } ); - } - - private boolean setTags( long binding_record, Iterable tags ) - { - // There could be several tags for the given record in the database, one for each taggerId. We need - // to delete all of those tags and replace them with given list. The incoming tags are first put - // into a map, indexed by their taggerId. Then we examine the btree of tags to find all tags for this - // record. In each case we decide whether to delete or update the tag. Tags of the same size can be - // updated in place, otherwise the tag needs to be deleted and recreated. - - final Map newTags = new HashMap(); - for( ITag tag : tags ) - { - ITag dupTag = newTags.put( tag.getTaggerId(), tag ); - if( dupTag != null ) - CCorePlugin.log( "Duplicate incoming tag for record " + binding_record + " from taggerId " + tag.getTaggerId() ); //$NON-NLS-1$ //$NON-NLS-2$ - } - - BTree btree = null; - try { btree = getTagsBTree(); } - catch( CoreException e ) { CCorePlugin.log( e ); return false; } - - PDOMTagSynchronizer sync = new PDOMTagSynchronizer( db, Long.valueOf( binding_record ), newTags ); - - // visit the full tree, then return true on success and false on failure - try { btree.accept( sync ); } - catch( CoreException e ) { CCorePlugin.log( e ); return false; } - - // Complete the synchronization (delete/insert the records that could not be modified in-place). This - // will only have something to do when a tag has changed length, which should be a rare. - sync.synchronize( btree ); - - // insert any new tags that are left in the incoming list - for( ITag newTag : newTags.values() ) - { - IWritableTag pdomTag = createTag( binding_record, newTag.getTaggerId(), newTag.getDataLen() ); - pdomTag.putBytes( 0, newTag.getBytes( 0, -1 ), -1 ); - } - - return true; - } - - private static PDOMTagIndex getTagIndex( PDOM pdom ) - { - if( pdom == null ) - return null; - - try - { - PDOMTagIndex index = pdom.getTagIndex(); - return index.db == null ? null : index; - } - catch( CoreException e ) { CCorePlugin.log(e); } - return null; - } - - // common implementations - public static IWritableTag createTag( PDOM pdom, long record, String id, int len ) - { - PDOMTagIndex index = getTagIndex( pdom ); - if( index == null ) - return null; - - return index.createTag( record, id, len ); - } - - public static ITag getTag( PDOM pdom, long record, String id ) - { - PDOMTagIndex index = getTagIndex( pdom ); - if( index == null ) - return null; - - return index.getTag( record, id ); - } - - public static Iterable getTags( PDOM pdom, long record ) - { - PDOMTagIndex index = getTagIndex( pdom ); - if( index == null ) - return Collections.emptyList(); - - return index.getTags( record ); - } - - public static boolean setTags( PDOM pdom, long record, Iterable tags ) - { - if( record == 0 ) - return true; - - PDOMTagIndex index = getTagIndex( pdom ); - if( index == null ) - return false; - - return index.setTags( record, tags ); - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java deleted file mode 100644 index aca9c277272..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.tag; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.internal.core.pdom.db.BTree; -import org.eclipse.cdt.internal.core.pdom.db.Database; -import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; -import org.eclipse.core.runtime.CoreException; - -public class PDOMTagSynchronizer implements IBTreeVisitor -{ - private final Database db; - private final Long searchRecord; - private final Map newTags; - - private final List toRemove = new LinkedList(); - private final List toInsert = new LinkedList(); - - public PDOMTagSynchronizer( Database db, Long searchRecord, Map newTags ) - { - this.db = db; - this.searchRecord = searchRecord; - this.newTags = newTags; - } - - /** - * Complete the synchronization by deleting and inserting all required records. Return - * true if successful and false otherwise. - */ - public boolean synchronize( BTree tree ) - { - for( Long rm : toRemove ) - try - { - long record = rm.longValue(); - tree.delete( record ); - db.free( record ); - } - catch( CoreException e ) - { - CCorePlugin.log( e ); - } - toRemove.clear(); - - for( Long insert : toInsert ) - try { tree.insert( insert.longValue() ); } - catch( CoreException e ) - { - CCorePlugin.log( e ); - try { db.free( insert.longValue() ); } - catch( CoreException e1 ) { CCorePlugin.log( e1 ); } - } - toInsert.clear(); - - return true; - } - - @Override - public int compare( long test_record ) throws CoreException - { - // TODO this is the same as BTreeIterable.Descriptor.compare - - long test_node = new PDOMTag( db, test_record ).getNode(); - - // -1 if record < key, 0 if record == key, 1 if record > key - return Long.valueOf( test_node ).compareTo( searchRecord ); - } - - @Override - public boolean visit( long existing_record ) throws CoreException - { - PDOMTag existingTag = new PDOMTag( db, existing_record ); - String taggerId = existingTag.getTaggerId(); - - ITag newTag = newTags.remove( taggerId ); - if( newTag == null ) - toRemove.add( Long.valueOf( existing_record ) ); - else if( newTag.getDataLen() > existingTag.getDataLen() ) - { - toRemove.add( Long.valueOf( existing_record ) ); - - PDOMTag pdomTag = existingTag.cloneWith( newTag.getBytes( 0, -1 ) ); - if( pdomTag != null ) - toInsert.add( Long.valueOf( pdomTag.getRecord() ) ); - } - else if( ! existingTag.putBytes( 0, newTag.getBytes( 0, -1 ), -1 ) ) - CCorePlugin.log( "Unable to modify data of tag record " + existing_record + " from taggerId " + taggerId ); //$NON-NLS-1$ //$NON-NLS-2$ - - // try to visit the full tree - return true; - } -} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java deleted file mode 100644 index e7a04c839ed..00000000000 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2013 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.eclipse.cdt.internal.core.pdom.tag; - -import org.eclipse.cdt.core.dom.ast.tag.ITag; -import org.eclipse.cdt.core.dom.ast.tag.ITagReader; -import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; -import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; -import org.eclipse.cdt.internal.core.pdom.PDOM; - -public class PDOMTaggable implements ITagReader, ITagWriter -{ - private final PDOM pdom; - private final long record; - - public PDOMTaggable( PDOM pdom, long record ) - { - this.pdom = pdom; - this.record = record; - } - - @Override - public IWritableTag createTag( String id, int len ) - { - return PDOMTagIndex.createTag( pdom, record, id, len ); - } - - @Override - public ITag getTag( String id ) - { - return PDOMTagIndex.getTag( pdom, record, id ); - } - - @Override - public Iterable getTags() - { - return PDOMTagIndex.getTags( pdom, record ); - } - - @Override - public boolean setTags( Iterable tags ) - { - return PDOMTagIndex.setTags( pdom, record, tags ); - } -} diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties index 287ee250127..46e1547c2f1 100644 --- a/core/org.eclipse.cdt.core/plugin.properties +++ b/core/org.eclipse.cdt.core/plugin.properties @@ -121,7 +121,6 @@ CConfigurationDataProvider.name = CConfigurationData provider projectConverter.name = project converter CIndex.name = CIndex externalSettingsProvider.name = External Settings provider -tagger.name = Parser Node Tagger Extension Point GeneratePDOMApplication.name = GeneratePDOM defaultProvider.name = Default Provider templatesExtensionPoint.name = Templates Extension point diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml index 4b2e257ed6a..bb1125caabd 100644 --- a/core/org.eclipse.cdt.core/plugin.xml +++ b/core/org.eclipse.cdt.core/plugin.xml @@ -42,7 +42,6 @@ - diff --git a/core/org.eclipse.cdt.core/schema/tagger.exsd b/core/org.eclipse.cdt.core/schema/tagger.exsd deleted file mode 100644 index 98d37683785..00000000000 --- a/core/org.eclipse.cdt.core/schema/tagger.exsd +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - This extension point allows extensions to contribute to the parsed nodes. When PDOM nodes are tagged, the content of the tag is stored in to the Database. The information for other nodes, e.g., the AST, is stored in memory. - - - - - - - - - - - - - - - - - - - a fully qualified identifier of the target extension point - - - - - - - an optional identifier of the extension instance - - - - - - - an optional name of the extension instance - - - - - - - - - - - - - - - - - - - - - - - - - - - A unique identifier for this tagger's contributions. - -The local id will be appended to the contributing plugin's id (separated with a dot '.') to form the globally unique identifier for this tagger. This id is used to uniquely associate the tag with this plugin. - - - - - - - - - - - - 8.2 - - - - - - - - - The following is an example of a Tagger contribution: -<p> -<pre> -<extension - point="org.eclipse.cdt.core.tagger" - id="example" - name="Example Tagger Extension"> - <bindingTagger - local-id="my-tagger" - class="com.example.internal.ExampleTagger"> - <enablement> - <with variable="projectNatures"> - <iterate operator="or"> - <equals value="com.example.my-nature"/> - </iterate> - </with> - </enablement> - </bindingTagger> -</extension> -</pre> -</p> - - - - - - - - - The contributed class must implement <code>org.eclipse.cdt.core.dom.ast.tag.IBindingTagger</code> - - - - - - - - - - Copyright (c) 2013 QNX Software Systems 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 -http://www.eclipse.org/legal/epl-v10.html - - - - diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index b5fc7a7384f..22a22903a2e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -26,7 +26,6 @@ import java.util.ResourceBundle; import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; import org.eclipse.cdt.core.cdtvariables.IUserVarSupplier; import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.dom.ast.tag.ITagService; import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager; import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; @@ -51,7 +50,6 @@ import org.eclipse.cdt.internal.core.ICConsole; import org.eclipse.cdt.internal.core.PositionTrackerManager; import org.eclipse.cdt.internal.core.cdtvariables.CdtVariableManager; import org.eclipse.cdt.internal.core.cdtvariables.UserVarSupplier; -import org.eclipse.cdt.internal.core.dom.ast.tag.TagService; import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsScannerInfoProvider; import org.eclipse.cdt.internal.core.model.CModelManager; @@ -216,8 +214,6 @@ public class CCorePlugin extends Plugin { private PDOMManager pdomManager; - private ITagService tagService = new TagService(); - private CdtVarPathEntryVariableManager fPathEntryVariableManager; private final class NullConsole implements IConsole { @@ -717,13 +713,6 @@ public class CCorePlugin extends Plugin { return getDefault().pdomManager; } - /** - * @since 5.5 - */ - public static ITagService getTagService() { - return getDefault().tagService; - } - public IPathEntryVariableManager getPathEntryVariableManager() { return fPathEntryVariableManager; } From 6c6ab24c2355b454aa529361c9e0ee06d4166d35 Mon Sep 17 00:00:00 2001 From: Andrew Eidsness Date: Tue, 26 Feb 2013 16:53:28 -0500 Subject: [PATCH 13/27] Bug 400020: Allow tagging of IBindings Addresses review comments from https://git.eclipse.org/r/#/c/10648. Fixes the junit problems by making sure that the dummy PDOM acquires its write lock before calling exercising the tag index. Original commit message: This new extension point allows contributors to put their own information into the PDOM and to later retrieve it for their own purposes. There are many details in the bug. The idea is that contributors provide an implementation of IBindingTagger, which is given a chance to examine IBindings when they are created. The ITagWriter interface allows the contributor to create a new tag which can then have data written to it. The ITagService interface (accessible from CCorePlugin.getTagService() provides a way for the contributor to later get an instance of ITagReader to retrieve tags from bindings. ITags are copied to the PDOM when the associated binding is persisteed. Contributors use a unique id (based on their plugin id), so that multiple contributors are able to independently tag a given binding. In-memory tags are not cached. I've done some timing tests using my sample implementation and found no measurable difference. The full log lines look like: !MESSAGE Indexed 'simple-01' (2 sources, 184 headers) in sec: 21,550 declarations; 35,394 references; 0 unresolved inclusions; 1 syntax errors; 0 unresolved names (0.00%) I did 5 tests using the current master (no tagging-related code), the times were: 18.86 sec 9.17 sec 5.91 sec 4.79 sec 4.83 sec And then I ran the same sequence of tests using the code in this commit: 18.73 sec 9.39 sec 6.50 sec 4.78 sec 5.27 sec If performance does become a problem, then caching could be introduced with a new implementation of ITaggableService. The two problems are finding a key other than the identity of the IBinding (since IBindings are re-created often) and properly evicting stale entries when the binding is no longer valid. The process of copying tags from an in-memory IBinding to a PDOMBinding, is a synchronization. This means that tags that are no longer applicable, will be removed from the persistent store. While developing this I found that PDOMBindings are not deleted from the Database (only the names that reference them are deleted), so there is no provision for deleting all tags at once. New database locks are not needed. By the time the persistent tags are accessed, higher levels of code have already taken a read or write lock as appropriate. There are new unit tests covering the changes to the PDOM. Change-Id: I6ae1afc949082f7f4484b3faa1550670be43312f Reviewed-on: https://git.eclipse.org/r/10659 Reviewed-by: Doug Schaefer IP-Clean: Doug Schaefer Tested-by: Doug Schaefer --- .../pdom/tests/PDOMStringSetTests.java | 76 +++++ .../pdom/tests/PDOMTagIndexTests.java | 147 ++++++++ .../cdt/internal/pdom/tests/PDOMTests.java | 4 +- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 4 + .../cdt/core/dom/ast/tag/IBindingTagger.java | 39 +++ .../eclipse/cdt/core/dom/ast/tag/ITag.java | 44 +++ .../cdt/core/dom/ast/tag/ITagReader.java | 35 ++ .../cdt/core/dom/ast/tag/ITagService.java | 33 ++ .../cdt/core/dom/ast/tag/ITagWriter.java | 39 +++ .../cdt/core/dom/ast/tag/IWritableTag.java | 33 ++ .../core/dom/ast/tag/NonCachedTaggable.java | 89 +++++ .../cdt/internal/core/dom/ast/tag/Tag.java | 79 +++++ .../internal/core/dom/ast/tag/TagManager.java | 103 ++++++ .../internal/core/dom/ast/tag/TagService.java | 36 ++ .../core/dom/ast/tag/TaggerDescriptor.java | 196 +++++++++++ .../dom/parser/cpp/semantics/CPPVisitor.java | 6 +- .../core/pdom/AbstractIndexerTask.java | 5 + .../eclipse/cdt/internal/core/pdom/PDOM.java | 22 +- .../internal/core/pdom/db/PDOMStringSet.java | 190 +++++++++++ .../internal/core/pdom/dom/PDOMBinding.java | 86 ++--- .../core/pdom/dom/c/PDOMCLinkage.java | 14 +- .../core/pdom/dom/cpp/PDOMCPPLinkage.java | 24 +- .../internal/core/pdom/tag/BTreeIterable.java | 87 +++++ .../cdt/internal/core/pdom/tag/PDOMTag.java | 323 ++++++++++++++++++ .../internal/core/pdom/tag/PDOMTagIndex.java | 269 +++++++++++++++ .../core/pdom/tag/PDOMTagSynchronizer.java | 104 ++++++ .../internal/core/pdom/tag/PDOMTaggable.java | 51 +++ core/org.eclipse.cdt.core/plugin.properties | 1 + core/org.eclipse.cdt.core/plugin.xml | 1 + core/org.eclipse.cdt.core/schema/tagger.exsd | 139 ++++++++ .../src/org/eclipse/cdt/core/CCorePlugin.java | 11 + .../ui/QtCompletionProposalComputer.java | 4 +- 32 files changed, 2241 insertions(+), 53 deletions(-) create mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java create mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java create mode 100644 core/org.eclipse.cdt.core/schema/tagger.exsd diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java new file mode 100644 index 00000000000..9d3431b5c61 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.pdom.tests; + +import java.io.File; + +import junit.framework.Test; + +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.core.pdom.db.ChunkCache; +import org.eclipse.cdt.internal.core.pdom.db.Database; +import org.eclipse.cdt.internal.core.pdom.db.PDOMStringSet; + +// copy/pasted from BTreeTests +public class PDOMStringSetTests extends BaseTestCase { + protected File dbFile; + protected Database db; + protected PDOMStringSet stringSet; + protected int rootRecord; + + public static Test suite() { + return suite(PDOMStringSetTests.class); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + + dbFile = File.createTempFile("pdomstringsettest", "db"); + db = new Database(dbFile, new ChunkCache(), 0, false); + db.setExclusiveLock(); + rootRecord = Database.DATA_AREA; + stringSet = new PDOMStringSet(db, rootRecord); + } + + @Override + protected void tearDown() throws Exception { + db.close(); + dbFile.deleteOnExit(); + + super.tearDown(); + } + + // Quick tests to exercise the basic functionality. + public void testInterface() throws Exception { + long val1_rec_a = stringSet.add("val1"); + long val2_rec_a = stringSet.add("val2"); + long val1_rec_b = stringSet.add("val1"); + assertTrue(val1_rec_a != 0); + assertTrue(val2_rec_a != 0); + assertEquals(val1_rec_a, val1_rec_b); + + long val1_find = stringSet.find("val1"); + long val2_find = stringSet.find("val2"); + assertEquals(val1_rec_a, val1_find); + assertEquals(val2_rec_a, val2_find); + + long val1_rm = stringSet.remove("val1"); + assertEquals(val1_rec_a, val1_rm); + assertEquals(0, stringSet.find("val1")); + assertEquals(val2_rec_a, stringSet.find("val2")); + + stringSet.clearCaches(); + assertEquals(val2_rec_a, stringSet.find("val2")); + assertEquals(0, stringSet.find("val1")); + } +} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java new file mode 100644 index 00000000000..47a00535717 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.pdom.tests; + +import java.io.File; +import java.util.Arrays; + +import junit.framework.Test; + +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IIndexLocationConverter; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.core.dom.ast.tag.Tag; +import org.eclipse.cdt.internal.core.pdom.PDOM; +import org.eclipse.cdt.internal.core.pdom.WritablePDOM; +import org.eclipse.cdt.internal.core.pdom.tag.PDOMTag; +import org.eclipse.cdt.internal.core.pdom.tag.PDOMTagIndex; + +// copy/pasted from BTreeTests +public class PDOMTagIndexTests extends BaseTestCase { + private PDOM pdom; + + public static Test suite() { + return suite(PDOMTagIndexTests.class); + } + + private static class MockIndexLocationConverter implements + IIndexLocationConverter { + @Override + public IIndexFileLocation fromInternalFormat(String raw) { + return null; + } + + @Override + public String toInternalFormat(IIndexFileLocation location) { + return null; + } + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + + // Create a dummy instance of the PDOM for the various tests to operate + // upon. Also acquire the PDOM's write lock to simulate the condition + // under which the tag index is normally accessed. + File tmpFile = File.createTempFile(getClass().getSimpleName() + '.' + + Double.toString(Math.random()).substring(2), null); + pdom = new WritablePDOM(tmpFile, new MockIndexLocationConverter(), + LanguageManager.getInstance().getPDOMLinkageFactoryMappings()); + pdom.acquireWriteLock(); + } + + @Override + protected void tearDown() throws Exception { + pdom.close(); + super.tearDown(); + } + + // return the nearest valid record that is less than the specified base + private static long lastRecordBase = 1000; + + private static long computeValidRecord() { + lastRecordBase += 1000; + return (lastRecordBase & ~7L) | 2; + } + + // A quick sanity test to confirm basic functionality. + public void testSimple() throws Exception { + String tagger = "tagger_a"; + long rec = computeValidRecord(); + + assertNotNull(PDOMTagIndex.createTag(pdom, rec, tagger, 1)); + assertNotNull(PDOMTagIndex.getTag(pdom, rec, tagger)); + } + + public void testMultipleTaggers() throws Exception { + String tagger_a = "tagger_a"; + String tagger_b = "tagger_b"; + long rec1 = computeValidRecord(); + long rec2 = computeValidRecord(); + + assertNotNull(PDOMTagIndex.createTag(pdom, rec1, tagger_a, 1)); + assertNotNull(PDOMTagIndex.createTag(pdom, rec1, tagger_b, 1)); + assertNotNull(PDOMTagIndex.createTag(pdom, rec2, tagger_a, 1)); + + assertNotNull(PDOMTagIndex.getTag(pdom, rec2, tagger_a)); + assertNull(PDOMTagIndex.getTag(pdom, rec2, tagger_b)); + + Iterable tags1 = PDOMTagIndex.getTags(pdom, rec1); + int tag_count = 0; + for (ITag tag : tags1) { + ++tag_count; + assertTrue(tag.getTaggerId().equals(tagger_a) + || tag.getTaggerId().equals(tagger_b)); + assertEquals(1, tag.getDataLen()); + } + assertEquals(2, tag_count); + } + + public void testReplaceTags() throws Exception { + String tagger_a = "tagger_a"; + String tagger_b = "tagger_b"; + long rec = computeValidRecord(); + + ITag taga = PDOMTagIndex.createTag(pdom, rec, tagger_a, 2); + assertNotNull(taga); + assertTrue(taga instanceof PDOMTag); + PDOMTag taga_pdom = (PDOMTag) taga; + ITag tagb = PDOMTagIndex.createTag(pdom, rec, tagger_a, 2); + assertNotNull(tagb); + + // replacement should delete tags for taggers that are no longer present + // and shorter tags + // should be modified in place + PDOMTagIndex.setTags(pdom, rec, + Arrays. asList(new Tag(tagger_a, 1))); + assertNull(PDOMTagIndex.getTag(pdom, rec, tagger_b)); + ITag shorter_ = PDOMTagIndex.getTag(pdom, rec, tagger_a); + assertNotNull(shorter_); + assertTrue(shorter_ instanceof PDOMTag); + PDOMTag shorter_pdom = (PDOMTag) shorter_; + assertEquals(taga_pdom.getRecord(), shorter_pdom.getRecord()); + + // longer tags should create a new record + PDOMTagIndex.setTags(pdom, rec, + Arrays. asList(new Tag(tagger_a, 4))); + ITag longer_ = PDOMTagIndex.getTag(pdom, rec, tagger_a); + assertNotNull(longer_); + assertTrue(longer_ instanceof PDOMTag); + PDOMTag longer_pdom = (PDOMTag) longer_; + assertTrue(taga_pdom.getRecord() != longer_pdom.getRecord()); + + // TODO figure out how to confirm that the original tag was free'd + } +} diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java index f244ec3925c..3640bbe7339 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java @@ -38,7 +38,9 @@ public class PDOMTests extends TestSuite { suite.addTest(OverloadsWithinSingleTUTests.suite()); suite.addTest(OverloadsWithinCommonHeaderTests.suite()); suite.addTest(BTreeTests.suite()); - suite.addTest(FilesOnReindexTests.suite()); + suite.addTest(PDOMStringSetTests.suite()); + suite.addTest(PDOMTagIndexTests.suite()); + suite.addTest(FilesOnReindexTests.suite()); suite.addTest(GeneratePDOMApplicationTest.suite()); suite.addTest(CPPFieldTests.suite()); diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 9130967645b..b4de8014640 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.core.dom.ast.gnu, org.eclipse.cdt.core.dom.ast.gnu.c, org.eclipse.cdt.core.dom.ast.gnu.cpp, + org.eclipse.cdt.core.dom.ast.tag, org.eclipse.cdt.core.dom.parser, org.eclipse.cdt.core.dom.parser.c, org.eclipse.cdt.core.dom.parser.cpp, @@ -52,6 +53,7 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.internal.core.browser;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.cdtvariables;x-internal:=true, org.eclipse.cdt.internal.core.dom;x-internal:=true, + org.eclipse.cdt.internal.core.dom.ast.tag;x-internal:=true, org.eclipse.cdt.internal.core.dom.parser;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.dom.parser.c;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.core.dom.parser.cpp;x-friends:="org.eclipse.cdt.ui", @@ -84,6 +86,7 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.internal.core.pdom.dom.cpp;x-internal:=true, org.eclipse.cdt.internal.core.pdom.export;x-internal:=true, org.eclipse.cdt.internal.core.pdom.indexer;x-friends:="org.eclipse.cdt.ui", + org.eclipse.cdt.internal.core.pdom.tag;x-internal:=true, org.eclipse.cdt.internal.core.resources;x-friends:="org.eclipse.cdt.ui,org.eclipse.cdt.make.core,org.eclipse.cdt.codan.ui.cxx", org.eclipse.cdt.internal.core.settings.model;x-internal:=true, org.eclipse.cdt.internal.core.util;x-internal:=true, @@ -111,6 +114,7 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.utils.xcoff, org.eclipse.cdt.utils.xcoff.parser Require-Bundle: org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java new file mode 100644 index 00000000000..57df74e5e39 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IBinding; + +/** + * Implementations are contributed with the org.eclipse.cdt.core.tagger extension-point. The implementation is + * responsible for populating the tag's data using a given input binding. + * + * @see #process(ITagWriter, IBinding, IASTName) + * @since 5.5 + */ +public interface IBindingTagger { + /** + * Examines the given input binding to decide if a tag should be created. Use the given tagWriter to + * create data if needed. Return the tag if one was created and null otherwise. A tagger (as identified by + * it's unique id string) is allowed to create only one tag for each binding. + * + * @param tagWriter + * the writer to use for creating new tags + * @param binding + * the binding to examine when populating the tag (if needed) + * @param ast + * the AST name from which the binding was created + * @return the tag if one was created and null otherwise + */ + public ITag process(ITagWriter tagWriter, IBinding binding, IASTName ast); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java new file mode 100644 index 00000000000..027b4afd928 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +/** + * Tags are used to annotate {@link ITagReader}'s with extra information. They are created by implementations + * of {@link IBindingTagger} which are contributed using the org.eclipse.cdt.core.tagger extension point. The + * base tag interface is read-only, it is extended by the writable {@link IWritableTag}. + * + * @see IBindingTagger + * @see ITagReader + * @see IWritableTag + * @since 5.5 + */ +public interface ITag { + /** A constant that is returned to indicate a read failure. */ + public static final int FAIL = -1; + + /** Return the number of bytes in the tag's data payload. */ + public int getDataLen(); + + /** Return the globally unique id of the tagger that created the receiver. */ + public String getTaggerId(); + + /** Return the byte from the specified offset or {@link #FAIL} on failure. */ + public int getByte(int offset); + + /** + * Return the specified number of bytes from the specified offset. Specify len of -1 to read all bytes + * from the specified offset to the end of the payload. Return null if the given range is not valid. This + * would be expected if the version of the contributor has changed in a way that changes the structure of + * the data that it stores. Contributors must be able to deal with that case. + */ + public byte[] getBytes(int offset, int len); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java new file mode 100644 index 00000000000..fd7ca0bae91 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +/** + * An interface that provides read-only access to the tags associated with a particular binding. + * + * @see ITag + * @see ITagService + * @since 5.5 + */ +public interface ITagReader { + /** + * Look for a tag for the receiver, returns null if there is no such tag. + * + * @param id + * A string that uniquely identifies the tag to be returned. This value was provided by the + * contributor when the tag was created (see {@link ITagWriter#createTag(String, int)}). + */ + public ITag getTag(String id); + + /** + * Return all tags known to the receiver. Does not return null. + */ + public Iterable getTags(); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java new file mode 100644 index 00000000000..237fc4830ca --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +import org.eclipse.cdt.core.dom.ast.IBinding; + +/** + * Provides ITagReaders for specific bindings. The kind of the reader will vary based on the kind of the input + * binding. + * + * @see ITag + * @see ITagReader + * @since 5.5 + */ +public interface ITagService { + /** + * Finds or creates a tag reader for the specified binding or null if a reader cannot be associated with + * this binding. + * + * @param binding + * could be null + */ + public ITagReader findTagReader(IBinding binding); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java new file mode 100644 index 00000000000..f77deac8ff4 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +/** + * An interface that allows tag creation and modification. + * + * @see ITag + * @see ITagService + * @since 5.5 + */ +public interface ITagWriter { + /** + * Create and return a new tag for the receiver. E.g., if this writer is associated with a persistent + * binding, then returned tag will read and write from the PDOM database. + * + * @param id + * A string that uniquely identifies the tag to be returned. This value will be used by the + * contributor when to find the tag (see {@link ITagReader#getTag(String)}). + * @param len + * The number of bytes that should be allocated to store the tag's data. + */ + public IWritableTag createTag(String id, int len); + + /** + * Sets the receiver's tags to only the ones provided. Deletes existing tags that are not in the argument + * list. + */ + public boolean setTags(Iterable tags); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java new file mode 100644 index 00000000000..adf1d8b169d --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.core.dom.ast.tag; + +/** + * Tags are used to annotate {@link ITagWriter}'s with extra information. They are created by implementations + * of {@link IBindingTagger} which are contributed using the org.eclipse.cdt.core.tagger extension point. + * + * @see IBindingTagger + * @see ITagReader + * @see ITagWriter + * @since 5.5 + */ +public interface IWritableTag extends ITag { + /** Write the given byte to the given offset in the tag. Return true if successful and false otherwise. */ + public boolean putByte(int offset, byte data); + + /** + * Write the argument buffer into the receiver's payload starting at the specified offset. Write the + * specified number of bytes or the full buffer when len is -1. Return true if successful and false + * otherwise. + */ + public boolean putBytes(int offset, byte data[], int len); +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java new file mode 100644 index 00000000000..8683da41bd5 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.dom.ast.tag; + +import org.eclipse.cdt.core.dom.ast.IASTDeclarator; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.ITagReader; +import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; +import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; +import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; + +public class NonCachedTaggable implements ITagReader, ITagWriter { + private final IBinding binding; + private IASTName ast; + + public NonCachedTaggable(IBinding binding) { + this.binding = binding; + } + + @Override + public IWritableTag createTag(String id, int len) { + return new Tag(id, len); + } + + @Override + public ITag getTag(String id) { + return TagManager.getInstance().process(id, this, binding, getAST()); + } + + @Override + public Iterable getTags() { + return TagManager.getInstance().process(this, binding, getAST()); + } + + @Override + public boolean setTags(Iterable tags) { + // this non-caching implementation has nothing to set, the tags will be regenerated + // when they are queried + return true; + } + + private IASTName getAST() { + if (ast != null) + return ast; + + if (!(binding instanceof ICPPInternalBinding)) + return null; + + IASTNode node = getPhysicalNode((ICPPInternalBinding) binding); + if (node == null) + return null; + + return ast = getName(node); + } + + private static IASTNode getPhysicalNode(ICPPInternalBinding binding) { + IASTNode node = binding.getDefinition(); + if (node != null) + return node; + + IASTNode[] nodes = binding.getDeclarations(); + if (nodes == null || nodes.length <= 0) + return null; + return nodes[0]; + } + + private static IASTName getName(IASTNode node) { + if (node instanceof IASTName) + return (IASTName) node; + if (node instanceof ICPPASTCompositeTypeSpecifier) + return ((ICPPASTCompositeTypeSpecifier) node).getName(); + if (node instanceof IASTDeclarator) + return ((IASTDeclarator) node).getName(); + return null; + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java new file mode 100644 index 00000000000..7b9430de292 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.dom.ast.tag; + +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; + +/** + * A trivial implementation that stores all data in memory. + * + * @see NonCachedTaggable + */ +public class Tag implements IWritableTag { + private final String taggerId; + private final byte[] buff; + + public Tag(String taggerId, int dataLen) { + this.taggerId = taggerId; + this.buff = new byte[dataLen]; + } + + @Override + public String getTaggerId() { + return taggerId; + } + + @Override + public int getDataLen() { + return buff.length; + } + + private boolean isInBounds(int offset, int len) { + return offset >= 0 && offset < buff.length && (offset + len) <= buff.length; + } + + @Override + public boolean putByte(int offset, byte b) { + if (!isInBounds(offset, 1)) + return false; + + buff[offset] = b; + return true; + } + + @Override + public boolean putBytes(int offset, byte[] data, int len) { + len = len >= 0 ? len : data.length; + if (!isInBounds(offset, len)) + return false; + + System.arraycopy(data, 0, buff, offset, len); + return true; + } + + @Override + public int getByte(int offset) { + return isInBounds(offset, 1) ? buff[offset] : ITag.FAIL; + } + + @Override + public byte[] getBytes(int offset, int len) { + len = len >= 0 ? len : buff.length - offset; + if (!isInBounds(offset, len)) + return null; + + byte[] data = new byte[len]; + System.arraycopy(buff, offset, data, 0, len); + return data; + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java new file mode 100644 index 00000000000..57c29d8f523 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.dom.ast.tag; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.tag.IBindingTagger; +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.ITagReader; +import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; +import org.eclipse.cdt.internal.core.pdom.dom.IPDOMBinding; +import org.eclipse.cdt.internal.core.pdom.tag.PDOMTaggable; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; + +public class TagManager { + private static TagManager INSTANCE; + + private Map taggers; + + public static TagManager getInstance() { + if (INSTANCE == null) + INSTANCE = new TagManager(); + return INSTANCE; + } + + private TagManager() { + taggers = loadExtensions(); + } + + private static final String ExtensionPoint = "tagger"; //$NON-NLS-1$ + + private static Map loadExtensions() { + Map taggers = new HashMap(); + + // load the extensions + IConfigurationElement[] elements = Platform.getExtensionRegistry() + .getConfigurationElementsFor(CCorePlugin.PLUGIN_ID, ExtensionPoint); + for (IConfigurationElement element : elements) { + TaggerDescriptor desc = new TaggerDescriptor(element); + taggers.put(desc.getId(), desc); + } + + return taggers; + } + + /** + * Provide an opportunity for the specified tagger to process the given values. The tagger will only run + * if its enablement expression returns true for the arguments. + */ + public ITag process(String taggerId, ITagWriter tagWriter, IBinding binding, IASTName ast) { + TaggerDescriptor desc = taggers.get(taggerId); + if (desc == null) + return null; + + IBindingTagger tagger = desc.getBindingTaggerFor(binding, ast); + return tagger == null ? null : tagger.process(tagWriter, binding, ast); + } + + /** Provide an opportunity for all enabled taggers to process the given values. */ + public Iterable process(ITagWriter tagWriter, IBinding binding, IASTName ast) { + List tags = new LinkedList(); + for (TaggerDescriptor desc : taggers.values()) { + IBindingTagger tagger = desc.getBindingTaggerFor(binding, ast); + if (tagger != null) { + ITag tag = tagger.process(tagWriter, binding, ast); + if (tag != null) + tags.add(tag); + } + } + + return tags; + } + + /** Add or remove tags from the destination to ensure that it has the same tag information as the source. */ + public void syncTags(IPDOMBinding dst, IBinding src) { + // don't try to copy any tags when there are no contributors to this extension point + if (dst == null || taggers.isEmpty()) + return; + + ITagReader tagReader = CCorePlugin.getTagService().findTagReader(src); + if (tagReader == null) + return; + + ITagWriter tagWriter = new PDOMTaggable(dst.getPDOM(), dst.getRecord()); + tagWriter.setTags(tagReader.getTags()); + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java new file mode 100644 index 00000000000..ca22dc92ab2 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.dom.ast.tag; + +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.tag.ITagReader; +import org.eclipse.cdt.core.dom.ast.tag.ITagService; + +public class TagService implements ITagService { + /** + * First gives the IBinding instance a chance to convert itself, by calling IAdaptable#getAdapter( + * ITagReader.class ) on the binding. If the binding doesn't provide an implementation then a simple, + * in-memory, non-cached implementation is created and returned. + */ + @Override + public ITagReader findTagReader(IBinding binding) { + if (binding == null) + return null; + + // let the binding adapt to its own tag reader + ITagReader tagReader = (ITagReader) binding.getAdapter(ITagReader.class); + if (tagReader != null) + return tagReader; + + return new NonCachedTaggable(binding); + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java new file mode 100644 index 00000000000..f408e887801 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java @@ -0,0 +1,196 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.dom.ast.tag; + +import java.util.Arrays; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.tag.IBindingTagger; +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.expressions.EvaluationContext; +import org.eclipse.core.expressions.EvaluationResult; +import org.eclipse.core.expressions.Expression; +import org.eclipse.core.expressions.ExpressionConverter; +import org.eclipse.core.expressions.ExpressionTagNames; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; + +/** + * Internal container for extensions of org.eclipse.cdt.core.tagger. The implementation of the tagger is + * instantiated only after checking the enablement expression (if present) for the specified binding. This + * avoids activating the contributing plugin until it is actually needed. + */ +public class TaggerDescriptor { + private static final String Attr_LocalId = "local-id"; //$NON-NLS-1$ + private static final String Attr_Class = "class"; //$NON-NLS-1$ + + private final IConfigurationElement element; + private final Expression enablementExpression; + private Boolean fStatus = null; + + private String id; + private IBindingTagger tagger; + + private static final String VAR_PROJECTNATURES = "projectNatures"; //$NON-NLS-1$ + private static final String VAR_LANGUAGEID = "languageId"; //$NON-NLS-1$ + + /** + * An empty implementation of the tagger used as a placeholder in descriptors that are unable to load the + * contributed class. + */ + private static final IBindingTagger NullTagger = new IBindingTagger() { + @Override + public ITag process(ITagWriter tagWriter, IBinding binding, IASTName ast) { + return null; + } + }; + + public TaggerDescriptor(IConfigurationElement element) { + this.element = element; + + Expression expr = null; + IConfigurationElement[] children = element.getChildren(ExpressionTagNames.ENABLEMENT); + switch (children.length) { + case 0: + fStatus = Boolean.TRUE; + break; + case 1: + try { + ExpressionConverter parser = ExpressionConverter.getDefault(); + expr = parser.perform(children[0]); + } catch (CoreException e) { + CCorePlugin.log("Error in enablement expression of " + id, e); //$NON-NLS-1$ + } + break; + default: + CCorePlugin.log("Too many enablement expressions for " + id); //$NON-NLS-1$ + fStatus = Boolean.FALSE; + break; + } + enablementExpression = expr; + } + + public String getId() { + if (id != null) + return id; + + String globalId = element.getContributor().getName(); + String localId = element.getAttribute(Attr_LocalId); + + // there must be a valid local id + if (localId == null) { + String extId = element.getDeclaringExtension().getSimpleIdentifier(); + CCorePlugin + .log("Invalid extension " + globalId + '.' + extId + " must provide tagger's local-id"); //$NON-NLS-1$ //$NON-NLS-2$ + return null; + } + + // the extension should not include the plugin id, but return immediately if it does + if (localId.startsWith(globalId) && localId.length() > globalId.length()) + return localId; + + // make sure the local id has real content + if (localId.isEmpty()) { + String extId = element.getDeclaringExtension().getSimpleIdentifier(); + CCorePlugin + .log("Invalid extension " + globalId + '.' + extId + " must provide value for tagger's local-id"); //$NON-NLS-1$ //$NON-NLS-2$ + return null; + } + + // otherwise prepend with the globalId, and ensure a dot between them + if (localId.charAt(0) == '.') + return globalId + localId; + return globalId + '.' + localId; + } + + private boolean matches(ITranslationUnit tu) { + // if the enablement expression is missing or structurally invalid, then return immediately + if (fStatus != null) + return fStatus.booleanValue(); + + // if there is no tu, then the enablement expression cannot be evaluated, assume that all taggers + // are needed + if (tu == null) + return true; + + if (enablementExpression != null) + try { + IProject project = null; + ICProject cProject = tu.getCProject(); + if (cProject != null) + project = cProject.getProject(); + + EvaluationContext evalContext = new EvaluationContext(null, project); + + // if the project is not accessible, then only taggers that don't care about it will + // get a chance to run + if (project != null) { + String[] natures = project.getDescription().getNatureIds(); + evalContext.addVariable(VAR_PROJECTNATURES, Arrays.asList(natures)); + } + + ILanguage language = tu.getLanguage(); + if (language != null) + evalContext.addVariable(VAR_LANGUAGEID, language.getId()); + + return enablementExpression.evaluate(evalContext) == EvaluationResult.TRUE; + } catch (CoreException e) { + CCorePlugin.log("Error while evaluating enablement expression for " + id, e); //$NON-NLS-1$ + } + + fStatus = Boolean.FALSE; + return false; + } + + private IBindingTagger getTagger() { + if (tagger == null) + synchronized (this) { + if (tagger == null) { + try { + tagger = (IBindingTagger) element.createExecutableExtension(Attr_Class); + } catch (CoreException e) { + String id = element.getDeclaringExtension().getNamespaceIdentifier() + '.' + + element.getDeclaringExtension().getSimpleIdentifier(); + CCorePlugin.log("Error in class attribute of " + id, e); //$NON-NLS-1$ + + // mark the tagger with an empty implementation to prevent future load attempts + tagger = NullTagger; + } + } + } + + return tagger; + } + + // Activates the plugin if needed. + public IBindingTagger getBindingTaggerFor(IBinding binding, IASTName ast) { + // If there isn't an ast with an AST-TU accessible, then there is no way to defer processing, + // just return the tagger and let it try to sort things out. E.g., this happens for built-in + // things. + if (ast == null) + return getTagger(); + IASTTranslationUnit astTU = ast.getTranslationUnit(); + if (astTU == null) + return getTagger(); + + // Otherwise evaluate the enablement expression for this TU + return matches(astTU.getOriginatingTranslationUnit()) ? getTagger() : null; + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index d306479aaf5..403516e53a8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -340,10 +340,10 @@ public class CPPVisitor extends ASTQueries { return false; } } - + if (inScope == null) return false; - + IBinding pb= names[names.length-2].resolvePreBinding(); if (pb instanceof IProblemBinding) return false; @@ -357,7 +357,7 @@ public class CPPVisitor extends ASTQueries { } else if (pb instanceof ICPPNamespace) { scope= ((ICPPNamespace)pb).getNamespaceScope(); } - + return scope == inScope; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index cf628dbf052..df417262095 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -41,6 +41,7 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.AbstractLanguage; import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.FileContent; import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -48,6 +49,7 @@ import org.eclipse.cdt.core.parser.ISignificantMacros; import org.eclipse.cdt.core.parser.IncludeFileContentProvider; import org.eclipse.cdt.core.parser.ParserUtil; import org.eclipse.cdt.internal.core.dom.IIncludeFileResolutionHeuristics; +import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; import org.eclipse.cdt.internal.core.index.FileContentKey; import org.eclipse.cdt.internal.core.index.IIndexFragment; import org.eclipse.cdt.internal.core.index.IIndexFragmentFile; @@ -1004,6 +1006,9 @@ public abstract class AbstractIndexerTask extends PDOMWriter { IASTTranslationUnit ast= createAST(lang, codeReader, scanInfo, isSource, fASTOptions, ctx, pm); fStatistics.fParsingTime += System.currentTimeMillis() - start; if (ast != null) { + // Give the new AST-TU a chance to recognize its translation unit before it is written + // to the index. + ( (ASTTranslationUnit)ast ).setOriginatingTranslationUnit( (ITranslationUnit)tu ); writeToIndex(lang.getLinkageID(), ast, codeReader, ctx, pm); } } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index 8b8d7092bcc..5c59fbcba75 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -89,6 +89,7 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMMacroReferenceName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNamedNode; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; +import org.eclipse.cdt.internal.core.pdom.tag.PDOMTagIndex; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -208,7 +209,7 @@ public class PDOM extends PlatformObject implements IPDOM { * 113.0 - Changed marshaling of values, bug 327878 * #114.0# - Partial specializations for class template specializations, bug 332884. * - Corrected signatures for function templates, bug 335062. <> - * + * * CDT 8.1 development (versions not supported on the 8.0.x branch) * 120.0 - Enumerators in global index, bug 356235 * 120.1 - Specializations of using declarations, bug 357293. @@ -217,7 +218,7 @@ public class PDOM extends PlatformObject implements IPDOM { * 123.0 - Combined file size and encoding hash code. * 124.0 - GCC attributes and NO_RETURN flag for functions. * #125.0# - Indexes for unresolved includes and files indexed with I/O errors. <> - * + * * CDT 8.2 development (versions not supported on the 8.1.x branch) * 130.0 - Dependent expressions, bug 299911. * 131.0 - Dependent expressions part 2, bug 299911. @@ -230,6 +231,7 @@ public class PDOM extends PlatformObject implements IPDOM { * 138.0 - Constexpr functions, bug 395238. * 139.0 - More efficient and robust storage of types and template arguments, bug 395243. * 140.0 - Enumerators with dependent values, bug 389009. + * 140.1 - Mechanism for tagging nodes with extended data, bug 400020 * 141.0 - Storing enclosing template bindings for evaluations, bug 399829 */ private static final int MIN_SUPPORTED_VERSION= version(141, 0); @@ -270,7 +272,8 @@ public class PDOM extends PlatformObject implements IPDOM { public static final int INDEX_OF_DEFECTIVE_FILES = Database.DATA_AREA + 8; public static final int INDEX_OF_FILES_WITH_UNRESOLVED_INCLUDES = Database.DATA_AREA + 12; public static final int PROPERTIES = Database.DATA_AREA + 16; - public static final int END= Database.DATA_AREA + 20; + public static final int TAG_INDEX = Database.DATA_AREA + 20; + public static final int END= Database.DATA_AREA + 24; static { assert END <= Database.CHUNK_SIZE; } @@ -332,6 +335,7 @@ public class PDOM extends PlatformObject implements IPDOM { // Local caches protected Database db; private BTree fileIndex; + private PDOMTagIndex tagIndex; private BTree indexOfDefectiveFiles; private BTree indexOfFiledWithUnresolvedIncludes; private final Map fLinkageIDCache = new HashMap(); @@ -460,6 +464,15 @@ public class PDOM extends PlatformObject implements IPDOM { return fileIndex; } + public PDOMTagIndex getTagIndex() throws CoreException { + if (tagIndex == null) + { + // tag index can only be stored in database versions 139.1 or greater + tagIndex = new PDOMTagIndex( db.getVersion() >= version( 139, 1 ) ? db : null, TAG_INDEX ); + } + return tagIndex; + } + /** * Returns the index of files that were read with I/O errors. */ @@ -549,7 +562,7 @@ public class PDOM extends PlatformObject implements IPDOM { }); return files.toArray(new IIndexFragmentFile[files.size()]); } - + protected IIndexFragmentFile addFile(int linkageID, IIndexFileLocation location, ISignificantMacros sigMacros) throws CoreException { PDOMLinkage linkage= createLinkage(linkageID); @@ -1358,6 +1371,7 @@ public class PDOM extends PlatformObject implements IPDOM { private void clearCaches() { fileIndex= null; + tagIndex = null; indexOfDefectiveFiles= null; indexOfFiledWithUnresolvedIncludes= null; fLinkageIDCache.clear(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java new file mode 100644 index 00000000000..3c2774c21e8 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMStringSet.java @@ -0,0 +1,190 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.db; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.CoreException; + +/** + * A container for storing a set of strings in the Database. The container allows only one instance of each + * string to be stored. + *

+ * This implementation should only be used when the set is expected to be small. It uses a singly linked list + * for storing strings in Database. Which means that a linear lookup is needed to find strings in the list. An + * in-memory, lazily-loaded, cache is provided so the list will only be fully retrieved once in the lifetime + * of this instance. A BTree will be more efficient for larger sets. + */ +public class PDOMStringSet { + private final Database db; + + private long ptr; + private long head; + private long loaded; + + // A lazily initialized, in-memory cache that maps a persisted string to its storage record. + private Map lazyCache; + + public PDOMStringSet(Database db, long ptr) throws CoreException { + this.db = db; + this.ptr = ptr; + + head = 0; + loaded = 0; + } + + public void clearCaches() { + head = 0; + loaded = 0; + + if (lazyCache != null) + lazyCache = null; + } + + private long getHead() throws CoreException { + if (head == 0) + head = db.getRecPtr(ptr); + return head; + } + + // A simple enum describing the type of the information that is stored in the Database. Each + // enumerator represents a single field in the persistent structure and is able to answer its + // offset in that structure. + private static enum NodeType { + Next, Item, _last; + + // NOTE: All fields are pointers, if that changes then these initializations will need + // to be updated. + public final long offset = ordinal() * Database.PTR_SIZE; + public static final int sizeof = (int) _last.offset; + + /** Return the value of the pointer stored in this field in the given instance. */ + public long get(Database db, long instance) throws CoreException { + return db.getRecPtr(instance + offset); + } + + /** Store the given pointer into this field in the given instance. */ + public void put(Database db, long instance, long value) throws CoreException { + db.putRecPtr(instance + offset, value); + } + } + + /** + * Adds the given string to the receiving set. May cause the entire list to be loaded from the Database + * while testing for uniqueness. Returns the record of the string that was inserted into the list. + */ + public long add(String str) throws CoreException { + long record = find(str); + if (record != 0) + return record; + + IString string = db.newString(str); + record = string.getRecord(); + + long new_node = db.malloc(NodeType.sizeof); + NodeType.Next.put(db, new_node, getHead()); + NodeType.Item.put(db, new_node, record); + + if (lazyCache == null) + lazyCache = new HashMap(); + lazyCache.put(str, record); + + // If the Database has already been partially searched, then the loaded pointer will be after the + // head. Since we've already put this new record into the lazy cache, there is no reason to try to + // load it again. We put the new node at the start of the list so that it will be before the loaded + // pointer. + head = new_node; + if (loaded == 0) + loaded = new_node; + db.putRecPtr(ptr, new_node); + return record; + } + + /** + * Search for the given string in the receiver. This could cause the entire list to be loaded from the + * Database. The results are cached, so the list will only be loaded one time during the lifetime of this + * instance. Returns the record of the String. + */ + public long find(String str) throws CoreException { + if (lazyCache != null) { + Long l = lazyCache.get(str); + if (l != null) + return l.longValue(); + } + + // if there is nothing in the Database, then there is nothing to load + if (getHead() == 0) + return 0; + + // otherwise prepare the cache for the data that is about to be loaded + if (lazyCache == null) + lazyCache = new HashMap(); + + // if nothing has been loaded, then start loading with the head node, otherwise continue + // loading from whatever is after the last loaded node + long curr = loaded == 0 ? getHead() : NodeType.Next.get(db, loaded); + while (curr != 0) { + long next = NodeType.Next.get(db, curr); + long item = NodeType.Item.get(db, curr); + + IString string = db.getString(item); + + // put the value into the cache + lazyCache.put(string.getString(), Long.valueOf(item)); + + // return immediately if this is the target + if (string.compare(str, true) == 0) + return item; + + // otherwise keep looking + loaded = curr; + curr = next; + } + + return 0; + } + + /** + * Return a pointer to the record of the String that was removed. + */ + public long remove(String str) throws CoreException { + if (lazyCache != null) + lazyCache.remove(str); + + long prev = 0; + long curr = getHead(); + while (curr != 0) { + long next = NodeType.Next.get(db, curr); + long item = NodeType.Item.get(db, curr); + + IString string = db.getString(item); + + if (string.compare(str, true) == 0) { + if (head != curr) + NodeType.Next.put(db, prev, next); + else { + db.putRecPtr(ptr, next); + head = next; + } + + db.free(curr); + return item; + } + + prev = curr; + curr = next; + } + + return 0; + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java index 769d7a0071f..1ff1729dd34 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java @@ -26,6 +26,7 @@ import org.eclipse.cdt.core.dom.ast.IScope.ScopeLookupData; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; +import org.eclipse.cdt.core.dom.ast.tag.ITagReader; import org.eclipse.cdt.core.index.IIndexFileSet; import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; @@ -36,6 +37,7 @@ import org.eclipse.cdt.internal.core.index.IIndexScope; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.IString; +import org.eclipse.cdt.internal.core.pdom.tag.PDOMTaggable; import org.eclipse.core.runtime.CoreException; /** @@ -48,33 +50,41 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding private static final int FIRST_DEF_OFFSET = PDOMNamedNode.RECORD_SIZE + 4; // size 4 private static final int FIRST_REF_OFFSET = PDOMNamedNode.RECORD_SIZE + 8; // size 4 private static final int LOCAL_TO_FILE = PDOMNamedNode.RECORD_SIZE + 12; // size 4 - + @SuppressWarnings("hiding") protected static final int RECORD_SIZE = PDOMNamedNode.RECORD_SIZE + 16; private byte hasDeclaration= -1; - + protected PDOMBinding(PDOMLinkage linkage, PDOMNode parent, char[] name) throws CoreException { super(linkage, parent, name); } - + public PDOMBinding(PDOMLinkage linkage, long record) { super(linkage, record); } - + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(PDOMBinding.class)) return this; + // Any PDOMBinding can have a persistent tag. These tags should be deleted when the PDOMBinding + // is deleted. However, PDOMBinding's don't get deleted, so there is no way to trigger deleting + // of the tags. If the implementation is changed so that PDOMBindings do get deleted, then call: + // PDOMTagIndex.setTags( getPDOM(), pdomBinding.record, Collections.emptyList() ); + // to clear out all tags for the binding. + if (adapter.isAssignableFrom(ITagReader.class)) + return new PDOMTaggable( getPDOM(), getRecord() ); + return null; } - + /** * Is the binding as the record orphaned, i.e., has no declarations * or references. * Watch out, a binding may also be used in a type (e.g. pointer to class) - * + * * @param pdom * @param record * @return true if the binding is orphaned. @@ -86,7 +96,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding && db.getRecPtr(record + FIRST_DEF_OFFSET) == 0 && db.getRecPtr(record + FIRST_REF_OFFSET) == 0; } - + @Override public final boolean hasDeclaration() throws CoreException { if (hasDeclaration == -1) { @@ -101,7 +111,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return hasDeclaration != 0; } - + public final void addDeclaration(PDOMName name) throws CoreException { PDOMName first = getFirstDeclaration(); if (first != null) { @@ -110,7 +120,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } setFirstDeclaration(name); } - + public final void addDefinition(PDOMName name) throws CoreException { PDOMName first = getFirstDefinition(); if (first != null) { @@ -119,7 +129,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } setFirstDefinition(name); } - + public final void addReference(PDOMName name) throws CoreException { PDOMName first = getFirstReference(); if (first != null) { @@ -128,37 +138,37 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } setFirstReference(name); } - + public PDOMName getFirstDeclaration() throws CoreException { long namerec = getDB().getRecPtr(record + FIRST_DECL_OFFSET); return namerec != 0 ? new PDOMName(getLinkage(), namerec) : null; } - + public void setFirstDeclaration(PDOMName name) throws CoreException { long namerec = name != null ? name.getRecord() : 0; getDB().putRecPtr(record + FIRST_DECL_OFFSET, namerec); } - + public PDOMName getFirstDefinition() throws CoreException { long namerec = getDB().getRecPtr(record + FIRST_DEF_OFFSET); return namerec != 0 ? new PDOMName(getLinkage(), namerec) : null; } - + public void setFirstDefinition(PDOMName name) throws CoreException { long namerec = name != null ? name.getRecord() : 0; getDB().putRecPtr(record + FIRST_DEF_OFFSET, namerec); } - + public PDOMName getFirstReference() throws CoreException { long namerec = getDB().getRecPtr(record + FIRST_REF_OFFSET); return namerec != 0 ? new PDOMName(getLinkage(), namerec) : null; } - + public void setFirstReference(PDOMName name) throws CoreException { long namerec = name != null ? name.getRecord() : 0; getDB().putRecPtr(record + FIRST_REF_OFFSET, namerec); } - + @Override public final PDOMFile getLocalToFile() throws CoreException { final long filerec = getLocalToFileRec(getDB(), record); @@ -196,7 +206,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return CharArrayUtils.EMPTY; } - + public IIndexScope getParent() { try { IBinding parent = getParentBinding(); @@ -208,12 +218,12 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return null; } - + @Override public final IIndexScope getScope() { - // The parent node in the binding hierarchy is the scope. + // The parent node in the binding hierarchy is the scope. try { - IBinding parent= getParentBinding(); + IBinding parent= getParentBinding(); while (parent != null) { if (parent instanceof ICPPClassType) { return (IIndexScope) ((ICPPClassType) parent).getCompositeScope(); @@ -223,7 +233,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding final ICPPEnumeration enumeration = (ICPPEnumeration) parent; if (enumeration.isScoped()) { return (IIndexScope) enumeration.asScope(); - } + } parent= ((PDOMNamedNode) parent).getParentBinding(); } else if (parent instanceof IIndexScope) { return (IIndexScope) parent; @@ -237,7 +247,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return null; } - + @Override public IIndexFragment getFragment() { return getPDOM(); @@ -245,7 +255,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding @Override abstract protected int getRecordSize(); // superclass's implementation is no longer valid - + /* For debug purposes only. * @see java.lang.Object#toString() */ @@ -266,15 +276,15 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } else { return getName() + "()"; //$NON-NLS-1$ } - } + } return getName(); } - + /** * For debug purposes only. * @param linkage * @param value - * @return String representation of value. + * @return String representation of value. */ protected static String getConstantNameForValue(PDOMLinkage linkage, int value) { Class c= linkage.getClass(); @@ -297,7 +307,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return Integer.toString(value); } - + public PDOMName getScopeName() { try { PDOMName name = getFirstDefinition(); @@ -314,7 +324,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding public String[] getQualifiedName() { return new String[] { getName() }; } - + @Override final public boolean isFileLocal() throws CoreException { return getDB().getRecPtr(record + LOCAL_TO_FILE) != 0; @@ -327,11 +337,11 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding /** * Compares two binding fully qualified names. If b0 has - * less segments than b1 then -1 is returned, if b0 has + * less segments than b1 then -1 is returned, if b0 has * more segments than b1 then 1 is returned. If the segment * lengths are equal then comparison is lexicographical on each * component name, beginning with the most nested name and working - * outward. + * outward. * If one of the bindings in the hierarchy is file-local it is treated as a different * binding. * The first non-zero comparison is returned as the result. @@ -345,7 +355,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding */ private static int comparePDOMBindingQNs(PDOMBinding b0, PDOMBinding b1) { try { - int cmp = 0; + int cmp = 0; do { IString s0 = b0.getDBName(), s1 = b1.getDBName(); cmp = s0.compare(s1, true); @@ -370,7 +380,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } /** - * Compares two PDOMBinding objects in accordance with + * Compares two PDOMBinding objects in accordance with * {@link IIndexFragmentBindingComparator#compare(IIndexFragmentBinding, IIndexFragmentBinding)} * @param other * @return comparison result, -1, 0, or 1. @@ -384,14 +394,14 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } return cmp; } - + /** * Returns whether pdomCompareTo returns zero */ public final boolean pdomEquals(PDOMBinding other) { return pdomCompareTo(other)==0; } - + @Override public final int getBindingConstant() { return getNodeType(); @@ -399,11 +409,11 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding /** * The binding is reused by a declaration or definition, we may need to update modifiers. - * @throws CoreException + * @throws CoreException */ public void update(PDOMLinkage linkage, IBinding newBinding) throws CoreException { } - + @Override final public void delete(PDOMLinkage linkage) throws CoreException { assert false; @@ -417,7 +427,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding public int getAdditionalNameFlags(int standardFlags, IASTName name) { return 0; } - + public final IBinding getBinding(IASTName name, boolean resolve) { return getBinding(name, resolve, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index dd7be434ab3..77608c1b493 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -25,6 +25,7 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.index.IIndexBinding; +import org.eclipse.cdt.internal.core.dom.ast.tag.TagManager; import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation; import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; import org.eclipse.cdt.internal.core.dom.parser.ProblemType; @@ -97,6 +98,11 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { if (pdomBinding != null) { getPDOM().putCachedResult(inputBinding, pdomBinding); } + + // Synchronize the tags associated with the persistent binding to match the set that is + // associated with the input binding. + TagManager.getInstance().syncTags( pdomBinding, inputBinding ); + return pdomBinding; } @@ -104,7 +110,13 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { } if (shouldUpdate(pdomBinding, fromName)) { - pdomBinding.update(this, fromName.getBinding()); + IBinding fromBinding = fromName.getBinding(); + + pdomBinding.update(this, fromBinding); + + // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but + // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. + TagManager.getInstance().syncTags( pdomBinding, fromBinding ); } return pdomBinding; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 656dfb02abd..3d85ab48e7f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -75,6 +75,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.parser.util.ArrayUtil; import org.eclipse.cdt.internal.core.Util; +import org.eclipse.cdt.internal.core.dom.ast.tag.TagManager; import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation; import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; @@ -358,6 +359,10 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { if (inputBinding instanceof CPPClosureType) { addImplicitMethods(pdomBinding, (ICPPClassType) binding, fromName); } + + // Synchronize the tags associated with the persistent binding to match the set that is + // associated with the input binding. + TagManager.getInstance().syncTags( pdomBinding, inputBinding ); } } catch (DOMException e) { throw new CoreException(Util.createStatus(e)); @@ -367,8 +372,15 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { } if (shouldUpdate(pdomBinding, fromName)) { - pdomBinding.update(this, fromName.getBinding()); + IBinding fromBinding = fromName.getBinding(); + + pdomBinding.update(this, fromBinding); + + // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but + // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. + TagManager.getInstance().syncTags( pdomBinding, fromBinding ); } + return pdomBinding; } @@ -408,7 +420,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { // template parameters are created directly by their owners. if (binding instanceof ICPPTemplateParameter) return null; - if (binding instanceof ICPPUnknownBinding) + if (binding instanceof ICPPUnknownBinding) return null; if (binding instanceof ICPPSpecialization) { @@ -561,6 +573,10 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { } else if (!getPDOM().hasLastingDefinition(pdomBinding)) { pdomBinding.update(this, method); old.remove(pdomBinding); + + // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but + // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. + TagManager.getInstance().syncTags( pdomBinding, method ); } } } @@ -691,7 +707,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { if (result != null) { return result; } - + // Assign names to anonymous types. IBinding binding= PDOMASTAdapter.getAdapterForAnonymousASTBinding(inputBinding); if (binding == null) { @@ -1111,7 +1127,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { return CPPPointerToMemberType.unmarshal(firstByte, buffer); case ITypeMarshalBuffer.DEPENDENT_EXPRESSION_TYPE: return TypeOfDependentExpression.unmarshal(firstByte, buffer); - case ITypeMarshalBuffer.UNKNOWN_MEMBER: + case ITypeMarshalBuffer.UNKNOWN_MEMBER: IBinding binding= CPPUnknownMember.unmarshal(getPDOM(), firstByte, buffer); if (binding instanceof IType) return (IType) binding; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java new file mode 100644 index 00000000000..53740f13331 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.tag; + +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.internal.core.pdom.db.BTree; +import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; +import org.eclipse.core.runtime.CoreException; + +public class BTreeIterable implements Iterable { + public static interface Descriptor { + public int compare(long record) throws CoreException; + + public T create(long record); + } + + private final BTree btree; + private final Descriptor descriptor; + + public BTreeIterable(BTree btree, Descriptor descriptor) { + this.btree = btree; + this.descriptor = descriptor; + } + + @Override + public Iterator iterator() { + Visitor v = new Visitor(); + try { + btree.accept(v); + } catch (CoreException e) { + CCorePlugin.log(e); + return Collections. emptyList().iterator(); + } + return new BTreeIterator(v.records); + } + + private class Visitor implements IBTreeVisitor { + public final List records = new LinkedList(); + + @Override + public int compare(long record) throws CoreException { + return BTreeIterable.this.descriptor.compare(record); + } + + @Override + public boolean visit(long record) throws CoreException { + records.add(Long.valueOf(record)); + return true; + } + } + + private class BTreeIterator implements Iterator { + private final Iterator records; + + public BTreeIterator(Iterable records) { + this.records = records.iterator(); + } + + @Override + public void remove() { + } + + @Override + public boolean hasNext() { + return records.hasNext(); + } + + @Override + public T next() { + return BTreeIterable.this.descriptor.create(records.next()); + } + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java new file mode 100644 index 00000000000..c332fcc5b83 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTag.java @@ -0,0 +1,323 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.tag; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; +import org.eclipse.cdt.internal.core.pdom.db.Database; +import org.eclipse.cdt.internal.core.pdom.db.IBTreeComparator; +import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; +import org.eclipse.core.runtime.CoreException; + +/** + * A container for storing tags in the PDOM. The storage format is as follows: + * + * 

+ * PDOMTag
+ * {
+ *     u4 node_record; # pointer to the node that is being tagged
+ *     u4 tagger_id;   # pointer to the string that identifies the tagger that
+ *                     # created this tag
+ *     u4 data_len;    # number of bytes stored in this tag's payload
+ *     u1[];           # a buffer for storing the tag's payload
+ * };
+ *
+ * + * Each tag points to the contributing tagger id, the record that is being tagged. Finally, it stores a buffer + * for the tag's payload. The buffer is read and written by the contributor of the tag. + */ +public class PDOMTag implements IWritableTag { + private final Database db; + private final long record; + + private String taggerId; + private int dataLen = -1; + + private static enum Fields { + Node, TaggerId, DataLen, Data; + + public final long offset = ordinal() * Database.PTR_SIZE; + + public static int sizeof(int datalen) { + return (int) Data.offset + datalen; + } + + public long getRecPtr(Database db, long instance, long data_offset) throws CoreException { + return db.getRecPtr(instance + offset + data_offset); + } + + public void putRecPtr(Database db, long instance, long data_offset, long value) + throws CoreException { + db.putRecPtr(instance + offset + data_offset, value); + } + + public void put(Database db, long instance, long data_offset, byte value) + throws CoreException { + db.putByte(instance + offset + data_offset, value); + } + + public void put(Database db, long instance, byte[] data, long data_offset, int len) + throws CoreException { + db.putBytes(instance + offset + data_offset, data, len); + } + + public byte getByte(Database db, long instance, long data_offset) throws CoreException { + return db.getByte(instance + offset + data_offset); + } + + public byte[] getBytes(Database db, long instance, long data_offset, int len) + throws CoreException { + byte[] data = new byte[len]; + db.getBytes(instance + offset + data_offset, data); + return data; + } + + public void put(Database db, long instance, long data_offset, int value) + throws CoreException { + db.putInt(instance + offset + data_offset, value); + } + + public int getInt(Database db, long instance, long data_offset) throws CoreException { + return db.getInt(instance + offset + data_offset); + } + } + + public PDOMTag(Database db, long record) { + this.db = db; + this.record = record; + } + + public PDOMTag(Database db, int dataLen) throws CoreException { + this.db = db; + this.record = db.malloc(Fields.sizeof(dataLen)); + this.dataLen = dataLen; + Fields.DataLen.put(db, record, 0, dataLen); + } + + public long getNode() throws CoreException { + return Fields.Node.getRecPtr(db, record, 0); + } + + @Override + public String getTaggerId() { + if (taggerId == null) + try { + long taggerIdRecord = Fields.TaggerId.getRecPtr(db, record, 0); + taggerId = taggerIdRecord == 0L ? new String() : db.getString(taggerIdRecord) + .getString(); + } catch (CoreException e) { + CCorePlugin.log(e); + } + + return taggerId; + } + + @Override + public int getDataLen() { + if (dataLen < 0) + try { + dataLen = Fields.DataLen.getInt(db, record, 0); + } catch (CoreException e) { + CCorePlugin.log(e); + return 0; + } + + return dataLen; + } + + public long getRecord() { + return record; + } + + /** + * Create and return a new PDOMTag that has the same node/taggerId as the receiver but with the specified + * data. Return null on failure. + */ + public PDOMTag cloneWith(byte[] data) throws CoreException { + PDOMTag partialTag = null; + try { + long existing_node = Fields.Node.getRecPtr(db, record, 0); + long existing_id = Fields.TaggerId.getRecPtr(db, record, 0); + + partialTag = new PDOMTag(db, data.length); + Fields.Node.putRecPtr(db, partialTag.record, 0, existing_node); + Fields.TaggerId.putRecPtr(db, partialTag.record, 0, existing_id); + if (partialTag.putBytes(0, data, data.length)) { + PDOMTag tag = partialTag; + partialTag = null; + return tag; + } + } finally { + if (partialTag != null) + partialTag.delete(); + } + + return null; + } + + public void delete() { + if (db != null && record != 0) + try { + db.free(record); + } catch (CoreException e) { + CCorePlugin.log(e); + } + } + + public static class BTreeComparator implements IBTreeComparator { + private final Database db; + + public BTreeComparator(Database db) { + this.db = db; + } + + @Override + public int compare(long record1, long record2) throws CoreException { + if (record1 == record2) + return 0; + + long node1 = Fields.Node.getRecPtr(db, record1, 0); + long node2 = Fields.Node.getRecPtr(db, record2, 0); + if (node1 < node2) + return -1; + if (node1 > node2) + return 1; + + long tagger1 = Fields.TaggerId.getRecPtr(db, record1, 0); + long tagger2 = Fields.TaggerId.getRecPtr(db, record2, 0); + if (tagger1 < tagger2) + return -1; + if (tagger1 > tagger2) + return 1; + + return 0; + } + } + + public static class BTreeVisitor implements IBTreeVisitor { + private final Database db; + private final long node2; + private final long tagger2; + + public boolean hasResult = false; + public long tagRecord = 0; + + public BTreeVisitor(Database db, long node2, long tagger2) { + this.db = db; + this.node2 = node2; + this.tagger2 = tagger2; + } + + @Override + public int compare(long record1) throws CoreException { + long node1 = Fields.Node.getRecPtr(db, record1, 0); + if (node1 < node2) + return -1; + if (node1 > node2) + return 1; + + long tagger1 = Fields.TaggerId.getRecPtr(db, record1, 0); + if (tagger1 < tagger2) + return -1; + if (tagger1 > tagger2) + return 1; + + return 0; + } + + @Override + public boolean visit(long record) throws CoreException { + tagRecord = record; + hasResult = true; + return false; + } + } + + public void setNode(long node) throws CoreException { + Fields.Node.putRecPtr(db, record, 0, node); + } + + public void setTaggerId(long idRecord) throws CoreException { + Fields.TaggerId.putRecPtr(db, record, 0, idRecord); + } + + private boolean isInBounds(int offset, int len) { + int data_len = getDataLen(); + return offset >= 0 && offset < data_len && (offset + len) <= data_len; + } + + @Override + public boolean putByte(int offset, byte data) { + if (!isInBounds(offset, 1)) + return false; + + try { + Fields.Data.put(db, record, offset, data); + return true; + } catch (CoreException e) { + CCorePlugin.log(e); + return false; + } + } + + @Override + public boolean putBytes(int offset, byte[] data, int len) { + boolean fullWrite = len < 0; + if (fullWrite) + len = data.length; + if (!isInBounds(offset, len)) + return false; + + try { + Fields.Data.put(db, record, data, offset, len); + + // if the new buffer replaces all of the existing one, then modify the receiver's stored length + int currLen = getDataLen(); + if (fullWrite && offset == 0 && currLen > len) { + Fields.DataLen.put(db, record, 0, len); + dataLen = len; + } + + return true; + } catch (CoreException e) { + CCorePlugin.log(e); + return false; + } + } + + @Override + public int getByte(int offset) { + if (!isInBounds(offset, 1)) + return FAIL; + + try { + return Fields.Data.getByte(db, record, offset); + } catch (CoreException e) { + CCorePlugin.log(e); + return FAIL; + } + } + + @Override + public byte[] getBytes(int offset, int len) { + len = len >= 0 ? len : getDataLen() - offset; + if (!isInBounds(offset, len)) + return null; + + try { + return Fields.Data.getBytes(db, record, offset, len); + } catch (CoreException e) { + CCorePlugin.log(e); + return null; + } + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java new file mode 100644 index 00000000000..614ba8f34d4 --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagIndex.java @@ -0,0 +1,269 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.tag; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; +import org.eclipse.cdt.internal.core.pdom.PDOM; +import org.eclipse.cdt.internal.core.pdom.db.BTree; +import org.eclipse.cdt.internal.core.pdom.db.Database; +import org.eclipse.cdt.internal.core.pdom.db.PDOMStringSet; +import org.eclipse.core.runtime.CoreException; + +/** + * Not thread-safe. + */ +public class PDOMTagIndex { + private final Database db; + private final long ptr; + private long rootRecord; + + private static enum Fields { + TaggerIds, Tags, _last; + + public final long offset = ordinal() * Database.PTR_SIZE; + public static int sizeof = _last.ordinal() * Database.PTR_SIZE; + } + + private PDOMStringSet taggerIds; + private BTree tags; + + public PDOMTagIndex(Database db, long ptr) throws CoreException { + this.db = db; + this.ptr = ptr; + this.rootRecord = 0; + } + + private long getFieldAddress(Fields field) throws CoreException { + if (rootRecord == 0) + rootRecord = db.getRecPtr(ptr); + + if (rootRecord == 0) { + rootRecord = db.malloc(Fields.sizeof); + db.putRecPtr(ptr, rootRecord); + } + + return rootRecord + field.offset; + } + + private PDOMStringSet getTaggerIds() throws CoreException { + if (taggerIds == null) + taggerIds = new PDOMStringSet(db, getFieldAddress(Fields.TaggerIds)); + return taggerIds; + } + + private BTree getTagsBTree() throws CoreException { + if (tags == null) + tags = new BTree(db, getFieldAddress(Fields.Tags), new PDOMTag.BTreeComparator(db)); + return tags; + } + + /** + * Return the record storing the specified tagger id. Create a new record if needed. + */ + private long getIdRecord(String taggerId, boolean createIfNeeded) { + assert taggerId != null; + assert !taggerId.isEmpty(); + + if (db == null || taggerId == null || taggerId.isEmpty() + || (taggerIds == null && !createIfNeeded)) + return 0L; + + try { + long record = getTaggerIds().find(taggerId); + if (record == 0 && createIfNeeded) + record = getTaggerIds().add(taggerId); + return record; + } catch (CoreException e) { + CCorePlugin.log(e); + } + + return 0L; + } + + private IWritableTag createTag(long record, String id, int len) { + if (db == null) + return null; + + long idRecord = getIdRecord(id, true); + if (idRecord == 0L) + return null; + + try { + PDOMTag tag = new PDOMTag(db, len); + tag.setNode(record); + tag.setTaggerId(idRecord); + + // return the tag if it was properly inserted + long inserted = getTagsBTree().insert(tag.getRecord()); + if (inserted == tag.getRecord()) + return tag; + + // TODO check that the existing record has the same length + + // otherwise destroy this provisional one and return the tag that was actually inserted + // TODO figure out what this case means + tag.delete(); + return inserted == 0 ? null : new PDOMTag(db, inserted); + } catch (CoreException e) { + CCorePlugin.log(e); + } + + return null; + } + + private ITag getTag(long record, String id) { + if (db == null) + return null; + + long idRecord = getIdRecord(id, false); + if (idRecord == 0L) + return null; + + PDOMTag.BTreeVisitor v = new PDOMTag.BTreeVisitor(db, record, idRecord); + try { + getTagsBTree().accept(v); + } catch (CoreException e) { + CCorePlugin.log(e); + } + + return v.hasResult ? new PDOMTag(db, v.tagRecord) : null; + } + + private Iterable getTags(long binding_record) { + BTree btree = null; + try { + btree = getTagsBTree(); + } catch (CoreException e) { + CCorePlugin.log(e); + return Collections.emptyList(); + } + + final Long bindingRecord = Long.valueOf(binding_record); + return new BTreeIterable(btree, new BTreeIterable.Descriptor() { + @Override + public ITag create(long record) { + return new PDOMTag(db, record); + } + + @Override + public int compare(long test_record) throws CoreException { + long test_node = new PDOMTag(db, test_record).getNode(); + + // -1 if record < key, 0 if record == key, 1 if record > key + return Long.valueOf(test_node).compareTo(bindingRecord); + } + }); + } + + private boolean setTags(long binding_record, Iterable tags) { + // There could be several tags for the given record in the database, one for each taggerId. We need + // to delete all of those tags and replace them with given list. The incoming tags are first put + // into a map, indexed by their taggerId. Then we examine the btree of tags to find all tags for this + // record. In each case we decide whether to delete or update the tag. Tags of the same size can be + // updated in place, otherwise the tag needs to be deleted and recreated. + + final Map newTags = new HashMap(); + for (ITag tag : tags) { + ITag dupTag = newTags.put(tag.getTaggerId(), tag); + if (dupTag != null) + CCorePlugin + .log("Duplicate incoming tag for record " + binding_record + " from taggerId " + tag.getTaggerId()); //$NON-NLS-1$ //$NON-NLS-2$ + } + + BTree btree = null; + try { + btree = getTagsBTree(); + } catch (CoreException e) { + CCorePlugin.log(e); + return false; + } + + PDOMTagSynchronizer sync = new PDOMTagSynchronizer(db, Long.valueOf(binding_record), + newTags); + + // visit the full tree, then return true on success and false on failure + try { + btree.accept(sync); + } catch (CoreException e) { + CCorePlugin.log(e); + return false; + } + + // Complete the synchronization (delete/insert the records that could not be modified in-place). This + // will only have something to do when a tag has changed length, which should be a rare. + sync.synchronize(btree); + + // insert any new tags that are left in the incoming list + for (ITag newTag : newTags.values()) { + IWritableTag pdomTag = createTag(binding_record, newTag.getTaggerId(), + newTag.getDataLen()); + pdomTag.putBytes(0, newTag.getBytes(0, -1), -1); + } + + return true; + } + + private static PDOMTagIndex getTagIndex(PDOM pdom) { + if (pdom == null) + return null; + + try { + PDOMTagIndex index = pdom.getTagIndex(); + return index.db == null ? null : index; + } catch (CoreException e) { + CCorePlugin.log(e); + } + return null; + } + + // common implementations + public static IWritableTag createTag(PDOM pdom, long record, String id, int len) { + PDOMTagIndex index = getTagIndex(pdom); + if (index == null) + return null; + + return index.createTag(record, id, len); + } + + public static ITag getTag(PDOM pdom, long record, String id) { + PDOMTagIndex index = getTagIndex(pdom); + if (index == null) + return null; + + return index.getTag(record, id); + } + + public static Iterable getTags(PDOM pdom, long record) { + PDOMTagIndex index = getTagIndex(pdom); + if (index == null) + return Collections.emptyList(); + + return index.getTags(record); + } + + public static boolean setTags(PDOM pdom, long record, Iterable tags) { + if (record == 0) + return true; + + PDOMTagIndex index = getTagIndex(pdom); + if (index == null) + return false; + + return index.setTags(record, tags); + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java new file mode 100644 index 00000000000..4043e44d8fd --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTagSynchronizer.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.tag; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.internal.core.pdom.db.BTree; +import org.eclipse.cdt.internal.core.pdom.db.Database; +import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; +import org.eclipse.core.runtime.CoreException; + +/** + * An implementation utility for synchronizing the tags between source and destination nodes. + */ +public class PDOMTagSynchronizer implements IBTreeVisitor { + private final Database db; + private final Long searchRecord; + private final Map newTags; + + private final List toRemove = new LinkedList(); + private final List toInsert = new LinkedList(); + + public PDOMTagSynchronizer(Database db, Long searchRecord, Map newTags) { + this.db = db; + this.searchRecord = searchRecord; + this.newTags = newTags; + } + + /** + * Complete the synchronization by deleting and inserting all required records. Return true if successful + * and false otherwise. + */ + public boolean synchronize(BTree tree) { + for (Long rm : toRemove) + try { + long record = rm.longValue(); + tree.delete(record); + db.free(record); + } catch (CoreException e) { + CCorePlugin.log(e); + } + toRemove.clear(); + + for (Long insert : toInsert) + try { + tree.insert(insert.longValue()); + } catch (CoreException e) { + CCorePlugin.log(e); + try { + db.free(insert.longValue()); + } catch (CoreException e1) { + CCorePlugin.log(e1); + } + } + toInsert.clear(); + + return true; + } + + @Override + public int compare(long test_record) throws CoreException { + // TODO this is the same as BTreeIterable.Descriptor.compare + + long test_node = new PDOMTag(db, test_record).getNode(); + + // -1 if record < key, 0 if record == key, 1 if record > key + return Long.valueOf(test_node).compareTo(searchRecord); + } + + @Override + public boolean visit(long existing_record) throws CoreException { + PDOMTag existingTag = new PDOMTag(db, existing_record); + String taggerId = existingTag.getTaggerId(); + + ITag newTag = newTags.remove(taggerId); + if (newTag == null) { + toRemove.add(Long.valueOf(existing_record)); + } else if (newTag.getDataLen() > existingTag.getDataLen()) { + toRemove.add(Long.valueOf(existing_record)); + + PDOMTag pdomTag = existingTag.cloneWith(newTag.getBytes(0, -1)); + if (pdomTag != null) + toInsert.add(Long.valueOf(pdomTag.getRecord())); + } else if (!existingTag.putBytes(0, newTag.getBytes(0, -1), -1)) + CCorePlugin + .log("Unable to modify data of tag record " + existing_record + " from taggerId " + taggerId); //$NON-NLS-1$ //$NON-NLS-2$ + + // try to visit the full tree + return true; + } +} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java new file mode 100644 index 00000000000..5714ee6655b --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/PDOMTaggable.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2013 QNX Software Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andrew Eidsness - Initial implementation + */ + +package org.eclipse.cdt.internal.core.pdom.tag; + +import org.eclipse.cdt.core.dom.ast.tag.ITag; +import org.eclipse.cdt.core.dom.ast.tag.ITagReader; +import org.eclipse.cdt.core.dom.ast.tag.ITagWriter; +import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; +import org.eclipse.cdt.internal.core.pdom.PDOM; + +/** + * A container for things that can be tagged and then stored in the index database. + */ +public class PDOMTaggable implements ITagReader, ITagWriter { + private final PDOM pdom; + private final long record; + + public PDOMTaggable(PDOM pdom, long record) { + this.pdom = pdom; + this.record = record; + } + + @Override + public IWritableTag createTag(String id, int len) { + return PDOMTagIndex.createTag(pdom, record, id, len); + } + + @Override + public ITag getTag(String id) { + return PDOMTagIndex.getTag(pdom, record, id); + } + + @Override + public Iterable getTags() { + return PDOMTagIndex.getTags(pdom, record); + } + + @Override + public boolean setTags(Iterable tags) { + return PDOMTagIndex.setTags(pdom, record, tags); + } +} diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties index 46e1547c2f1..287ee250127 100644 --- a/core/org.eclipse.cdt.core/plugin.properties +++ b/core/org.eclipse.cdt.core/plugin.properties @@ -121,6 +121,7 @@ CConfigurationDataProvider.name = CConfigurationData provider projectConverter.name = project converter CIndex.name = CIndex externalSettingsProvider.name = External Settings provider +tagger.name = Parser Node Tagger Extension Point GeneratePDOMApplication.name = GeneratePDOM defaultProvider.name = Default Provider templatesExtensionPoint.name = Templates Extension point diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml index bb1125caabd..4b2e257ed6a 100644 --- a/core/org.eclipse.cdt.core/plugin.xml +++ b/core/org.eclipse.cdt.core/plugin.xml @@ -42,6 +42,7 @@ + diff --git a/core/org.eclipse.cdt.core/schema/tagger.exsd b/core/org.eclipse.cdt.core/schema/tagger.exsd new file mode 100644 index 00000000000..98d37683785 --- /dev/null +++ b/core/org.eclipse.cdt.core/schema/tagger.exsd @@ -0,0 +1,139 @@ + + + + + + + + + This extension point allows extensions to contribute to the parsed nodes. When PDOM nodes are tagged, the content of the tag is stored in to the Database. The information for other nodes, e.g., the AST, is stored in memory. + + + + + + + + + + + + + + + + + + + a fully qualified identifier of the target extension point + + + + + + + an optional identifier of the extension instance + + + + + + + an optional name of the extension instance + + + + + + + + + + + + + + + + + + + + + + + + + + + A unique identifier for this tagger's contributions. + +The local id will be appended to the contributing plugin's id (separated with a dot '.') to form the globally unique identifier for this tagger. This id is used to uniquely associate the tag with this plugin. + + + + + + + + + + + + 8.2 + + + + + + + + + The following is an example of a Tagger contribution: +<p> +<pre> +<extension + point="org.eclipse.cdt.core.tagger" + id="example" + name="Example Tagger Extension"> + <bindingTagger + local-id="my-tagger" + class="com.example.internal.ExampleTagger"> + <enablement> + <with variable="projectNatures"> + <iterate operator="or"> + <equals value="com.example.my-nature"/> + </iterate> + </with> + </enablement> + </bindingTagger> +</extension> +</pre> +</p> + + + + + + + + + The contributed class must implement <code>org.eclipse.cdt.core.dom.ast.tag.IBindingTagger</code> + + + + + + + + + + Copyright (c) 2013 QNX Software Systems 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 +http://www.eclipse.org/legal/epl-v10.html + + + + diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index 22a22903a2e..b5fc7a7384f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -26,6 +26,7 @@ import java.util.ResourceBundle; import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; import org.eclipse.cdt.core.cdtvariables.IUserVarSupplier; import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.tag.ITagService; import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager; import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; @@ -50,6 +51,7 @@ import org.eclipse.cdt.internal.core.ICConsole; import org.eclipse.cdt.internal.core.PositionTrackerManager; import org.eclipse.cdt.internal.core.cdtvariables.CdtVariableManager; import org.eclipse.cdt.internal.core.cdtvariables.UserVarSupplier; +import org.eclipse.cdt.internal.core.dom.ast.tag.TagService; import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsScannerInfoProvider; import org.eclipse.cdt.internal.core.model.CModelManager; @@ -214,6 +216,8 @@ public class CCorePlugin extends Plugin { private PDOMManager pdomManager; + private ITagService tagService = new TagService(); + private CdtVarPathEntryVariableManager fPathEntryVariableManager; private final class NullConsole implements IConsole { @@ -713,6 +717,13 @@ public class CCorePlugin extends Plugin { return getDefault().pdomManager; } + /** + * @since 5.5 + */ + public static ITagService getTagService() { + return getDefault().tagService; + } + public IPathEntryVariableManager getPathEntryVariableManager() { return fPathEntryVariableManager; } diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java index 733e08857ab..63d22a437fc 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java @@ -156,7 +156,7 @@ public class QtCompletionProposalComputer extends ParsingBasedProposalComputer return false; int result = tag.getByte( 0 ); - return result != ITag.Fail + return result != ITag.FAIL && ( ( result & QtPlugin.SignalSlot_Mask_signal ) == QtPlugin.SignalSlot_Mask_signal ); } }; @@ -175,7 +175,7 @@ public class QtCompletionProposalComputer extends ParsingBasedProposalComputer return false; int result = tag.getByte( 0 ); - return result != ITag.Fail + return result != ITag.FAIL && ( ( result & QtPlugin.SignalSlot_Mask_slot ) == QtPlugin.SignalSlot_Mask_slot ); } }; From 9c4d88dab487ddb2ab594bf88743199775d24559 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Tue, 26 Feb 2013 23:08:13 -0500 Subject: [PATCH 14/27] Fix up a few formatting things and the version number for tags. --- .../cdt/internal/core/pdom/AbstractIndexerTask.java | 2 +- .../parser/org/eclipse/cdt/internal/core/pdom/PDOM.java | 7 +++---- .../cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index df417262095..29c316206de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -1008,7 +1008,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { if (ast != null) { // Give the new AST-TU a chance to recognize its translation unit before it is written // to the index. - ( (ASTTranslationUnit)ast ).setOriginatingTranslationUnit( (ITranslationUnit)tu ); + ((ASTTranslationUnit)ast).setOriginatingTranslationUnit((ITranslationUnit)tu); writeToIndex(lang.getLinkageID(), ast, codeReader, ctx, pm); } } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index 5c59fbcba75..b56e4eb9fac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -465,10 +465,9 @@ public class PDOM extends PlatformObject implements IPDOM { } public PDOMTagIndex getTagIndex() throws CoreException { - if (tagIndex == null) - { - // tag index can only be stored in database versions 139.1 or greater - tagIndex = new PDOMTagIndex( db.getVersion() >= version( 139, 1 ) ? db : null, TAG_INDEX ); + if (tagIndex == null) { + // tag index can only be stored in database versions 140.1 or greater + tagIndex = new PDOMTagIndex(db.getVersion() >= version(140, 1) ? db : null, TAG_INDEX); } return tagIndex; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 3d85ab48e7f..b07afe54c2e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -378,7 +378,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, fromBinding ); + TagManager.getInstance().syncTags(pdomBinding, fromBinding); } return pdomBinding; From 773aa77a2ac589f15951363faa7159b93f9b77f9 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Mon, 25 Feb 2013 16:21:49 -0500 Subject: [PATCH 15/27] Bug 401743 - NullPointerException in EvalBinding.instantiate() - tpMap is null Change-Id: Iea69ddf7f1872f0e1b0a918faed400b6d5d4f2f7 Reviewed-on: https://git.eclipse.org/r/10641 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../parser/tests/ast2/AST2TemplateTests.java | 25 +++++++++++++++++++ .../cdt/internal/core/dom/parser/Value.java | 12 +++++++++ .../dom/parser/cpp/semantics/EvalBinding.java | 13 +++++++--- .../core/dom/parser/cpp/semantics/EvalID.java | 4 +-- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java index 10fb36e671f..54feea4966d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java @@ -7334,4 +7334,29 @@ public class AST2TemplateTests extends AST2TestBase { public void testVariadicNonTypeTemplateParameter_401400() throws Exception { parseAndCheckBindings(); } + + // template struct tuple_indices {}; + // template + // struct make_indices_imp; + // template + // struct make_indices_imp, Ep> { + // typedef typename make_indices_imp, Ep>::type type; + // }; + // template + // struct make_indices_imp, Ep> { + // typedef tuple_indices type; + // }; + // template + // struct make_tuple_indices { + // typedef typename make_indices_imp, Ep>::type type; + // }; + // template + // class async_func { + // void operator()() { + // typedef typename make_tuple_indices<1 + sizeof...(Args), 1>::type Index; + // } + // }; + public void testVariadicTemplatesNPE_401743() throws Exception { + parseAndCheckBindings(); + } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java index dbb79403e81..21bf02ae84e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java @@ -402,6 +402,18 @@ public class Value implements IValue { public static boolean isDependentValue(IValue nonTypeValue) { if (nonTypeValue == null) return false; + // Unknown values may or may not be dependent. In the case of a template with + // a non-type template argument, whether or not the argument's value is dependent + // determines whether or not the template gets instantiated. In light of this, + // it's safer to assume that an unknown value is dependent because: + // 1. Instantiating a template with a non-type template argument whose value is + // unknown is useless. + // 2. Instantiating such a template can lead to an infinite recursion of + // instantiations (e.g. consider a template A that delegates to A, + // with A<0> being specialized to end the recursion - if N is unknown, + // N - 1 will be unknown as well, and we get an infinite recursion). + if (nonTypeValue == UNKNOWN) + return true; ICPPEvaluation eval = nonTypeValue.getEvaluation(); return eval != null && eval.isValueDependent(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java index a59760b7055..1f5101a1df2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java @@ -279,6 +279,11 @@ public class EvalBinding extends CPPDependentEvaluation { value= ((IVariable) fBinding).getInitialValue(); } else if (fBinding instanceof IEnumerator) { value= ((IEnumerator) fBinding).getValue(); + } else if (fBinding instanceof IFunction) { + // If a function passed as a non-type template parameter is constexpr, + // it can be used inside the template as a constexpr function, so it's + // important to preserve the binding in the value. + value = Value.create(this); } if (value == null) value = Value.UNKNOWN; @@ -336,9 +341,11 @@ public class EvalBinding extends CPPDependentEvaluation { ICPPClassSpecialization within, int maxdepth, IASTNode point) { IBinding origBinding = getBinding(); if (origBinding instanceof ICPPTemplateNonTypeParameter) { - ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding, packOffset); - if (argument != null && argument.isNonTypeValue()) { - return argument.getNonTypeEvaluation(); + if (tpMap != null) { + ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding, packOffset); + if (argument != null && argument.isNonTypeValue()) { + return argument.getNonTypeEvaluation(); + } } // TODO(sprigogin): Do we need something similar for pack expansion? } else if (origBinding instanceof ICPPParameter) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java index 49960745ddc..1b50bb7f038 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java @@ -354,10 +354,8 @@ public class EvalID extends CPPDependentEvaluation { return new EvalFunctionSet(new CPPFunctionSet(functions, templateArgs, null), fAddressOf, getTemplateDefinition()); } IBinding binding = bindings.length == 1 ? bindings[0] : null; - if (binding instanceof IEnumerator) { + if (binding instanceof IEnumerator || binding instanceof ICPPMember) { return new EvalBinding(binding, null, getTemplateDefinition()); - } else if (binding instanceof ICPPMember) { - return new EvalMemberAccess(nameOwner, ValueCategory.PRVALUE, binding, false, getTemplateDefinition()); } else if (binding instanceof CPPFunctionSet) { return new EvalFunctionSet((CPPFunctionSet) binding, fAddressOf, getTemplateDefinition()); } From 96a4a227aa4228ac03813407eb112c6cc8f5ef14 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 21 Feb 2013 20:46:08 -0500 Subject: [PATCH 16/27] Bug 401479 - Error involving variadic templates and function objects Change-Id: Ie4fcbc1a14d9a3b034789b3dd5c2b24dd05c196d Reviewed-on: https://git.eclipse.org/r/10578 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../parser/tests/ast2/AST2TemplateTests.java | 17 +++ .../core/dom/parser/ITypeMarshalBuffer.java | 95 ++++++++----- .../core/dom/parser/ProblemFunctionType.java | 4 +- .../internal/core/dom/parser/ProblemType.java | 8 +- .../cdt/internal/core/dom/parser/Value.java | 24 ++-- .../core/dom/parser/c/CArrayType.java | 44 +++--- .../core/dom/parser/c/CBasicType.java | 21 ++- .../core/dom/parser/c/CFunctionType.java | 20 +-- .../core/dom/parser/c/CPointerType.java | 14 +- .../core/dom/parser/c/CQualifierType.java | 16 +-- .../cpp/CPPASTPackExpansionExpression.java | 14 +- .../parser/cpp/CPPAliasTemplateInstance.java | 6 +- .../core/dom/parser/cpp/CPPArrayType.java | 14 +- .../core/dom/parser/cpp/CPPBasicType.java | 21 ++- .../parser/cpp/CPPDeferredClassInstance.java | 6 +- .../core/dom/parser/cpp/CPPFunctionType.java | 18 +-- .../dom/parser/cpp/CPPParameterPackType.java | 6 +- .../parser/cpp/CPPPointerToMemberType.java | 18 +-- .../core/dom/parser/cpp/CPPPointerType.java | 18 +-- .../core/dom/parser/cpp/CPPQualifierType.java | 14 +- .../core/dom/parser/cpp/CPPReferenceType.java | 10 +- .../cpp/CPPTemplateNonTypeArgument.java | 6 +- .../parser/cpp/CPPUnknownClassInstance.java | 6 +- .../core/dom/parser/cpp/CPPUnknownMember.java | 14 +- .../cpp/semantics/CPPDependentEvaluation.java | 60 ++++++++ .../dom/parser/cpp/semantics/EvalBinary.java | 4 +- .../cpp/semantics/EvalBinaryTypeId.java | 4 +- .../dom/parser/cpp/semantics/EvalBinding.java | 18 ++- .../dom/parser/cpp/semantics/EvalComma.java | 4 +- .../parser/cpp/semantics/EvalCompound.java | 4 +- .../parser/cpp/semantics/EvalConditional.java | 14 +- .../dom/parser/cpp/semantics/EvalFixed.java | 24 ++-- .../cpp/semantics/EvalFunctionCall.java | 17 +-- .../parser/cpp/semantics/EvalFunctionSet.java | 14 +- .../core/dom/parser/cpp/semantics/EvalID.java | 18 +-- .../parser/cpp/semantics/EvalInitList.java | 17 +-- .../cpp/semantics/EvalMemberAccess.java | 18 +-- .../cpp/semantics/EvalParameterPack.java | 131 ++++++++++++++++++ .../dom/parser/cpp/semantics/EvalTypeId.java | 26 ++-- .../dom/parser/cpp/semantics/EvalUnary.java | 4 +- .../parser/cpp/semantics/EvalUnaryTypeID.java | 4 +- .../dom/parser/cpp/semantics/LookupData.java | 3 +- .../cpp/semantics/SignatureBuilder.java | 29 ++-- .../semantics/TypeOfDependentExpression.java | 4 +- .../composite/cpp/CPPCompositesFactory.java | 9 ++ .../eclipse/cdt/internal/core/pdom/PDOM.java | 9 +- .../core/pdom/db/TypeMarshalBuffer.java | 85 ++++++------ .../core/pdom/dom/c/PDOMCLinkage.java | 18 +-- .../core/pdom/dom/cpp/PDOMCPPLinkage.java | 88 ++++++------ 49 files changed, 637 insertions(+), 423 deletions(-) create mode 100644 core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalParameterPack.java diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java index 54feea4966d..31a9337ca88 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java @@ -7205,6 +7205,23 @@ public class AST2TemplateTests extends AST2TestBase { parseAndCheckBindings(); } + // int fn(int); + // struct S { + // template + // auto operator()(Args... args) -> decltype(fn(args...)); + // }; + // template + // int foo(F); + // template + // void bar(T); + // int main() { + // S s; + // bar(foo(s(0))); + // } + public void testVariadicTemplatesAndFunctionObjects_401479() throws Exception { + parseAndCheckBindings(); + } + // struct S { // void kind(); // }; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ITypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ITypeMarshalBuffer.java index 470ea5f1943..c163a7d07ba 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ITypeMarshalBuffer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ITypeMarshalBuffer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems, Inc. and others. + * Copyright (c) 2009, 2013 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,6 +9,7 @@ * Markus Schorn - initial API and implementation * Thomas Corbat * Sergey Prigogin (Google) + * Nathan Ridge *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; @@ -22,45 +23,56 @@ import org.eclipse.core.runtime.CoreException; * Buffer for marshalling and unmarshalling types. */ public interface ITypeMarshalBuffer { - final static byte BASIC_TYPE= 1; - final static byte POINTER_TYPE= 2; - final static byte ARRAY_TYPE= 3; - final static byte CVQUALIFIER_TYPE= 4; - final static byte FUNCTION_TYPE= 5; - final static byte REFERENCE_TYPE= 6; - final static byte POINTER_TO_MEMBER_TYPE= 7; - final static byte PACK_EXPANSION_TYPE= 8; - final static byte PROBLEM_TYPE= 9; - final static byte VALUE= 10; - final static byte DEPENDENT_EXPRESSION_TYPE= 11; - final static byte UNKNOWN_MEMBER= 12; - final static byte UNKNOWN_MEMBER_CLASS_INSTANCE= 13; - final static byte DEFERRED_CLASS_INSTANCE= 14; - final static byte ALIAS_TEMPLATE = 15; + final static byte BASIC_TYPE = 0x01; + final static byte POINTER_TYPE = 0x02; + final static byte ARRAY_TYPE = 0x03; + final static byte CVQUALIFIER_TYPE = 0x04; + final static byte FUNCTION_TYPE = 0x05; + final static byte REFERENCE_TYPE = 0x06; + final static byte POINTER_TO_MEMBER_TYPE = 0x07; + final static byte PACK_EXPANSION_TYPE = 0x08; + final static byte PROBLEM_TYPE = 0x09; + final static byte VALUE = 0x0A; + final static byte DEPENDENT_EXPRESSION_TYPE = 0x0B; + final static byte UNKNOWN_MEMBER = 0x0C; + final static byte UNKNOWN_MEMBER_CLASS_INSTANCE = 0x0D; + final static byte DEFERRED_CLASS_INSTANCE = 0x0E; + final static byte ALIAS_TEMPLATE = 0x0F; + // Can add more types up to 0x1C, after that it will collide with TypeMarshalBuffer.UNSTORABLE_TYPE. final static byte - EVAL_BINARY= 1, - EVAL_BINARY_TYPE_ID = 2, - EVAL_BINDING = 3, - EVAL_COMMA = 4, - EVAL_COMPOUND = 5, - EVAL_CONDITIONAL = 6, - EVAL_FIXED= 7, - EVAL_FUNCTION_CALL= 8, - EVAL_FUNCTION_SET= 9, - EVAL_ID= 10, - EVAL_INIT_LIST= 11, - EVAL_MEMBER_ACCESS= 12, - EVAL_TYPE_ID= 13, - EVAL_UNARY= 14, - EVAL_UNARY_TYPE_ID = 15; + EVAL_BINARY = 0x01, + EVAL_BINARY_TYPE_ID = 0x02, + EVAL_BINDING = 0x03, + EVAL_COMMA = 0x04, + EVAL_COMPOUND = 0x05, + EVAL_CONDITIONAL = 0x06, + EVAL_FIXED = 0x07, + EVAL_FUNCTION_CALL = 0x08, + EVAL_FUNCTION_SET = 0x09, + EVAL_ID = 0x0A, + EVAL_INIT_LIST = 0x0B, + EVAL_MEMBER_ACCESS = 0x0C, + EVAL_PARAMETER_PACK = 0x0D, + EVAL_TYPE_ID = 0x0E, + EVAL_UNARY = 0x0F, + EVAL_UNARY_TYPE_ID = 0x10; + // Can add more evaluations up to 0x1C, after that it will collide with TypeMarshalBuffer.UNSTORABLE_TYPE. - static final byte KIND_MASK= 15; + static final short KIND_MASK = 0x001F; - final static int FLAG1 = 0x10; - final static int FLAG2 = 0x20; - final static int FLAG3 = 0x40; - final static int FLAG4 = 0x80; + final static short FIRST_FLAG = 0x0020; + + final static short FLAG1 = 0x0020; + final static short FLAG2 = 0x0040; + final static short FLAG3 = 0x0080; + final static short FLAG4 = 0x0100; + final static short FLAG5 = 0x0200; + final static short FLAG6 = 0x0400; + final static short FLAG7 = 0x0800; + // Can add more flags up to LAST_FLAG. + + final static short LAST_FLAG = 0x2000; CoreException unmarshallingError(); @@ -72,6 +84,11 @@ public interface ITypeMarshalBuffer { int getByte() throws CoreException; int getFixedInt() throws CoreException; + /** + * Reads a 16-bit integer stored in the variable length base-128 encoding. + */ + public short getShort() throws CoreException; + /** * Reads a 32-bit integer stored in the variable length base-128 encoding. */ @@ -92,6 +109,12 @@ public interface ITypeMarshalBuffer { void putByte(byte data); void putFixedInt(int data); + /** + * Writes a 16-bit integer in the variable length base-128 encoding. + * @param value the value to write + */ + public void putShort(short value); + /** * Writes a 32-bit integer in the variable length base-128 encoding. Each byte, except the last * byte, has the most significant bit set – this indicates that there are further bytes to come. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemFunctionType.java index fdeddcf8d21..797bf9278c3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemFunctionType.java @@ -28,11 +28,11 @@ public class ProblemFunctionType extends ProblemType implements ICPPFunctionType @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - buffer.putByte((byte) (ITypeMarshalBuffer.PROBLEM_TYPE | ITypeMarshalBuffer.FLAG1)); + buffer.putShort((short) (ITypeMarshalBuffer.PROBLEM_TYPE | ITypeMarshalBuffer.FLAG1)); buffer.putInt(getID()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { return new ProblemFunctionType(buffer.getInt()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemType.java index 8c6852c2935..48d9b49696a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemType.java @@ -56,13 +56,13 @@ public class ProblemType implements IProblemType, ISerializableType { @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.PROBLEM_TYPE); + buffer.putShort(ITypeMarshalBuffer.PROBLEM_TYPE); buffer.putInt(getID()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) - return ProblemFunctionType.unmarshal(firstByte, buffer); + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) + return ProblemFunctionType.unmarshal(firstBytes, buffer); return new ProblemType(buffer.getInt()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java index 21bf02ae84e..49dfa213641 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java @@ -154,41 +154,41 @@ public class Value implements IValue { return IBinding.EMPTY_BINDING_ARRAY; } - public void marshall(ITypeMarshalBuffer buf) throws CoreException { + public void marshal(ITypeMarshalBuffer buf) throws CoreException { if (UNKNOWN == this) { - buf.putByte((byte) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG1)); + buf.putShort((short) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG1)); } else { Long num= numericalValue(); if (num != null) { long lv= num; if (lv >= 0) { - buf.putByte((byte) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG2)); + buf.putShort((short) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG2)); buf.putLong(lv); } else { - buf.putByte((byte) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG3)); + buf.putShort((short) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG3)); buf.putLong(-lv); } } else if (fFixedValue != null) { - buf.putByte((byte) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG4)); + buf.putShort((short) (ITypeMarshalBuffer.VALUE | ITypeMarshalBuffer.FLAG4)); buf.putCharArray(fFixedValue); } else { - buf.putByte((ITypeMarshalBuffer.VALUE)); + buf.putShort(ITypeMarshalBuffer.VALUE); fEvaluation.marshal(buf, true); } } } public static IValue unmarshal(ITypeMarshalBuffer buf) throws CoreException { - int firstByte= buf.getByte(); - if (firstByte == TypeMarshalBuffer.NULL_TYPE) + short firstBytes= buf.getShort(); + if (firstBytes == TypeMarshalBuffer.NULL_TYPE) return null; - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) return Value.UNKNOWN; - if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) + if ((firstBytes & ITypeMarshalBuffer.FLAG2) != 0) return Value.create(buf.getLong()); - if ((firstByte & ITypeMarshalBuffer.FLAG3) != 0) + if ((firstBytes & ITypeMarshalBuffer.FLAG3) != 0) return Value.create(-buf.getLong()); - if ((firstByte & ITypeMarshalBuffer.FLAG4) != 0) + if ((firstBytes & ITypeMarshalBuffer.FLAG4) != 0) return new Value(buf.getCharArray(), null); ISerializableEvaluation eval= buf.unmarshalEvaluation(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java index 42a3be333bf..e18c5720b2d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java @@ -160,35 +160,28 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.ARRAY_TYPE; - int flags= 0; + short firstBytes = ITypeMarshalBuffer.ARRAY_TYPE; long nval= -1; IValue val= null; - if (isConst()) flags |= 0x01; - if (isVolatile()) flags |= 0x02; - if (isRestrict()) flags |= 0x04; - if (isStatic()) flags |= 0x08; - if (isVariableLength()) flags |= 0x10; - if (flags != 0) { - firstByte |= ITypeMarshalBuffer.FLAG1; - } + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isRestrict()) firstBytes |= ITypeMarshalBuffer.FLAG3; + if (isStatic()) firstBytes |= ITypeMarshalBuffer.FLAG4; + if (isVariableLength()) firstBytes |= ITypeMarshalBuffer.FLAG5; val= getSize(); if (val != null) { - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG6; Long num= val.numericalValue(); if (num != null) { nval= num; if (nval >= 0) { - firstByte |= ITypeMarshalBuffer.FLAG3; + firstBytes |= ITypeMarshalBuffer.FLAG7; } } } - buffer.putByte((byte) firstByte); - if (flags != 0) { - buffer.putByte((byte) flags); - } + buffer.putShort(firstBytes); if (nval >= 0) { buffer.putLong(nval); } else if (val != null) { @@ -197,21 +190,20 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - int flags= 0; + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IValue value= null; - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) { - flags= buffer.getByte(); - } - if ((firstByte & ITypeMarshalBuffer.FLAG3) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG7) != 0) { value = Value.create(buffer.getLong()); - } else if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) { + } else if ((firstBytes & ITypeMarshalBuffer.FLAG6) != 0) { value = buffer.unmarshalValue(); } IType nested= buffer.unmarshalType(); - CArrayType result= new CArrayType(nested, (flags & 0x01) != 0, (flags & 0x02) != 0, (flags & 0x04) != 0, value); - result.setIsStatic((flags & 0x08) != 0); - result.setIsVariableLength((flags & 0x10) != 0); + CArrayType result= new CArrayType(nested, + (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG3) != 0, value); + result.setIsStatic((firstBytes & ITypeMarshalBuffer.FLAG4) != 0); + result.setIsVariableLength((firstBytes & ITypeMarshalBuffer.FLAG5) != 0); return result; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java index bd3d0b23c36..0ac2f77d745 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java @@ -60,6 +60,7 @@ public class CBasicType implements ICBasicType, ISerializableType { } private static Kind getKind(ICASTSimpleDeclSpecifier sds) { + // Note: when adding a new kind, marshal() and unnmarshal() may need to be revised. switch (sds.getType()) { case IASTSimpleDeclSpecifier.t_bool: return Kind.eBoolean; @@ -170,25 +171,21 @@ public class CBasicType implements ICBasicType, ISerializableType { @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { final int kind= getKind().ordinal(); - final int shiftedKind= kind * ITypeMarshalBuffer.FLAG1; + final int shiftedKind= kind * ITypeMarshalBuffer.FIRST_FLAG; final int modifiers= getModifiers(); - if (shiftedKind < ITypeMarshalBuffer.FLAG4 && modifiers == 0) { - buffer.putByte((byte) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind)); + if (modifiers == 0) { + buffer.putShort((short) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind)); } else { - buffer.putByte((byte) (ITypeMarshalBuffer.BASIC_TYPE | ITypeMarshalBuffer.FLAG4)); - buffer.putByte((byte) kind); + buffer.putShort((short) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind | ITypeMarshalBuffer.LAST_FLAG)); buffer.putByte((byte) modifiers); } } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - final boolean dense= (firstByte & ITypeMarshalBuffer.FLAG4) == 0; + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + final boolean haveModifiers= (firstBytes & ITypeMarshalBuffer.LAST_FLAG) != 0; int modifiers= 0; - int kind; - if (dense) { - kind= (firstByte & (ITypeMarshalBuffer.FLAG4-1))/ITypeMarshalBuffer.FLAG1; - } else { - kind= buffer.getByte(); + int kind= (firstBytes & (ITypeMarshalBuffer.LAST_FLAG-1))/ITypeMarshalBuffer.FIRST_FLAG; + if (haveModifiers) { modifiers= buffer.getByte(); } return new CBasicType(Kind.values()[kind], modifiers); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java index 7eda549d946..986e24f1961 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java @@ -78,16 +78,16 @@ public class CFunctionType implements IFunctionType, ISerializableType { @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE; + short firstBytes = ITypeMarshalBuffer.FUNCTION_TYPE; int len= parameters.length & 0xffff; - int codedLen= len * ITypeMarshalBuffer.FLAG1; - if (codedLen < ITypeMarshalBuffer.FLAG4) { - firstByte |= codedLen; - buffer.putByte((byte) firstByte); + int codedLen= len * ITypeMarshalBuffer.FIRST_FLAG; + if (codedLen < ITypeMarshalBuffer.LAST_FLAG) { + firstBytes |= codedLen; + buffer.putShort(firstBytes); } else { - firstByte |= ITypeMarshalBuffer.FLAG4; - buffer.putByte((byte) firstByte); + firstBytes |= ITypeMarshalBuffer.LAST_FLAG; + buffer.putShort(firstBytes); buffer.putInt(len); } @@ -97,12 +97,12 @@ public class CFunctionType implements IFunctionType, ISerializableType { } } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int len; - if (((firstByte & ITypeMarshalBuffer.FLAG4) != 0)) { + if (((firstBytes & ITypeMarshalBuffer.LAST_FLAG) != 0)) { len= buffer.getInt(); } else { - len= (firstByte & (ITypeMarshalBuffer.FLAG4-1))/ITypeMarshalBuffer.FLAG1; + len= (firstBytes & (ITypeMarshalBuffer.LAST_FLAG-1))/ITypeMarshalBuffer.FIRST_FLAG; } IType rt= buffer.unmarshalType(); IType[] pars= new IType[len]; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java index 61b76051203..89477b01764 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java @@ -94,17 +94,17 @@ public class CPointerType implements ICPointerType, ITypeContainer, ISerializabl @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.POINTER_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - if (isRestrict()) firstByte |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + short firstBytes = ITypeMarshalBuffer.POINTER_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isRestrict()) firstBytes |= ITypeMarshalBuffer.FLAG3; + buffer.putShort(firstBytes); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); - return new CPointerType(nested, firstByte/ITypeMarshalBuffer.FLAG1); + return new CPointerType(nested, firstBytes/ITypeMarshalBuffer.FLAG1); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java index 23ff677f145..604be21a982 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java @@ -144,17 +144,17 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.CVQUALIFIER_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - if (isRestrict()) firstByte |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.CVQUALIFIER_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isRestrict()) firstBytes |= ITypeMarshalBuffer.FLAG3; + buffer.putShort(firstBytes); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); - return new CQualifierType(nested, (firstByte & ITypeMarshalBuffer.FLAG1) != 0, - (firstByte & ITypeMarshalBuffer.FLAG2) != 0, (firstByte & ITypeMarshalBuffer.FLAG3) != 0); + return new CQualifierType(nested, (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0, (firstBytes & ITypeMarshalBuffer.FLAG3) != 0); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java index 56695296b2a..58747fd9592 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; -import static org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory.PRVALUE; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -21,9 +19,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPackExpansionExpression; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; -import org.eclipse.cdt.internal.core.dom.parser.ProblemType; -import org.eclipse.cdt.internal.core.dom.parser.Value; -import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFixed; +import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalParameterPack; /** * Implementation of pack expansion expression. @@ -70,13 +66,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac @Override public ICPPEvaluation getEvaluation() { if (fEvaluation == null) { - IType type = fPattern.getExpressionType(); - if (type == null) { - type= ProblemType.UNKNOWN_FOR_EXPRESSION; - } else { - type= new CPPParameterPackType(type); - } - fEvaluation= new EvalFixed(type, PRVALUE, Value.create(((ICPPASTExpression) fPattern).getEvaluation())); + fEvaluation = new EvalParameterPack(((ICPPASTExpression) fPattern).getEvaluation(), this); } return fEvaluation; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplateInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplateInstance.java index bae0b088cbd..b0bf15eab83 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplateInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplateInstance.java @@ -111,14 +111,14 @@ public class CPPAliasTemplateInstance extends PlatformObject @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte = ITypeMarshalBuffer.ALIAS_TEMPLATE; - buffer.putByte((byte) firstByte); + short firstBytes = ITypeMarshalBuffer.ALIAS_TEMPLATE; + buffer.putShort(firstBytes); buffer.putCharArray(name); buffer.marshalType(aliasedType); buffer.marshalBinding(aliasTemplate); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { char[] name = buffer.getCharArray(); IType unmarshalledAliasedTypeInstance = buffer.unmarshalType(); ICPPAliasTemplate unmarshalledAlias = (ICPPAliasTemplate)buffer.unmarshalBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java index 32555a25f86..bcef9a11210 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java @@ -111,11 +111,11 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - final byte firstByte = ITypeMarshalBuffer.ARRAY_TYPE; + final short firstBytes = ITypeMarshalBuffer.ARRAY_TYPE; IValue val= getSize(); if (val == null) { - buffer.putByte(firstByte); + buffer.putShort(firstBytes); buffer.marshalType(getType()); return; } @@ -124,22 +124,22 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy if (num != null) { long lnum= num; if (lnum >= 0) { - buffer.putByte((byte) (firstByte | ITypeMarshalBuffer.FLAG1)); + buffer.putShort((short) (firstBytes | ITypeMarshalBuffer.FLAG1)); buffer.putLong(lnum); buffer.marshalType(getType()); return; } } - buffer.putByte((byte) (firstByte | ITypeMarshalBuffer.FLAG2)); + buffer.putShort((short) (firstBytes | ITypeMarshalBuffer.FLAG2)); buffer.marshalValue(val); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IValue value= null; - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) { value = Value.create(buffer.getLong()); - } else if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) { + } else if ((firstBytes & ITypeMarshalBuffer.FLAG2) != 0) { value = buffer.unmarshalValue(); } IType nested= buffer.unmarshalType(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java index 146430c12ff..625c1bd4b02 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java @@ -85,6 +85,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { } static Kind getKind(final int simpleDeclSpecType) { + // Note: when adding a new kind, marshal() and unnmarshal() may need to be revised. switch (simpleDeclSpecType) { case IASTSimpleDeclSpecifier.t_bool: return Kind.eBoolean; @@ -224,25 +225,21 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { final int kind= getKind().ordinal(); - final int shiftedKind= kind * ITypeMarshalBuffer.FLAG1; + final int shiftedKind= kind * ITypeMarshalBuffer.FIRST_FLAG; final int modifiers= getModifiers(); - if (shiftedKind < ITypeMarshalBuffer.FLAG4 && modifiers == 0) { - buffer.putByte((byte) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind)); + if (modifiers == 0) { + buffer.putShort((short) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind)); } else { - buffer.putByte((byte) (ITypeMarshalBuffer.BASIC_TYPE | ITypeMarshalBuffer.FLAG4)); - buffer.putByte((byte) kind); + buffer.putShort((short) (ITypeMarshalBuffer.BASIC_TYPE | shiftedKind | ITypeMarshalBuffer.LAST_FLAG)); buffer.putByte((byte) modifiers); } } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - final boolean dense= (firstByte & ITypeMarshalBuffer.FLAG4) == 0; + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + final boolean haveModifiers= (firstBytes & ITypeMarshalBuffer.LAST_FLAG) != 0; int modifiers= 0; - int kind; - if (dense) { - kind= (firstByte & (ITypeMarshalBuffer.FLAG4 - 1)) / ITypeMarshalBuffer.FLAG1; - } else { - kind= buffer.getByte(); + int kind= (firstBytes & (ITypeMarshalBuffer.LAST_FLAG - 1)) / ITypeMarshalBuffer.FIRST_FLAG; + if (haveModifiers) { modifiers= buffer.getByte(); } return new CPPBasicType(Kind.values()[kind], modifiers); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java index 5b4cc473cc4..605f88708d9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java @@ -227,8 +227,8 @@ public class CPPDeferredClassInstance extends CPPUnknownBinding implements ICPPD @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.DEFERRED_CLASS_INSTANCE; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.DEFERRED_CLASS_INSTANCE; + buffer.putShort(firstBytes); buffer.marshalBinding(fClassTemplate); buffer.putInt(fArguments.length); for (ICPPTemplateArgument arg : fArguments) { @@ -236,7 +236,7 @@ public class CPPDeferredClassInstance extends CPPUnknownBinding implements ICPPD } } - public static ICPPDeferredClassInstance unmarshal(IIndexFragment fragment, int firstByte, + public static ICPPDeferredClassInstance unmarshal(IIndexFragment fragment, short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IBinding template= buffer.unmarshalBinding(); int argcount= buffer.getInt(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java index 1655e0beba4..f39a368a208 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java @@ -136,12 +136,12 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - if (takesVarArgs()) firstByte |= ITypeMarshalBuffer.FLAG3; + short firstBytes= ITypeMarshalBuffer.FUNCTION_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (takesVarArgs()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.putInt(parameters.length); buffer.marshalType(returnType); @@ -150,14 +150,16 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { } } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int len= buffer.getInt(); IType rt= buffer.unmarshalType(); IType[] pars= new IType[len]; for (int i = 0; i < pars.length; i++) { pars[i]= buffer.unmarshalType(); } - return new CPPFunctionType(rt, pars, (firstByte & ITypeMarshalBuffer.FLAG1) != 0, - (firstByte & ITypeMarshalBuffer.FLAG2) != 0, (firstByte & ITypeMarshalBuffer.FLAG3) != 0); + return new CPPFunctionType(rt, pars, + (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, // const + (firstBytes & ITypeMarshalBuffer.FLAG3) != 0, // volatile + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0); // takes varargs } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java index 03bfac229b7..708ae3450c0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java @@ -72,12 +72,12 @@ public class CPPParameterPackType implements ICPPParameterPackType, ITypeContain @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.PACK_EXPANSION_TYPE; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.PACK_EXPANSION_TYPE; + buffer.putShort(firstBytes); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); if (nested == null) return new ProblemBinding(null, IProblemBinding.SEMANTIC_INVALID_TYPE); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java index 57ba7226e1e..2c253c00595 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java @@ -97,20 +97,20 @@ public class CPPPointerToMemberType extends CPPPointerType implements ICPPPointe @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.POINTER_TO_MEMBER_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - if (isRestrict()) firstByte |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.POINTER_TO_MEMBER_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isRestrict()) firstBytes |= ITypeMarshalBuffer.FLAG3; + buffer.putShort(firstBytes); buffer.marshalType(getType()); buffer.marshalType(getMemberOfClass()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); IType memberOf= buffer.unmarshalType(); - return new CPPPointerToMemberType(nested, memberOf, (firstByte & ITypeMarshalBuffer.FLAG1) != 0, - (firstByte & ITypeMarshalBuffer.FLAG2) != 0, - (firstByte & ITypeMarshalBuffer.FLAG3) != 0); + return new CPPPointerToMemberType(nested, memberOf, (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG3) != 0); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java index 47fcc5db617..7993228e425 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java @@ -108,20 +108,20 @@ public class CPPPointerType implements IPointerType, ITypeContainer, ISerializab @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.POINTER_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - if (isRestrict()) firstByte |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.POINTER_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + if (isRestrict()) firstBytes |= ITypeMarshalBuffer.FLAG3; + buffer.putShort(firstBytes); final IType nestedType = getType(); buffer.marshalType(nestedType); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); - return new CPPPointerType(nested, (firstByte & ITypeMarshalBuffer.FLAG1) != 0, - (firstByte & ITypeMarshalBuffer.FLAG2) != 0, - (firstByte & ITypeMarshalBuffer.FLAG3) != 0); + return new CPPPointerType(nested, (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG3) != 0); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java index 28fad2be5be..df4c9201694 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java @@ -92,16 +92,16 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.CVQUALIFIER_TYPE; - if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; - if (isVolatile()) firstByte |= ITypeMarshalBuffer.FLAG2; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.CVQUALIFIER_TYPE; + if (isConst()) firstBytes |= ITypeMarshalBuffer.FLAG1; + if (isVolatile()) firstBytes |= ITypeMarshalBuffer.FLAG2; + buffer.putShort(firstBytes); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); - return new CPPQualifierType(nested, (firstByte & ITypeMarshalBuffer.FLAG1) != 0, - (firstByte & ITypeMarshalBuffer.FLAG2) != 0); + return new CPPQualifierType(nested, (firstBytes & ITypeMarshalBuffer.FLAG1) != 0, + (firstBytes & ITypeMarshalBuffer.FLAG2) != 0); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java index a8a64ea435b..abcf69bee9b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java @@ -109,16 +109,16 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.REFERENCE_TYPE; + short firstBytes= ITypeMarshalBuffer.REFERENCE_TYPE; if (isRValueReference()) { - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; } - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalType(getType()); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType nested= buffer.unmarshalType(); - return new CPPReferenceType(nested, (firstByte & ITypeMarshalBuffer.FLAG1) != 0); + return new CPPReferenceType(nested, (firstBytes & ITypeMarshalBuffer.FLAG1) != 0); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeArgument.java index d18ff891a0e..866ecda85e2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeArgument.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeArgument.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.core.dom.ast.IValue; import org.eclipse.cdt.core.dom.ast.cpp.ICPPParameterPackType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFixed; +import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalParameterPack; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalTypeId; import org.eclipse.core.runtime.Assert; @@ -90,9 +91,8 @@ public class CPPTemplateNonTypeArgument implements ICPPTemplateArgument { IType t= ((ICPPParameterPackType) type).getType(); if (t != null) { ICPPEvaluation evaluation; - if (fEvaluation instanceof EvalFixed) { - EvalFixed fixed = (EvalFixed) fEvaluation; - evaluation = new EvalFixed(t, fixed.getValueCategory(), fixed.getValue()); + if (fEvaluation instanceof EvalParameterPack) { + evaluation = ((EvalParameterPack) fEvaluation).getExpansionPattern(); } else { evaluation = new EvalTypeId(t, fEvaluation.getTemplateDefinition(), fEvaluation); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java index a48d638f138..d65aa05790e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java @@ -82,8 +82,8 @@ public class CPPUnknownClassInstance extends CPPUnknownMemberClass implements IC @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.UNKNOWN_MEMBER_CLASS_INSTANCE; - buffer.putByte((byte) firstByte); + short firstBytes= ITypeMarshalBuffer.UNKNOWN_MEMBER_CLASS_INSTANCE; + buffer.putShort(firstBytes); buffer.marshalType(getOwnerType()); buffer.putCharArray(getNameCharArray()); buffer.putInt(arguments.length); @@ -92,7 +92,7 @@ public class CPPUnknownClassInstance extends CPPUnknownMemberClass implements IC } } - public static ICPPUnknownMemberClassInstance unmarshal(IIndexFragment fragment, int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ICPPUnknownMemberClassInstance unmarshal(IIndexFragment fragment, short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType owner= buffer.unmarshalType(); char[] name = buffer.getCharArray(); int argcount= buffer.getInt(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownMember.java index 0866fd3d83f..db6db9d5fb4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownMember.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownMember.java @@ -49,24 +49,24 @@ public class CPPUnknownMember extends CPPUnknownBinding implements ICPPUnknownMe @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= ITypeMarshalBuffer.UNKNOWN_MEMBER; + short firstBytes= ITypeMarshalBuffer.UNKNOWN_MEMBER; if (this instanceof ICPPField) { - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; } else if (this instanceof ICPPMethod) { - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG2; } - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalType(getOwnerType()); buffer.putCharArray(getNameCharArray()); } - public static IBinding unmarshal(IIndexFragment fragment, int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IBinding unmarshal(IIndexFragment fragment, short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType owner= buffer.unmarshalType(); char[] name = buffer.getCharArray(); - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) { return new PDOMCPPUnknownField(fragment, owner, name); - } else if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) { + } else if ((firstBytes & ITypeMarshalBuffer.FLAG2) != 0) { return new PDOMCPPUnknownMethod(fragment, owner, name); } return new PDOMCPPUnknownMemberClass(fragment, owner, name); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java index 650a36cc4bb..d90736f33af 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java @@ -17,8 +17,11 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; +import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.PlatformObject; @@ -94,6 +97,63 @@ public abstract class CPPDependentEvaluation extends CPPEvaluation { buffer.marshalBinding(getTemplateDefinition()); } + /** + * Instantiate evaluations that represent subexpressions separated by commas. + * If a subexpression is a pack expansion expression, and the template parameter map + * contains a mapping for the parameter pack(s) that occur in its expansion pattern, + * the expansion pattern is instantiated once for each mapped template argument, + * and the resulting evaluations are returned in place of the pack expansion. + * + * This code is similar to CPPTemplates.instantiateArguments(), but applies to evaluations + * rather than template arguments. + */ + protected static ICPPEvaluation[] instantiateCommaSeparatedSubexpressions( + ICPPEvaluation[] subexpressions, ICPPTemplateParameterMap tpMap, int packOffset, + ICPPClassSpecialization within, int maxdepth, IASTNode point) { + ICPPEvaluation[] result = subexpressions; + int resultShift = 0; + for (int i = 0; i < subexpressions.length; i++) { + ICPPEvaluation origEval = subexpressions[i]; + ICPPEvaluation newEval; + if (origEval instanceof EvalParameterPack) { + origEval = ((EvalParameterPack) origEval).getExpansionPattern(); + if (origEval == null) { + newEval = EvalFixed.INCOMPLETE; + } else { + int packSize = origEval.determinePackSize(tpMap); + if (packSize == CPPTemplates.PACK_SIZE_FAIL || packSize == CPPTemplates.PACK_SIZE_NOT_FOUND) { + newEval = EvalFixed.INCOMPLETE; + } else if (packSize == CPPTemplates.PACK_SIZE_DEFER) { + newEval = origEval; + } else { + int shift = packSize - 1; + ICPPEvaluation[] newResult = new ICPPEvaluation[subexpressions.length + resultShift + shift]; + System.arraycopy(result, 0, newResult, 0, i + resultShift); + for (int j = 0; j < packSize; ++j) { + newEval = origEval.instantiate(tpMap, j, within, maxdepth, point); + newResult[i + resultShift + j] = newEval; + } + result = newResult; + resultShift += shift; + continue; + } + } + } else { + newEval = origEval.instantiate(tpMap, packOffset, within, maxdepth, point); + } + + if (result != subexpressions) + result[i + resultShift] = newEval; + else if (newEval != origEval) { + assert resultShift == 0; + result = new ICPPEvaluation[subexpressions.length]; + System.arraycopy(subexpressions, 0, result, 0, i); + result[i] = newEval; + } + } + return result; + } + /** * Used to defer the resolution of a template definition until it is needed, * to avoid recursion. The only valid operation on this binding is resolve(). diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java index bb919a9960d..79bd8aa5d78 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java @@ -331,14 +331,14 @@ public class EvalBinary extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_BINARY); + buffer.putShort(ITypeMarshalBuffer.EVAL_BINARY); buffer.putByte((byte) fOperator); buffer.marshalEvaluation(fArg1, includeValue); buffer.marshalEvaluation(fArg2, includeValue); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int op= buffer.getByte(); ICPPEvaluation arg1= (ICPPEvaluation) buffer.unmarshalEvaluation(); ICPPEvaluation arg2= (ICPPEvaluation) buffer.unmarshalEvaluation(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinaryTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinaryTypeId.java index 8521bfa51c1..ef523a74551 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinaryTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinaryTypeId.java @@ -109,14 +109,14 @@ public class EvalBinaryTypeId extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_BINARY_TYPE_ID); + buffer.putShort(ITypeMarshalBuffer.EVAL_BINARY_TYPE_ID); buffer.putByte((byte) fOperator.ordinal()); buffer.marshalType(fType1); buffer.marshalType(fType2); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int op= buffer.getByte(); IType arg1= buffer.unmarshalType(); IType arg2= buffer.unmarshalType(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java index 1f5101a1df2..ab9474476a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java @@ -305,24 +305,24 @@ public class EvalBinding extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - byte firstByte = ITypeMarshalBuffer.EVAL_BINDING; + short firstBytes = ITypeMarshalBuffer.EVAL_BINDING; ICPPFunction parameterOwner = getParameterOwner(); if (parameterOwner != null) { // A function parameter cannot be marshalled directly. We are storing the owning // function and the parameter position instead. - buffer.putByte((byte) (ITypeMarshalBuffer.EVAL_BINDING | ITypeMarshalBuffer.FLAG1)); + buffer.putShort((short) (ITypeMarshalBuffer.EVAL_BINDING | ITypeMarshalBuffer.FLAG1)); buffer.marshalBinding(parameterOwner); buffer.putInt(getFunctionParameterPosition()); } else { - buffer.putByte(firstByte); + buffer.putShort(firstBytes); buffer.marshalBinding(fBinding); } buffer.marshalType(fFixedType ? fType : null); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) { ICPPFunction parameterOwner= (ICPPFunction) buffer.unmarshalBinding(); int parameterPosition= buffer.getInt(); IType type= buffer.unmarshalType(); @@ -347,10 +347,12 @@ public class EvalBinding extends CPPDependentEvaluation { return argument.getNonTypeEvaluation(); } } - // TODO(sprigogin): Do we need something similar for pack expansion? } else if (origBinding instanceof ICPPParameter) { ICPPParameter parameter = (ICPPParameter) origBinding; IType origType = parameter.getType(); + if (origType instanceof ICPPParameterPackType && packOffset != -1) { + origType = ((ICPPParameterPackType) origType).getType(); + } IType instantiatedType = CPPTemplates.instantiateType(origType, tpMap, packOffset, within, point); if (origType != instantiatedType) { return new EvalFixed(instantiatedType, ValueCategory.LVALUE, Value.create(this)); @@ -387,6 +389,10 @@ public class EvalBinding extends CPPDependentEvaluation { if (binding instanceof ICPPUnknownBinding) { return CPPTemplates.determinePackSize((ICPPUnknownBinding) binding, tpMap); } + if (binding instanceof ICPPParameter && ((ICPPParameter) binding).isParameterPack()) { + ICPPParameterPackType type = (ICPPParameterPackType) ((ICPPParameter) binding).getType(); + return CPPTemplates.determinePackSize(type.getType(), tpMap); + } if (binding instanceof ICPPSpecialization) { binding = ((ICPPSpecialization) binding).getSpecializedBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalComma.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalComma.java index 889a2f0ce07..85678480412 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalComma.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalComma.java @@ -159,7 +159,7 @@ public class EvalComma extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_COMMA); + buffer.putShort(ITypeMarshalBuffer.EVAL_COMMA); buffer.putInt(fArguments.length); for (ICPPEvaluation arg : fArguments) { buffer.marshalEvaluation(arg, includeValue); @@ -167,7 +167,7 @@ public class EvalComma extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int len= buffer.getInt(); ICPPEvaluation[] args = new ICPPEvaluation[len]; for (int i = 0; i < args.length; i++) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalCompound.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalCompound.java index 6e8f0486710..571dd363b57 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalCompound.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalCompound.java @@ -81,12 +81,12 @@ public class EvalCompound extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_COMPOUND); + buffer.putShort(ITypeMarshalBuffer.EVAL_COMPOUND); buffer.marshalEvaluation(fDelegate, includeValue); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { ICPPEvaluation arg= (ICPPEvaluation) buffer.unmarshalEvaluation(); IBinding templateDefinition= buffer.unmarshalBinding(); return new EvalCompound(arg, templateDefinition); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalConditional.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalConditional.java index c130d0f763b..77e669385c9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalConditional.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalConditional.java @@ -309,22 +309,22 @@ public class EvalConditional extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - int firstByte = ITypeMarshalBuffer.EVAL_CONDITIONAL; + short firstBytes = ITypeMarshalBuffer.EVAL_CONDITIONAL; if (fPositiveThrows) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; if (fNegativeThrows) - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG2; - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalEvaluation(fCondition, includeValue); buffer.marshalEvaluation(fPositive, includeValue); buffer.marshalEvaluation(fNegative, includeValue); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - boolean pth= (firstByte & ITypeMarshalBuffer.FLAG1) != 0; - boolean nth= (firstByte & ITypeMarshalBuffer.FLAG2) != 0; + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + boolean pth= (firstBytes & ITypeMarshalBuffer.FLAG1) != 0; + boolean nth= (firstBytes & ITypeMarshalBuffer.FLAG2) != 0; ICPPEvaluation cond= (ICPPEvaluation) buffer.unmarshalEvaluation(); ICPPEvaluation pos= (ICPPEvaluation) buffer.unmarshalEvaluation(); ICPPEvaluation neg= (ICPPEvaluation) buffer.unmarshalEvaluation(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFixed.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFixed.java index 343a7621f18..9041faf7c08 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFixed.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFixed.java @@ -116,37 +116,37 @@ public class EvalFixed extends CPPEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { includeValue= includeValue && fValue != Value.UNKNOWN; - int firstByte = ITypeMarshalBuffer.EVAL_FIXED; + short firstBytes = ITypeMarshalBuffer.EVAL_FIXED; if (includeValue) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; switch (fValueCategory) { - case LVALUE: - firstByte |= ITypeMarshalBuffer.FLAG2; - break; case PRVALUE: - firstByte |= ITypeMarshalBuffer.FLAG3; + firstBytes |= ITypeMarshalBuffer.FLAG2; + break; + case LVALUE: + firstBytes |= ITypeMarshalBuffer.FLAG3; break; default: break; } - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalType(fType); if (includeValue) { buffer.marshalValue(fValue); } } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - final boolean readValue= (firstByte & ITypeMarshalBuffer.FLAG1) != 0; + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + final boolean readValue= (firstBytes & ITypeMarshalBuffer.FLAG1) != 0; IValue value; ValueCategory cat; - switch (firstByte & (ITypeMarshalBuffer.FLAG2 | ITypeMarshalBuffer.FLAG3)) { + switch (firstBytes & (ITypeMarshalBuffer.FLAG2 | ITypeMarshalBuffer.FLAG3)) { case ITypeMarshalBuffer.FLAG2: - cat= LVALUE; + cat= PRVALUE; break; case ITypeMarshalBuffer.FLAG3: - cat= PRVALUE; + cat= LVALUE; break; default: cat= XVALUE; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java index 7df4e724073..d6660dee6b2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java @@ -174,7 +174,7 @@ public class EvalFunctionCall extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_FUNCTION_CALL); + buffer.putShort(ITypeMarshalBuffer.EVAL_FUNCTION_CALL); buffer.putInt(fArguments.length); for (ICPPEvaluation arg : fArguments) { buffer.marshalEvaluation(arg, includeValue); @@ -182,7 +182,7 @@ public class EvalFunctionCall extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int len= buffer.getInt(); ICPPEvaluation[] args = new ICPPEvaluation[len]; for (int i = 0; i < args.length; i++) { @@ -195,17 +195,8 @@ public class EvalFunctionCall extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(ICPPTemplateParameterMap tpMap, int packOffset, ICPPClassSpecialization within, int maxdepth, IASTNode point) { - ICPPEvaluation[] args = fArguments; - for (int i = 0; i < fArguments.length; i++) { - ICPPEvaluation arg = fArguments[i].instantiate(tpMap, packOffset, within, maxdepth, point); - if (arg != fArguments[i]) { - if (args == fArguments) { - args = new ICPPEvaluation[fArguments.length]; - System.arraycopy(fArguments, 0, args, 0, fArguments.length); - } - args[i] = arg; - } - } + ICPPEvaluation[] args = instantiateCommaSeparatedSubexpressions(fArguments, tpMap, + packOffset, within, maxdepth, point); if (args == fArguments) return this; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java index a267dd3f409..c2620582117 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java @@ -109,13 +109,13 @@ public class EvalFunctionSet extends CPPDependentEvaluation { public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { final ICPPFunction[] bindings = fFunctionSet.getBindings(); final ICPPTemplateArgument[] args = fFunctionSet.getTemplateArguments(); - int firstByte = ITypeMarshalBuffer.EVAL_FUNCTION_SET; + short firstBytes = ITypeMarshalBuffer.EVAL_FUNCTION_SET; if (fAddressOf) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; if (args != null) - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG2; - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.putInt(bindings.length); for (ICPPFunction binding : bindings) { buffer.marshalBinding(binding); @@ -129,15 +129,15 @@ public class EvalFunctionSet extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - final boolean addressOf= (firstByte & ITypeMarshalBuffer.FLAG1) != 0; + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + final boolean addressOf= (firstBytes & ITypeMarshalBuffer.FLAG1) != 0; int bindingCount= buffer.getInt(); ICPPFunction[] bindings= new ICPPFunction[bindingCount]; for (int i = 0; i < bindings.length; i++) { bindings[i]= (ICPPFunction) buffer.unmarshalBinding(); } ICPPTemplateArgument[] args= null; - if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG2) != 0) { int len= buffer.getInt(); args = new ICPPTemplateArgument[len]; for (int i = 0; i < args.length; i++) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java index 1b50bb7f038..73ce2393dad 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java @@ -145,15 +145,15 @@ public class EvalID extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - int firstByte = ITypeMarshalBuffer.EVAL_ID; + short firstBytes = ITypeMarshalBuffer.EVAL_ID; if (fAddressOf) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; if (fQualified) - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG2; if (fTemplateArgs != null) - firstByte |= ITypeMarshalBuffer.FLAG3; + firstBytes |= ITypeMarshalBuffer.FLAG3; - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalEvaluation(fFieldOwner, false); buffer.putCharArray(fName); buffer.marshalBinding(fNameOwner); @@ -166,14 +166,14 @@ public class EvalID extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - final boolean addressOf= (firstByte & ITypeMarshalBuffer.FLAG1) != 0; - final boolean qualified= (firstByte & ITypeMarshalBuffer.FLAG2) != 0; + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + final boolean addressOf= (firstBytes & ITypeMarshalBuffer.FLAG1) != 0; + final boolean qualified= (firstBytes & ITypeMarshalBuffer.FLAG2) != 0; ICPPEvaluation fieldOwner= (ICPPEvaluation) buffer.unmarshalEvaluation(); char[] name= buffer.getCharArray(); IBinding nameOwner= buffer.unmarshalBinding(); ICPPTemplateArgument[] args= null; - if ((firstByte & ITypeMarshalBuffer.FLAG3) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG3) != 0) { int len= buffer.getInt(); args = new ICPPTemplateArgument[len]; for (int i = 0; i < args.length; i++) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java index 8364ff49b94..3da037ea5e8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java @@ -91,7 +91,7 @@ public class EvalInitList extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_INIT_LIST); + buffer.putShort(ITypeMarshalBuffer.EVAL_INIT_LIST); buffer.putInt(fClauses.length); for (ICPPEvaluation arg : fClauses) { buffer.marshalEvaluation(arg, includeValue); @@ -99,7 +99,7 @@ public class EvalInitList extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int len= buffer.getInt(); ICPPEvaluation[] args = new ICPPEvaluation[len]; for (int i = 0; i < args.length; i++) { @@ -112,17 +112,8 @@ public class EvalInitList extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(ICPPTemplateParameterMap tpMap, int packOffset, ICPPClassSpecialization within, int maxdepth, IASTNode point) { - ICPPEvaluation[] clauses = fClauses; - for (int i = 0; i < fClauses.length; i++) { - ICPPEvaluation clause = fClauses[i].instantiate(tpMap, packOffset, within, maxdepth, point); - if (clause != fClauses[i]) { - if (clauses == fClauses) { - clauses = new ICPPEvaluation[fClauses.length]; - System.arraycopy(fClauses, 0, clauses, 0, fClauses.length); - } - clauses[i] = clause; - } - } + ICPPEvaluation[] clauses = instantiateCommaSeparatedSubexpressions(fClauses, tpMap, + packOffset, within, maxdepth, point); if (clauses == fClauses) return this; return new EvalInitList(clauses, getTemplateDefinition()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java index 240ab162e65..90149b8358d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java @@ -295,27 +295,27 @@ public class EvalMemberAccess extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - int firstByte = ITypeMarshalBuffer.EVAL_MEMBER_ACCESS; + short firstBytes = ITypeMarshalBuffer.EVAL_MEMBER_ACCESS; if (fIsPointerDeref) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; if (fOwnerValueCategory == LVALUE) { - firstByte |= ITypeMarshalBuffer.FLAG2; + firstBytes |= ITypeMarshalBuffer.FLAG2; } else if (fOwnerValueCategory == XVALUE) { - firstByte |= ITypeMarshalBuffer.FLAG3; + firstBytes |= ITypeMarshalBuffer.FLAG3; } - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalType(fOwnerType); buffer.marshalBinding(fMember); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { - boolean isDeref= (firstByte & ITypeMarshalBuffer.FLAG1) != 0; + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + boolean isDeref= (firstBytes & ITypeMarshalBuffer.FLAG1) != 0; ValueCategory ownerValueCat; - if ((firstByte & ITypeMarshalBuffer.FLAG2) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG2) != 0) { ownerValueCat= LVALUE; - } else if ((firstByte & ITypeMarshalBuffer.FLAG3) != 0) { + } else if ((firstBytes & ITypeMarshalBuffer.FLAG3) != 0) { ownerValueCat= XVALUE; } else { ownerValueCat= PRVALUE; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalParameterPack.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalParameterPack.java new file mode 100644 index 00000000000..4b6d921accc --- /dev/null +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalParameterPack.java @@ -0,0 +1,131 @@ +/******************************************************************************* + * Copyright (c) 2013 Nathan Ridge. + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Nathan Ridge - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; + +import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.IType; +import org.eclipse.cdt.core.dom.ast.IValue; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassSpecialization; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; +import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation; +import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer; +import org.eclipse.cdt.internal.core.dom.parser.ProblemType; +import org.eclipse.cdt.internal.core.dom.parser.Value; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPParameterPackType; +import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation; +import org.eclipse.core.runtime.CoreException; + +/** + * Evaluation for a pack expansion expression. + */ +public class EvalParameterPack extends CPPDependentEvaluation { + + private ICPPEvaluation fExpansionPattern; + private IType fType; + + public EvalParameterPack(ICPPEvaluation expansionPattern, IASTNode pointOfDefinition) { + this(expansionPattern, findEnclosingTemplate(pointOfDefinition)); + } + public EvalParameterPack(ICPPEvaluation expansionPattern, IBinding templateDefinition) { + super(templateDefinition); + fExpansionPattern = expansionPattern; + } + + public ICPPEvaluation getExpansionPattern() { + return fExpansionPattern; + } + + @Override + public boolean isInitializerList() { + return fExpansionPattern.isInitializerList(); + } + + @Override + public boolean isFunctionSet() { + return fExpansionPattern.isFunctionSet(); + } + + @Override + public boolean isTypeDependent() { + return fExpansionPattern.isTypeDependent(); + } + + @Override + public boolean isValueDependent() { + return fExpansionPattern.isValueDependent(); + } + + @Override + public IType getTypeOrFunctionSet(IASTNode point) { + if (fType == null) { + IType type = fExpansionPattern.getTypeOrFunctionSet(point); + if (type == null) { + fType= ProblemType.UNKNOWN_FOR_EXPRESSION; + } else { + fType= new CPPParameterPackType(type); + } + } + return fType; + } + + @Override + public IValue getValue(IASTNode point) { + return Value.create(fExpansionPattern); + } + + @Override + public ValueCategory getValueCategory(IASTNode point) { + return ValueCategory.PRVALUE; + } + + @Override + public ICPPEvaluation instantiate(ICPPTemplateParameterMap tpMap, int packOffset, + ICPPClassSpecialization within, int maxdepth, IASTNode point) { + ICPPEvaluation expansionPattern = fExpansionPattern.instantiate(tpMap, packOffset, within, maxdepth, point); + if (expansionPattern == fExpansionPattern) + return this; + return new EvalParameterPack(expansionPattern, getTemplateDefinition()); + } + + @Override + public ICPPEvaluation computeForFunctionCall(CPPFunctionParameterMap parameterMap, + int maxdepth, IASTNode point) { + ICPPEvaluation expansionPattern = fExpansionPattern.computeForFunctionCall(parameterMap, maxdepth, point); + if (expansionPattern == fExpansionPattern) + return this; + return new EvalParameterPack(expansionPattern, getTemplateDefinition()); + } + + @Override + public int determinePackSize(ICPPTemplateParameterMap tpMap) { + return CPPTemplates.PACK_SIZE_NOT_FOUND; + } + + @Override + public boolean referencesTemplateParameter() { + return fExpansionPattern.referencesTemplateParameter(); + } + + @Override + public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { + buffer.putShort(ITypeMarshalBuffer.EVAL_PARAMETER_PACK); + buffer.marshalEvaluation(fExpansionPattern, includeValue); + marshalTemplateDefinition(buffer); + } + + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { + ICPPEvaluation expansionPattern = (ICPPEvaluation) buffer.unmarshalEvaluation(); + IBinding templateDefinition = buffer.unmarshalBinding(); + return new EvalParameterPack(expansionPattern, templateDefinition); + } +} \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java index 60b06027cd3..59cccee4e1a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java @@ -121,11 +121,11 @@ public class EvalTypeId extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - int firstByte = ITypeMarshalBuffer.EVAL_TYPE_ID; + short firstBytes = ITypeMarshalBuffer.EVAL_TYPE_ID; if (includeValue) - firstByte |= ITypeMarshalBuffer.FLAG1; + firstBytes |= ITypeMarshalBuffer.FLAG1; - buffer.putByte((byte) firstByte); + buffer.putShort(firstBytes); buffer.marshalType(fInputType); if (includeValue) { buffer.putInt(fArguments.length); @@ -136,10 +136,10 @@ public class EvalTypeId extends CPPDependentEvaluation { marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { IType type= buffer.unmarshalType(); ICPPEvaluation[] args= null; - if ((firstByte & ITypeMarshalBuffer.FLAG1) != 0) { + if ((firstBytes & ITypeMarshalBuffer.FLAG1) != 0) { int len= buffer.getInt(); args = new ICPPEvaluation[len]; for (int i = 0; i < args.length; i++) { @@ -153,19 +153,9 @@ public class EvalTypeId extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(ICPPTemplateParameterMap tpMap, int packOffset, ICPPClassSpecialization within, int maxdepth, IASTNode point) { - ICPPEvaluation[] args = fArguments; - if (fArguments != null) { - for (int i = 0; i < fArguments.length; i++) { - ICPPEvaluation arg = fArguments[i].instantiate(tpMap, packOffset, within, maxdepth, point); - if (arg != fArguments[i]) { - if (args == fArguments) { - args = new ICPPEvaluation[fArguments.length]; - System.arraycopy(fArguments, 0, args, 0, fArguments.length); - } - args[i] = arg; - } - } - } + ICPPEvaluation[] args = null; + if (fArguments != null) + args = instantiateCommaSeparatedSubexpressions(fArguments, tpMap, packOffset, within, maxdepth, point); IType type = CPPTemplates.instantiateType(fInputType, tpMap, packOffset, within, point); if (args == fArguments && type == fInputType) return this; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnary.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnary.java index f3dc221be57..147d903871d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnary.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnary.java @@ -300,14 +300,14 @@ public class EvalUnary extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_UNARY); + buffer.putShort(ITypeMarshalBuffer.EVAL_UNARY); buffer.putByte((byte) fOperator); buffer.marshalEvaluation(fArgument, includeValue); buffer.marshalBinding(fAddressOfQualifiedNameBinding); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int op= buffer.getByte(); ICPPEvaluation arg= (ICPPEvaluation) buffer.unmarshalEvaluation(); IBinding binding= buffer.unmarshalBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java index c7ade038d89..417c079a99f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java @@ -175,13 +175,13 @@ public class EvalUnaryTypeID extends CPPDependentEvaluation { @Override public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.EVAL_UNARY_TYPE_ID); + buffer.putShort(ITypeMarshalBuffer.EVAL_UNARY_TYPE_ID); buffer.putByte((byte) fOperator); buffer.marshalType(fOrigType); marshalTemplateDefinition(buffer); } - public static ISerializableEvaluation unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { int op= buffer.getByte(); IType arg= buffer.unmarshalType(); IBinding templateDefinition= buffer.unmarshalBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java index eb52bce8ca3..d3f5602b7e4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java @@ -64,7 +64,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPParameterPackType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDeclaration; import org.eclipse.cdt.core.parser.util.ArrayUtil; @@ -518,7 +517,7 @@ public class LookupData extends ScopeLookupData { int count= 0; if (functionArgs != null) { for (ICPPEvaluation arg : functionArgs) { - if (arg instanceof EvalFixed && arg.getTypeOrFunctionSet(null) instanceof ICPPParameterPackType) + if (arg instanceof EvalParameterPack) count++; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SignatureBuilder.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SignatureBuilder.java index 7ec523e7b46..684dbec2302 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SignatureBuilder.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SignatureBuilder.java @@ -25,8 +25,8 @@ import org.eclipse.cdt.internal.core.dom.parser.Value; import org.eclipse.core.runtime.CoreException; class SignatureBuilder implements ITypeMarshalBuffer { - private static final byte NULL_TYPE= 0; - private static final byte UNSTORABLE_TYPE= (byte) -1; + private static final short NULL_TYPE = 0x0000; + private static final short UNSTORABLE_TYPE = 0x001D; private final StringBuilder fBuffer; @@ -51,7 +51,7 @@ class SignatureBuilder implements ITypeMarshalBuffer { if (binding instanceof ISerializableType) { ((ISerializableType) binding).marshal(this); } else if (binding == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else { appendSeparator(); if (binding instanceof ICPPBinding) { @@ -73,19 +73,19 @@ class SignatureBuilder implements ITypeMarshalBuffer { if (type instanceof ISerializableType) { ((ISerializableType) type).marshal(this); } else if (type == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else if (type instanceof IBinding) { marshalBinding((IBinding) type); } else { assert false : "Cannot serialize " + ASTTypeUtil.getType(type) + " (" + type.getClass().getName() + ")"; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - putByte(UNSTORABLE_TYPE); + putShort(UNSTORABLE_TYPE); } } @Override public void marshalEvaluation(ISerializableEvaluation eval, boolean includeValues) throws CoreException { if (eval == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else { eval.marshal(this, includeValues); } @@ -94,16 +94,16 @@ class SignatureBuilder implements ITypeMarshalBuffer { @Override public void marshalValue(IValue value) throws CoreException { if (value instanceof Value) { - ((Value) value).marshall(this); + ((Value) value).marshal(this); } else { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } } @Override public void marshalTemplateArgument(ICPPTemplateArgument arg) throws CoreException { if (arg.isNonTypeValue()) { - putByte(VALUE); + putShort(VALUE); arg.getNonTypeEvaluation().marshal(this, true); } else { marshalType(arg.getTypeValue()); @@ -122,6 +122,12 @@ class SignatureBuilder implements ITypeMarshalBuffer { fBuffer.append(value); } + @Override + public void putShort(short value) { + appendSeparator(); + fBuffer.append(value); + } + @Override public void putInt(int value) { appendSeparator(); @@ -187,6 +193,11 @@ class SignatureBuilder implements ITypeMarshalBuffer { throw new UnsupportedOperationException(); } + @Override + public short getShort() throws CoreException { + throw new UnsupportedOperationException(); + } + @Override public int getInt() throws CoreException { throw new UnsupportedOperationException(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeOfDependentExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeOfDependentExpression.java index d77e3e96595..c1bccc5280b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeOfDependentExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeOfDependentExpression.java @@ -63,11 +63,11 @@ public class TypeOfDependentExpression implements ICPPUnknownType, ISerializable @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { - buffer.putByte(ITypeMarshalBuffer.DEPENDENT_EXPRESSION_TYPE); + buffer.putShort(ITypeMarshalBuffer.DEPENDENT_EXPRESSION_TYPE); buffer.marshalEvaluation(fEvaluation, false); } - public static IType unmarshal(int firstByte, ITypeMarshalBuffer buffer) throws CoreException { + public static IType unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { ISerializableEvaluation eval= buffer.unmarshalEvaluation(); if (eval instanceof ICPPEvaluation) return new TypeOfDependentExpression((ICPPEvaluation) eval); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java index 476aa1d9f30..aa0d6e90467 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java @@ -85,6 +85,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFunctionSet; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalID; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalInitList; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalMemberAccess; +import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalParameterPack; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalTypeId; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalUnary; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalUnaryTypeID; @@ -375,6 +376,14 @@ public class CPPCompositesFactory extends AbstractCompositeFactory { e= new EvalMemberAccess(a2, e.getOwnerValueCategory(), b2, e.isPointerDeref(), templateDefinition2); return e; } + if (eval instanceof EvalParameterPack) { + EvalParameterPack e = (EvalParameterPack) eval; + ICPPEvaluation a = e.getExpansionPattern(); + ICPPEvaluation a2 = getCompositeEvaluation(a); + if (a != a2 || templateDefinition != templateDefinition2) + e = new EvalParameterPack(a2, templateDefinition2); + return e; + } if (eval instanceof EvalTypeId) { EvalTypeId e= (EvalTypeId) eval; IType a = e.getInputType(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index b56e4eb9fac..e10beb8daed 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -232,11 +232,12 @@ public class PDOM extends PlatformObject implements IPDOM { * 139.0 - More efficient and robust storage of types and template arguments, bug 395243. * 140.0 - Enumerators with dependent values, bug 389009. * 140.1 - Mechanism for tagging nodes with extended data, bug 400020 - * 141.0 - Storing enclosing template bindings for evaluations, bug 399829 + * 141.0 - Storing enclosing template bindings for evaluations, bug 399829. + * 142.0 - Changed marshalling of evaluations to allow more than 15 evaluation kinds, bug 401479. */ - private static final int MIN_SUPPORTED_VERSION= version(141, 0); - private static final int MAX_SUPPORTED_VERSION= version(141, Short.MAX_VALUE); - private static final int DEFAULT_VERSION = version(141, 0); + private static final int MIN_SUPPORTED_VERSION= version(142, 0); + private static final int MAX_SUPPORTED_VERSION= version(142, Short.MAX_VALUE); + private static final int DEFAULT_VERSION = version(142, 0); private static int version(int major, int minor) { return (major << 16) + minor; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java index 99d99e82e3f..bb3af31e2a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java @@ -35,10 +35,10 @@ import org.eclipse.core.runtime.CoreException; */ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { public static final byte[] EMPTY= { 0, 0, 0, 0, 0, 0 }; - public static final byte NULL_TYPE= 0; - public static final byte INDIRECT_TYPE= (byte) -1; - public static final byte BINDING_TYPE= (byte) -2; - public static final byte UNSTORABLE_TYPE= (byte) -3; + public static final byte NULL_TYPE = 0x00; + public static final byte INDIRECT_TYPE = 0x1F; + public static final byte BINDING_TYPE = 0x1E; + public static final byte UNSTORABLE_TYPE = 0x1D; public static final IType UNSTORABLE_TYPE_PROBLEM = new ProblemType(ISemanticProblem.TYPE_NOT_PERSISTED); @@ -83,13 +83,13 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { if (binding instanceof ISerializableType) { ((ISerializableType) binding).marshal(this); } else if (binding == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else { PDOMNode pb= fLinkage.addTypeBinding(binding); if (pb == null) { - putByte(UNSTORABLE_TYPE); + putShort(UNSTORABLE_TYPE); } else { - putByte(BINDING_TYPE); + putShort(BINDING_TYPE); putByte((byte) 0); putRecordPointer(pb.getRecord()); } @@ -98,19 +98,17 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { @Override public IBinding unmarshalBinding() throws CoreException { - if (fPos >= fBuffer.length) - throw unmarshallingError(); - - byte firstByte= fBuffer[fPos]; - if (firstByte == BINDING_TYPE) { - fPos += 2; + int oldPos = fPos; + short firstBytes = getShort(); + if (firstBytes == BINDING_TYPE) { + fPos += 1; long rec= getRecordPointer(); return (IBinding) fLinkage.getNode(rec); - } else if (firstByte == NULL_TYPE || firstByte == UNSTORABLE_TYPE) { - fPos++; + } else if (firstBytes == NULL_TYPE || firstBytes == UNSTORABLE_TYPE) { return null; } + fPos = oldPos; // fLinkage.unmarshalBinding() will read firstBytes again return fLinkage.unmarshalBinding(this); } @@ -119,40 +117,37 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { if (type instanceof ISerializableType) { ((ISerializableType) type).marshal(this); } else if (type == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else if (type instanceof IBinding) { marshalBinding((IBinding) type); } else { assert false : "Cannot serialize " + ASTTypeUtil.getType(type) + " (" + type.getClass().getName() + ")"; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - putByte(UNSTORABLE_TYPE); + putShort(UNSTORABLE_TYPE); } } @Override public IType unmarshalType() throws CoreException { - if (fPos >= fBuffer.length) - throw unmarshallingError(); - - byte firstByte= fBuffer[fPos]; - if (firstByte == BINDING_TYPE) { - fPos += 2; + int oldPos = fPos; + short firstBytes = getShort(); + if (firstBytes == BINDING_TYPE) { + fPos += 1; long rec= getRecordPointer(); return (IType) fLinkage.getNode(rec); - } else if (firstByte == NULL_TYPE) { - fPos++; + } else if (firstBytes == NULL_TYPE) { return null; - } else if (firstByte == UNSTORABLE_TYPE) { - fPos++; + } else if (firstBytes == UNSTORABLE_TYPE) { return UNSTORABLE_TYPE_PROBLEM; } + fPos = oldPos; // fLinkage.unmarshalType() will read firstBytes again return fLinkage.unmarshalType(this); } @Override public void marshalEvaluation(ISerializableEvaluation eval, boolean includeValues) throws CoreException { if (eval == null) { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } else { eval.marshal(this, includeValues); } @@ -160,23 +155,15 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { @Override public ISerializableEvaluation unmarshalEvaluation() throws CoreException { - if (fPos >= fBuffer.length) - throw unmarshallingError(); - - byte firstByte= fBuffer[fPos]; - if (firstByte == NULL_TYPE) { - fPos++; - return null; - } return fLinkage.unmarshalEvaluation(this); } @Override public void marshalValue(IValue value) throws CoreException { if (value instanceof Value) { - ((Value) value).marshall(this); + ((Value) value).marshal(this); } else { - putByte(NULL_TYPE); + putShort(NULL_TYPE); } } @@ -191,7 +178,7 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { @Override public void marshalTemplateArgument(ICPPTemplateArgument arg) throws CoreException { if (arg.isNonTypeValue()) { - putByte(VALUE); + putShort(VALUE); arg.getNonTypeEvaluation().marshal(this, true); } else { final IType typeValue = arg.getTypeValue(); @@ -207,11 +194,12 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { @Override public ICPPTemplateArgument unmarshalTemplateArgument() throws CoreException { - int firstByte= getByte(); - if (firstByte == VALUE) { + int oldPos = fPos; + short firstBytes = getShort(); + if (firstBytes == VALUE) { return new CPPTemplateNonTypeArgument((ICPPEvaluation) unmarshalEvaluation(), null); } else { - fPos--; + fPos = oldPos; IType type = unmarshalType(); IType originalType = unmarshalType(); if (originalType == null || originalType == UNSTORABLE_TYPE_PROBLEM) @@ -284,6 +272,11 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { return result; } + @Override + public void putShort(short value) { + putInt(value); + } + @Override public void putInt(int value) { do { @@ -306,6 +299,14 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer { } while (value != 0); } + @Override + public short getShort() throws CoreException { + int result = getInt(); + if (result > Short.MAX_VALUE) + unmarshallingError(); + return (short) result; + } + @Override public int getInt() throws CoreException { int b = getByte(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index 77608c1b493..1105005b8fa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -344,23 +344,23 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { @Override public IType unmarshalType(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= buffer.getByte(); - switch((firstByte & ITypeMarshalBuffer.KIND_MASK)) { + short firstBytes= buffer.getShort(); + switch((firstBytes & ITypeMarshalBuffer.KIND_MASK)) { case ITypeMarshalBuffer.ARRAY_TYPE: - return CArrayType.unmarshal(firstByte, buffer); + return CArrayType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.BASIC_TYPE: - return CBasicType.unmarshal(firstByte, buffer); + return CBasicType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.CVQUALIFIER_TYPE: - return CQualifierType.unmarshal(firstByte, buffer); + return CQualifierType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.FUNCTION_TYPE: - return CFunctionType.unmarshal(firstByte, buffer); + return CFunctionType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.POINTER_TYPE: - return CPointerType.unmarshal(firstByte, buffer); + return CPointerType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.PROBLEM_TYPE: - return ProblemType.unmarshal(firstByte, buffer); + return ProblemType.unmarshal(firstBytes, buffer); } - throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first byte=" + firstByte)); //$NON-NLS-1$ + throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first bytes=" + firstBytes)); //$NON-NLS-1$ } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index b07afe54c2e..a9a3b1d1ed9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -111,6 +111,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFunctionSet; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalID; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalInitList; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalMemberAccess; +import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalParameterPack; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalTypeId; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalUnary; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalUnaryTypeID; @@ -122,6 +123,7 @@ import org.eclipse.cdt.internal.core.pdom.WritablePDOM; import org.eclipse.cdt.internal.core.pdom.db.BTree; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.IBTreeComparator; +import org.eclipse.cdt.internal.core.pdom.db.TypeMarshalBuffer; import org.eclipse.cdt.internal.core.pdom.dom.IPDOMMemberOwner; import org.eclipse.cdt.internal.core.pdom.dom.PDOMASTAdapter; import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; @@ -1105,94 +1107,98 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { @Override public IType unmarshalType(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= buffer.getByte(); - switch ((firstByte & ITypeMarshalBuffer.KIND_MASK)) { + short firstBytes= buffer.getShort(); + switch ((firstBytes & ITypeMarshalBuffer.KIND_MASK)) { case ITypeMarshalBuffer.ARRAY_TYPE: - return CPPArrayType.unmarshal(firstByte, buffer); + return CPPArrayType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.BASIC_TYPE: - return CPPBasicType.unmarshal(firstByte, buffer); + return CPPBasicType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.CVQUALIFIER_TYPE: - return CPPQualifierType.unmarshal(firstByte, buffer); + return CPPQualifierType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.FUNCTION_TYPE: - return CPPFunctionType.unmarshal(firstByte, buffer); + return CPPFunctionType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.POINTER_TYPE: - return CPPPointerType.unmarshal(firstByte, buffer); + return CPPPointerType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.PROBLEM_TYPE: - return ProblemType.unmarshal(firstByte, buffer); + return ProblemType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.REFERENCE_TYPE: - return CPPReferenceType.unmarshal(firstByte, buffer); + return CPPReferenceType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.PACK_EXPANSION_TYPE: - return CPPParameterPackType.unmarshal(firstByte, buffer); + return CPPParameterPackType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.POINTER_TO_MEMBER_TYPE: - return CPPPointerToMemberType.unmarshal(firstByte, buffer); + return CPPPointerToMemberType.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.DEPENDENT_EXPRESSION_TYPE: - return TypeOfDependentExpression.unmarshal(firstByte, buffer); + return TypeOfDependentExpression.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.UNKNOWN_MEMBER: - IBinding binding= CPPUnknownMember.unmarshal(getPDOM(), firstByte, buffer); + IBinding binding= CPPUnknownMember.unmarshal(getPDOM(), firstBytes, buffer); if (binding instanceof IType) return (IType) binding; break; case ITypeMarshalBuffer.UNKNOWN_MEMBER_CLASS_INSTANCE: - return CPPUnknownClassInstance.unmarshal(getPDOM(), firstByte, buffer); + return CPPUnknownClassInstance.unmarshal(getPDOM(), firstBytes, buffer); case ITypeMarshalBuffer.DEFERRED_CLASS_INSTANCE: - return CPPDeferredClassInstance.unmarshal(getPDOM(), firstByte, buffer); + return CPPDeferredClassInstance.unmarshal(getPDOM(), firstBytes, buffer); case ITypeMarshalBuffer.ALIAS_TEMPLATE: - return CPPAliasTemplateInstance.unmarshal(firstByte, buffer); + return CPPAliasTemplateInstance.unmarshal(firstBytes, buffer); } - throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first byte=" + firstByte)); //$NON-NLS-1$ + throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first bytes=" + firstBytes)); //$NON-NLS-1$ } @Override public IBinding unmarshalBinding(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= buffer.getByte(); - switch ((firstByte & ITypeMarshalBuffer.KIND_MASK)) { + short firstBytes= buffer.getShort(); + switch ((firstBytes & ITypeMarshalBuffer.KIND_MASK)) { case ITypeMarshalBuffer.UNKNOWN_MEMBER: - return CPPUnknownMember.unmarshal(getPDOM(), firstByte, buffer); + return CPPUnknownMember.unmarshal(getPDOM(), firstBytes, buffer); case ITypeMarshalBuffer.UNKNOWN_MEMBER_CLASS_INSTANCE: - return CPPUnknownClassInstance.unmarshal(getPDOM(), firstByte, buffer); + return CPPUnknownClassInstance.unmarshal(getPDOM(), firstBytes, buffer); case ITypeMarshalBuffer.DEFERRED_CLASS_INSTANCE: - return CPPDeferredClassInstance.unmarshal(getPDOM(), firstByte, buffer); + return CPPDeferredClassInstance.unmarshal(getPDOM(), firstBytes, buffer); } - throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first byte=" + firstByte)); //$NON-NLS-1$ + throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal a type, first bytes=" + firstBytes)); //$NON-NLS-1$ } @Override public ISerializableEvaluation unmarshalEvaluation(ITypeMarshalBuffer buffer) throws CoreException { - int firstByte= buffer.getByte(); - switch ((firstByte & ITypeMarshalBuffer.KIND_MASK)) { + short firstBytes= buffer.getShort(); + if (firstBytes == TypeMarshalBuffer.NULL_TYPE) + return null; + switch ((firstBytes & ITypeMarshalBuffer.KIND_MASK)) { case ITypeMarshalBuffer.EVAL_BINARY: - return EvalBinary.unmarshal(firstByte, buffer); + return EvalBinary.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_BINARY_TYPE_ID: - return EvalBinaryTypeId.unmarshal(firstByte, buffer); + return EvalBinaryTypeId.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_BINDING: - return EvalBinding.unmarshal(firstByte, buffer); + return EvalBinding.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_COMMA: - return EvalComma.unmarshal(firstByte, buffer); + return EvalComma.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_COMPOUND: - return EvalCompound.unmarshal(firstByte, buffer); + return EvalCompound.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_CONDITIONAL: - return EvalConditional.unmarshal(firstByte, buffer); + return EvalConditional.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_FIXED: - return EvalFixed.unmarshal(firstByte, buffer); + return EvalFixed.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_FUNCTION_CALL: - return EvalFunctionCall.unmarshal(firstByte, buffer); + return EvalFunctionCall.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_FUNCTION_SET: - return EvalFunctionSet.unmarshal(firstByte, buffer); + return EvalFunctionSet.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_ID: - return EvalID.unmarshal(firstByte, buffer); + return EvalID.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_INIT_LIST: - return EvalInitList.unmarshal(firstByte, buffer); + return EvalInitList.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_MEMBER_ACCESS: - return EvalMemberAccess.unmarshal(firstByte, buffer); + return EvalMemberAccess.unmarshal(firstBytes, buffer); + case ITypeMarshalBuffer.EVAL_PARAMETER_PACK: + return EvalParameterPack.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_TYPE_ID: - return EvalTypeId.unmarshal(firstByte, buffer); + return EvalTypeId.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_UNARY: - return EvalUnary.unmarshal(firstByte, buffer); + return EvalUnary.unmarshal(firstBytes, buffer); case ITypeMarshalBuffer.EVAL_UNARY_TYPE_ID: - return EvalUnaryTypeID.unmarshal(firstByte, buffer); + return EvalUnaryTypeID.unmarshal(firstBytes, buffer); } - throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal an evaluation, first byte=" + firstByte)); //$NON-NLS-1$ + throw new CoreException(CCorePlugin.createStatus("Cannot unmarshal an evaluation, first bytes=" + firstBytes)); //$NON-NLS-1$ } } From ba6c3f63162959e940030427476eda0b178201a0 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 27 Feb 2013 12:25:14 -0800 Subject: [PATCH 17/27] Cosmetics. --- .../pdom/tests/PDOMStringSetTests.java | 1 - .../pdom/tests/PDOMTagIndexTests.java | 1 - .../cdt/core/dom/ast/tag/IBindingTagger.java | 12 ++++---- .../eclipse/cdt/core/dom/ast/tag/ITag.java | 23 +++++++------- .../cdt/core/dom/ast/tag/ITagReader.java | 10 +++---- .../cdt/core/dom/ast/tag/ITagService.java | 9 +++--- .../cdt/core/dom/ast/tag/ITagWriter.java | 12 ++++---- .../cdt/core/dom/ast/tag/IWritableTag.java | 14 ++++----- .../core/dom/ast/tag/NonCachedTaggable.java | 3 +- .../cdt/internal/core/dom/ast/tag/Tag.java | 1 - .../internal/core/dom/ast/tag/TagManager.java | 16 +++++----- .../internal/core/dom/ast/tag/TagService.java | 10 +++---- .../core/dom/ast/tag/TaggerDescriptor.java | 30 +++++++++---------- .../dom/parser/cpp/semantics/CPPVisitor.java | 8 ++--- .../core/pdom/AbstractIndexerTask.java | 4 +-- .../internal/core/pdom/dom/PDOMBinding.java | 11 +++---- .../core/pdom/dom/c/PDOMCLinkage.java | 13 ++++---- .../core/pdom/dom/cpp/PDOMCPPLinkage.java | 11 +++---- .../internal/core/pdom/tag/BTreeIterable.java | 1 - .../src/org/eclipse/cdt/core/CCorePlugin.java | 2 +- 20 files changed, 94 insertions(+), 98 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java index 9d3431b5c61..cb50bdd7c27 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.pdom.tests; import java.io.File; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java index 47a00535717..c735691e987 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTagIndexTests.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.pdom.tests; import java.io.File; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java index 57df74e5e39..1829adb1465 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IBindingTagger.java @@ -8,24 +8,24 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.core.dom.ast.tag; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IBinding; /** - * Implementations are contributed with the org.eclipse.cdt.core.tagger extension-point. The implementation is - * responsible for populating the tag's data using a given input binding. + * Implementations are contributed with the org.eclipse.cdt.core.tagger extension-point. + * The implementation is responsible for populating the tag's data using a given input binding. * * @see #process(ITagWriter, IBinding, IASTName) * @since 5.5 */ public interface IBindingTagger { /** - * Examines the given input binding to decide if a tag should be created. Use the given tagWriter to - * create data if needed. Return the tag if one was created and null otherwise. A tagger (as identified by - * it's unique id string) is allowed to create only one tag for each binding. + * Examines the given input binding to decide if a tag should be created. Use the given + * tagWriter to create data if needed. Return the tag if one was created and null otherwise. + * A tagger (as identified by it's unique id string) is allowed to create only one tag for each + * binding. * * @param tagWriter * the writer to use for creating new tags diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java index 027b4afd928..a51c712281a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITag.java @@ -8,13 +8,13 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.core.dom.ast.tag; /** - * Tags are used to annotate {@link ITagReader}'s with extra information. They are created by implementations - * of {@link IBindingTagger} which are contributed using the org.eclipse.cdt.core.tagger extension point. The - * base tag interface is read-only, it is extended by the writable {@link IWritableTag}. + * Tags are used to annotate {@link ITagReader}'s with extra information. They are created by + * implementations of {@link IBindingTagger} which are contributed using + * the org.eclipse.cdt.core.tagger extension point. The base tag interface is read-only, it is + * extended by the writable {@link IWritableTag}. * * @see IBindingTagger * @see ITagReader @@ -25,20 +25,21 @@ public interface ITag { /** A constant that is returned to indicate a read failure. */ public static final int FAIL = -1; - /** Return the number of bytes in the tag's data payload. */ + /** Returns the number of bytes in the tag's data payload. */ public int getDataLen(); - /** Return the globally unique id of the tagger that created the receiver. */ + /** Returns the globally unique id of the tagger that created the receiver. */ public String getTaggerId(); - /** Return the byte from the specified offset or {@link #FAIL} on failure. */ + /** Returns the byte from the specified offset or {@link #FAIL} on failure. */ public int getByte(int offset); /** - * Return the specified number of bytes from the specified offset. Specify len of -1 to read all bytes - * from the specified offset to the end of the payload. Return null if the given range is not valid. This - * would be expected if the version of the contributor has changed in a way that changes the structure of - * the data that it stores. Contributors must be able to deal with that case. + * Returns the specified number of bytes from the specified offset. Specify {@code len} of -1 + * to read all bytes from the specified offset to the end of the payload. Returns null if + * the given range is not valid. This would be expected if the version of the contributor has + * changed in a way that changes the structure of the data that it stores. Contributors must be + * able to deal with that case. */ public byte[] getBytes(int offset, int len); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java index fd7ca0bae91..96d272b3966 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagReader.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.core.dom.ast.tag; /** @@ -20,16 +19,17 @@ package org.eclipse.cdt.core.dom.ast.tag; */ public interface ITagReader { /** - * Look for a tag for the receiver, returns null if there is no such tag. + * Looks for a tag for the receiver, returns null if there is no such tag. * * @param id - * A string that uniquely identifies the tag to be returned. This value was provided by the - * contributor when the tag was created (see {@link ITagWriter#createTag(String, int)}). + * A string that uniquely identifies the tag to be returned. This value was provided + * by the contributor when the tag was created + * (see {@link ITagWriter#createTag(String, int)}). */ public ITag getTag(String id); /** - * Return all tags known to the receiver. Does not return null. + * Returns all tags known to the receiver. Does not return null. */ public Iterable getTags(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java index 237fc4830ca..31a4ad384fc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagService.java @@ -8,14 +8,13 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.core.dom.ast.tag; import org.eclipse.cdt.core.dom.ast.IBinding; /** - * Provides ITagReaders for specific bindings. The kind of the reader will vary based on the kind of the input - * binding. + * Provides ITagReaders for specific bindings. The kind of the reader will vary based on the kind + * of the input binding. * * @see ITag * @see ITagReader @@ -23,8 +22,8 @@ import org.eclipse.cdt.core.dom.ast.IBinding; */ public interface ITagService { /** - * Finds or creates a tag reader for the specified binding or null if a reader cannot be associated with - * this binding. + * Finds or creates a tag reader for the specified binding or null if a reader cannot be + * associated with this binding. * * @param binding * could be null diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java index f77deac8ff4..50c39180436 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/ITagWriter.java @@ -20,20 +20,20 @@ package org.eclipse.cdt.core.dom.ast.tag; */ public interface ITagWriter { /** - * Create and return a new tag for the receiver. E.g., if this writer is associated with a persistent - * binding, then returned tag will read and write from the PDOM database. + * Creates and returns a new tag for the receiver. E.g., if this writer is associated with + * a persistent binding, then returned tag will read and write from the PDOM database. * * @param id - * A string that uniquely identifies the tag to be returned. This value will be used by the - * contributor when to find the tag (see {@link ITagReader#getTag(String)}). + * A string that uniquely identifies the tag to be returned. This value will be used + * by the contributor when to find the tag (see {@link ITagReader#getTag(String)}). * @param len * The number of bytes that should be allocated to store the tag's data. */ public IWritableTag createTag(String id, int len); /** - * Sets the receiver's tags to only the ones provided. Deletes existing tags that are not in the argument - * list. + * Sets the receiver's tags to only the ones provided. Deletes existing tags that are not in + * the argument list. */ public boolean setTags(Iterable tags); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java index adf1d8b169d..cf790cd2190 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/tag/IWritableTag.java @@ -8,12 +8,12 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.core.dom.ast.tag; /** - * Tags are used to annotate {@link ITagWriter}'s with extra information. They are created by implementations - * of {@link IBindingTagger} which are contributed using the org.eclipse.cdt.core.tagger extension point. + * Tags are used to annotate {@link ITagWriter}'s with extra information. They are created by + * implementations of {@link IBindingTagger} which are contributed using + * the org.eclipse.cdt.core.tagger extension point. * * @see IBindingTagger * @see ITagReader @@ -21,13 +21,13 @@ package org.eclipse.cdt.core.dom.ast.tag; * @since 5.5 */ public interface IWritableTag extends ITag { - /** Write the given byte to the given offset in the tag. Return true if successful and false otherwise. */ + /** Writes the given byte to the given offset in the tag. Returns {@code true} if successful. */ public boolean putByte(int offset, byte data); /** - * Write the argument buffer into the receiver's payload starting at the specified offset. Write the - * specified number of bytes or the full buffer when len is -1. Return true if successful and false - * otherwise. + * Writes the argument buffer into the receiver's payload starting at the specified offset. + * Writes the specified number of bytes or the full buffer when {@code len} is -1. Returns + * {@code true} if successful. */ public boolean putBytes(int offset, byte data[], int len); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java index 8683da41bd5..7d0a812b86e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/NonCachedTaggable.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.dom.ast.tag; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -47,7 +46,7 @@ public class NonCachedTaggable implements ITagReader, ITagWriter { @Override public boolean setTags(Iterable tags) { - // this non-caching implementation has nothing to set, the tags will be regenerated + // This non-caching implementation has nothing to set, the tags will be regenerated // when they are queried return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java index 7b9430de292..99c18d217a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/Tag.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.dom.ast.tag; import org.eclipse.cdt.core.dom.ast.tag.ITag; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java index 57c29d8f523..8579ed9db37 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagManager.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.dom.ast.tag; import java.util.HashMap; @@ -29,6 +28,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; public class TagManager { + private static final String EXTENSION_POINT = "tagger"; //$NON-NLS-1$ private static TagManager INSTANCE; private Map taggers; @@ -43,14 +43,12 @@ public class TagManager { taggers = loadExtensions(); } - private static final String ExtensionPoint = "tagger"; //$NON-NLS-1$ - private static Map loadExtensions() { Map taggers = new HashMap(); - // load the extensions + // Load the extensions IConfigurationElement[] elements = Platform.getExtensionRegistry() - .getConfigurationElementsFor(CCorePlugin.PLUGIN_ID, ExtensionPoint); + .getConfigurationElementsFor(CCorePlugin.PLUGIN_ID, EXTENSION_POINT); for (IConfigurationElement element : elements) { TaggerDescriptor desc = new TaggerDescriptor(element); taggers.put(desc.getId(), desc); @@ -60,8 +58,8 @@ public class TagManager { } /** - * Provide an opportunity for the specified tagger to process the given values. The tagger will only run - * if its enablement expression returns true for the arguments. + * Provides an opportunity for the specified tagger to process the given values. The tagger will + * only run if its enablement expression returns true for the arguments. */ public ITag process(String taggerId, ITagWriter tagWriter, IBinding binding, IASTName ast) { TaggerDescriptor desc = taggers.get(taggerId); @@ -72,7 +70,7 @@ public class TagManager { return tagger == null ? null : tagger.process(tagWriter, binding, ast); } - /** Provide an opportunity for all enabled taggers to process the given values. */ + /** Provides an opportunity for all enabled taggers to process the given values. */ public Iterable process(ITagWriter tagWriter, IBinding binding, IASTName ast) { List tags = new LinkedList(); for (TaggerDescriptor desc : taggers.values()) { @@ -87,7 +85,7 @@ public class TagManager { return tags; } - /** Add or remove tags from the destination to ensure that it has the same tag information as the source. */ + /** Adds or removes tags from the destination to ensure that it has the same tag information as the source. */ public void syncTags(IPDOMBinding dst, IBinding src) { // don't try to copy any tags when there are no contributors to this extension point if (dst == null || taggers.isEmpty()) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java index ca22dc92ab2..c09acbac421 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TagService.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.dom.ast.tag; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -17,16 +16,17 @@ import org.eclipse.cdt.core.dom.ast.tag.ITagService; public class TagService implements ITagService { /** - * First gives the IBinding instance a chance to convert itself, by calling IAdaptable#getAdapter( - * ITagReader.class ) on the binding. If the binding doesn't provide an implementation then a simple, - * in-memory, non-cached implementation is created and returned. + * First gives the IBinding instance a chance to convert itself, by calling + * IAdaptable#getAdapter(ITagReader.class) on the binding. If the binding doesn't provide + * an implementation then a simple, in-memory, non-cached implementation is created and + * returned. */ @Override public ITagReader findTagReader(IBinding binding) { if (binding == null) return null; - // let the binding adapt to its own tag reader + // Let the binding adapt to its own tag reader ITagReader tagReader = (ITagReader) binding.getAdapter(ITagReader.class); if (tagReader != null) return tagReader; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java index f408e887801..a18cb7ac155 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/ast/tag/TaggerDescriptor.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.dom.ast.tag; import java.util.Arrays; @@ -33,9 +32,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; /** - * Internal container for extensions of org.eclipse.cdt.core.tagger. The implementation of the tagger is - * instantiated only after checking the enablement expression (if present) for the specified binding. This - * avoids activating the contributing plugin until it is actually needed. + * Internal container for extensions of org.eclipse.cdt.core.tagger. The implementation of + * the tagger is instantiated only after checking the enablement expression (if present) for + * the specified binding. This avoids activating the contributing plugin until it is actually + * needed. */ public class TaggerDescriptor { private static final String Attr_LocalId = "local-id"; //$NON-NLS-1$ @@ -52,10 +52,10 @@ public class TaggerDescriptor { private static final String VAR_LANGUAGEID = "languageId"; //$NON-NLS-1$ /** - * An empty implementation of the tagger used as a placeholder in descriptors that are unable to load the - * contributed class. + * An empty implementation of the tagger used as a placeholder in descriptors that are unable + * to load the contributed class. */ - private static final IBindingTagger NullTagger = new IBindingTagger() { + private static final IBindingTagger NULL_TAGGER = new IBindingTagger() { @Override public ITag process(ITagWriter tagWriter, IBinding binding, IASTName ast) { return null; @@ -97,8 +97,8 @@ public class TaggerDescriptor { // there must be a valid local id if (localId == null) { String extId = element.getDeclaringExtension().getSimpleIdentifier(); - CCorePlugin - .log("Invalid extension " + globalId + '.' + extId + " must provide tagger's local-id"); //$NON-NLS-1$ //$NON-NLS-2$ + CCorePlugin.log("Invalid extension " + globalId + '.' + extId //$NON-NLS-1$ + + " must provide tagger's local-id"); //$NON-NLS-1$ return null; } @@ -109,8 +109,8 @@ public class TaggerDescriptor { // make sure the local id has real content if (localId.isEmpty()) { String extId = element.getDeclaringExtension().getSimpleIdentifier(); - CCorePlugin - .log("Invalid extension " + globalId + '.' + extId + " must provide value for tagger's local-id"); //$NON-NLS-1$ //$NON-NLS-2$ + CCorePlugin.log("Invalid extension " + globalId + '.' + extId //$NON-NLS-1$ + + " must provide value for tagger's local-id"); //$NON-NLS-1$ return null; } @@ -121,12 +121,12 @@ public class TaggerDescriptor { } private boolean matches(ITranslationUnit tu) { - // if the enablement expression is missing or structurally invalid, then return immediately + // If the enablement expression is missing or structurally invalid, then return immediately if (fStatus != null) return fStatus.booleanValue(); - // if there is no tu, then the enablement expression cannot be evaluated, assume that all taggers - // are needed + // If there is no tu, then the enablement expression cannot be evaluated, assume that all + // taggers are needed if (tu == null) return true; @@ -171,7 +171,7 @@ public class TaggerDescriptor { CCorePlugin.log("Error in class attribute of " + id, e); //$NON-NLS-1$ // mark the tagger with an empty implementation to prevent future load attempts - tagger = NullTagger; + tagger = NULL_TAGGER; } } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 403516e53a8..1a3adf30e78 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -344,7 +344,7 @@ public class CPPVisitor extends ASTQueries { if (inScope == null) return false; - IBinding pb= names[names.length-2].resolvePreBinding(); + IBinding pb= names[names.length - 2].resolvePreBinding(); if (pb instanceof IProblemBinding) return false; @@ -930,11 +930,11 @@ public class CPPVisitor extends ASTQueries { if (name instanceof ICPPASTQualifiedName) { IASTName[] names = ((ICPPASTQualifiedName) name).getNames(); if (names.length >= 2) { - IBinding b= names[names.length-2].resolvePreBinding(); + IBinding b= names[names.length - 2].resolvePreBinding(); if (b instanceof IType) { IType classType= getNestedType((IType) b, TDEF); if (classType instanceof ICPPClassType) { - final char[] dtorName = names[names.length-1].getLookupKey(); + final char[] dtorName = names[names.length - 1].getLookupKey(); final char[] className = ((ICPPClassType) classType).getNameCharArray(); return CharArrayUtils.equals(dtorName, className); } @@ -1303,7 +1303,7 @@ public class CPPVisitor extends ASTQueries { IASTName name = findInnermostDeclarator(fnDeclarator).getName(); if (name instanceof ICPPASTQualifiedName) { IASTName[] ns = ((ICPPASTQualifiedName) name).getNames(); - name = ns[ns.length -1]; + name = ns[ns.length - 1]; } return getContainingScope(name); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index 29c316206de..e579274828d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -1006,9 +1006,9 @@ public abstract class AbstractIndexerTask extends PDOMWriter { IASTTranslationUnit ast= createAST(lang, codeReader, scanInfo, isSource, fASTOptions, ctx, pm); fStatistics.fParsingTime += System.currentTimeMillis() - start; if (ast != null) { - // Give the new AST-TU a chance to recognize its translation unit before it is written + // Give the new AST a chance to recognize its translation unit before it is written // to the index. - ((ASTTranslationUnit)ast).setOriginatingTranslationUnit((ITranslationUnit)tu); + ((ASTTranslationUnit) ast).setOriginatingTranslationUnit((ITranslationUnit) tu); writeToIndex(lang.getLinkageID(), ast, codeReader, ctx, pm); } } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java index 1ff1729dd34..bbe90bf06f2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java @@ -69,13 +69,14 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding if (adapter.isAssignableFrom(PDOMBinding.class)) return this; - // Any PDOMBinding can have a persistent tag. These tags should be deleted when the PDOMBinding - // is deleted. However, PDOMBinding's don't get deleted, so there is no way to trigger deleting - // of the tags. If the implementation is changed so that PDOMBindings do get deleted, then call: - // PDOMTagIndex.setTags( getPDOM(), pdomBinding.record, Collections.emptyList() ); + // Any PDOMBinding can have a persistent tag. These tags should be deleted when + // the PDOMBinding is deleted. However, PDOMBinding's don't get deleted, so there is no way + // to trigger deleting of the tags. If the implementation is changed so that PDOMBindings + // do get deleted, then it should call: + // PDOMTagIndex.setTags(getPDOM(), pdomBinding.record, Collections.emptyList()); // to clear out all tags for the binding. if (adapter.isAssignableFrom(ITagReader.class)) - return new PDOMTaggable( getPDOM(), getRecord() ); + return new PDOMTaggable(getPDOM(), getRecord()); return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index 1105005b8fa..c5fbc320bb5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -99,9 +99,9 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { getPDOM().putCachedResult(inputBinding, pdomBinding); } - // Synchronize the tags associated with the persistent binding to match the set that is - // associated with the input binding. - TagManager.getInstance().syncTags( pdomBinding, inputBinding ); + // Synchronize the tags associated with the persistent binding to match the set that + // is associated with the input binding. + TagManager.getInstance().syncTags(pdomBinding, inputBinding); return pdomBinding; } @@ -114,9 +114,10 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { pdomBinding.update(this, fromBinding); - // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but - // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, fromBinding ); + // Update the tags based on the tags from the new binding. This cannot be done in + // PDOMBinding.update, because not all subclasses (e.g., PDOMCPPFunction) call + // the superclass implementation. + TagManager.getInstance().syncTags(pdomBinding, fromBinding); } return pdomBinding; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index a9a3b1d1ed9..0f1c7b116a1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -362,9 +362,9 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { addImplicitMethods(pdomBinding, (ICPPClassType) binding, fromName); } - // Synchronize the tags associated with the persistent binding to match the set that is - // associated with the input binding. - TagManager.getInstance().syncTags( pdomBinding, inputBinding ); + // Synchronize the tags associated with the persistent binding to match + // the set that is associated with the input binding. + TagManager.getInstance().syncTags(pdomBinding, inputBinding); } } catch (DOMException e) { throw new CoreException(Util.createStatus(e)); @@ -378,8 +378,9 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { pdomBinding.update(this, fromBinding); - // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but - // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. + // Update the tags based on the tags from the new binding. This cannot be done in + // PDOMBinding.update, because not all subclasses (e.g., PDOMCPPFunction) call + // the superclass implementation. TagManager.getInstance().syncTags(pdomBinding, fromBinding); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java index 53740f13331..c5774014f73 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/tag/BTreeIterable.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Eidsness - Initial implementation */ - package org.eclipse.cdt.internal.core.pdom.tag; import java.util.Collections; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index b5fc7a7384f..8db644358f2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -208,7 +208,7 @@ public class CCorePlugin extends Plugin { /** * @noreference This field is not intended to be referenced by clients. */ - public CDTLogWriter cdtLog = null; + public CDTLogWriter cdtLog; private volatile CProjectDescriptionManager fNewCProjectDescriptionManager; From d806cdcf2d9515fac2536e9ba4b25d3addc06801 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 27 Feb 2013 12:34:14 -0800 Subject: [PATCH 18/27] Code streamlining. --- .../parser/org/eclipse/cdt/internal/core/pdom/PDOM.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index e10beb8daed..9c4e5668329 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -467,8 +467,7 @@ public class PDOM extends PlatformObject implements IPDOM { public PDOMTagIndex getTagIndex() throws CoreException { if (tagIndex == null) { - // tag index can only be stored in database versions 140.1 or greater - tagIndex = new PDOMTagIndex(db.getVersion() >= version(140, 1) ? db : null, TAG_INDEX); + tagIndex = new PDOMTagIndex(db, TAG_INDEX); } return tagIndex; } @@ -483,7 +482,7 @@ public class PDOM extends PlatformObject implements IPDOM { } /** - * Returns the index of files containg unresolved includes. + * Returns the index of files containing unresolved includes. */ public BTree getIndexOfFilesWithUnresolvedIncludes() throws CoreException { if (indexOfFiledWithUnresolvedIncludes == null) { From 0de53f5f2a8b13f5a20f4e42e8e242e6e78cccc6 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 27 Feb 2013 12:44:51 -0800 Subject: [PATCH 19/27] Comment adjustment. --- .../org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index c5fbc320bb5..e2982667677 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -115,7 +115,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { pdomBinding.update(this, fromBinding); // Update the tags based on the tags from the new binding. This cannot be done in - // PDOMBinding.update, because not all subclasses (e.g., PDOMCPPFunction) call + // PDOMBinding.update, because not all subclasses (e.g., PDOMCFunction) call // the superclass implementation. TagManager.getInstance().syncTags(pdomBinding, fromBinding); } From 52c0edd492391f725d3cf5f6da113dd7924688fe Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 27 Feb 2013 15:49:15 -0800 Subject: [PATCH 20/27] Revert "Bug 401743 - NullPointerException in EvalBinding.instantiate() - tpMap is null" This reverts commit 773aa77a2ac589f15951363faa7159b93f9b77f9. --- .../parser/tests/ast2/AST2TemplateTests.java | 25 ------------------- .../cdt/internal/core/dom/parser/Value.java | 12 --------- .../dom/parser/cpp/semantics/EvalBinding.java | 13 +++------- .../core/dom/parser/cpp/semantics/EvalID.java | 4 ++- 4 files changed, 6 insertions(+), 48 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java index 31a9337ca88..27d75405018 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java @@ -7351,29 +7351,4 @@ public class AST2TemplateTests extends AST2TestBase { public void testVariadicNonTypeTemplateParameter_401400() throws Exception { parseAndCheckBindings(); } - - // template struct tuple_indices {}; - // template - // struct make_indices_imp; - // template - // struct make_indices_imp, Ep> { - // typedef typename make_indices_imp, Ep>::type type; - // }; - // template - // struct make_indices_imp, Ep> { - // typedef tuple_indices type; - // }; - // template - // struct make_tuple_indices { - // typedef typename make_indices_imp, Ep>::type type; - // }; - // template - // class async_func { - // void operator()() { - // typedef typename make_tuple_indices<1 + sizeof...(Args), 1>::type Index; - // } - // }; - public void testVariadicTemplatesNPE_401743() throws Exception { - parseAndCheckBindings(); - } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java index 49dfa213641..700f42d10e1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java @@ -402,18 +402,6 @@ public class Value implements IValue { public static boolean isDependentValue(IValue nonTypeValue) { if (nonTypeValue == null) return false; - // Unknown values may or may not be dependent. In the case of a template with - // a non-type template argument, whether or not the argument's value is dependent - // determines whether or not the template gets instantiated. In light of this, - // it's safer to assume that an unknown value is dependent because: - // 1. Instantiating a template with a non-type template argument whose value is - // unknown is useless. - // 2. Instantiating such a template can lead to an infinite recursion of - // instantiations (e.g. consider a template A that delegates to A, - // with A<0> being specialized to end the recursion - if N is unknown, - // N - 1 will be unknown as well, and we get an infinite recursion). - if (nonTypeValue == UNKNOWN) - return true; ICPPEvaluation eval = nonTypeValue.getEvaluation(); return eval != null && eval.isValueDependent(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java index ab9474476a7..cd6b3f000fd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinding.java @@ -279,11 +279,6 @@ public class EvalBinding extends CPPDependentEvaluation { value= ((IVariable) fBinding).getInitialValue(); } else if (fBinding instanceof IEnumerator) { value= ((IEnumerator) fBinding).getValue(); - } else if (fBinding instanceof IFunction) { - // If a function passed as a non-type template parameter is constexpr, - // it can be used inside the template as a constexpr function, so it's - // important to preserve the binding in the value. - value = Value.create(this); } if (value == null) value = Value.UNKNOWN; @@ -341,11 +336,9 @@ public class EvalBinding extends CPPDependentEvaluation { ICPPClassSpecialization within, int maxdepth, IASTNode point) { IBinding origBinding = getBinding(); if (origBinding instanceof ICPPTemplateNonTypeParameter) { - if (tpMap != null) { - ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding, packOffset); - if (argument != null && argument.isNonTypeValue()) { - return argument.getNonTypeEvaluation(); - } + ICPPTemplateArgument argument = tpMap.getArgument((ICPPTemplateNonTypeParameter) origBinding, packOffset); + if (argument != null && argument.isNonTypeValue()) { + return argument.getNonTypeEvaluation(); } } else if (origBinding instanceof ICPPParameter) { ICPPParameter parameter = (ICPPParameter) origBinding; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java index 73ce2393dad..bf6318bced9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java @@ -354,8 +354,10 @@ public class EvalID extends CPPDependentEvaluation { return new EvalFunctionSet(new CPPFunctionSet(functions, templateArgs, null), fAddressOf, getTemplateDefinition()); } IBinding binding = bindings.length == 1 ? bindings[0] : null; - if (binding instanceof IEnumerator || binding instanceof ICPPMember) { + if (binding instanceof IEnumerator) { return new EvalBinding(binding, null, getTemplateDefinition()); + } else if (binding instanceof ICPPMember) { + return new EvalMemberAccess(nameOwner, ValueCategory.PRVALUE, binding, false, getTemplateDefinition()); } else if (binding instanceof CPPFunctionSet) { return new EvalFunctionSet((CPPFunctionSet) binding, fAddressOf, getTemplateDefinition()); } From 91de3531687c4da12b74c7a8c83cb422c4f061df Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Thu, 28 Feb 2013 08:17:19 -0500 Subject: [PATCH 21/27] Bug 396268 - [Visualizer] Add CPU/core load information to the multicore visualizer Change-Id: I28432354b497732b4ecf7924bb7227e0b8d25508 Reviewed-on: https://git.eclipse.org/r/10077 Reviewed-by: William Swanson Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam --- .../resources/messages.properties | 13 + .../ui/actions/EnableLoadMetersAction.java | 77 +++++ .../ui/actions/SetLoadMeterPeriodAction.java | 62 ++++ .../internal/ui/model/VisualizerCPU.java | 24 ++ .../internal/ui/model/VisualizerCore.java | 24 ++ .../internal/ui/model/VisualizerLoadInfo.java | 71 ++++ .../internal/ui/model/VisualizerModel.java | 24 ++ .../view/IMulticoreVisualizerConstants.java | 36 +++ .../internal/ui/view/MulticoreVisualizer.java | 264 +++++++++++++++ .../ui/view/MulticoreVisualizerCPU.java | 61 +++- .../ui/view/MulticoreVisualizerCanvas.java | 81 ++++- .../ui/view/MulticoreVisualizerCore.java | 33 +- .../ui/view/MulticoreVisualizerLoadMeter.java | 223 +++++++++++++ .../internal/utils/DSFDebugModel.java | 63 ++++ .../internal/utils/DSFDebugModelListener.java | 14 + .../dsf/gdb/internal/ProcStatCoreLoads.java | 42 +++ .../dsf/gdb/internal/ProcStatCounters.java | 140 ++++++++ .../cdt/dsf/gdb/internal/ProcStatParser.java | 100 ++++++ .../cdt/dsf/gdb/service/GDBHardwareAndOS.java | 303 +++++++++++++++++- .../dsf/gdb/service/IGDBHardwareAndOS2.java | 27 ++ .../commands/Suite_Sessionless_Tests.java | 5 +- .../dsf/gdb/tests/ProcStatParserTest.java | 220 +++++++++++++ .../cdt/visualizer/ui/VisualizerAction.java | 6 + 23 files changed, 1891 insertions(+), 22 deletions(-) create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/EnableLoadMetersAction.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/SetLoadMeterPeriodAction.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerLoadInfo.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerLoadMeter.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java create mode 100644 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ProcStatParserTest.java diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/resources/messages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/resources/messages.properties index 0103a53551c..62b3b75d91f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/resources/messages.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/resources/messages.properties @@ -7,6 +7,7 @@ # # Contributors: # William R. Swanson (Tilera Corporation) +# Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) # ============================================================================= # ----------------------------------------------------------------------------- @@ -19,3 +20,15 @@ MulticoreVisualizer.actions.SelectAll.description=Select all thread(s) MulticoreVisualizer.actions.Refresh.text=Refresh@F5 MulticoreVisualizer.actions.Refresh.description=Refresh the visualizer display + +MulticoreVisualizer.actions.EnableLoadMeter.Enable.text=Enable Load Meters +MulticoreVisualizer.actions.EnableLoadMeter.Disable.text=Disable Load Meters +MulticoreVisualizer.actions.EnableLoadMeter.description=Enable or disable the load meters + +MulticoreVisualizer.actions.SetLoadMeterPeriod.fast.text=Fast +MulticoreVisualizer.actions.SetLoadMeterPeriod.medium.text=Medium +MulticoreVisualizer.actions.SetLoadMeterPeriod.slow.text=Slow +MulticoreVisualizer.actions.SetLoadMeterPeriod.description=Choose the refresh speed for load meters + +MulticoreVisualizer.actions.LoadMeterSubmenu.text=Load Meters +MulticoreVisualizer.actions.LoadMetersRefreshSubSubmenu.text=Refresh Speed diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/EnableLoadMetersAction.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/EnableLoadMetersAction.java new file mode 100644 index 00000000000..d4061ff46fa --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/EnableLoadMetersAction.java @@ -0,0 +1,77 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ + +package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions; + +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizer; +import org.eclipse.cdt.visualizer.ui.VisualizerAction; + +/** + * @since 1.1 + */ +public class EnableLoadMetersAction extends VisualizerAction { + + /** Visualizer instance we're associated with. */ + MulticoreVisualizer m_visualizer = null; + + boolean m_enabled = false; + + public EnableLoadMetersAction(boolean enable) { + m_enabled = enable; + setText(getTextToDisplay()); + setDescription(MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.EnableLoadMeter.description")); //$NON-NLS-1$ + } + + /** Dispose method. */ + @Override + public void dispose() + { + m_visualizer = null; + super.dispose(); + } + + // --- init methods --- + + /** Initializes this action for the specified view. */ + public void init(MulticoreVisualizer visualizer) + { + m_visualizer = visualizer; + } + + + // --- methods --- + + private String getTextToDisplay() { + if(m_enabled) { + return MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.EnableLoadMeter.Disable.text"); //$NON-NLS-1$ + } + else { + return MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.EnableLoadMeter.Enable.text"); //$NON-NLS-1$ + } + } + + /** Invoked when action is triggered. */ + @Override + public void run() { + if (m_visualizer != null) { + // toggle enabled state + m_enabled = !m_enabled; + m_visualizer.setLoadMetersEnabled(m_enabled); + m_visualizer.refresh(); + + setText(getTextToDisplay()); + } + } +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/SetLoadMeterPeriodAction.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/SetLoadMeterPeriodAction.java new file mode 100644 index 00000000000..5e4be80f5cb --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/SetLoadMeterPeriodAction.java @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ + +package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions; + +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizer; +import org.eclipse.cdt.visualizer.ui.VisualizerAction; + +/** + * @since 1.1 + */ +public class SetLoadMeterPeriodAction extends VisualizerAction { + + + /** Visualizer instance we're associated with. */ + MulticoreVisualizer m_visualizer = null; + + final int m_period; + + public SetLoadMeterPeriodAction(String label, int period) { + super(label, AS_RADIO_BUTTON); + m_period = period; + + setDescription(MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.SetLoadMeterPeriod.description")); //$NON-NLS-1$ + } + + /** Dispose method. */ + @Override + public void dispose() + { + m_visualizer = null; + super.dispose(); + } + + // --- init methods --- + + /** Initializes this action for the specified view. */ + public void init(MulticoreVisualizer visualizer) + { + m_visualizer = visualizer; + } + + /** Invoked when action is triggered. */ + @Override + public void run() { + if (!isChecked()) return; + + if (m_visualizer != null) { + m_visualizer.setLoadMeterTimerPeriod(m_period); + } + } +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java index 1f92161f1fd..c70117be4c8 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; @@ -29,6 +30,11 @@ public class VisualizerCPU /** ID of this core. */ public int m_id; + /** Contains load information + * @since 1.1 + */ + protected VisualizerLoadInfo m_loadinfo; + /** List of cores */ protected ArrayList m_cores; @@ -55,6 +61,7 @@ public class VisualizerCPU m_coreMap = null; m_cores.clear(); m_cores = null; + m_loadinfo = null; } } @@ -75,6 +82,23 @@ public class VisualizerCPU return m_id; } + /** sets the load info for this CPU + * @since 1.1*/ + public synchronized void setLoadInfo (VisualizerLoadInfo info) { + m_loadinfo = info; + } + + /** Gets the CPU usage load of this CPU. + * @since 1.1*/ + public synchronized Integer getLoad() { + return (m_loadinfo == null) ? null : m_loadinfo.getLoad(); + } + + /** get the highest recorded load for this CPU + * @since 1.1*/ + public synchronized Integer getHighLoadWatermark() { + return (m_loadinfo == null) ? null : m_loadinfo.getHighLoadWaterMark(); + } // --- methods --- diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCore.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCore.java index 87bc1c55e96..4d2e6571d44 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCore.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCore.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; @@ -23,6 +24,10 @@ public class VisualizerCore /** Linux CPU ID of this core. */ public int m_id = 0; + /** Contains load information + * @since 1.1 + */ + protected VisualizerLoadInfo m_loadinfo; // --- constructors/destructors --- @@ -34,6 +39,7 @@ public class VisualizerCore /** Dispose method */ public void dispose() { + m_loadinfo = null; } @@ -57,6 +63,24 @@ public class VisualizerCore public int getID() { return m_id; } + + /** sets the load info for this core + * @since 1.1*/ + public synchronized void setLoadInfo (VisualizerLoadInfo info) { + m_loadinfo = info; + } + + /** Gets the CPU usage load of this core. + * @since 1.1*/ + public synchronized Integer getLoad() { + return (m_loadinfo == null) ? null : m_loadinfo.getLoad(); + } + + /** get the highest recorded load for this core + * @since 1.1*/ + public synchronized Integer getHighLoadWatermark() { + return (m_loadinfo == null) ? null : m_loadinfo.getHighLoadWaterMark(); + } // --- methods --- diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerLoadInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerLoadInfo.java new file mode 100644 index 00000000000..f6cef401446 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerLoadInfo.java @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ +package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; + + +//---------------------------------------------------------------------------- +//VisualizerLoadInfo +//---------------------------------------------------------------------------- + +/** + * @since 1.1 + */ +public class VisualizerLoadInfo { + + // --- members --- + + /** load */ + protected Integer m_load = null; + + /** the high load water-mark */ + protected Integer m_highLoadWatermark = null; + + + // --- constructors/destructors --- + + /** constructor */ + public VisualizerLoadInfo (Integer load) { + m_load = load; + } + + public VisualizerLoadInfo (Integer load, Integer highLoadWatermark) { + this(load); + m_highLoadWatermark = highLoadWatermark; + } + + + // --- Object methods --- + + /** Returns string representation. */ + @Override + public String toString() { + if(m_highLoadWatermark != null) { + return "Load:" + m_load + ", high water-mark:" + m_highLoadWatermark; //$NON-NLS-1$ //$NON-NLS-2$ + } + else { + return "Load:" + m_load + ", high water-mark: not defined"; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + + // --- accessors --- + + /** Gets the CPU usage load of this core. */ + public Integer getLoad() { + return m_load; + } + + /** get the high load water-mark */ + public Integer getHighLoadWaterMark() { + return m_highLoadWatermark; + } + + +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java index d62a71435d7..bdddd3bdf25 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; @@ -38,12 +39,17 @@ public class VisualizerModel /** Completion state tracker. */ protected Todo m_todo; + /** Completion state tracker for load meters. */ + protected Todo m_loadTodo; + // Setting to remove exited threads, or keep them shown. // If we are to support this, we should have a preference // and a way to for the user to clean up old threads, // or maybe a timeout to remove them. private boolean m_keepExitedThreads = false; + protected boolean m_loadMetersEnabled = false; + // --- constructors/destructors --- /** Constructor */ @@ -52,6 +58,7 @@ public class VisualizerModel m_cpuMap = new Hashtable(); m_threads = new ArrayList(); m_todo = new Todo(); + m_loadTodo = new Todo(); } /** Dispose method */ @@ -76,6 +83,10 @@ public class VisualizerModel m_todo.dispose(); m_todo = null; } + if (m_loadTodo != null) { + m_loadTodo.dispose(); + m_loadTodo = null; + } } @@ -86,6 +97,19 @@ public class VisualizerModel return m_todo; } + /** Gets completion state tracker. */ + public Todo getLoadTodo() { + return m_loadTodo; + } + + public void setLoadMetersEnabled (boolean enable) { + m_loadMetersEnabled = enable; + } + + public boolean getLoadMetersEnabled () { + return m_loadMetersEnabled; + } + // --- methods --- /** Sorts cores, cpus, etc. by IDs. */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/IMulticoreVisualizerConstants.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/IMulticoreVisualizerConstants.java index 5b3a280cacc..6ec0634e24f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/IMulticoreVisualizerConstants.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/IMulticoreVisualizerConstants.java @@ -7,6 +7,7 @@ * * Contributors: * Marc Khouzam (Ericsson) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; @@ -49,6 +50,17 @@ public class IMulticoreVisualizerConstants public static final Color COLOR_CRASHED_CORE_FG = Colors.RED; public static final Color COLOR_CRASHED_CORE_BG = Colors.DARK_RED; + // Colors for drawing CPUs + + /** + * @since 1.1 + */ + public static final Color COLOR_CPU_FG = Colors.GREEN; + /** + * @since 1.1 + */ + public static final Color COLOR_CPU_BG = Colors.getColor(0,64,0); + // Colors for text /** Color to be used to draw a the text for a thread */ @@ -58,4 +70,28 @@ public class IMulticoreVisualizerConstants /** Color to be used to draw a the text for a core */ public static final Color COLOR_CORE_TEXT_FG = Colors.WHITE; public static final Color COLOR_CORE_TEXT_BG = Colors.BLACK; + + /** Color to be used to draw the load text + * @since 1.1 + */ + public static final Color COLOR_LOAD_TEXT = Colors.GREEN; + + // Colors for load meters + + /** + * @since 1.1 + */ + public static final Color COLOR_LOAD_LOADBAR_NORMAL = Colors.GREEN; + /** + * @since 1.1 + */ + public static final Color COLOR_LOAD_LOADBAR_OVERLOAD = Colors.RED; + /** + * @since 1.1 + */ + public static final Color COLOR_LOAD_UNDERBAR_FG = Colors.getColor(0,200,0); + /** + * @since 1.1 + */ + public static final Color COLOR_LOAD_UNDERBAR_BG_DEFAULT = Colors.getColor(0,64,0); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java index f9ea96ac601..76910a4fa53 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java @@ -9,10 +9,12 @@ * William R. Swanson (Tilera Corporation) - initial API and implementation * IBM Corporation * Marc Dumais (Ericsson) - Bug 399281 + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -24,11 +26,15 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMData; import org.eclipse.cdt.dsf.gdb.launching.GDBProcess; import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.EnableLoadMetersAction; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.RefreshAction; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.SelectAllAction; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.SetLoadMeterPeriodAction; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCPU; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCore; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerExecutionState; +import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerLoadInfo; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerModel; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerThread; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModel; @@ -37,6 +43,7 @@ import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFSessionStat import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DebugViewUtils; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICPUDMContext; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICoreDMContext; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.ILoadInfo; import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext; import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext; import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.IDMVMContext; @@ -46,6 +53,7 @@ import org.eclipse.cdt.visualizer.ui.plugin.CDTVisualizerUIPlugin; import org.eclipse.cdt.visualizer.ui.util.Colors; import org.eclipse.cdt.visualizer.ui.util.GUIUtils; import org.eclipse.cdt.visualizer.ui.util.SelectionUtils; +import org.eclipse.cdt.visualizer.ui.util.Timer; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandAction; @@ -63,6 +71,7 @@ import org.eclipse.debug.internal.ui.views.launch.LaunchView; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -107,6 +116,39 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer /** Model changed listener, attached to Debug View. */ protected IModelChangedListener m_modelChangedListener = null; + // These two arrays are used to cache the CPU and core + // contexts, each time the model is recreated. This way + // we can avoid asking the backend for the CPU/core + // geometry each time we want to update the load information. + /** + * @since 1.1 + */ + protected ICPUDMContext[] m_cpuContextsCache = null; + /** + * @since 1.1 + */ + protected ICoreDMContext[] m_coreContextsCache = null; + + /** + * Main switch that determines if we should display the load meters + * @since 1.1 + */ + protected boolean m_loadMetersEnabled = false; + /** + * Timer used to trigger the update of the CPU/core load meters + * @since 1.1 + */ + protected Timer m_updateLoadMeterTimer = null; + /** + * @since 1.1 + */ + protected int m_loadMeterTimerPeriod = LOAD_METER_TIMER_MEDIUM; // default 1000ms + // Load meters refresh periods, in ms + private static final int LOAD_METER_TIMER_MIN = 100; + private static final int LOAD_METER_TIMER_FAST = 500; + private static final int LOAD_METER_TIMER_MEDIUM = 1000; + private static final int LOAD_METER_TIMER_SLOW = 5000; + // --- UI members --- @@ -143,6 +185,17 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer /** Toolbar / menu action */ RefreshAction m_refreshAction = null; + /** Sub-menu */ + IMenuManager m_loadMetersSubMenu = null; + /** Sub-sub menu */ + IMenuManager m_loadMetersRefreshSubSubmenu = null; + + /** Menu action */ + EnableLoadMetersAction m_enableLoadMetersAction = null; + + /** Menu action */ + List m_setLoadMeterPeriodActions = null; + // --- constructors/destructors --- @@ -158,6 +211,7 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer super.dispose(); removeDebugViewerListener(); disposeActions(); + disposeLoadMeterTimer(); } @@ -169,6 +223,26 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer fEventListener = new MulticoreVisualizerEventListener(this); } + /** + * @since 1.1 + */ + protected void initializeLoadMeterTimer() { + if (!m_loadMetersEnabled) return; + m_updateLoadMeterTimer = DSFDebugModel.getLoadTimer(m_sessionState, m_loadMeterTimerPeriod, this); + // one-shot timer (re-scheduled upon successful triggering) + m_updateLoadMeterTimer.setRepeating(false); + } + + /** + * @since 1.1 + */ + protected void disposeLoadMeterTimer() { + if(m_updateLoadMeterTimer != null) { + m_updateLoadMeterTimer.dispose(); + m_updateLoadMeterTimer = null; + } + } + /** Invoked when visualizer is disposed, to permit any cleanup. */ @Override public void disposeVisualizer() @@ -198,6 +272,28 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer return Messages.MulticoreVisualizer_tooltip; } + /** + * @since 1.1 + */ + public void setLoadMeterTimerPeriod(int p) { + assert (p > LOAD_METER_TIMER_MIN); + if (m_loadMeterTimerPeriod == p) return; + m_loadMeterTimerPeriod = p > LOAD_METER_TIMER_MIN ? p : LOAD_METER_TIMER_MIN; + disposeLoadMeterTimer(); + initializeLoadMeterTimer(); + } + + /** + * @since 1.1 + */ + public void setLoadMetersEnabled(boolean enabled) { + if (m_loadMetersEnabled == enabled) return; + m_loadMetersEnabled = enabled; + // save load meter enablement in model + fDataModel.setLoadMetersEnabled(m_loadMetersEnabled); + disposeLoadMeterTimer(); + initializeLoadMeterTimer(); + } // --- canvas management --- @@ -219,6 +315,7 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer m_canvas.dispose(); m_canvas = null; } + disposeLoadMeterTimer(); } /** Invoked after visualizer control creation, */ @@ -285,6 +382,37 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer m_refreshAction = new RefreshAction(); m_refreshAction.init(this); + + // create load meters sub-menu and associated actions + m_loadMetersSubMenu = new MenuManager(MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.LoadMeterSubmenu.text")); //$NON-NLS-1$ + m_loadMetersRefreshSubSubmenu = new MenuManager(MulticoreVisualizerUIPlugin.getString( + "MulticoreVisualizer.actions.LoadMetersRefreshSubSubmenu.text")); //$NON-NLS-1$ + + m_enableLoadMetersAction = new EnableLoadMetersAction(m_loadMetersEnabled); + m_enableLoadMetersAction.init(this); + // enable the load meter sub-menu + m_enableLoadMetersAction.setEnabled(true); + + m_setLoadMeterPeriodActions = new ArrayList(); + m_setLoadMeterPeriodActions.add(new SetLoadMeterPeriodAction( + MulticoreVisualizerUIPlugin.getString("MulticoreVisualizer.actions.SetLoadMeterPeriod.fast.text"), //$NON-NLS-1$ + LOAD_METER_TIMER_FAST)); + + SetLoadMeterPeriodAction defaultAction = new SetLoadMeterPeriodAction( + MulticoreVisualizerUIPlugin.getString("MulticoreVisualizer.actions.SetLoadMeterPeriod.medium.text"), //$NON-NLS-1$ + LOAD_METER_TIMER_MEDIUM); + m_setLoadMeterPeriodActions.add(defaultAction); + + m_setLoadMeterPeriodActions.add(new SetLoadMeterPeriodAction( + MulticoreVisualizerUIPlugin.getString("MulticoreVisualizer.actions.SetLoadMeterPeriod.slow.text"), //$NON-NLS-1$ + LOAD_METER_TIMER_SLOW)); + for (SetLoadMeterPeriodAction act : m_setLoadMeterPeriodActions) { + act.init(this); + act.setEnabled(true); + } + defaultAction.setChecked(true); + defaultAction.run(); // Note: debug view may not be initialized at startup, // so we'll pretend the actions are not yet updated, @@ -301,6 +429,10 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer m_selectAllAction.setEnabled(enabled); m_refreshAction.setEnabled(enabled); + // show the load meter refresh speed sub-menu only + // if the load meters are enabled + m_loadMetersRefreshSubSubmenu.setVisible(m_loadMetersEnabled); + // We should not change the enablement of the debug view // actions, as they are automatically enabled/disabled // by the platform. @@ -358,6 +490,30 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer m_refreshAction = null; } + + if (m_loadMetersSubMenu != null) { + m_loadMetersSubMenu.dispose(); + m_loadMetersSubMenu = null; + } + + if (m_loadMetersRefreshSubSubmenu != null) { + m_loadMetersRefreshSubSubmenu.dispose(); + m_loadMetersRefreshSubSubmenu = null; + } + + if (m_enableLoadMetersAction != null ) { + m_enableLoadMetersAction.dispose(); + m_enableLoadMetersAction = null; + } + + if (m_setLoadMeterPeriodActions != null) { + for (SetLoadMeterPeriodAction act : m_setLoadMeterPeriodActions) { + act.dispose(); + } + m_setLoadMeterPeriodActions.clear(); + m_setLoadMeterPeriodActions = null; + } + m_actionsInitialized = false; } @@ -420,6 +576,21 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer menuManager.add(m_selectAllAction); menuManager.add(m_refreshAction); + menuManager.add(m_separatorAction); + + // add load meters sub-menus and actions + m_loadMetersSubMenu.removeAll(); + m_loadMetersRefreshSubSubmenu.removeAll(); + + menuManager.add(m_loadMetersSubMenu); + + m_loadMetersSubMenu.add(m_enableLoadMetersAction); + m_loadMetersSubMenu.add(m_loadMetersRefreshSubSubmenu); + + for (SetLoadMeterPeriodAction act : m_setLoadMeterPeriodActions) { + m_loadMetersRefreshSubSubmenu.add(act); + } + updateActions(); Point location = m_viewer.getContextMenuLocation(); updateContextMenuActions(location); @@ -663,6 +834,11 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer if (m_sessionState != null && ! m_sessionState.getSessionID().equals(sessionId)) { + // stop timer that updates the load meters + disposeLoadMeterTimer(); + m_cpuContextsCache = null; + m_coreContextsCache = null; + m_sessionState.removeServiceEventListener(fEventListener); m_sessionState.dispose(); m_sessionState = null; @@ -674,6 +850,8 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer { m_sessionState = new DSFSessionState(sessionId); m_sessionState.addServiceEventListener(fEventListener); + // start timer that updates the load meters + initializeLoadMeterTimer(); changed = true; } @@ -762,6 +940,8 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer /** Invoked when getModel() request completes. */ @ConfinedToDsfExecutor("getSession().getExecutor()") public void getVisualizerModelDone(VisualizerModel model) { + fDataModel.setLoadMetersEnabled(m_loadMetersEnabled); + updateLoads(); model.sort(); setCanvasModel(model); } @@ -774,6 +954,8 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer @ConfinedToDsfExecutor("getSession().getExecutor()") public void getCPUsDone(ICPUDMContext[] cpuContexts, Object arg) { + // save CPU contexts + m_cpuContextsCache = cpuContexts; VisualizerModel model = (VisualizerModel) arg; if (cpuContexts == null || cpuContexts.length == 0) { @@ -811,6 +993,8 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer ICoreDMContext[] coreContexts, Object arg) { + // save core contexts + m_coreContextsCache = coreContexts; VisualizerModel model = (VisualizerModel) arg; if (coreContexts == null || coreContexts.length == 0) { @@ -924,6 +1108,70 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer done(1, model); } + + /** + * @since 1.1 + */ + @ConfinedToDsfExecutor("getSession().getExecutor()") + @Override + public void updateLoads() { + if (m_cpuContextsCache == null || m_coreContextsCache == null) { + // not ready to get load info yet + return; + } + // if meters not enabled, do not query backend + if (!m_loadMetersEnabled) { + return; + } + + VisualizerModel model = fDataModel; + + // keep track of how many loads we expect + int count = m_cpuContextsCache.length + m_coreContextsCache.length; + model.getLoadTodo().dispose(); + model.getLoadTodo().add(count); + + // ask load for each CPU + for (ICPUDMContext cpuCtx : m_cpuContextsCache) { + DSFDebugModel.getLoad(m_sessionState, cpuCtx, this, model); + } + // ask load for each core + for (ICoreDMContext coreCtx : m_coreContextsCache) { + DSFDebugModel.getLoad(m_sessionState, coreCtx, this, model); + } + } + + /** + * Invoked when a getLoad() request completes. + * @since 1.1*/ + @Override + @ConfinedToDsfExecutor("getSession().getExecutor()") + public void getLoadDone(IDMContext context, ILoadInfo load, Object arg) + { + VisualizerModel model = (VisualizerModel) arg; + Integer l = null; + + if (load != null) { + l = Integer.valueOf(load.getLoad()); + } + + // CPU context? Update the correct CPU in the model + if (context instanceof ICPUDMContext) { + ICPUDMContext cpuContext = (ICPUDMContext) context; + VisualizerCPU cpu = model.getCPU(Integer.parseInt(cpuContext.getId())); + cpu.setLoadInfo(new VisualizerLoadInfo(l)); + } + // Core context? Update the correct core in the model + else if(context instanceof ICoreDMContext) { + ICoreDMContext coreContext = (ICoreDMContext) context; + VisualizerCore core = model.getCore(Integer.parseInt(coreContext.getId())); + core.setLoadInfo(new VisualizerLoadInfo(l)); + } + + loadDone(1, model); + } + + /** Update "done" count for current visualizer model. */ protected void done(int n, VisualizerModel model) { model.getTodo().done(n); @@ -931,5 +1179,21 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer getVisualizerModelDone(model); } } + + /** Update "done" count for current visualizer model. */ + protected void loadDone(int n, VisualizerModel model) { + model.getLoadTodo().done(n); + if (model.getLoadTodo().isDone()) { + // canvas may have been disposed since the transaction has started + if (m_canvas != null) { + m_canvas.refreshLoadMeters(); + m_canvas.requestUpdate(); + } + if (m_updateLoadMeterTimer != null) { + // re-start timer + m_updateLoadMeterTimer.start(); + } + } + } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java index fc0cf24f29d..423610b31a2 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; @@ -14,7 +15,6 @@ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; import java.util.ArrayList; import java.util.List; -import org.eclipse.cdt.visualizer.ui.util.Colors; import org.eclipse.cdt.visualizer.ui.util.GUIUtils; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.GC; @@ -32,6 +32,22 @@ public class MulticoreVisualizerCPU extends MulticoreVisualizerGraphicObject /** Child cores. */ protected ArrayList m_cores; + /** + * Load meter associated to this CPU + * @since 1.1 + */ + protected MulticoreVisualizerLoadMeter m_loadMeter; + + /** + * @since 1.1 + */ + protected static final Color BG_COLOR = IMulticoreVisualizerConstants.COLOR_CPU_BG; + + /** + * @since 1.1 + */ + protected static final Color FG_COLOR = IMulticoreVisualizerConstants.COLOR_CPU_FG; + // --- constructors/destructors --- @@ -40,12 +56,18 @@ public class MulticoreVisualizerCPU extends MulticoreVisualizerGraphicObject { m_id = id; m_cores = new ArrayList(); + + // default load meter + m_loadMeter = new MulticoreVisualizerLoadMeter(null, null); } /** Dispose method */ @Override public void dispose() { super.dispose(); + if (m_loadMeter != null) { + m_loadMeter.dispose(); + } } @@ -77,17 +99,30 @@ public class MulticoreVisualizerCPU extends MulticoreVisualizerGraphicObject return m_cores; } + /** + * @since 1.1 + */ + public void setLoadMeter (MulticoreVisualizerLoadMeter meter) { + m_loadMeter = meter; + } + + /** + * @since 1.1 + */ + public MulticoreVisualizerLoadMeter getLoadMeter() { + return m_loadMeter; + } // --- paint methods --- /** Invoked to allow element to paint itself on the viewer canvas */ @Override public void paintContent(GC gc) { - Color fg, bg; - fg = Colors.getColor(0,255,0); - bg = Colors.getColor(0,64,0); - gc.setForeground(fg); - gc.setBackground(bg); + gc.setForeground(FG_COLOR); + gc.setBackground(BG_COLOR); + + // We want the load meter to share the same BG color + m_loadMeter.setParentBgColor(BG_COLOR); gc.fillRectangle(m_bounds); gc.drawRectangle(m_bounds); @@ -103,15 +138,13 @@ public class MulticoreVisualizerCPU extends MulticoreVisualizerGraphicObject @Override public void paintDecorations(GC gc) { if (m_bounds.height > 20) { - Color fg, bg; - fg = Colors.getColor(0,255,0); - bg = Colors.getColor(0,64,0); - gc.setForeground(fg); - gc.setBackground(bg); + gc.setForeground(IMulticoreVisualizerConstants.COLOR_CPU_FG); + gc.setBackground(IMulticoreVisualizerConstants.COLOR_CPU_BG); - int text_indent = 6; - int tx = m_bounds.x + m_bounds.width - text_indent; - int ty = m_bounds.y + m_bounds.height - text_indent; + int text_indent_x = 6; + int text_indent_y = 2; + int tx = m_bounds.x + m_bounds.width - text_indent_x; + int ty = m_bounds.y + m_bounds.height - text_indent_y; GUIUtils.drawTextAligned(gc, Integer.toString(m_id), tx, ty, false, false); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java index 093501c1cb4..9ba43feeb85 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java @@ -12,11 +12,13 @@ * Marc Dumais (Ericsson) - Bug 396200 * Marc Dumais (Ericsson) - Bug 396293 * Marc Dumais (Ericsson) - Bug 399281 + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; import java.util.List; @@ -76,6 +78,12 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas */ protected boolean m_recacheSizes = true; + /** + * Whether the load information has changed and we need to update the load meters + * @since 1.1 + */ + protected boolean m_recacheLoadMeters = true; + /** Whether we need to repaint the canvas */ protected boolean m_update = true; @@ -283,6 +291,13 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas requestUpdate(); } + /** + * only update the load meters + * @since 1.1 + */ + public void refreshLoadMeters() { + requestRecache(false, false, true); + } // --- resize methods --- @@ -316,16 +331,26 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas /** Requests that next paint call should recache state and/or size information */ // synchronized so we don't change recache flags while doing a recache public synchronized void requestRecache() { - requestRecache(true, true); + requestRecache(true, true, true); } /** Requests that next paint call should recache state and/or size information */ // synchronized so we don't change recache flags while doing a recache public synchronized void requestRecache(boolean state, boolean sizes) { + requestRecache(state, sizes, true); + } + + /** + * Requests that the next paing call should recache state and/or size and/or load information + * @since 1.1 + */ + // synchronized so we don't change recache flags while doing a recache + public synchronized void requestRecache(boolean state, boolean sizes, boolean load) { m_recache = true; // NOTE: we intentionally OR these flags with any pending request(s) m_recacheState |= state; m_recacheSizes |= sizes; + m_recacheLoadMeters |= load; } /** Fits n square items into a rectangle of the specified size. @@ -372,6 +397,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas m_threads.clear(); m_cpuMap.clear(); m_coreMap.clear(); + m_threadMap.clear(); // For debugging purposes only, allows us to force a CPU count. //int cpu_count = 0; @@ -399,11 +425,40 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas } */ - // we've recached state, which implies recacheing sizes too + // we've recached state, which implies recacheing sizes and load meters m_recacheState = false; + m_recacheLoadMeters = true; m_recacheSizes = true; } + if (m_recacheLoadMeters) { + // refresh the visualizer CPU and core load meters + if (m_model != null) { + Enumeration modelCpus = m_cpuMap.keys(); + while (modelCpus.hasMoreElements()) { + VisualizerCPU modelCpu = modelCpus.nextElement(); + MulticoreVisualizerCPU visualizerCpu = m_cpuMap.get(modelCpu); + // update CPUs load meter + MulticoreVisualizerLoadMeter meter = visualizerCpu.getLoadMeter(); + meter.setEnabled(m_model.getLoadMetersEnabled()); + meter.setLoad(modelCpu.getLoad()); + meter.setHighLoadWatermark(modelCpu.getHighLoadWatermark()); + + for (VisualizerCore modelCore : modelCpu.getCores()) { + MulticoreVisualizerCore visualizerCore = m_coreMap.get(modelCore); + // update cores load meter + meter = visualizerCore.getLoadMeter(); + meter.setEnabled(m_model.getLoadMetersEnabled()); + meter.setLoad(modelCore.getLoad()); + meter.setHighLoadWatermark(modelCore.getHighLoadWatermark()); + } + } + } + + m_recacheSizes = true; + m_recacheLoadMeters = false; + } + if (m_recacheSizes) { // avoid doing resize calculations if the model is not ready if (m_model == null ) { @@ -416,9 +471,14 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas int cpu_margin = 8; // margin around edges of CPU grid int cpu_separation = 6; // spacing between CPUS - int core_margin = 4; // margin around cores in a CPU - int core_separation = 2; // spacing between cores + // make room when load meters are present, else use a more compact layout + int core_margin = m_model.getLoadMetersEnabled() ? 20 : 4; // margin around cores in a CPU + int core_separation = m_model.getLoadMetersEnabled() ? 4 : 2; // spacing between cores + int loadMeterWidth = core_margin*3/5; + int loadMeterHMargin = core_margin/5; + int loadMeterHCoreMargin = loadMeterHMargin + 5; + // Get overall area we have for laying out content. Rectangle bounds = getClientArea(); GUIUtils.inset(bounds, cpu_margin); @@ -442,6 +502,8 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas int x = bounds.x, y = bounds.y; for (MulticoreVisualizerCPU cpu : m_cpus) { cpu.setBounds(x, y, cpu_size-1, cpu_size-1); + // put cpu meter in the right margin of the CPU + cpu.getLoadMeter().setBounds(x + cpu_size - 2*cpu_margin, y + 2*core_margin, loadMeterWidth, cpu_size-3*core_margin); int left = x + core_margin; int cx = left, cy = y + core_margin; @@ -449,6 +511,13 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas { core.setBounds(cx, cy, core_size, core_size); + core.getLoadMeter().setBounds( + cx + core_size - loadMeterHCoreMargin - loadMeterWidth, + cy + core_size * 1 / 3, + loadMeterWidth, + core_size * 2 / 3 - loadMeterHCoreMargin + ); + cx += core_size + core_separation; if (cx + core_size + core_margin > x + cpu_size) { cx = left; @@ -564,11 +633,15 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas // paint cpus for (MulticoreVisualizerCPU cpu : m_cpus) { cpu.paintContent(gc); + cpu.getLoadMeter().paintContent(gc); + cpu.getLoadMeter().paintDecorations(gc); } // paint cores for (MulticoreVisualizerCore core : m_cores) { core.paintContent(gc); + core.getLoadMeter().paintContent(gc); + core.getLoadMeter().paintDecorations(gc); } // paint cpus IDs on top of cores diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java index 2772a058ea7..37359cc768b 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; @@ -36,6 +37,12 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject /** List of threads currently on this core. */ protected ArrayList m_threads; + /** + * Load meter associated to this core + * @since 1.1 + */ + protected MulticoreVisualizerLoadMeter m_loadMeter; + // --- constructors/destructors --- /** Constructor */ @@ -44,6 +51,9 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject if (m_cpu != null) m_cpu.addCore(this); m_id = id; m_threads = new ArrayList(); + + // default load meter + m_loadMeter = new MulticoreVisualizerLoadMeter(null, null); } /** Dispose method */ @@ -54,6 +64,9 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject m_threads.clear(); m_threads = null; } + if (m_loadMeter != null) { + m_loadMeter.dispose(); + } } @@ -95,6 +108,20 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject { return m_threads; } + + /** + * @since 1.1 + */ + public void setLoadMeter (MulticoreVisualizerLoadMeter meter) { + m_loadMeter = meter; + } + + /** + * @since 1.1 + */ + public MulticoreVisualizerLoadMeter getLoadMeter() { + return m_loadMeter; + } /** * A core state is based on its thread states. @@ -149,8 +176,12 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject /** Invoked to allow element to paint itself on the viewer canvas */ @Override public void paintContent(GC gc) { + Color bg = getCoreStateColor(false); + gc.setForeground(getCoreStateColor(true)); - gc.setBackground(getCoreStateColor(false)); + gc.setBackground(bg); + // We want the load meter to share the same BG color + m_loadMeter.setParentBgColor(bg); gc.fillRectangle(m_bounds); gc.drawRectangle(m_bounds); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerLoadMeter.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerLoadMeter.java new file mode 100644 index 00000000000..9a55a98d196 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerLoadMeter.java @@ -0,0 +1,223 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ +package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; + +import org.eclipse.cdt.visualizer.ui.util.Colors; +import org.eclipse.cdt.visualizer.ui.util.GUIUtils; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Rectangle; + +/** + * @since 1.1 + */ +public class MulticoreVisualizerLoadMeter extends MulticoreVisualizerGraphicObject { + + // --- members --- + + /** Is this load meter enabled? */ + protected boolean m_enabled = false; + + /** The current CPU/core load */ + protected Integer m_currentLoad = null; + + /** the high load water-mark */ + protected Integer m_highLoadWatermark = null; + + /** second rectangle, that will be displayed to show the load */ + protected Rectangle m_loadRect = null; + + /** to display the high load water-mark */ + protected Rectangle m_highWatermarkRect = null; + + /** Switch that permits to hide the load meter when not in overload */ + protected Boolean m_showOnlyIfOverload = false; + + /** Default overload threshold */ + protected int m_overloadThreshold = 75; + + /** Permits to have the load meter use the same BG color as its parent */ + protected Color m_parentBgColor = null; + + + // --- constructors/destructors --- + + /** Constructor */ + + public MulticoreVisualizerLoadMeter(Integer load) { + m_currentLoad = load; + } + + /** Constructor witch includes the high load water-mark */ + public MulticoreVisualizerLoadMeter(Integer load, Integer highWatermark) { + this(load); + m_highLoadWatermark = highWatermark; + } + + /** Dispose method */ + @Override + public void dispose() { + super.dispose(); + } + + + // --- accessors --- + + public void setEnabled (boolean enabled) { + m_enabled = enabled; + } + + public boolean getEnabled() { + return m_enabled; + } + + public void setLoad(Integer load) { + m_currentLoad = load; + } + + /** + * @return the load value. If the value is undefined (null), zero is + * returned. Method isLoadDefined() can be used to determine is the load + * value is defined, in the cases where the difference is important + * if needed. + */ + public int getLoad() { + return (m_currentLoad != null) ? m_currentLoad : 0; + } + + /** + * @return true if load is a non-null value, otherwise false. + */ + public boolean isLoadDefined() { + return (m_currentLoad != null); + } + + public void setHighLoadWatermark(Integer wm) { + m_highLoadWatermark = wm; + } + + public void setOverloadThreshold (int t) { + m_overloadThreshold = t; + } + + public void setShowyOnlyIfOverload (Boolean o) { + m_showOnlyIfOverload = o; + } + + public void setParentBgColor(Color c) { + m_parentBgColor = c; + } + + // --- paint methods --- + + /** get a color that corresponds to the current load */ + private Color getLoadColor() { + + if (getLoad() < m_overloadThreshold) { + return IMulticoreVisualizerConstants.COLOR_LOAD_LOADBAR_NORMAL; + } + else { + return IMulticoreVisualizerConstants.COLOR_LOAD_LOADBAR_OVERLOAD; + } + } + + /** Invoked to allow element to paint itself on the viewer canvas */ + @Override + public void paintContent(GC gc) { + if (!m_enabled) { + return; + } + + if (getLoad() < m_overloadThreshold && m_showOnlyIfOverload) + return; + + // Show meter only if there is enough space + if (m_bounds.height < 30) { + return; + } + + if (m_parentBgColor == null) { + // use default bg color + m_parentBgColor = IMulticoreVisualizerConstants.COLOR_LOAD_UNDERBAR_BG_DEFAULT; + } + + // Display complete-length load bar + gc.setForeground(IMulticoreVisualizerConstants.COLOR_LOAD_UNDERBAR_FG); + gc.setBackground(m_parentBgColor); + gc.fillRectangle(m_bounds); + gc.drawRectangle(m_bounds); + + // Create/display shorter bar over to show current load + int x,y,w,h; + x = m_bounds.x; + y = (int) (m_bounds.y + m_bounds.height * ((100.0f - getLoad()) / 100.0f)); + w = m_bounds.width; + h = (int) (m_bounds.height - m_bounds.height * ((100.0f - getLoad()) / 100.0f)); + + m_loadRect = new Rectangle(x, y, w, h); + gc.setBackground(getLoadColor()); + gc.fillRectangle(m_loadRect); + gc.drawRectangle(m_loadRect); + + // Display high water-mark, if defined + if ( m_highLoadWatermark != null) { + x = m_bounds.x - 5; + y = (int) (m_bounds.y + m_bounds.height * ((100.0f - m_highLoadWatermark) / 100.0f)); + w = m_bounds.width + 7; + h = 2; + + m_highWatermarkRect = new Rectangle(x, y, w, h); + gc.setBackground(Colors.BLACK); + gc.setForeground(Colors.DARK_RED); + gc.fillRectangle(m_highWatermarkRect); + gc.drawRectangle(m_highWatermarkRect); + } + + } + + /** Returns true if object has decorations to paint. */ + @Override + public boolean hasDecorations() { + return true; + } + + /** Invoked to allow element to paint decorations on top of anything drawn on it */ + @Override + public void paintDecorations(GC gc) { + String load; + + // display nothing if load meter is not enabled + if (!m_enabled) + return; + // "display only if overload" mode applicable? + if (getLoad() < m_overloadThreshold && m_showOnlyIfOverload) + return; + + // is there an actual value to display yet? + if (isLoadDefined()) { + load = Integer.toString(getLoad()); + } + // no + else { + load = "n/a"; //$NON-NLS-1$ + } + + // Show load text only if there is enough space + if (m_bounds.height > 50) { + // Display load in text above the load monitor bar + gc.setForeground(IMulticoreVisualizerConstants.COLOR_LOAD_TEXT); + int tx = m_bounds.x; + int ty = m_bounds.y; + GUIUtils.drawTextAligned(gc, load, tx, ty, true, false); + } + } + +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModel.java index d7b65a1020e..add78f58485 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModel.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModel.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils; @@ -14,6 +15,7 @@ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils; import java.util.ArrayList; import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor; +import org.eclipse.cdt.dsf.concurrent.DsfExecutor; import org.eclipse.cdt.dsf.concurrent.ImmediateCountingRequestMonitor; import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.ImmediateRequestMonitor; @@ -34,8 +36,12 @@ import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICPUDMContext; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICoreDMContext; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.IHardwareTargetDMContext; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.ILoadInfo; import org.eclipse.cdt.dsf.gdb.service.IGDBProcesses.IGdbThreadDMData; import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext; +import org.eclipse.cdt.dsf.service.DsfSession; +import org.eclipse.cdt.visualizer.ui.util.Timer; /** Debugger state information accessors. @@ -81,6 +87,31 @@ public class DSFDebugModel { ); } + + /** Request load information for a single CPU or core + * @since 1.1*/ + @ConfinedToDsfExecutor("getSession().getExecutor()") + public static void getLoad(DSFSessionState sessionState, + final IDMContext context, + final DSFDebugModelListener listener, + final Object arg) + { + IGDBHardwareAndOS2 hwService = sessionState.getService(IGDBHardwareAndOS2.class); + if (hwService == null) { + listener.getLoadDone(context, null, arg); + return; + } + + hwService.getLoadInfo(context, + new ImmediateDataRequestMonitor() { + @Override + protected void handleCompleted() { + listener.getLoadDone(context, getData(), arg); + } + } + ); + } + /** Requests list of Cores. * Calls back to getCoresDone() on listener. */ @ConfinedToDsfExecutor("getSession().getExecutor()") @@ -337,4 +368,36 @@ public class DSFDebugModel { return false; } + + /** + * Creates and returns a timer that refreshes the load meters + * @since 1.1 + */ + public static Timer getLoadTimer(final DSFSessionState sessionState, + final int timeout, + final DSFDebugModelListener listener) + { + + Timer t = new Timer(timeout) { + @Override + public void run() { + if (sessionState != null) { + DsfSession session = DsfSession.getSession(sessionState.getSessionID()); + if (session != null) { + DsfExecutor executor = session.getExecutor(); + if (executor != null) { + executor.execute(new Runnable() { + @Override + public void run() { + listener.updateLoads(); + } + }); + } + } + } + } + }; + + return t; + } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModelListener.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModelListener.java index f55a2594d9a..2336d6de0f0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModelListener.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModelListener.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils; @@ -17,6 +18,7 @@ import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMData; import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerExecutionState; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICPUDMContext; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS.ICoreDMContext; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.ILoadInfo; import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext; /** Interface for classes that interact with DSFDebugModel. @@ -64,5 +66,17 @@ public interface DSFDebugModelListener { IThreadDMData threadData, VisualizerExecutionState state, Object arg); + + /** + * Invoked when getLoad() request completes. + * @since 1.1 + */ + public void getLoadDone(IDMContext context, ILoadInfo loads, Object arg); + /** + * Invoked when the load timer triggers + * @since 1.1 + */ + public void updateLoads(); + } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java new file mode 100644 index 00000000000..fb19f8c486e --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ +package org.eclipse.cdt.dsf.gdb.internal; + +import java.util.HashMap; +import java.util.Map; + +/** + * This class provides a container to store the computed + * loads for the various CPU cores. + * + */ +public class ProcStatCoreLoads { + private Map m_coreLoads; + + public ProcStatCoreLoads() { + m_coreLoads = new HashMap(); + } + + public void put(String coreId, Float load) { + m_coreLoads.put(coreId,load); + } + + /** + * @param cpuId: the cpu/core id, as listed in /proc/cpuinfo. + * For example, for the core labelled "cpu0" in /proc/stat, + * use id "0". + * @return The measured load for that core + */ + public Float getLoad(String cpuId) { + return m_coreLoads.get("cpu"+cpuId); //$NON-NLS-1$ + } +} + diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java new file mode 100644 index 00000000000..c0e1259dcc0 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java @@ -0,0 +1,140 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ + +package org.eclipse.cdt.dsf.gdb.internal; + +import java.util.HashMap; +import java.util.Map; + +/** + * A class that holds one set of /proc/stat counters. + * TODO: extend to more than the tick counters. + */ +public class ProcStatCounters { + private Map fTickCounters = new HashMap(); + + /** + * An object of this class holds one set of core/CPU tick counter values, for a single CPU core + */ + private class OneCoreTickCounters { + private int fUser; + private int fNice; + private int fSystem; + private int fIdle; + private int fIowait; + private int fIrq; + private int fSoftirq; + + public OneCoreTickCounters(Integer[] c) { + // sanity checks + assert (c != null && c.length >= 7); + if (c == null || c.length < 7) return; + + fUser = c[0]; + fNice = c[1]; + fSystem = c[2]; + fIdle = c[3]; + fIowait = c[4]; + fIrq = c[5]; + fSoftirq = c[6]; + } + + /** + * @return The sum of all "active" (i.e. non-idle) tick counters + */ + private int getActiveTicks() { + return fUser + fNice + fSystem + fIowait + fIrq + fSoftirq; + } + + /** + * @return The "idle" tick counter + */ + private int getIdleTicks() { + return fIdle; + } + } + + /** + * + */ + public ProcStatCounters() { + fTickCounters = new HashMap(); + } + + /** + * Saves the tick counters for one core + * @param core: the core id, as seen in /proc/stat. + * @param ticks: Array of tick counters, as read from a CPU/core line in /proc/stat + */ + public void addTickCounters(String core, Integer[] ticks) { + fTickCounters.put(core, new OneCoreTickCounters(ticks)); + } + + /** + * Note: It was discovered during testing that sometimes, the counters in + * /proc/stat are not updated for a given core, between two measurements. + * The cause seems to be that with CPUs such as the i5 and i7, some power- + * saving modes can put a core to sleep for a short time. When all counters + * for a core are the same for 2 measurements, it can cause a division by + * zero below, in the load computing code. Given that this can legitimately + * happen, we handle the case and assign a load of zero, when it does. + * + * @param old: another ProcStatCounters object. If null, will compute the + * average load from boot time (i.e. historical load). + * @return the load, for each CPU core, computed from the two + * sets of counters. + */ + public final ProcStatCoreLoads computeLoads(final ProcStatCounters old) { + ProcStatCoreLoads loads = new ProcStatCoreLoads(); + + // for each core + for(String coreId: fTickCounters.keySet()) { + OneCoreTickCounters coreCountersNew = fTickCounters.get(coreId); + // Do we have 2 sets of counters to compute the load from? + if (old != null) { + OneCoreTickCounters coreCountersOld = old.fTickCounters.get(coreId); + int diffIdle = coreCountersNew.getIdleTicks() - coreCountersOld.getIdleTicks(); + int diffActive = coreCountersNew.getActiveTicks() - coreCountersOld.getActiveTicks(); + + // Sanity check - we do not expect that the counter should decrease + assert(diffIdle >= 0); + assert(diffActive >= 0); + + if (diffIdle < 0 || diffActive < 0) { + return null; + } + + float load; + if (diffIdle + diffActive != 0) { + load = diffActive / (float)(diffActive + diffIdle); + } + // Here we catch the cases where a core has been asleep for the whole + // measurement period. See note above this method. + else { + load = 0; + } + loads.put(coreId, load * 100.0f); + } + // we have only one set of counters; we will effectively compute the historical load, + // from boot time until now. + else { + int diffIdle = coreCountersNew.getIdleTicks(); + int diffActive = coreCountersNew.getActiveTicks(); + assert (diffActive + diffIdle != 0); + float load = diffActive / (float)(diffActive + diffIdle); + loads.put(coreId, load * 100.0f); + } + } + + return loads; + } + +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java new file mode 100644 index 00000000000..a69d5cb17ff --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ +package org.eclipse.cdt.dsf.gdb.internal; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Vector; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author Marc Dumais + * TODO: extend to more than the tick counters. + * @see also http://www.linuxhowtos.org/System/procstat.htm + */ +public class ProcStatParser { + + private ProcStatCounters cpuCoreCounters; + private ProcStatCounters cpuCoreCountersOld; + + public ProcStatParser() { + + } + + /** + * Read and parse the /proc/stat file given as param + * @param fileName + */ + public void parseStatFile(String fileName) throws FileNotFoundException, NumberFormatException { + cpuCoreCountersOld = cpuCoreCounters; + + File statFile = new File(fileName); + if (!statFile.exists()) { + throw new FileNotFoundException(); + } + + cpuCoreCounters = new ProcStatCounters(); + BufferedReader reader = null; + try { + String coreId; + Reader r = new InputStreamReader(new FileInputStream(statFile)); + reader = new BufferedReader(r); + String line; + // ex: "cpu0 2048635 3195 385292 66149962 895977 22 36130 0 0 0" + // note: we intentionally do not catch the "cpu" (without a core number) line. + Pattern patternCpu = Pattern.compile("^(cpu[0-9]+)(.*)$"); //$NON-NLS-1$ + + while ((line = reader.readLine()) != null) { + line = line.trim(); + + // catch "cpu" lines from /proc/stat + Matcher matcherCpu = patternCpu.matcher(line); + if (matcherCpu.find()) { + Vector ticks = new Vector(); + coreId = matcherCpu.group(1); + // extract the counters for current cpu line + for (String tick : matcherCpu.group(2).trim().split("\\s+")) { //$NON-NLS-1$ + ticks.add(Integer.parseInt(tick)); + } + + cpuCoreCounters.addTickCounters(coreId, ticks.toArray(new Integer[ticks.size()])); + } + } + + } catch (IOException e) { + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) {/* Don't care */} + reader = null; + } + + } + + /** + * @return a Map of the computed CPU/core loads. The load of individual + * CPUs/cores can be found with keys "cpuN", where N is the CPU/core + * number, starting with 0, as found in /proc/stat . + * + */ + public ProcStatCoreLoads getCpuLoad() { + return cpuCoreCounters.computeLoads(cpuCoreCountersOld); + } + +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java index 5a803476829..6a69334d4bf 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson and others. + * Copyright (c) 2012-2013 Ericsson 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 @@ -8,17 +8,22 @@ * Contributors: * Marc Khouzam (Ericsson) - initial API and implementation * Marc Khouzam (Ericsson) - Updated to use /proc/cpuinfo for remote targets (Bug 374024) + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.Vector; +import java.util.concurrent.TimeUnit; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; @@ -27,6 +32,7 @@ import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor; import org.eclipse.cdt.dsf.concurrent.Immutable; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.datamodel.AbstractDMContext; +import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.DataModelInitializedEvent; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.datamodel.IDMData; @@ -42,6 +48,8 @@ import org.eclipse.cdt.dsf.debug.service.command.IEventListener; import org.eclipse.cdt.dsf.gdb.internal.CoreInfo; import org.eclipse.cdt.dsf.gdb.internal.CoreList; import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; +import org.eclipse.cdt.dsf.gdb.internal.ProcStatCoreLoads; +import org.eclipse.cdt.dsf.gdb.internal.ProcStatParser; import org.eclipse.cdt.dsf.gdb.internal.service.command.commands.MIMetaGetCPUInfo; import org.eclipse.cdt.dsf.gdb.internal.service.command.output.MIMetaGetCPUInfoInfo; import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl; @@ -65,7 +73,7 @@ import org.osgi.framework.BundleContext; * * @since 4.1 */ -public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardwareAndOS, ICachingService { +public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardwareAndOS2, ICachingService { @Immutable protected static class GDBCPUDMC extends AbstractDMContext @@ -152,6 +160,34 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware } + /** + * @since 4.2 + */ + @Immutable + protected class GDBLoadInfo implements ILoadInfo { + private String fLoad; + private Map fDetailedLoad; + + public GDBLoadInfo(String load, Map detailedLoad) { + fLoad = load; + fDetailedLoad = detailedLoad; + } + public GDBLoadInfo(String load) { + this(load, null); + } + @Override + public String getLoad() { + return fLoad; + } + @Override + public Map getDetailedLoad() { + return fDetailedLoad; + } + } + + // to save queued load info requests for later processing + private Map> fLoadInfoRequestCache; + private IGDBControl fCommandControl; private IGDBBackend fBackend; private CommandFactory fCommandFactory; @@ -170,6 +206,19 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware // Bug 374293 private boolean fSessionInitializationComplete; + // used to keep track when we last computed the load + private long fLastCpuLoadRefresh = 0; + // to keep track if we are already seeking to get the load + private boolean fLoadRequestOngoing = false; + // Length of the measured sample in ms + private final static int LOAD_SAMPLE_DELAY = 250; + // To avoid bombarding the remote GDB server, we cache the measured load + // and serve it again if requested within a short period of time. + private ProcStatCoreLoads fCachedLoads = null; + // lifetime of the load cache, in ms + private final static int LOAD_CACHE_LIFETIME = 500; + + public GDBHardwareAndOS(DsfSession session) { super(session); } @@ -211,11 +260,13 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware // handle getting the required cpu info fFetchCPUInfoCache = new CommandCache(getSession(), new CPUInfoManager()); fFetchCPUInfoCache.setContextAvailable(fCommandControl.getContext(), true); + fLoadInfoRequestCache = new HashMap>(); getSession().addServiceEventListener(this, null); // Register this service. register(new String[] { IGDBHardwareAndOS.class.getName(), + IGDBHardwareAndOS2.class.getName(), GDBHardwareAndOS.class.getName() }, new Hashtable()); @@ -234,6 +285,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware public void shutdown(RequestMonitor requestMonitor) { getSession().removeServiceEventListener(this); fFetchCPUInfoCache.reset(); + fLoadInfoRequestCache.clear(); unregister(); super.shutdown(requestMonitor); } @@ -502,4 +554,251 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware public void removeCommand(ICommandToken token) { assert false : "Not supported"; } //$NON-NLS-1$ } + + /** + * @since 4.2 + */ + @Override + public boolean isAvailable() { + return false; + } + + /** + * @since 4.2 + */ + @Override + public void getResourceClasses(IDMContext dmc, + DataRequestMonitor rm) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Operation not supported", null)); //$NON-NLS-1$ + } + + /** + * @since 4.2 + */ + @Override + public void getResourcesInformation(IDMContext dmc, String resourceClassId, + DataRequestMonitor rm) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Operation not supported", null)); //$NON-NLS-1$ + } + + + /** + * This method processes "load info" requests. The load is computed using a + * sampling method; two readings of a local or remote /proc/stat file are done + * with a delay in between. Then the load is computed from the two samples, + * for all CPUs/cores known in the system. + * + * Because of the method used, it's possible that fast variations in CPU usage will + * be missed. However longer load trends should be reflected in the results. + * + * To avoid generating too much load in the remote case, there is a cache that will + * return the already computed load, if requested multiple times in a short period. + * There is also a mechanism to queue subsequent requests if one is ongoing. Upon + * completion of the ongoing request, any queued request is answered with the load + * that was just computed. + * + * @since 4.2 + */ + @Override + public void getLoadInfo(final IDMContext context, final DataRequestMonitor rm) { + if (!(context instanceof ICoreDMContext) && !(context instanceof ICPUDMContext)) { + // we only support getting the load for a CPU or a core + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE, "Load information not supported for this context type", null)); //$NON-NLS-1$ + return; + } + + // The measurement interval should be of a minimum length to be meaningful + assert (LOAD_SAMPLE_DELAY >= 100); + // so the cache is useful + assert (LOAD_CACHE_LIFETIME >= LOAD_SAMPLE_DELAY); + + // This way of computing the CPU load is only applicable to Linux + if (!Platform.getOS().equals(Platform.OS_LINUX)) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Operation not supported", null)); //$NON-NLS-1$ + return; + } + + // Is a request is already ongoing? + if(fLoadRequestOngoing) { + // queue current new request + fLoadInfoRequestCache.put(context, rm); + return; + } + // no request ongoing, so proceed + fLoadRequestOngoing = true; + + // caching mechanism to keep things sane, even if the views(s) + // request load information very often. + long currentTime = System.currentTimeMillis(); + + // time to fetch fresh load information? + if (fLastCpuLoadRefresh + LOAD_CACHE_LIFETIME < currentTime) { + fLastCpuLoadRefresh = currentTime; + } + else { + // not time yet... re-use cached load data + processLoads(context, rm, fCachedLoads); + fLoadRequestOngoing = false; + return; + } + + final ProcStatParser procStatParser = new ProcStatParser(); + final ICommandControlDMContext dmc = DMContexts.getAncestorOfType(context, ICommandControlDMContext.class); + final String statFile = "/proc/stat"; //$NON-NLS-1$ + final String localFile = "/tmp/" + GdbPlugin.PLUGIN_ID + ".proc.stat." + getSession().getId(); //$NON-NLS-1$ //$NON-NLS-2$ + + // Remote debugging? We will ask GDB to get us the /proc/stat file from target, twice, with a delay between. + if (fBackend.getSessionType() == SessionType.REMOTE) { + fCommandControl.queueCommand( + fCommandFactory.createCLIRemoteGet(dmc, statFile, localFile), + new ImmediateDataRequestMonitor(rm) { + @Override + protected void handleCompleted() { + if (! isSuccess()) { + fLoadRequestOngoing = false; + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + return; + } + + // Success - parse first set of stat counters + try { + procStatParser.parseStatFile(localFile); + } catch (Exception e) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + fLoadRequestOngoing = false; + return; + } + // delete temp file + new File(localFile).delete(); + + getExecutor().schedule(new Runnable() { + @Override + public void run() { + fCommandControl.queueCommand( + fCommandFactory.createCLIRemoteGet(dmc, statFile, localFile), + new ImmediateDataRequestMonitor(rm) { + @Override + protected void handleCompleted() { + if (! isSuccess()) { + fLoadRequestOngoing = false; + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + return; + } + + // Success - parse the second set of stat counters and compute loads + try { + procStatParser.parseStatFile(localFile); + } catch (Exception e) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + fLoadRequestOngoing = false; + return; + } + // delete temp file + new File(localFile).delete(); + + // Compute load + fCachedLoads = procStatParser.getCpuLoad(); + processLoads(context, rm, fCachedLoads); + + // done with request + fLoadRequestOngoing = false; + // process any queued request + for(Entry> e : fLoadInfoRequestCache.entrySet()) { + processLoads(e.getKey(), e.getValue(), fCachedLoads); + } + fLoadInfoRequestCache.clear(); + } + }); + } + }, LOAD_SAMPLE_DELAY, TimeUnit.MILLISECONDS); + } + }); + // Local debugging? Then we can read /proc/stat directly + } else { + // Read /proc/stat file for the first time + try { + procStatParser.parseStatFile(statFile); + } catch (Exception e) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + fLoadRequestOngoing = false; + return; + } + + // Read /proc/stat file again after a delay + getExecutor().schedule(new Runnable() { + @Override + public void run() { + try { + procStatParser.parseStatFile(statFile); + } catch (Exception e) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + fLoadRequestOngoing = false; + return; + } + // compute load + fCachedLoads = procStatParser.getCpuLoad(); + processLoads(context, rm, fCachedLoads); + + // done with request + fLoadRequestOngoing = false; + // process any queued request + for(Entry> e : fLoadInfoRequestCache.entrySet()) { + processLoads(e.getKey(), e.getValue(), fCachedLoads); + } + fLoadInfoRequestCache.clear(); + } + }, LOAD_SAMPLE_DELAY, TimeUnit.MILLISECONDS); + } + } + + /** + * For a given "load info" request, this method processes the load obtained from the + * proc stat parser and creates/sends the response. + * @param context + * @param rm + * @param loads + */ + private void processLoads(final IDMContext context, final DataRequestMonitor rm, final ProcStatCoreLoads loads) { + + // problem with fetching load info + if (loads == null) { + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info", null)); //$NON-NLS-1$ + return; + } + // core context? + if (context instanceof ICoreDMContext) { + String coreId = ((ICoreDMContext) context).getId(); + // Integer precision sufficient for our purpose + float load = loads.getLoad(coreId); + rm.done(new GDBLoadInfo(Integer.toString((int)load))); + } + else if (context instanceof ICPUDMContext) { + // get the list of cores in that CPU + getCores(context, + new ImmediateDataRequestMonitor() { + @Override + protected void handleCompleted() { + ICoreDMContext[] coreContexts = getData(); + + if (!isSuccess() || coreContexts == null || coreContexts.length < 1) { + // Unable to get any core data + rm.done(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Can't get load info for CPU", null)); //$NON-NLS-1$ + return; + } + + int i = 0; + float load = 0.0f; + // compute the average load of cores in that CPU + for (ICoreDMContext coreCtx : coreContexts) { + String coreId = coreCtx.getId(); + load += loads.getLoad(coreId); + i++; + } + load /= i; + rm.done(new GDBLoadInfo(Integer.toString((int)load))); + } + } + ); + } + } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBHardwareAndOS2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBHardwareAndOS2.java index 256c67dd93f..7c0c3bd047b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBHardwareAndOS2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBHardwareAndOS2.java @@ -7,10 +7,13 @@ * * Contributors: * Vladimir Prus (Mentor Graphics) - initial API and implementation + * Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; +import java.util.Map; + import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.datamodel.IDMContext; @@ -64,4 +67,28 @@ public interface IGDBHardwareAndOS2 extends IGDBHardwareAndOS { * Return table describing resources of specified class. */ void getResourcesInformation(IDMContext dmc, String resourceClassId, DataRequestMonitor rm); + + + /** + * Information about the CPU/core load for one given CPU or core + */ + public interface ILoadInfo + { + /** + * A string representing the current load (between "0" and "100") + */ + public String getLoad(); + /** + * Used to give more details about a CPU's/core's load. For instance + * the breakdown of the different load types and their proportion: system, + * user, I/O, interrupts, etc. + */ + public Map getDetailedLoad(); + } + + /** + * Computes CPU/core load information according to context and + * asynchronously returns the result in a ILoadInfo object + */ + void getLoadInfo(IDMContext dmc, DataRequestMonitor rm); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java index de08ef198d9..3039dee5b4e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java @@ -7,6 +7,7 @@ * * Contributors: * Ericsson - Initial Implementation + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.dsf.mi.service.command.commands; @@ -14,6 +15,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIStringHandlerTests; import org.eclipse.cdt.dsf.mi.service.command.output.MIThreadTests; import org.eclipse.cdt.tests.dsf.gdb.framework.OnceOnlySuite; import org.eclipse.cdt.tests.dsf.gdb.tests.LaunchUtilsTest; +import org.eclipse.cdt.tests.dsf.gdb.tests.ProcStatParserTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -29,7 +31,8 @@ import org.junit.runners.Suite; TestMICommandConstructCommand.class, MIThreadTests.class, LaunchUtilsTest.class, - MIStringHandlerTests.class + MIStringHandlerTests.class, + ProcStatParserTest.class /* Add your test class here */ }) public class Suite_Sessionless_Tests { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ProcStatParserTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ProcStatParserTest.java new file mode 100644 index 00000000000..23f2ede4126 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ProcStatParserTest.java @@ -0,0 +1,220 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) + *******************************************************************************/ +package org.eclipse.cdt.tests.dsf.gdb.tests; + +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; + +import org.eclipse.cdt.dsf.gdb.internal.ProcStatCoreLoads; +import org.eclipse.cdt.dsf.gdb.internal.ProcStatParser; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class ProcStatParserTest { + + final static String stat_t0 = "cpu 27599070 16857 1627173 178832624 958471 10 21253 0 0 0\n" + + "cpu0 7076626 3073 420740 44122942 620655 7 19123 0 0 0\n" + + "cpu1 6839475 2644 480003 44885633 53738 2 1200 0 0 0\n" + + "cpu2 6861775 9347 337505 44860715 195008 0 573 0 0 0\n" + + "cpu3 6821192 1792 388924 44963332 89067 0 355 0 0 0\n" + + "intr 255054962 1785 9 0 0 0 0 0 0 1 393 0 0 125 0 0 0 1861780 5056689 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3138534 3946219 2295808 199 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + + "ctxt 406954066\n" + + "btime 1357642511\n" + + "processes 187587\n" + + "procs_running 2\n" + + "procs_blocked 0\n" + + "softirq 187777133 0 82842161 104536 3977894 3827626 0 3881246 12353598 94844 80695228"; + final static String stat_t0_file = "/tmp/stat_t0"; + + final static String stat_t1 = "cpu 27599216 16857 1627190 178835528 958483 10 21255 0 0 0\n" + + "cpu0 7076664 3073 420751 44123650 620668 7 19125 0 0 0\n" + + "cpu1 6839509 2644 480004 44886368 53738 2 1200 0 0 0\n" + + "cpu2 6861813 9347 337507 44861445 195008 0 573 0 0 0\n" + + "cpu3 6821229 1792 388926 44964063 89067 0 355 0 0 0\n" + + "intr 255057230 1785 9 0 0 0 0 0 0 1 393 0 0 125 0 0 0 1861874 5056997 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3138618 3946264 2295808 199 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + + "ctxt 406958462\n" + + "btime 1357642511\n" + + "processes 187593\n" + + "procs_running 5\n" + + "procs_blocked 0\n" + + "softirq 187779126 0 82842674 104538 3977978 3827690 0 3881346 12353760 94845 80696295"; + final static String stat_t1_file = "/tmp/stat_t1"; + + final static String stat_t2 = "cpu 27602962 16857 1627282 178835528 958483 10 21256 0 0 0\n" + + "cpu0 7077593 3073 420781 44123650 620668 7 19126 0 0 0\n" + + "cpu1 6840413 2644 480060 44886368 53738 2 1200 0 0 0\n" + + "cpu2 6862773 9347 337507 44861445 195008 0 573 0 0 0\n" + + "cpu3 6822181 1792 388933 44964063 89067 0 355 0 0 0\n" + + "intr 255070028 1785 9 0 0 0 0 0 0 1 393 0 0 125 0 0 0 1861998 5057533 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3138674 3946472 2295808 199 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + + "ctxt 407001757\n" + + "btime 1357642511\n" + + "processes 187607\n" + + "procs_running 5\n" + + "procs_blocked 0\n" + + "softirq 187794229 0 82852274 104540 3978034 3827918 0 3881474 12354181 94845 80700963"; + final static String stat_t2_file = "/tmp/stat_t2"; + + // to trigger exception upon parsing + final static String stat_wrong_content = "cpu 27602962 16857 1627282 178835528 958483 10 21256 0 0 0\n" + + "cpu0 AAAAAAA 3073 420781 44123650 620668 7 19126 0 0 0\n" + + "cpu1 AAAAAAA 2644 480060 44886368 53738 2 1200 0 0 0\n" + + "cpu2 AAAAAAA 9347 337507 44861445 195008 0 573 0 0 0\n" + + "cpu3 AAAAAAA 1792 388933 44964063 89067 0 355 0 0 0\n" + + "intr 255070028 1785 9 0 0 0 0 0 0 1 393 0 0 125 0 0 0 1861998 5057533 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3138674 3946472 2295808 199 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + + "ctxt 407001757\n" + + "btime 1357642511\n" + + "processes 187607\n" + + "procs_running 5\n" + + "procs_blocked 0\n" + + "softirq 187794229 0 82852274 104540 3978034 3827918 0 3881474 12354181 94845 80700963"; + final static String stat_wrong_content_file = "/tmp/stat_wrong_content"; + + + @BeforeClass + public static void init_once() { + // generate test input files once at beginning of tests + writeStr2File(stat_t0, stat_t0_file); + writeStr2File(stat_t1, stat_t1_file); + writeStr2File(stat_t2, stat_t2_file); + writeStr2File(stat_wrong_content, stat_wrong_content_file); + } + + @AfterClass + public static void cleanup() { + // cleanup at end of tests + new File(stat_t0_file).delete(); + new File(stat_t1_file).delete(); + new File(stat_t2_file).delete(); + new File(stat_wrong_content_file).delete(); + } + + + + // testcases + + + @Test + public void testProcStatParse1() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + procStatParser.parseStatFile(stat_t0_file); + procStatParser.parseStatFile(stat_t1_file); + ProcStatCoreLoads load = procStatParser.getCpuLoad(); + + int l0 = (int)load.getLoad("0").floatValue(); + assertEquals(8,l0); + int l1 = (int)load.getLoad("1").floatValue(); + assertEquals(4,l1); + int l2 = (int)load.getLoad("2").floatValue(); + assertEquals(5,l2); + int l3 = (int)load.getLoad("3").floatValue(); + assertEquals(5,l3); + } + + @Test + public void testProcStatParse2() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + procStatParser.parseStatFile(stat_t1_file); + procStatParser.parseStatFile(stat_t2_file); + ProcStatCoreLoads load = procStatParser.getCpuLoad(); + + int l0 = (int)load.getLoad("0").floatValue(); + assertEquals(100,l0); + int l1 = (int)load.getLoad("1").floatValue(); + assertEquals(100,l1); + int l2 = (int)load.getLoad("2").floatValue(); + assertEquals(100,l2); + int l3 = (int)load.getLoad("3").floatValue(); + assertEquals(100,l3); + } + + @Test + public void testProcStatParse3() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + procStatParser.parseStatFile(stat_t0_file); + procStatParser.parseStatFile(stat_t2_file); + ProcStatCoreLoads load = procStatParser.getCpuLoad(); + + int l0 = (int)load.getLoad("0").floatValue(); + assertEquals(59,l0); + int l1 = (int)load.getLoad("1").floatValue(); + assertEquals(57,l1); + int l2 = (int)load.getLoad("2").floatValue(); + assertEquals(57,l2); + int l3 = (int)load.getLoad("3").floatValue(); + assertEquals(57,l3); + } + + /** + * Reverse the order of the /proc/stat files to cause parsing problem + * @throws Exception + */ + @Test + public void testProcStatParseWrongOrder() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + procStatParser.parseStatFile(stat_t2_file); + procStatParser.parseStatFile(stat_t0_file); + ProcStatCoreLoads load = procStatParser.getCpuLoad(); + assertEquals(load, null); + } + + + @Test + public void testProcStatParseOneSetOfCounters() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + procStatParser.parseStatFile(stat_t0_file); + ProcStatCoreLoads load = procStatParser.getCpuLoad(); + + int l0 = (int)load.getLoad("0").floatValue(); + assertEquals(15,l0); + int l1 = (int)load.getLoad("1").floatValue(); + assertEquals(14,l1); + int l2 = (int)load.getLoad("2").floatValue(); + assertEquals(14,l2); + int l3 = (int)load.getLoad("3").floatValue(); + assertEquals(13,l3); + } + + @Test(expected=FileNotFoundException.class) + public void testStatFileDoesNotExist() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + // read non-existing stat file + procStatParser.parseStatFile("/file/does/not/exist"); + } + + @Test(expected=NumberFormatException.class) + public void testStatFileDoesntParse() throws Exception { + ProcStatParser procStatParser = new ProcStatParser(); + // read non-existing stat file + procStatParser.parseStatFile(stat_wrong_content_file); + } + + + // util functions + + private static void writeStr2File(String str, String fileName) { + FileWriter fileWriter = null; + File f = new File(fileName); + try { + fileWriter = new FileWriter(f); + fileWriter.write(str); + fileWriter.close(); + + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java index 0098d84854d..d9418221edc 100755 --- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java +++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java @@ -7,6 +7,7 @@ * * Contributors: * William R. Swanson (Tilera Corporation) + * Marc Dumais (Ericsson) - Initial API and implementation (Bug 396268) *******************************************************************************/ package org.eclipse.cdt.visualizer.ui; @@ -37,6 +38,11 @@ public class VisualizerAction extends Action // programmatically. } + /** Constructor. */ + public VisualizerAction(String text, int style) { + super(text, style); + } + /** Constructor. */ public VisualizerAction(String text, String description) { super(text); From 5cad4cd8beda87c04cdbd3619813d0afe453f65c Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 28 Feb 2013 11:44:23 -0800 Subject: [PATCH 22/27] Bug 402006 - [formatter] Crashes on sizeof() macro --- .../cdt/internal/formatter/CodeFormatterVisitor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java index c4da1712865..be1b39a2939 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java @@ -2467,6 +2467,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } private int visit(IASTTypeIdExpression node) { + if (enclosedInMacroExpansion(node)) { + return PROCESS_SKIP; + } scribe.printNextToken(peekNextToken()); scribe.printNextToken(Token.tLPAREN); node.getTypeId().accept(this); @@ -2598,6 +2601,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } private int visit(IASTUnaryExpression node) { + if (enclosedInMacroExpansion(node)) { + return PROCESS_SKIP; + } final IASTExpression operand= node.getOperand(); final int operator= node.getOperator(); switch (operator) { From 719982b23bd265699213650a6ec5e2d995db7f08 Mon Sep 17 00:00:00 2001 From: Andrew Eidsness Date: Wed, 27 Feb 2013 08:16:19 -0500 Subject: [PATCH 23/27] Recognize Q_SIGNAL and Q_SLOT on single functions Qt allows signals and slots to be marked directly on the function, e.g., class T { Q_SIGNAL void some_signal(); Q_SLOT void some_slot(); }; This change modifies the Qt signal/slot tagger to look for these tags in addition to the previously implemented search for the visibility label. Change-Id: Ibf43df8d80d4ca9f8b62776e7a35a4fc067a289e Reviewed-on: https://git.eclipse.org/r/10701 Reviewed-by: Doug Schaefer IP-Clean: Doug Schaefer Tested-by: Doug Schaefer --- .../org/eclipse/cdt/qt/core/QtKeywords.java | 21 +- .../qt/internal/core/QtSignalSlotTagger.java | 255 ++++++-- .../ui/QtCompletionProposalComputer.java | 584 +++++++++--------- 3 files changed, 492 insertions(+), 368 deletions(-) diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtKeywords.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtKeywords.java index 381655ef025..2e514ebfbeb 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtKeywords.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtKeywords.java @@ -11,16 +11,13 @@ package org.eclipse.cdt.qt.core; /** * Declares constants related to tokens that are special in Qt applications. */ -public class QtKeywords -{ - public static final String Q_SIGNALS = "Q_SIGNALS"; - public static final String Q_SLOTS = "Q_SLOTS"; - public static final String SIGNALS = "signals"; - public static final String SLOTS = "slots"; - - public static final String SIGNAL = "SIGNAL"; - public static final String SLOT = "SLOT"; - - public static final String QOBJECT = "QObject"; - public static final String CONNECT = "connect"; +public class QtKeywords { + public static final String CONNECT = "connect"; + public static final String Q_SIGNAL = "Q_SIGNAL"; + public static final String Q_SIGNALS = "Q_SIGNALS"; + public static final String Q_SLOT = "Q_SLOT"; + public static final String Q_SLOTS = "Q_SLOTS"; + public static final String QOBJECT = "QObject"; + public static final String SIGNALS = "signals"; + public static final String SLOTS = "slots"; } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtSignalSlotTagger.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtSignalSlotTagger.java index a82b3c15547..06c2f6f08d7 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtSignalSlotTagger.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtSignalSlotTagger.java @@ -9,11 +9,14 @@ package org.eclipse.cdt.qt.internal.core; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTMacroExpansionLocation; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion; +import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; +import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel; @@ -25,77 +28,203 @@ import org.eclipse.cdt.core.dom.ast.tag.IWritableTag; import org.eclipse.cdt.qt.core.QtKeywords; import org.eclipse.cdt.qt.core.QtPlugin; -public class QtSignalSlotTagger implements IBindingTagger -{ - private static ICPPASTVisibilityLabel findVisibilityLabel( ICPPMethod method, IASTNode ast ) - { - // the visibility cannot be found without an ast - if( ast == null ) - return null; +/** + * Finds all functions that are marked as Qt signals or slots and tags them in + * the index. There are two ways that Qt understands for marking a function as a + * signal or slot: 1) With a macro in the function's visibility label 2) With a + * macro before the function itself E.g., both of these cases are valid: + * + * 
+ * class T
+ * {
+ * private:
+ *     Q_SLOT void some_slot();
+ * 
+ * signals:
+ *     void some_signal();
+ * };
+ *
+ * + * The 6 applicable macros are signals, Q_SIGNALS, Q_SIGNAL, slots, Q_SLOTS, and + * Q_SLOT. + */ +public class QtSignalSlotTagger implements IBindingTagger { + private static ICPPASTVisibilityLabel findVisibilityLabel( + ICPPMethod method, IASTNode ast) { + // the visibility cannot be found without an ast + if (ast == null) + return null; - IASTNode methodDecl = ast; - ICPPASTCompositeTypeSpecifier classType = null; - while( methodDecl != null - && classType == null ) - { - IASTNode parent = methodDecl.getParent(); - if( parent instanceof ICPPASTCompositeTypeSpecifier ) - classType = (ICPPASTCompositeTypeSpecifier)parent; - else - methodDecl = parent; - } + IASTNode methodDecl = ast; + ICPPASTCompositeTypeSpecifier classType = null; + while (methodDecl != null && classType == null) { + IASTNode parent = methodDecl.getParent(); + if (parent instanceof ICPPASTCompositeTypeSpecifier) + classType = (ICPPASTCompositeTypeSpecifier) parent; + else + methodDecl = parent; + } - if( methodDecl == null - || classType == null ) - return null; + if (methodDecl == null || classType == null) + return null; - ICPPASTVisibilityLabel lastLabel = null; - for( IASTDeclaration decl : classType.getMembers() ) - { - if( decl instanceof ICPPASTVisibilityLabel ) - lastLabel = (ICPPASTVisibilityLabel)decl; - else if( decl == methodDecl ) - return lastLabel; - } + ICPPASTVisibilityLabel lastLabel = null; + for (IASTDeclaration decl : classType.getMembers()) { + if (decl instanceof ICPPASTVisibilityLabel) + lastLabel = (ICPPASTVisibilityLabel) decl; + else if (decl == methodDecl) + return lastLabel; + } - return null; - } + return null; + } - @Override - public ITag process( ITagWriter tagWriter, IBinding binding, IASTName ast ) - { - // only methods a be signals or slots - if( ! ( binding instanceof ICPPMethod ) ) - return null; + private static byte getBitset(IASTNodeLocation... locations) { + for (IASTNodeLocation location : locations) + if (location instanceof IASTMacroExpansionLocation) { + IASTMacroExpansionLocation macroExpansion = (IASTMacroExpansionLocation) location; + IASTPreprocessorMacroExpansion exp = macroExpansion + .getExpansion(); + String macro = exp.getMacroReference().toString(); - // a visibility label is required in order to decide whether the method is a signal/slot - ICPPMethod method = (ICPPMethod)binding; - ICPPASTVisibilityLabel v = findVisibilityLabel( method, ast ); - if( v == null ) - return null; + if (QtKeywords.Q_SIGNAL.equals(macro) + || QtKeywords.Q_SIGNALS.equals(macro) + || QtKeywords.SIGNALS.equals(macro)) + return QtPlugin.SignalSlot_Mask_signal; + if (QtKeywords.Q_SLOT.equals(macro) + || QtKeywords.Q_SLOTS.equals(macro) + || QtKeywords.SLOTS.equals(macro)) + return QtPlugin.SignalSlot_Mask_slot; + } - byte bitset = 0; - for( IASTNodeLocation loc : v.getNodeLocations() ) - if( loc instanceof IASTMacroExpansionLocation ) - { - IASTMacroExpansionLocation macroExpansion = (IASTMacroExpansionLocation)loc; - IASTPreprocessorMacroExpansion exp = macroExpansion.getExpansion(); - String macro = exp.getMacroReference().toString(); + return 0; + } - if( QtKeywords.SIGNALS.equals( macro ) || QtKeywords.Q_SIGNALS.equals( macro ) ) - bitset |= QtPlugin.SignalSlot_Mask_signal; - else if( QtKeywords.SLOTS.equals( macro ) || QtKeywords.Q_SLOTS.equals( macro ) ) - bitset |= QtPlugin.SignalSlot_Mask_slot; - } + private static byte getBitset(IASTNode... nodes) { + byte bitset = 0; + for (IASTNode node : nodes) + if (node != null) + for (IASTNodeLocation loc : node.getNodeLocations()) + bitset |= getBitset(loc); - if( bitset != 0 ) - { - IWritableTag tag = tagWriter.createTag( QtPlugin.SIGNAL_SLOT_TAGGER_ID, 1 ); - if( tag != null - && tag.putByte( 0, bitset ) ) - return tag; - } + return bitset; + } - return null; - } + private static IASTNode getSimpleDecl(IASTNode node) { + while (node != null && !(node instanceof IASTSimpleDeclaration)) + node = node.getParent(); + return node; + } + + private byte getQtMarkers(ICPPMethod method, IASTName ast) { + byte bitset = 0; + if (ast == null) + return bitset; + + // Look for macros on the previous visibility label. + bitset |= getBitset(findVisibilityLabel(method, ast)); + + // Look for macros on this function. See Bug 401696 for a better + // description of why it needs + // to work this why. Briefly, the parser does not associate empty macros + // with the function when + // they are the first thing in the declaration. E.g., + // #define X + // void func1() {} + // X void func2() {} + // Could also look like: + // void func1() {} X + // void func2() {} + // + // The following code instead looks at the parents and children to find + // all node locations between + // the declarators. + // + // We first look at parents to find the closest SimpleDeclaration. We + // then look at that node's parent + // to find the node that is right before the target. Then we look at all + // node locations between the + // end of that previous node and the end of the target node. + + // find the closest containing SimpleDecl + IASTNode simpleDecl = getSimpleDecl(ast); + IASTNode parent = simpleDecl == null ? null : simpleDecl.getParent(); + if (parent == null) + return bitset; + + // find the declaration before the target + IASTNode previous = null; + IASTNode[] children = parent.getChildren(); + if (children.length > 1) + for (int i = 1; i < children.length; ++i) { + if (children[i] == simpleDecl) { + // if we haven't found a SimpleDecl, then find the nearest + // previous non-problem node + for (int j = i - 1; previous == null && j >= 0; --j) + if (!(children[j] instanceof IASTProblemHolder)) + previous = children[j]; + break; + } + if (children[i] instanceof IASTSimpleDeclaration) + previous = children[i]; + } + + // Signals/slots can only be declared inside of classes, so all cases we + // care about have a + // previous child, even if it is only the Base-class specifier. + if (previous == null) + return bitset; + + IASTFileLocation prevLocation = previous.getFileLocation(); + int prev_off = prevLocation.getNodeOffset(); + int prev_end = prevLocation.getNodeOffset() + + prevLocation.getNodeLength(); + + // Figure out where the target node ends. + int end = ast.getFileLocation().getNodeOffset() + + ast.getFileLocation().getNodeLength(); + + // Examine all locations that appear after the previous node and before + // the target node. + boolean found_previous = false; + for (IASTNodeLocation loc : parent.getNodeLocations()) { + int o = loc.getNodeOffset(); + int e = loc.getNodeOffset() + loc.getNodeLength(); + + // if the previous node has already been found, process this one + if (found_previous) + bitset |= getBitset(loc); + + // otherwise see if this is the previous node + else if (o <= prev_off && e >= prev_end) + found_previous = true; + + // stop processing when we're processed to the end of the target + if (e >= end) + break; + } + + return bitset; + } + + @Override + public ITag process(ITagWriter tagWriter, IBinding binding, IASTName ast) { + // only methods a be signals or slots + if (!(binding instanceof ICPPMethod)) + return null; + + // Find all qt marker macros associated with this node. + ICPPMethod method = (ICPPMethod) binding; + byte bitset = getQtMarkers(method, ast); + + // create and store the bitset if needed + if (bitset != 0) { + IWritableTag tag = tagWriter.createTag( + QtPlugin.SIGNAL_SLOT_TAGGER_ID, 1); + if (tag != null && tag.putByte(0, bitset)) + return tag; + } + + return null; + } } diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java index 63d22a437fc..2e6e6d53823 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java @@ -46,347 +46,345 @@ import org.eclipse.cdt.qt.core.QtKeywords; import org.eclipse.cdt.qt.core.QtNature; import org.eclipse.cdt.qt.core.QtPlugin; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.contentassist.ICEditorContentAssistInvocationContext; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.contentassist.ICompletionProposal; -@SuppressWarnings( "restriction" ) -public class QtCompletionProposalComputer extends ParsingBasedProposalComputer -{ - private boolean isApplicable( CContentAssistInvocationContext context ) - { - ITranslationUnit tu = context.getTranslationUnit(); - if( tu == null ) - return false; +@SuppressWarnings("restriction") +public class QtCompletionProposalComputer extends ParsingBasedProposalComputer { + private boolean isApplicable(ICEditorContentAssistInvocationContext context) { + ITranslationUnit tu = context.getTranslationUnit(); + if (tu == null) + return false; - ICProject cProject = tu.getCProject(); - if( cProject == null ) - return false; + ICProject cProject = tu.getCProject(); + if (cProject == null) + return false; - IProject project = cProject.getProject(); - if( project == null ) - return false; + IProject project = cProject.getProject(); + if (project == null) + return false; - try - { - return project.hasNature( QtNature.ID ); - } - catch( CoreException e ) - { - CUIPlugin.log( e ); - return false; - } - } + try { + return project.hasNature(QtNature.ID); + } catch (CoreException e) { + CUIPlugin.log(e); + return false; + } + } - private static boolean is_QObject_connect( CContentAssistInvocationContext context, IASTCompletionContext astContext, IASTName name ) - { - IASTName connectName = name.getLastName(); - if( ! QtKeywords.CONNECT.equals( new String( connectName.getSimpleID() ) ) ) - return false; + private static boolean is_QObject_connect( + ICEditorContentAssistInvocationContext context, + IASTCompletionContext astContext, IASTName name) { + IASTName connectName = name.getLastName(); + if (!QtKeywords.CONNECT.equals(new String(connectName.getSimpleID()))) + return false; - IBinding[] funcBindings = astContext.findBindings( connectName, ! context.isContextInformationStyle() ); - for( IBinding funcBinding : funcBindings ) - if( funcBinding instanceof ICPPFunction ) - { - IBinding ownerBinding = ( (ICPPFunction)funcBinding ).getOwner(); - if( ownerBinding != null && QtKeywords.QOBJECT.equals( ownerBinding.getName() ) ) - return true; - } + IBinding[] funcBindings = astContext.findBindings(connectName, + !context.isContextInformationStyle()); + for (IBinding funcBinding : funcBindings) + if (funcBinding instanceof ICPPFunction) { + IBinding ownerBinding = ((ICPPFunction) funcBinding).getOwner(); + if (ownerBinding != null + && QtKeywords.QOBJECT.equals(ownerBinding.getName())) + return true; + } - return false; - } + return false; + } - private static class Completion - { - private final String replacement; - private final String display; - private final int cursorOffset; + private static class Completion { + private final String replacement; + private final String display; + private final int cursorOffset; - public static final Completion SIGNAL = new Completion( "SIGNAL()", "SIGNAL(a)", -1 ); - public static final Completion SLOT = new Completion( "SLOT()", "SLOT(a)", -1 ); + public static final Completion SIGNAL = new Completion("SIGNAL()", + "SIGNAL(a)", -1); + public static final Completion SLOT = new Completion("SLOT()", + "SLOT(a)", -1); - public Completion( String replacement ) - { - this( replacement, replacement, 0 ); - } + public Completion(String replacement) { + this(replacement, replacement, 0); + } - public Completion( String replacement, String display, int cursorOffset ) - { - this.replacement = replacement; - this.display = display; - this.cursorOffset = cursorOffset; - } + public Completion(String replacement, String display, int cursorOffset) { + this.replacement = replacement; + this.display = display; + this.cursorOffset = cursorOffset; + } - public ICompletionProposal createProposal( CContentAssistInvocationContext context ) - { - int repLength = replacement.length(); - int repOffset = context.getInvocationOffset(); - CCompletionProposal p = new CCompletionProposal( replacement, repOffset, repLength, null, display, RelevanceConstants.DEFAULT_TYPE_RELEVANCE, context.getViewer() ); - p.setCursorPosition( repLength + cursorOffset ); - return p; - } + public ICompletionProposal createProposal( + ICEditorContentAssistInvocationContext context) { + int repLength = replacement.length(); + int repOffset = context.getInvocationOffset(); + CCompletionProposal p = new CCompletionProposal(replacement, + repOffset, repLength, null, display, + RelevanceConstants.DEFAULT_TYPE_RELEVANCE, + context.getViewer()); + p.setCursorPosition(repLength + cursorOffset); + return p; + } - @Override - public String toString() - { - if( replacement == null ) - return super.toString(); - return replacement + '@' + cursorOffset; - } - } + @Override + public String toString() { + if (replacement == null) + return super.toString(); + return replacement + '@' + cursorOffset; + } + } - private static interface MethodFilter - { - public boolean keep( ICPPMethod method ); + private static interface MethodFilter { + public boolean keep(ICPPMethod method); - public static class Qt - { - public static final MethodFilter Signal = new MethodFilter() - { - @Override - public boolean keep( ICPPMethod method ) - { - ITagReader tagReader = CCorePlugin.getTagService().findTagReader( method ); - if( tagReader == null ) - return false; + public static class Qt { + public static final MethodFilter Signal = new MethodFilter() { + @Override + public boolean keep(ICPPMethod method) { + ITagReader tagReader = CCorePlugin.getTagService() + .findTagReader(method); + if (tagReader == null) + return false; - ITag tag = tagReader.getTag( QtPlugin.SIGNAL_SLOT_TAGGER_ID ); - if( tag == null ) - return false; + ITag tag = tagReader.getTag(QtPlugin.SIGNAL_SLOT_TAGGER_ID); + if (tag == null) + return false; - int result = tag.getByte( 0 ); - return result != ITag.FAIL - && ( ( result & QtPlugin.SignalSlot_Mask_signal ) == QtPlugin.SignalSlot_Mask_signal ); - } - }; + int result = tag.getByte(0); + return result != ITag.FAIL + && ((result & QtPlugin.SignalSlot_Mask_signal) == QtPlugin.SignalSlot_Mask_signal); + } + }; - public static final MethodFilter Slot = new MethodFilter() - { - @Override - public boolean keep( ICPPMethod method ) - { - ITagReader tagReader = CCorePlugin.getTagService().findTagReader( method ); - if( tagReader == null ) - return false; + public static final MethodFilter Slot = new MethodFilter() { + @Override + public boolean keep(ICPPMethod method) { + ITagReader tagReader = CCorePlugin.getTagService() + .findTagReader(method); + if (tagReader == null) + return false; - ITag tag = tagReader.getTag( QtPlugin.SIGNAL_SLOT_TAGGER_ID ); - if( tag == null ) - return false; + ITag tag = tagReader.getTag(QtPlugin.SIGNAL_SLOT_TAGGER_ID); + if (tag == null) + return false; - int result = tag.getByte( 0 ); - return result != ITag.FAIL - && ( ( result & QtPlugin.SignalSlot_Mask_slot ) == QtPlugin.SignalSlot_Mask_slot ); - } - }; - } - } + int result = tag.getByte(0); + return result != ITag.FAIL + && ((result & QtPlugin.SignalSlot_Mask_slot) == QtPlugin.SignalSlot_Mask_slot); + } + }; + } + } - private static Iterable filterMethods( final ICPPClassType cls, final MethodFilter filter ) - { - return new Iterable() - { - @Override - public Iterator iterator() - { - return new Iterator() - { - private int index = 0; - private final ICPPMethod[] methods = cls.getMethods(); + private static Iterable filterMethods(final ICPPClassType cls, + final MethodFilter filter) { + return new Iterable() { + @Override + public Iterator iterator() { + return new Iterator() { + private int index = 0; + private final ICPPMethod[] methods = cls.getMethods(); - @Override - public boolean hasNext() - { - for( ; index < methods.length; ++index ) - if( filter.keep( methods[index] ) ) - return true; - return false; - } + @Override + public boolean hasNext() { + for (; index < methods.length; ++index) + if (filter.keep(methods[index])) + return true; + return false; + } - @Override public ICPPMethod next() { return methods[index++]; } - @Override public void remove() { } - }; - } - }; - } + @Override + public ICPPMethod next() { + return methods[index++]; + } - private static String getSignature( ICPPMethod method ) - { - StringBuilder signature = new StringBuilder(); + @Override + public void remove() { + } + }; + } + }; + } - signature.append( method.getName() ); - signature.append( '(' ); - boolean first = true; - for( ICPPParameter param : method.getParameters() ) - { - if( first ) - first = false; - else - signature.append( ", " ); - signature.append( ASTTypeUtil.getType( param.getType() ) ); - } + private static String getSignature(ICPPMethod method) { + StringBuilder signature = new StringBuilder(); - signature.append( ')' ); - return signature.toString(); - } + signature.append(method.getName()); + signature.append('('); + boolean first = true; + for (ICPPParameter param : method.getParameters()) { + if (first) + first = false; + else + signature.append(", "); + signature.append(ASTTypeUtil.getType(param.getType())); + } - private static void addCompletionsFor( Collection completions, IASTInitializerClause init, MethodFilter filter ) - { - if( !( init instanceof ICPPASTInitializerClause ) ) - return; + signature.append(')'); + return signature.toString(); + } - ICPPEvaluation eval = ( (ICPPASTInitializerClause)init ).getEvaluation(); - if( eval == null ) - return; + private static void addCompletionsFor(Collection completions, + IASTInitializerClause init, MethodFilter filter) { + if (!(init instanceof ICPPASTInitializerClause)) + return; - IType type = eval.getTypeOrFunctionSet( init ); - while( type instanceof IPointerType ) - type = ( (IPointerType)type ).getType(); + ICPPEvaluation eval = ((ICPPASTInitializerClause) init).getEvaluation(); + if (eval == null) + return; - if( type instanceof ICPPClassType ) - for( ICPPMethod signal : filterMethods( (ICPPClassType)type, filter ) ) - completions.add( new Completion( getSignature( signal ) ) ); - } + IType type = eval.getTypeOrFunctionSet(init); + while (type instanceof IPointerType) + type = ((IPointerType) type).getType(); - // Copied from org.eclipse.cdt.internal.ui.text.CParameterListValidator - private static int indexOfClosingPeer(String code, char left, char right, int pos) { - int level= 0; - final int length= code.length(); - while (pos < length) { - char ch= code.charAt(pos); - if (ch == left) { - ++level; - } else if (ch == right) { - if (--level == 0) { - return pos; - } - } - ++pos; - } - return -1; - } + if (type instanceof ICPPClassType) + for (ICPPMethod signal : filterMethods((ICPPClassType) type, filter)) + completions.add(new Completion(getSignature(signal))); + } - // Copied from org.eclipse.cdt.internal.ui.text.CParameterListValidator - private static int[] computeCommaPositions(String code) { - final int length= code.length(); - int pos= 0; - List positions= new ArrayList(); - positions.add(new Integer(-1)); - while (pos < length && pos != -1) { - char ch= code.charAt(pos); - switch (ch) { - case ',': - positions.add(new Integer(pos)); - break; - case '(': - pos= indexOfClosingPeer(code, '(', ')', pos); - break; - case '<': - pos= indexOfClosingPeer(code, '<', '>', pos); - break; - case '[': - pos= indexOfClosingPeer(code, '[', ']', pos); - break; - default: - break; - } - if (pos != -1) - pos++; - } - positions.add(new Integer(length)); + // Copied from org.eclipse.cdt.internal.ui.text.CParameterListValidator + private static int indexOfClosingPeer(String code, char left, char right, + int pos) { + int level = 0; + final int length = code.length(); + while (pos < length) { + char ch = code.charAt(pos); + if (ch == left) { + ++level; + } else if (ch == right) { + if (--level == 0) { + return pos; + } + } + ++pos; + } + return -1; + } - int[] fields= new int[positions.size()]; - for (int i= 0; i < fields.length; i++) - fields[i]= positions.get(i).intValue(); - return fields; - } + // Copied from org.eclipse.cdt.internal.ui.text.CParameterListValidator + private static int[] computeCommaPositions(String code) { + final int length = code.length(); + int pos = 0; + List positions = new ArrayList(); + positions.add(new Integer(-1)); + while (pos < length && pos != -1) { + char ch = code.charAt(pos); + switch (ch) { + case ',': + positions.add(new Integer(pos)); + break; + case '(': + pos = indexOfClosingPeer(code, '(', ')', pos); + break; + case '<': + pos = indexOfClosingPeer(code, '<', '>', pos); + break; + case '[': + pos = indexOfClosingPeer(code, '[', ']', pos); + break; + default: + break; + } + if (pos != -1) + pos++; + } + positions.add(new Integer(length)); + int[] fields = new int[positions.size()]; + for (int i = 0; i < fields.length; i++) + fields[i] = positions.get(i).intValue(); + return fields; + } - private void addConnectParameterCompletions( List proposals, CContentAssistInvocationContext context, IASTCompletionNode completionNode, String prefix ) - { - IASTName[] names = completionNode.getNames(); - List completions = new LinkedList(); + private void addConnectParameterCompletions( + List proposals, + ICEditorContentAssistInvocationContext context, + IASTCompletionNode completionNode, String prefix) { + IASTName[] names = completionNode.getNames(); + List completions = new LinkedList(); - for( IASTName name : names ) - { - // The node isn't properly hooked up, must have backtracked out of this node - if( name.getTranslationUnit() == null ) - continue; + for (IASTName name : names) { + // The node isn't properly hooked up, must have backtracked out of + // this node + if (name.getTranslationUnit() == null) + continue; - IASTCompletionContext astContext = name.getCompletionContext(); - if( astContext == null || ! ( astContext instanceof IASTNode ) ) - continue; - IASTNode astNode = (IASTNode)astContext; + IASTCompletionContext astContext = name.getCompletionContext(); + if (astContext == null || !(astContext instanceof IASTNode)) + continue; + IASTNode astNode = (IASTNode) astContext; - if( is_QObject_connect( context, astContext, name ) ) - { - int parseOffset = context.getParseOffset(); - int invocationOffset = context.getInvocationOffset(); + if (is_QObject_connect(context, astContext, name)) { + int parseOffset = context.getParseOffset(); + int invocationOffset = context.getInvocationOffset(); - String unparsed = ""; - try { unparsed = context.getDocument().get( parseOffset, invocationOffset - parseOffset ); } - catch( BadLocationException e ) { CCorePlugin.log( e ); } + String unparsed = ""; + try { + unparsed = context.getDocument().get(parseOffset, + invocationOffset - parseOffset); + } catch (BadLocationException e) { + CCorePlugin.log(e); + } - if( unparsed.length() > 0 && unparsed.charAt( 0 ) == '(' ) - unparsed = unparsed.substring( 1 ); + if (unparsed.length() > 0 && unparsed.charAt(0) == '(') + unparsed = unparsed.substring(1); - int[] commas = computeCommaPositions( unparsed ); - switch( commas.length ) - { - case 3: - completions.add( Completion.SIGNAL ); - break; - case 5: - completions.add( Completion.SLOT ); - break; - } - } - else if( astNode.getPropertyInParent() == IASTFunctionCallExpression.ARGUMENT ) - { - IASTNode parent = astNode.getParent(); - if( ! ( parent instanceof IASTFunctionCallExpression ) ) - continue; - IASTFunctionCallExpression call = (IASTFunctionCallExpression)parent; - IASTExpression nameExpr = call.getFunctionNameExpression(); - if( !( nameExpr instanceof IASTIdExpression ) ) - continue; - IASTIdExpression funcNameIdExpr = (IASTIdExpression)nameExpr; - IASTName funcName = funcNameIdExpr.getName(); + int[] commas = computeCommaPositions(unparsed); + switch (commas.length) { + case 3: + completions.add(Completion.SIGNAL); + break; + case 5: + completions.add(Completion.SLOT); + break; + } + } else if (astNode.getPropertyInParent() == IASTFunctionCallExpression.ARGUMENT) { + IASTNode parent = astNode.getParent(); + if (!(parent instanceof IASTFunctionCallExpression)) + continue; + IASTFunctionCallExpression call = (IASTFunctionCallExpression) parent; + IASTExpression nameExpr = call.getFunctionNameExpression(); + if (!(nameExpr instanceof IASTIdExpression)) + continue; + IASTIdExpression funcNameIdExpr = (IASTIdExpression) nameExpr; + IASTName funcName = funcNameIdExpr.getName(); - if( !is_QObject_connect( context, astContext, funcName ) ) - continue; + if (!is_QObject_connect(context, astContext, funcName)) + continue; - IASTInitializerClause[] args = call.getArguments(); - switch( args.length ) - { - case 2: - //if( QtKeywords.SIGNAL.equals( prefix ) ) - addCompletionsFor( completions, args[0], MethodFilter.Qt.Signal ); - break; - case 4: - if( QtKeywords.SLOT.equals( prefix ) ) - addCompletionsFor( completions, args[2], MethodFilter.Qt.Slot ); - break; - } - } - } + IASTInitializerClause[] args = call.getArguments(); + switch (args.length) { + case 2: + addCompletionsFor(completions, args[0], + MethodFilter.Qt.Signal); + break; + case 4: + addCompletionsFor(completions, args[2], + MethodFilter.Qt.Slot); + break; + } + } + } - for( Completion completion : completions ) - { - ICompletionProposal proposal = completion.createProposal( context ); - if( proposal != null ) - proposals.add( proposal ); - } - } + for (Completion completion : completions) { + ICompletionProposal proposal = completion.createProposal(context); + if (proposal != null) + proposals.add(proposal); + } + } - @Override - protected List computeCompletionProposals( CContentAssistInvocationContext context, IASTCompletionNode completionNode, String prefix ) throws CoreException - { - if( !isApplicable( context ) ) - return Collections.emptyList(); + @Override + protected List computeCompletionProposals( + CContentAssistInvocationContext context, + IASTCompletionNode completionNode, String prefix) + throws CoreException { + if (!isApplicable(context)) + return Collections.emptyList(); - List proposals = new ArrayList(); - addConnectParameterCompletions( proposals, context, completionNode, prefix ); - return proposals; - } + List proposals = new ArrayList(); + addConnectParameterCompletions(proposals, context, completionNode, + prefix); + return proposals; + } } From 9aa1b6ec2cf009f36c2c4c30c86e8d1ed8f72d23 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Thu, 28 Feb 2013 21:07:48 -0500 Subject: [PATCH 24/27] Bug 402071: Updating verb tense in Edit menu Change-Id: I9eb0e3eb5a88db8fd0b5c56d63eb04e9966f176c Reviewed-on: https://git.eclipse.org/r/10763 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../reference/cdt_u_m_edit.htm | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm index 8e9e789c43e..feebc7e83d8 100755 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm @@ -12,7 +12,7 @@

Selecting Edit Menu

- +
@@ -23,57 +23,58 @@ - - + - + - + - + - + - - + @@ -93,7 +94,7 @@ @@ -112,13 +113,13 @@ - + - @@ -126,45 +127,45 @@ - - - - - - - @@ -172,40 +173,40 @@ - - + - - + - + - + From d89d6a63f642dfb28250c32069719da2013784ed Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Thu, 28 Feb 2013 19:09:19 -0500 Subject: [PATCH 25/27] Bug 402071: Updating File menu docs Change-Id: I6c427a126efdedbdff69c86a955dc88d1775aaf4 Reviewed-on: https://git.eclipse.org/r/10762 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../images/cdt_menu_file.png | Bin 13613 -> 21521 bytes .../reference/cdt_u_m_file.htm | 269 +++++++++--------- 2 files changed, 138 insertions(+), 131 deletions(-) diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_file.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_file.png index 4ad536dce44de8c699521758bc5c2bc91f1a2a2d..5bf1dd53c8731955ea3be08ec6f871cb05896156 100644 GIT binary patch literal 21521 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

Vqszk2ANMf5x#)u0;g%Q?Kmi)czoU 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 literal 13613 zcmbVzWl&sEuqF~9AxKDYO@IV`m?4 zt*zBp`-7t9(5LU6?mpdLf2RpmRhGd-Cq_p=K){rfl~hMSK%@YE245lpD?TZ&seoUI z&gwGa2+$GIJ>bI&D={T81cb_{*N-MBz~}d7vg%3*2p*ph5d6L)Alw5>esBZ?7ghv> zePaX!{v-qhf-h+>H9-Uf&JsCEG0ks=N9nIC$a<1jWoQxY_w(tCmaP*t`Q$!AR)ZwTt-h4HF&RJa*98en>+QgS)D%<(!fznrV{( zd1nFU_oB~3hy8691NC=wYSx{+RG-mV4xw^q%ln~CUmJOTH)WNZ*}uoDUPd>`#~erP zt!4f`Pb0~WimBY`Ph3|cY>!KqpZ8;PtWIzKC}KZ%T&^wO%(YGCt7LjO(to>={W7K2 zp(gf4(&~))0hxss0p&ZA#s=3>T;w6|ecEi)U8iT8_uiC9TL8u1oq-}>&*7=kk^)O_ z`~4`#wLfP(=bPVC-(n{tpyB!^1LqRqg(BZmGOOk8K{xpjfj#Z`sQ(OG%z;vrSOx%H!n-aFFV3= z#Ab@*X*J&ieLap3*1yi!PJR_dr2R5uD|UKDmIj@yE0Hk$guoF&7ji9vg|aio{L{Oe z&)}OXSpmh%FM#BGyqCf?8I3I5a7svv?A|Y&96nr^@N2Zp`9HCho0IoRB19Et$K<4{ z2

c)@>ENVx>$XE}SZ!?Cy9enF)kx?(ZPCU2w~O|75qUh`%l;Hsj(_FK6J<(Akx4k_AH%F1vO&5W-ue-5-HL_~A(oWJEPgm|P5=QU3Bmbm79uZx* zeTHGZxG+la!z}ld@$vs;*hZAxBtm$4HURfAjq!LmhFkOpgRg_L4%XnwJlJ6Q72n?r zun0l3#m2vpCd|vW@6;}e&h{rm1#<2AD`9ndfoRKBN`>H4qdHUyPqww6wjzOBg&bH* zZkv;B2DN9&m1I#Ou!jyVeaFVLGZxvJ;1e+GiEHr8VHEg*=8qBAMO;Ye!&|@p&F<6? z===v*_sKQDE|Dh*$kH0zOegK5%I|FK(#qqmTuOAWLb5rFRqi=^j#&!NbF^7?85~R8esGgXWWO*>6!P5A z)fG5?jonK#e>S!myXtEnItaGm6-2nY`3YNY6MMQW1zdZ@p@?PC_3^$Eon;P&<0 zD42b=-b6~ zo80i)Ts5WPPh26ctMkRK!yJay8C)ik`<&tPPUDf{?9rCe(N%6pqgGFD$U`)~{DV~@G7F8}%(PxqrG*}07?E2V{nGmyqpe;kj<&HJ=K%zEoc z;^M~{sI_Dd<_&i`_sJ-Ji9NSdak;Oua)#@aqr z3Z+Bn-H$XQVMx4OwU>1acl>w{BWFUjh>H71o%4aQuY!!ET(FHG*F2ku>nE*_XCmqD*Ac62&lDL~PPcDr+7-!%x?`AN5*)BYWjlYG z`^(e&FTeaA{5N~~Ty#O(xRjC1s2LceaOXO(|1_b<;uS7LwV%!yOE%e5n!+tYY~quGJdoEV~pq4sKnBqTJ7X^D4N7mtRft>}p1y`c3X)!(4gIVYjyE}k_tkkZO3 zySzFIvNJ$UZc|kS_15?k&k`B^09G!GE`^|o!{!*nz8Vb$dT(t!@pvEYwY9l;^{fg% zp2a?&wEb;QeC~M=5xEfgS>YG$UdF38!A?Y0v=$<1+CjIUO1i@IQ^ROE=^LXC=SZu@ zuhm^0F}-~)K1c3Pmep-18!;I}{tLbK#_J^&A#TS~GH_3h60uLH@f{t42M?SX*e=$& zl)qC<_Od4*3h{)9=>k5s#cg!I-tIk6vG^({zcYp2KcFQ#WYhOG@o{9I1*_k&^7}ip zlDZXPk2C#!-jn5=9yafOfisDeo{9Ramm}UhX&h;b3pRDNcc|(tO0$`vR*T!Q4d>x3 zb>_CWsts7bpizQ1N1wxUWWLOJjwefCJF^>x{}>`N<;Oxdr)&2na5HL}=ju@#@uyET@zW$G;{7j zZUHYCiM1<%c1)*kD;Ixt7q|o73xIzt_D__-R%`W_zYpwEt{R7 zki3^ybeky=zM38u;w;<$32PYCp1~-PIeylp?P(UEkmHK_$lRwj3bRmPB4)G0Whso) zPe;F(CWn152ooq|-}?on+oKIvy+u)}a&zl7hsM82y;7(HC-` zG1L=|$EN5n3@@Jr@=Q9Zow_v07<}?Y+bWmFVS_Khm3H$5`#nOz+n3^>%1X3@f2!^8 z6uOiKxJMGaJ=>sUYwoHTcFQ1+4mQKXnZW5_;-Tb-*nM|^`b3*K!9zOFKka%MDF_LQ zS&wCq6@_=(_4httKi)r=EE}bNoWzU5*lVHYKHk5|xA4ftgM7V#XYVM5aH ziP2L0ZL9Y|b?H~1-(;>_1A{I&ZL4=E2i9oIbgz`{nb4_1v?=hchj2+8|-RM7-G}I5Q9QUDn6?zgSgt`P+~%oD4obAsz9eV zLLXkjc>L7gI;i+zjzGHEzu6==*!4^{X$4oVylSbTezb9+}(u2#QqHH)i28Eyz~|dG&X8)!TNQ(?jt$E z5IF^0+3ktx!N^qz(xfG z+e0*Wmg9fTND?&2(_|(K$EDg2rpYQGNOk-8)Z)@4|_YujgpwTr^*F1FwQe@3TAvsT}`ZUzF1)zlWiuQ5#_yo zP!+zh>PB}1lzg2)wF6s9b|)^u28qTzo0=>_*-44_L*FKH4A?>WAheP2RiMJ%^qW%Hsth|vj zC}5Nx2`Ad{j9RjRa9sf=oaV$s}0Z0md50#+v;h^nf! z@P2q@i(26tlScl%>?p`2_H_930=}T_a4uZDXwqTVniTCDrSS zHqH!Jb=cy{{0{9*Mmvr0;4-vqP@^if%ImXNC(;!f6&0mugoofkj8{}!9e($a3tH?ASnzG7qe#oX@NkQ+;7qvO|slT{a;AV-rmvWPL zpHcFWL&?1fn%e%{n?%WPUxG8>Z|gZeCC>Exuvzxd3|ET4h*IurPj4d|Yp<1A7H}eJ zIf}VahEYl|gp{iZ1_}T0;PaStkrFk*mZSSYDE(kkUKa1Xv>nduvPh`qEdS~&S8RyP zxdBTyompudU7?{=x63Q^?)%F9jUaCjwXf3+7iMNA)Ot*wJt~49B63*k&r!gs)B8** zv3XqEMFaH>i^Uzm+vC;ee!sR~i>&ERhKcIV_sJu?;l~Ttw{)^(yu2ZJCQGt|VXMu1 zL`1w=E7gLNA7z?g+A~L^n(;LxDt-+W^0FSoi#YDzIj}B;iT1kA4k(4kINgr>RI$c? zSL9Aw+;kaA^)-(mgOj=6BjQ>YAZ3-LABE{nivdL`MB5MZND~24TMbq#;RmYK{up{i zb~?Hr)U}SmMhgu^6hx+n$X%lWMEHoSRM~zO0=!s)p*`4@e#{h>Hab;Pji*-PLBAHt ze8Zt)A#W<;6MjFMM zx(jh{iz*X|AJrGY&*N7Qc2RP-iS^p*Ym7FK#Xv!)RTTm=kBZHlCZX*xZFQ3)9$J)X z{VdbWyQ-m-h+!8#b`o|4i!xFNAqC-9z*E?47l(S#tcI3#cYK10AVIcvxQ5pV@+^#f zFQ`IJoOTUlnW=-3P;d(~prw7PO>{@LOF6l};Kg1o28eqxHCO1GDv1V5I~mhiLt}lc z23*CnjEQ0d%P)gUgY&Bypg~qcEvEt1cuVV3*l&RIqZu{23g=^FoviRX@cI%dj zb=*#AVz2;Ii{p3zhlqbqoxf_(rNNrUHg4pI zgS$~Tr*%*+5vQAP^n>y-QEW%ssa|RdZ;L_8$=iKNORhP=5Uvt2Dv75Ium!5IIX*RM z{P>HbgXXJpHPh;e&!KQl$&9awY3;`Kn(T9i0x5#nx<*A_V|l^3dmQKHFmW*{E6-t! zaxRpJlL6G_$|a+kQ`(;)$Cla>Dn(6}q07#fNZ`psi=}eg{*INLQkXEtMT;d|P@iHD(AuZ|2r5v@Cy%2F4rH8ecG1j=8A3hrs#@ z9AKywFBg!(eA-zR`7Dn1RT~3(P$ZaqK}l6@e`rPs&jxCX0a#?JM338`x7F1yu$Fg0 z(+eRytE6D?VqvR-ci}Os#14jDn!(u2J)dPNLNJQ#Q{_Whb*A=p74P^&eVP*PF{ZV$ zU=9;bYeoYj=a$?qnA?~3GPVXL5m_|qakpNHUJ{TCF$F*~pw@&+sk#ap3kzFw9!|Ba z7?5}+kbHGQ1^0ZFHg@)B>%>fGT%YP_oMzp>cP5|x#35gne#vWh?aK2s^fGZpEH&Lk z%QiOWL4fxpLKnj4n(e~vT^pX|Jtox}&MHvYCHQx zoole^CRGbB|FT=ZzONRrVO&dTlM+O$Y6YD1bbYisE`7jhhu48uF4_o?=|&f0{c6Bj z!ww=kM*laFzWi`sh7e=`hAg2c>5FrNhg&_{J!n~ZQAB6gYGnHDftaXm2~un8000SU zfsnjI6A&#&OcD2(%7|lJyhmzIi@i@cY^9% zZBa_%DNB?Y<$R)NLh6V7eQe&47W-Q<|2hWMBq;UJko(y5weY0M6Rg%YngB-WnHq6& zT;To1J`(p77UdPWpFW9;4f$yQI%86tx}*fD^(Lmg1gqawO9ix%&^Obo=Y(d~`h<68 zXSd2&JImH6v(QArqjFZKbLdNPw?k(&&Sf?;lN^pclGMZ@?E1Tle%DKSpn<_e{|hC4 z2u*A1*L&`m;YpYlKDIF+zXwW!_DwY>hx7F14cW{s2I#kWn!4I?KGQFuWIPInF)G_n zuL{=cn}0=w4J^pCy6<0!gYKuicG664UyII=7kY?jZvT;8!&$y>aHp>y-`Jw~S!@F+ zE}EkPUmk4sk$T5LbL~6!+>g^cGsCuSBQJ~^CY^p|Cg7NH+(P*woF@-`v)L0pcJLtR zEy(avamWq$?ogfw%Z`;>!iV*0IkU!>C`{i=la20U%X)0Wr#>>Qxlr8wvcHK2w?XiT z-P{YY!~Br0fI~W6z+^19h)e6w%omWP6aV#E0mmB!MU+PmJNauhY7j`J)Gm-3Ni#Fl)DS#gL3T}J3 zjt}4r=`@VGk z-Vrj>apr@M%ru^RW`_$m>chux_phg4@~poJPdrM`tyrjXUWR?bV^##2FN{4V`;Jru zcymz>W;*INx=yaE8uKmsw>a2LZ1bB3OU<&OxEaJMGny@Jn;2nge-C;W64~PqLBrY{ zYxp~bT%CJEX5*__E05w)Fz7WLFE*>W{b0kp^XlWoWhz1>1-!UQ;De(AVA*Y5p;w=? z5pc86xAI;Wiy_jgYWlare|3CdV1LdpB$LHPStt-~gY*}P^RKHi3Tl#^U!aOabAb4lS$V(t( z2%cD;wchi)?1UWEL9eiJJgZMdT>y?0V6&C_RjTtG5QZL;)JgygbFUCPEjPSZEA{A`Wz+X`I~R*Lx_9pjv@$buhv zg`(i*!cdaJ#kxn7_?Zl0ID7B?3h>VHGb*M;cv<1nQTgG2xNW~2Nqu%B3=1K$u$Y*Z z5X&o?5dfcE#p#B}#gCKUOpBW9=*jex5h~P3@y*5P$Sp{A;r^;y#~h<1pa##{>CYYdCaZ>K`>#vg5~ArVf;VVm`HGJ)i{GOp~(aYoUM38uUm} zVDVtk@7@P>#@n-<+qNP3z}XqRrpm<=${FDFMjBgl2?=nsw@5&s$;EAtFW}! zPSdW1Ft>!i1W)$5;j-`Ek?c)Iw6V8Qjm&H{sxJ(li-NeGkQ=Xa{3u{s4dI@tU$m)U z>~X>2P8aWm^qdP`fS+mvpjX*`Dlqd3t6uP>5XINzGeU~g$f$XeS3x;k>Fm;pW|j5W zC~By9$UqbE!yKgQ-)rh0cISN4WUt50!vKqGW?R#fKs|*5g(XdWZ;nD=-9s7PwS)`oK*+ zxA%`GZ+ioC4n#o&0{XlAhau2PxfYu2IhM%7P6bz__*7B6`9qjh_5dHS0oH*E_cxP z44Fz7fdQuRUHX;l|MURr; zB$U8YajKc3G#Qy`nFGAB?pBGK+}20cyijn)y_n_bf1kVkbh$kqx6?}mlaYBw#%t0F z`m^_Ynku)pc&3MbGnu&>L3e4tbD4`!WTNfto5Wd;w)_0mD-~(=-g2iMBSo@YW$pGb z45~9(^M~M(0eA@WyPwruG51ogQ_&qT>+BcQrQPiBc2NFKqJ1-&vt&`6xo&`Oq!BWv3)nZvI`0~J&>YwWJHQ%dJAc@|fz10;U?TNstA@6Q zJH7ptu-&wDXVzh%TaSzehPZ#z?cwC7$ZS=3`O%7a%gLMlAgd)-fE}a2$Numx@Ml}6Fh~K3~SEz8>iP=z3MiNbU;j~IOshaZlSb)pF_63 z6|*p}*|D-~UGoMmGikD&wa!LH_fTo)v~x2Bu)>){B4TiC!oKdk zRnA}1{RQo-s=;iI+$hc%E12D=cyr1YOY_}XTMz|Fe7&r{Ib(}UDEcS&cTw;Mn@pby z!>2~W89(UZ^{FC(?c2%q&lgF4tWN4Cc(3mu9w}a?lJEOoX&tjoYFHiw;>w}xm}KFm zWpvIZzS;oXmGy4;=smcJhQ^7QnHa9{J&q?wDLD;UmQKTeiuKJ6*N0jPSZ>?KuaNAN zCKvTR`DO}w_1Y8mz57fmx@wU+hVn}>{J0yXM6$Z^H_Fk8J*cmMhkE0chcf6$l7M6& zY0P*jCB5x8ls?{x)}M(6l1X?95PA64B85k^!f`Li^UPs$#YsCU^T%taOOSv{s7s^`uS_XmR#9S}D zZ&(J1>Uqa_CIa9Q?BG4sq6eg;@!5-gY7K*Dr;CEpy2Iqe5M6AxWSMOC z;R6A&jo9G4n<-gL4p73CiD+_^N^b)FmX7F(TS?6asB+^3P=BbP!>4taOX}d-7)*GXX4<1pV@{(ew+~BRJu7(va3eJi|Rm4~WM~*yE(I zptaY%ES6c%p$b!5ZDhzE$L{Q{cK>`pLu!8a$oy^T{(6%-yo!XgmgRif*b>vSVTQU@ zZ@%>6*D&ZkyJAqnQr~jxnAWd>aqqH4x4o7P^^;FE>c>MzHVlr5t%R$~gz7!FWrb&7 zF2VjO5lymwxJBwXFiFwwd$j)H<(|?7Lm6)NH7m6cvcNa{}MovPt2QIkLJj zIH@_#e?qS0{0*8J7nCT;QWm9q70zrQau|kK^j}!&y5^Fesc^E_{O;C{UN3no3=dO$ zr4x%$`2j{2JO|cZ@+#A3X-s4MRwt|6U?xLJzlWzWD2J&>g5ku~Gq#mHQ^<0YE{C_L~4Q^ih zzd0x$6pVm*2wo0e5m02ufGT>4LaX`@?9f}pumJku$f{ZNK#Xe*P#OVsWDG4!R11jk z;y9^RRUlJg|I1XginIRS`cyJn`5%mE$G)K4=Y@k=Ol%vlSSirs$^lR>S3_;)tyAyW z6;|0V4E>Xbsg|XW3C02!9Un~F+xEwXZ8p8W36w~kDO-j#oLV$wd7$V_>O^IS>6`0$ zZfBRAU}<=_I47tkG4JJ5s&Ec)ypm$Cl&&XJr%?X6S_Kehe32Ucq9C>wue=qGIwz^Q zs?w=0eQEbifIl12UnT2JL`dG&fea_ry6kKOa_k&O9Nd{CN{KU zb#g)zcy30xZG_dfP?#aQ=#M0fNBf586K4I!uD3RVg_!>WeRLx9mZy)-nWVOi z2_p~?0Gi)wI&9-7A$xfB2JLHfO{gd$jJ_TPMbzIFKxGTl8HGyeKt#FNV9rf210mJ4 z@UFHf76>)vGDQ7_Jb<#jYugc*2S{6ZtlvDO_P`-vK@`y!h)G|73WowZU^5$q?%WC~sWB27| zyJcC~W5A7R{Z$eph_(rL%*? zOSzeNO`fs%`EXd0sO#=!if2~%mAS_WOQo5WMNjAiZFP-*WzHMcpto+7nJ(2My}G%Y zZ62^+{8m4te`G2%h)^-Bu!}3dG<2`RQO5Lb{9Rvh7#g!a9y)Fk8zsk77|VkByTL{? zBheB*)roM2);N;(gT&1JXv|86;cdAdkEdO%jZ#h}byG<}I7IR_!sKU(a&eVVsCA5- z_geSMziCEAFh&=RTqr;CwTMEYAC_}%r&Mek`~e@m^YjM|=c`<%DZ*!ARL^gX)s&wE z8U`#`wXs*FY9?+x2Lox#J3Xm<8S=4fjByLf_enZ@ocLHhF}I%- zh0*)+eLsYa`P&QP)SqfP)~k3v&??Fiu4W6~y#bNQ$>COmHa#ol&#bW}K*>oDeI)Ds zZX=6#bj3*+F8P(7eF&p4H}L~=Q*UbSYH^)SS2L7J51Uy$KAJNKh*}aP zUHPq6)PH~Pw=>T8JQ_PvD3-q_TFy!bUrF|Z$;Ou+a;dY&-(4cRrP8-3AZkIp*~$4Z z))W`7y*H@dOAj&b@6xrwN*qI1V58Ufh7Toc{?O}iS{pbafotwg;m-SAjHYa1_`b9N zLD5Gq5Ke70J~}QyA>paL{+um}1BCH^W~pkgbEO9u{KQpnM@Uiv;b_O;1Kgr2aErO} z?-uia0&@Vgkk{RMjUq~LkMQ4SA^HgZ1OBB9W0z9#@%8C4FD z_Tr-wN*rJ_H-Iv}=8uP_H(3^Ee)?hmLWQSdnuL63{*q|+y$)Kl#}3%F$F#2ihc z50`SBT{*%VS0z@I;Lbnri&_{Uz^BOW$Zag1CcgFza%A3U`5KP9lNfXV3rME+G84@mWA+^zVky zMccQN$MCtf&=AELBd%t})f+2HXfTpHE+F=qV99%$C&Tzp{Kjg@v9{w}=El&Azi@~6 zwNVi_w~T<;Nk8cGW!H4A8er4R$CB-Wu+3Osmk=+z ze_9fBP5@(0&*cZM*8=qObZe-wu^E6ZBklPK4LyNCJW73u%Kg6)0cg&%ismaxN3&_a zb=53I6#1<1iPbCuK}h0PVlhO+?wf%i~$SmjfB77`L$iS>i*U)p1y?-ETClF z@1lxuK361^Z;2P>elSwa$|9mYIqi>6{0>n}|^Cxr-azwQpVnEwJX4MZ$e1n^$ zZQySJ0azoYIZ#eRUBmAK^sV0|2b9^*s#!FEEmf-4DQTl60Hh^BP3?~)1QZ{SUzh}9 z{-i*WA*KBA3KuR1I3w1s;U)T(>ibmY1f+jc>34XnOBR#y$ZEhI)%JhATmApLcl$pa z_nHjoGKqFX<*?)Fc^<+G?D%WZ*^|gRbBph1 z*m+&R&<8>8L%BEHj=@|u1R{_~2Z7vuK|Y^B7*n}6gD7%pww_q=p!ew9z}a%C(yO-s zR2R~BFq&<*yi%HtvyLjF+ZmItw@18OYa2e4as)bf{l-J`J-hh=m2^q6Z2)=aG?;L%mY;pOG zjoi`k(zm0VcBs2S`_G{82Lp;o-XsNVMzL`qLkiIR+BhtBoWlT~Z+}I+ zqP+2+wmLG#^8b`b?QdICYQp5gCesRR^erubREi)vh{qh;f}ft!a{G=h2Frp#D34?D zm~na7@M2pxe{c{kAqE&D^F0Pqqw~8~dFkK{i932(i|iCCfZ@yz@`YXI-}Odt3wOSB9?oV7Msgp>aoqLP$% z@kRfNvGy>cnO+`X5iRH6?6p8GpDyMzR{S3rWa^3d#&z1az>HILQF|2wbK~YU2|2ip zKk2{EU$`5uYCBgPINq*o;kgMmS`McyIy4>KAC$M@v(S!7qwHi{_|8?HMl@o)av!_d zG0)}!W{nQ@Z&n1KC(+*R-S6)|`Cbf{MTtD~BHL{b#IN?eMz2xxul{>a?rQL@V}59{ zFR+z|=5>pSwa{gI7%&p0kb7`|P1@`;ok3vu&1A98K9$GO=f6ITx$SEAu)$%=3BRxZ zKXw_0XJ0M-43&gAc)+<(=SUozzrx3|XHNr=n6&&F-?(~h{yZSUIL|s6?iY7-J@VQJ i0+Zad-VXgmJH - File Menu actions - - -

File Menu actions

-

Selecting File Menu

- -

-

Name
UndoRevert the last change made in the + Reverts the last change made in the editor Ctrl+Z
RedoRedo a change previously reverted with - UndoRe-applies a change previously reverted + with Undo Ctrl+Y
CutCopy the currently selected text to the - clipboard and remove it from the editorCopies the currently selected text to + the clipboard and removes it from the editor Ctrl+X
CopyCopy the currently selected text to the - clipboardCopies the currently selected text to + the clipboard Ctrl+C
PastePaste the contents of the clipboard, as - text, to the currently active editor windowPastes the contents of the clipboard, + as text, to the currently active editor window Ctrl+V
DeleteDelete the currently selected textDeletes the currently selected text Delete
Select AllSelect all the text in the currently + Selects all the text in the currently active editor window Ctrl+A
Expand Selection To

Expand the selection (or create - a selection starting from the cursor) in the following ways:

Expands the selection (or + creates a selection starting from the cursor) in the following + ways:

 Alt+Shift+Arrow Keys
Enclosing Element
-
Add the enclosing expression or block to the selection +
Adds the enclosing expression or block to the selection (It relies on the embedded parser, so may fail when syntax errors are present.)
@@ -84,7 +85,7 @@
Next Element
-
Add the following element to the selection
+
Adds the following element to the selection
 Alt+Shift+Right
Previous Element
-
Add the preceding element to the selection
+
Adds the preceding element to the selection
 Alt+Shift+Left
Find / Replace...Open the basic in-editor Find / Replace - dialogOpens the basic in-editor Find / + Replace dialog Ctrl+F
Find WordFind the next occurrence of either the + Finds the next occurrence of either the word containing the cursor, or the first word of the current selection, if it covers multiple words (Added for Visual Studio compatibility.)
Find NextFind the next occurrence of the + Finds the next occurrence of the currently selected text, or the last text searched for, if there is no selection Ctrl+K
Find PreviousFind the previous occurrence of the + Finds the previous occurrence of the currently selected text, or the last text searched for, if there is no selection Ctrl+Shift+K
Incremental Find NextStart the incremental find mode + Starts the incremental find mode (Whatever is typed afterward will be searched for.) Ctrl+J
Incremental Find PreviousStart the incremental find mode, + Starts the incremental find mode, looking backward Ctrl+Shift+J
Add Bookmark...Add a bookmark pointing to the current + Adds a bookmark pointing to the current cursor position or selected text  
Add Task...Add a user defined task located at the + Adds a user defined task located at the current line  
Smart Insert ModeToggle the Smart Insert mode (i.e. the + Toggles the Smart Insert mode (i.e. the auto-completion features defined in C/C++ > Editor > Typing)
Show Tooltip DescriptionDisplay the tooltip appropriate to the + Displays the tooltip appropriate to the cursor position. F2
Word CompletionComplete the word containing the cursor - using the next available completion (Invoke it repeatedly to cycle - through them.)Completes the word containing the + cursor using the next available completion (If invoked repeatedly + it will cycle through the possibilities.) Alt+/
Quick FixDisplay the Quick Fix dialog + Displays the Quick Fix dialog appropriate to the cursor position. Ctrl+1
Content AssistDisplay the Content Assist dialog - appropriate to the cursor position (Invoke it repeatedly to cycle - through the available proposal types.)Displays the Content Assist dialog + appropriate to the cursor position (If invoked repeatedly it will + cycle through the available proposal types.) Ctrl+Space
Parameter HintsWhen invoked in a parameter list, - display the possible signatures in a tooltipDisplays the possible signatures in a + tooltip (Enabled when the cursor is in a parameter list) Ctrl+Shift+Space
Set Encoding...Display a dialog in which the active - editor's encoding can be specifiedDisplays a dialog in which the encoding + of the active editor can be specified  
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameFunctionKeyboard Shortcut
NewCreate a new project, folder, or file.Alt+Shift+N
Open File...Open existing file. 
CloseClose the current editor. - If the editor contains unsaved data, a save request dialog is shown.Ctrl+F4
Close AllClose all editors. - If editors contains unsaved data, a save request dialog will be shown.Ctrl+Shift+F4
SaveSave the content of the current editor. - Disabled if the editor does not contain unsaved changes.Ctrl+S
Save AsSave the content of the current editor under a new name. 
Save AllSave the content of the current editor. - Disabled if no editor contains unsaved changes.Ctrl+Shift+S
RevertRevert the content of the current editor back to the content of the saved file. - Disabled if the editor does not contain unsaved changes. 
MoveMove a resource. 
RenameRenames a resource.F2
RefreshRefreshes the content of the selected element with the local file system. - When launched from no specific selection, this command refreshes all projects.F5
Convert Line Delimiters to (submenu)Changes line delimiters either to Windows, or UNIX, or Mac OS9 format. 
PrintPrints the content of the current editor. Enabled when an editor has the focus.Ctrl+P
Switch workspace...Relaunches Eclipse with a new workspace. 
ImportOpens the Import dialog and shows all import wizards. 
ExportOpens the Export dialog and shows all export wizards. 
PropertiesOpens the property pages of the select elements.Alt+Enter
ExitExit Eclipse 
-

- -

-IBM Copyright Statement -

- +
+

File Menu actions

+

+ Selecting File Menu +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameFunctionKeyboard Shortcut
New (submenu)Creates a new project, folder, or fileAlt+Shift+N
Open File...Opens an existing file 
CloseCloses the current editor (If the + editor contains unsaved data, a save request dialog is shown.)Ctrl+W
Close AllCloses all editors (If any editors + contain unsaved data, save request dialogs will be shown for + them.)Ctrl+Shift+W
SaveSaves the content of the current editor + (Disabled if the editor does not contain unsaved changes.)Ctrl+S
Save As...Saves the content of the current editor + under a new name 
Save AllSaves the content of all open editor + windows (Disabled if no editor contains unsaved changes.)Ctrl+Shift+S
RevertReverts the content of the current + editor back to its most recently saved state (Disabled if the + editor does not contain unsaved changes.) 
Move...Moves a resource 
Rename...Renames a resourceF2
RefreshRefreshes the selected element against + the local file system (If nothing is selected, all open projects + are refreshed.)F5
Convert Line Delimiters + to (submenu)Changes the line delimiters of the + current editor to Windows (\r\n), or UNIX (\n) format 
Print...Prints the content of the current + editor (Enabled when an editor has the focus.)Ctrl+P
Switch workspace + (submenu)Changes the active workspace (The + submenu contains a list of recently used workspaces, and Other..., + which brings up a workspace selection dialog) +  
RestartRelaunches Eclipse 
Import...Opens the Import + dialog, which allows the selection of an Import wizard +  
ExportOpens the Export + dialog, which allows the selection of an Export wizard +  
PropertiesOpens the property page for the + selected elementAlt+Enter
ExitExits Eclipse 
+

+ IBM Copyright Statement +

+
+ \ No newline at end of file From 72702f1a041672cd6fd6053b9221ccd09ff2336f Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 1 Mar 2013 13:51:58 -0500 Subject: [PATCH 26/27] bug 401734: move LanguageSettingsImages.java from org.eclipse.cdt.internal.ui.newui to org.eclipse.cdt.internal.ui.language.settings.providers --- .../org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java | 2 +- .../settings/providers/LanguageSettingEntryDialog.java | 1 - .../settings/providers/LanguageSettingsEntriesTab.java | 1 - .../settings/providers}/LanguageSettingsImages.java | 4 +++- .../src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/{newui => language/settings/providers}/LanguageSettingsImages.java (95%) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index 156a062bdfe..03a9adb2950 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -31,7 +31,7 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.internal.corext.util.Strings; -import org.eclipse.cdt.internal.ui.newui.LanguageSettingsImages; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java index faa75e6c8ae..366306e0519 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java @@ -38,7 +38,6 @@ import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.AbstractPropertyDialog; import org.eclipse.cdt.internal.ui.ImageCombo; -import org.eclipse.cdt.internal.ui.newui.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.newui.Messages; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java index dd41893d473..61a1e9b9726 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java @@ -58,7 +58,6 @@ import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; -import org.eclipse.cdt.internal.ui.newui.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/LanguageSettingsImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java similarity index 95% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/LanguageSettingsImages.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java index 92044bf3e66..18913df5116 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/LanguageSettingsImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java @@ -9,7 +9,7 @@ * Andrew Gvozdev - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.internal.ui.newui; +package org.eclipse.cdt.internal.ui.language.settings.providers; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -31,6 +31,8 @@ import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.UNCPathConverter; +import org.eclipse.cdt.internal.ui.newui.Messages; + /** * Helper class to provide unified images for {@link ICLanguageSettingEntry}. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java index eb3401f86d9..c9005b518a4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java @@ -72,8 +72,8 @@ import org.eclipse.cdt.core.settings.model.MultiLanguageSetting; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProvidersPage; -import org.eclipse.cdt.internal.ui.newui.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; From 8364d2fbced9ec40c9b97ffd2f37c0160522f7ce Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 1 Mar 2013 13:54:56 -0500 Subject: [PATCH 27/27] bug 401734: CDT LanguageSettingsProviders do not support project-relative include paths --- .../internal/ui/cview/CViewLabelProvider.java | 27 ++-- .../providers/LanguageSettingEntryDialog.java | 86 ++++++----- .../providers/LanguageSettingsEntriesTab.java | 14 +- .../providers/LanguageSettingsImages.java | 133 ++++++++++-------- 4 files changed, 146 insertions(+), 114 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index 03a9adb2950..78f52af8a9c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2010 QNX Software Systems and others. + * Copyright (c) 2002, 2013 QNX Software Systems 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 @@ -35,18 +35,14 @@ import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsI import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -/* - * CViewLabelProvider +/** + * Label provider for "C/C++ Projects" view. */ public class CViewLabelProvider extends AppearanceAwareLabelProvider { - public CViewLabelProvider(long textFlags, int imageFlags) { super(textFlags, imageFlags); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { if (element instanceof IncludeReferenceProxy) { @@ -103,22 +99,23 @@ public class CViewLabelProvider extends AppearanceAwareLabelProvider { return Strings.markLTR(new StyledString(getText(element))); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ @Override public Image getImage(Object element) { String imageKey = null; if (element instanceof IncludeReferenceProxy) { IIncludeReference reference = ((IncludeReferenceProxy)element).getReference(); - IContainer containerInclude = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(reference.getPath()); - if (containerInclude != null) { - ICProject cproject = reference.getCProject(); - IProject project = (cproject != null) ? cproject.getProject() : null; + IPath path = reference.getPath(); + ICProject cproject = reference.getCProject(); + IProject project = (cproject != null) ? cproject.getProject() : null; + for (IContainer containerInclude : ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(URIUtil.toURI(path.makeAbsolute()))) { IProject projectInclude = containerInclude.getProject(); boolean isProjectRelative = projectInclude != null && projectInclude.equals(project); imageKey = LanguageSettingsImages.getImageKey(ICSettingEntry.INCLUDE_PATH, ICSettingEntry.VALUE_WORKSPACE_PATH, isProjectRelative); - } else { + if (isProjectRelative) { + break; + } + } + if (imageKey == null) { imageKey = CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER; } } else if (element instanceof IIncludeReference) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java index 366306e0519..7eb84d28c27 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java @@ -46,11 +46,11 @@ import org.eclipse.cdt.internal.ui.newui.Messages; public class LanguageSettingEntryDialog extends AbstractPropertyDialog { private static final String SLASH = "/"; //$NON-NLS-1$ - private ICConfigurationDescription cfgDescription; - private IProject project; - private ICLanguageSettingEntry entry; - private boolean clearValue; - private int kind; + private final ICConfigurationDescription cfgDescription; + private final IProject project; + private final ICLanguageSettingEntry initialEntry; + private final int initialKind; + private final boolean clearValue; private Composite compositeArea; private Label iconComboKind; @@ -115,9 +115,9 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { super(parent, ""); //$NON-NLS-1$ this.cfgDescription = cfgDescription; this.project = cfgDescription.getProjectDescription().getProject(); - this.entry = null; + this.initialEntry = null; + this.initialKind = kind; this.clearValue = true; - this.kind = kind; } /** @@ -128,8 +128,8 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { super(parent, ""); //$NON-NLS-1$ this.cfgDescription = cfgDescription; this.project = cfgDescription.getProjectDescription().getProject(); - this.entry = entry; - this.kind = entry != null ? entry.getKind() : ICSettingEntry.INCLUDE_PATH; + this.initialEntry = entry; + this.initialKind = entry != null ? entry.getKind() : ICSettingEntry.INCLUDE_PATH; this.clearValue = clearValue; } @@ -210,7 +210,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { gd.horizontalAlignment = SWT.RIGHT; iconComboKind.setLayoutData(gd); iconComboKind.setText(Messages.LanguageSettingEntryDialog_SelectKind); - int kindToComboIndex = kindToComboIndex(kind); + int kindToComboIndex = kindToComboIndex(initialKind); iconComboKind.setImage(comboKindImages[kindToComboIndex]); // Combo for the setting entry kind @@ -247,14 +247,14 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { comboPathCategory.add(pathCategories[i], pathCategoryImages[i]); } int pcindex = COMBO_PATH_INDEX_PROJECT; - if (entry != null) { - if ((entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) == 0) { + if (initialEntry != null) { + if ((initialEntry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) == 0) { pcindex = COMBO_PATH_INDEX_FILESYSTEM; } else { - if (entry.getName().startsWith(SLASH)) { - pcindex = COMBO_PATH_INDEX_WORKSPACE; - } else { + if (LanguageSettingsImages.isProjectRelative(initialEntry)) { pcindex = COMBO_PATH_INDEX_PROJECT; + } else { + pcindex = COMBO_PATH_INDEX_WORKSPACE; } } } @@ -285,8 +285,12 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { // Dir/File/Name input inputName = new Text(compositeArea, SWT.SINGLE | SWT.BORDER); - if (entry!=null && !clearValue) { - inputName.setText(entry.getName()); + if (initialEntry != null && !clearValue) { + String name = initialEntry.getName(); + if (pcindex == COMBO_PATH_INDEX_PROJECT && LanguageSettingsImages.isProjectRelative(initialEntry)) { + name = LanguageSettingsImages.toProjectRelative(name); + } + inputName.setText(name); } gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); gd.horizontalSpan = 2; @@ -333,14 +337,14 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { // Value input. Located after the other controls to get sufficient width int comboPathWidth = comboPathCategory.computeSize(SWT.DEFAULT, SWT.NONE).x; inputValue = new Text(compositeArea, SWT.SINGLE | SWT.BORDER); - if (entry != null && !clearValue) { - inputValue.setText(entry.getValue()); + if (initialEntry != null && !clearValue) { + inputValue.setText(initialEntry.getValue()); } gd = new GridData(SWT.FILL, SWT.NONE, false, false); gd.widthHint = comboPathWidth; inputValue.setLayoutData(gd); - if (entry != null && kind == ICSettingEntry.MACRO && !clearValue) { + if (initialEntry != null && initialKind == ICSettingEntry.MACRO && !clearValue) { inputValue.setFocus(); inputValue.setSelection(0, inputValue.getText().length()); } @@ -356,7 +360,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { // Checkbox "Built-In" checkBoxBuiltIn = new Button(compCheckboxes, SWT.CHECK); checkBoxBuiltIn.setText(Messages.LanguageSettingEntryDialog_BuiltInFlag); - checkBoxBuiltIn.setSelection(entry != null && (entry.getFlags() & ICSettingEntry.BUILTIN) != 0); + checkBoxBuiltIn.setSelection(initialEntry != null && (initialEntry.getFlags() & ICSettingEntry.BUILTIN) != 0); gd = new GridData(GridData.FILL_HORIZONTAL); checkBoxBuiltIn.setLayoutData(gd); checkBoxBuiltIn.addSelectionListener(new SelectionListener() { @@ -374,7 +378,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { // Checkbox "Contains system includes" checkBoxSystem = new Button(compCheckboxes, SWT.CHECK); checkBoxSystem.setText(Messages.LanguageSettingEntryDialog_ContainsSystemHeaders); - checkBoxSystem.setSelection(entry != null && (entry.getFlags() & ICSettingEntry.LOCAL) == 0); + checkBoxSystem.setSelection(initialEntry != null && (initialEntry.getFlags() & ICSettingEntry.LOCAL) == 0); gd = new GridData(GridData.FILL_HORIZONTAL); checkBoxSystem.setLayoutData(gd); checkBoxSystem.addSelectionListener(new SelectionListener() { @@ -392,7 +396,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { // Checkbox "Framework folder" checkBoxFramework = new Button(compCheckboxes, SWT.CHECK); checkBoxFramework.setText(Messages.LanguageSettingEntryDialog_FrameworkFolder); - checkBoxFramework.setSelection(entry != null && (entry.getFlags() & ICSettingEntry.FRAMEWORKS_MAC) != 0); + checkBoxFramework.setSelection(initialEntry != null && (initialEntry.getFlags() & ICSettingEntry.FRAMEWORKS_MAC) != 0); gd = new GridData(GridData.FILL_HORIZONTAL); checkBoxFramework.setLayoutData(gd); checkBoxFramework.addSelectionListener(new SelectionListener() { @@ -495,7 +499,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { boolean isProjectSelected = (indexPathKind == COMBO_PATH_INDEX_PROJECT); boolean isWorkspaceSelected = (indexPathKind == COMBO_PATH_INDEX_WORKSPACE); boolean isFilesystemSelected = (indexPathKind == COMBO_PATH_INDEX_FILESYSTEM); - + String path = inputName.getText().trim(); if (path.isEmpty()) { buttonOk.setEnabled(false); @@ -503,7 +507,7 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { buttonOk.setEnabled((isProjectSelected && !path.startsWith(SLASH)) || (isWorkspaceSelected && path.startsWith(SLASH)) || isFilesystemSelected); } - + buttonVars.setEnabled(isFilesystemSelected); } @@ -514,28 +518,38 @@ public class LanguageSettingEntryDialog extends AbstractPropertyDialog { public void buttonPressed(SelectionEvent e) { String str = null; if (e.widget.equals(buttonOk)) { - String name = inputName.getText().trim(); - text1 = name; - String value = inputValue.getText().trim(); + text1 = inputName.getText().trim(); result = true; + String name = text1; int flagBuiltIn = checkBoxBuiltIn.isVisible() && checkBoxBuiltIn.getSelection() ? ICSettingEntry.BUILTIN : 0; - int flagSystem = checkBoxSystem.isVisible() && checkBoxSystem.getSelection() ? 0 : ICSettingEntry.LOCAL; - int flagFramework = checkBoxFramework.isVisible() && checkBoxFramework.getSelection() ? ICSettingEntry.FRAMEWORKS_MAC : 0; - int indexPathKind = comboPathCategory.getSelectionIndex(); + int flags = flagBuiltIn; + int kind = comboKind.getSelectionIndex(); - boolean isProjectPath = indexPathKind == COMBO_PATH_INDEX_PROJECT; - boolean isWorkspacePath = (kind != COMBO_INDEX_MACRO) && (isProjectPath || indexPathKind == COMBO_PATH_INDEX_WORKSPACE); - int flagWorkspace = isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED : 0; - int flags = flagBuiltIn | flagWorkspace | flagSystem | flagFramework; + if (kind != COMBO_INDEX_MACRO) { + int flagSystem = checkBoxSystem.isVisible() && checkBoxSystem.getSelection() ? 0 : ICSettingEntry.LOCAL; + int flagFramework = checkBoxFramework.isVisible() && checkBoxFramework.getSelection() ? ICSettingEntry.FRAMEWORKS_MAC : 0; + + int indexPathKind = comboPathCategory.getSelectionIndex(); + boolean isProjectPath = indexPathKind == COMBO_PATH_INDEX_PROJECT; + boolean isWorkspacePath = indexPathKind == COMBO_PATH_INDEX_WORKSPACE; + int flagWorkspace = (isWorkspacePath || isProjectPath) ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0; + int flagResolved = isWorkspacePath && !name.contains("$") ? ICSettingEntry.RESOLVED : 0; //$NON-NLS-1$ + flags = flagBuiltIn | flagWorkspace | flagResolved | flagSystem | flagFramework; + + if (isProjectPath) { + name = LanguageSettingsImages.fromProjectRelative(name); + } + } ICLanguageSettingEntry entry = null; - switch (kind) { + switch (comboKind.getSelectionIndex()) { case COMBO_INDEX_INCLUDE_DIR: entry = CDataUtil.createCIncludePathEntry(name, flags); break; case COMBO_INDEX_MACRO: // Note that value=null is not supported by CMacroEntry + String value = inputValue.getText().trim(); entry = CDataUtil.createCMacroEntry(name, value, flags); break; case COMBO_INDEX_INCLUDE_FILE: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java index 61a1e9b9726..c01dcdcd081 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Andrew Gvozdev and others. + * Copyright (c) 2010, 2013 Andrew Gvozdev 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 @@ -155,11 +155,15 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { public String getText(Object element) { if (element instanceof ICLanguageSettingEntry) { ICLanguageSettingEntry entry = (ICLanguageSettingEntry) element; - String s = entry.getName(); - if ((entry.getKind() == ICSettingEntry.MACRO) && (entry.getFlags()&ICSettingEntry.UNDEFINED) == 0) { - s = s + '=' + entry.getValue(); + String text = entry.getName(); + if (entry.getKind() == ICSettingEntry.MACRO) { + if ((entry.getFlags() & ICSettingEntry.UNDEFINED) == 0) { + text = text + '=' + entry.getValue(); + } + } else if (LanguageSettingsImages.isProjectRelative(entry)) { + text = LanguageSettingsImages.toProjectRelative(text); } - return s; + return text; } return super.getText(element); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java index 18913df5116..feb38597b99 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Andrew Gvozdev and others. + * Copyright (c) 2010, 2013 Andrew Gvozdev 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 @@ -8,10 +8,8 @@ * Contributors: * Andrew Gvozdev - Initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.internal.ui.language.settings.providers; -import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; @@ -24,7 +22,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.cdt.core.settings.model.ACPathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.ui.CDTSharedImages; @@ -37,6 +34,54 @@ import org.eclipse.cdt.internal.ui.newui.Messages; * Helper class to provide unified images for {@link ICLanguageSettingEntry}. */ public class LanguageSettingsImages { + private static final String PROJ_NAME_PREFIX = "/${ProjName}/"; //$NON-NLS-1$ + + /** + * Check if the language settings entry should be presented as "project-relative" in UI. + * + * @param entry - language settings entry to check. + * @return {@code true} if the entry should be displayed as "project-relative", {@code false} otherwise. + */ + public static boolean isProjectRelative(ICLanguageSettingEntry entry) { + if (entry instanceof ACPathEntry) { + String path = entry.getName(); + return ((ACPathEntry) entry).isValueWorkspacePath() && path.startsWith(PROJ_NAME_PREFIX); + } + return false; + } + + /** + * Convert path used by {@link ICLanguageSettingEntry} to label representing project-relative portion. + * + * @param path - path to convert to label in project-relative format. + * @return label to be used to display the path in UI. + */ + public static String toProjectRelative(String path) { + if (path.startsWith(LanguageSettingsImages.PROJ_NAME_PREFIX)) { + return path.substring(LanguageSettingsImages.PROJ_NAME_PREFIX.length()); + } + return path; + } + + /** + * Convert label for project-relative path back to path representation carried by {@link ICLanguageSettingEntry}. + * + * @param label - label in project-relative format. + * @return path to be used by {@link ICLanguageSettingEntry}. + */ + public static String fromProjectRelative(String label) { + return LanguageSettingsImages.PROJ_NAME_PREFIX + label; + } + + /** + * Returns image for the given {@link ICLanguageSettingEntry} from internally managed repository including + * necessary overlays for given configuration description. + * + * @param kind - kind of {@link ICLanguageSettingEntry}, i.e. {@link ICSettingEntry#INCLUDE_PATH} etc. + * @param flags - flags of {@link ICSettingEntry}. + * @param isProjectRelative specifies if the image should present "project-relative" icon. + * @return the image for the entry with appropriate overlays. + */ public static Image getImage(int kind, int flags, boolean isProjectRelative) { String imageKey = getImageKey(kind, flags, isProjectRelative); if (imageKey != null) { @@ -54,19 +99,35 @@ public class LanguageSettingsImages { * @return the image for the entry with appropriate overlays. */ public static Image getImage(ICLanguageSettingEntry entry, ICConfigurationDescription cfgDescription) { - String projectName = null; + int kind = entry.getKind(); + int flags = entry.getFlags(); + boolean isProjectRelative = isProjectRelative(entry); - if (cfgDescription != null) { - ICProjectDescription prjDescription = cfgDescription.getProjectDescription(); - if (prjDescription != null) { - IProject project = prjDescription.getProject(); - if (project != null) { - projectName = project.getName(); - } + String imageKey = getImageKey(kind, flags, isProjectRelative); + if (imageKey != null) { + if ((flags & ICSettingEntry.UNDEFINED) != 0) { + return CDTSharedImages.getImageOverlaid(imageKey, CDTSharedImages.IMG_OVR_INACTIVE, IDecoration.BOTTOM_LEFT); } - } - return getImage(entry, projectName, cfgDescription); + String overlayKey=null; + IStatus status = getStatus(entry, cfgDescription); + switch (status.getSeverity()) { + case IStatus.ERROR: + overlayKey = CDTSharedImages.IMG_OVR_ERROR; + break; + case IStatus.WARNING: + overlayKey = CDTSharedImages.IMG_OVR_WARNING; + break; + case IStatus.INFO: + overlayKey = CDTSharedImages.IMG_OVR_WARNING; + break; + } + if (overlayKey != null) { + return CDTSharedImages.getImageOverlaid(imageKey, overlayKey, IDecoration.BOTTOM_LEFT); + } + return CDTSharedImages.getImage(imageKey); + } + return null; } /** @@ -116,50 +177,6 @@ public class LanguageSettingsImages { return imageKey; } - /** - * Returns image for the given entry from internally managed repository including - * necessary overlays. - * - * @param entry - language settings entry to get an image for. - * @param projectName - pass project name if available. That lets put "project" metaphor - * on the image. Pass {@code null} if no project name is available. - * @param cfgDescription - configuration description of the entry. - * @return the image for the entry with appropriate overlays. - */ - private static Image getImage(ICLanguageSettingEntry entry, String projectName, ICConfigurationDescription cfgDescription) { - int kind = entry.getKind(); - int flags = entry.getFlags(); - boolean isWorkspacePath = (flags & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0; - String path = entry.getName(); - boolean isProjectRelative = (projectName != null) && isWorkspacePath && path.startsWith(IPath.SEPARATOR + projectName + IPath.SEPARATOR); - - String imageKey = getImageKey(kind, flags, isProjectRelative); - if (imageKey != null) { - if ((flags & ICSettingEntry.UNDEFINED) != 0) { - return CDTSharedImages.getImageOverlaid(imageKey, CDTSharedImages.IMG_OVR_INACTIVE, IDecoration.BOTTOM_LEFT); - } - - if (entry instanceof ACPathEntry) { - String overlayKey=null; - IStatus status = getStatus(entry, cfgDescription); - switch (status.getSeverity()) { - case IStatus.ERROR: - overlayKey = CDTSharedImages.IMG_OVR_ERROR; - break; - case IStatus.WARNING: - overlayKey = CDTSharedImages.IMG_OVR_WARNING; - break; - case IStatus.INFO: - overlayKey = CDTSharedImages.IMG_OVR_WARNING; - break; - } - return CDTSharedImages.getImageOverlaid(imageKey, overlayKey, IDecoration.BOTTOM_LEFT); - } - return CDTSharedImages.getImage(imageKey); - } - return null; - } - /** * Checking if the entry points to existing or accessible location. * @param entry - resolved entry