diff options
164 files changed, 683 insertions, 693 deletions
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutoconfSubstRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutoconfSubstRule.java index 3fb85aef5be..6f7ba8fe880 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutoconfSubstRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutoconfSubstRule.java @@ -76,7 +76,7 @@ public class AutoconfSubstRule implements IPredicateRule { // A valid id has some alphabetic character in it. isId = true; } else if (c >= '0' && c <= '9' || c == '_') { - ; // continue + // continue } else if (c == '@' && isId) return getSuccessToken(); else diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java index 2c3984c67e0..b0e137a947b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java @@ -130,7 +130,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper super.doLoad(); isLoaded = true; } - }; + } public void setToolTipText(String toolTip) { this.getLabelControl().setToolTipText(toolTip); @@ -154,7 +154,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(AutotoolsPropertyMessages.getString("NewEnvVarDialog.title")); - }; + } @Override protected Control createDialogArea(Composite parent) { @@ -195,7 +195,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper gd.widthHint = fieldWidthHint; fTextValue.setLayoutData(gd); return composite; - }; + } // Obtain instance of OK button and set disabled. @Override @@ -225,7 +225,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper public String getValue() { return value; } - }; + } @Override protected String getNewInputObject() { @@ -309,7 +309,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper } return sb.toString().trim(); } - }; + } private List<FieldEditor> fieldEditors; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/ToolListLabelProvider.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/ToolListLabelProvider.java index 2522184b653..bdf356f25f0 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/ToolListLabelProvider.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/ToolListLabelProvider.java @@ -90,5 +90,5 @@ public class ToolListLabelProvider extends LabelProvider { if (descriptor != null && manager != null) { manager.destroyImage(descriptor); } - }; + } } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/text/hover/AutoconfTextHover.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/text/hover/AutoconfTextHover.java index 341c267d8e3..9217a88d08b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/text/hover/AutoconfTextHover.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/text/hover/AutoconfTextHover.java @@ -97,7 +97,7 @@ public class AutoconfTextHover implements ITextHover, ITextHoverExtension { public Document[] getDocuments() { return documents; } - }; + } private static Map<String, Document> acHoverDocs; private static Map<String, Document> amHoverDocs; diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/properties/CMakePropertyPage.java b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/properties/CMakePropertyPage.java index 8b710042679..078cb09be8c 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/properties/CMakePropertyPage.java +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/properties/CMakePropertyPage.java @@ -216,7 +216,7 @@ public class CMakePropertyPage extends PropertyPage { public enum ParseState { INIT, SEENCOMMENT - }; + } /** * Parse output of cmake -LAH call to determine options to show to user diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java index 477ec7d5f9d..975702f9659 100644 --- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java +++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java @@ -239,7 +239,7 @@ public class MesonPropertyPage extends PropertyPage { public enum ParseState { INIT, GROUP, OPTION, OPTION_WITH_VALUES, ARGS - }; + } @Override public boolean performOk() { diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java index 8262df67683..8d8e276ede2 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java @@ -78,7 +78,7 @@ public class QuickFixCreateNewClassTest { return translationUnitViaWorkspace; } throw new RuntimeException("Invalid marker"); - }; + } }; when(toWorkingCopy.apply(translationUnitViaWorkspace)).thenReturn(translationUnitWorkingCopy); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java index 10ce31c4bbe..9f6382f6c8a 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java @@ -359,7 +359,7 @@ public class RemoveUnusedDeclarationsRefactoring extends CRefactoring { } } return false; - }; + } private static Collection<IASTName> getDeclaredNames(IASTDeclaration declaration) { while (declaration instanceof ICPPASTTemplateDeclaration) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java index b878c1d74c0..e7741879c80 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java @@ -89,7 +89,7 @@ public class AsyncViewerTest extends BaseUITestCase { } return n.fChildren; } - }; + } private class MyLabelProvider extends LabelProvider { @Override diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/BuildOptionsParser.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/BuildOptionsParser.java index 8ef46b6939f..9d59c71af18 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/BuildOptionsParser.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/BuildOptionsParser.java @@ -106,4 +106,4 @@ public class BuildOptionsParser implements IWorkspaceRunnable, IMarkerGenerator // do nothing } -}; +} diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/CompilerOptionParser.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/CompilerOptionParser.java index ed6c206c50a..9227e448486 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/CompilerOptionParser.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/CompilerOptionParser.java @@ -175,4 +175,4 @@ public class CompilerOptionParser implements IWorkspaceRunnable { return currentFolder; } -}; +} diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java index 314a5eccd0d..33346eef90d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java @@ -29,13 +29,13 @@ public interface ICWatchpointTarget { int getSize(); // returns -1 if size not available void setSize(int size); - }; + } interface CanCreateWatchpointRequest extends IRequest { boolean getCanCreate(); void setCanCreate(boolean value); - }; + } /** * Determine if a watchpoint can be set on the element. The result does not diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java index 6dd93561fcc..780163d9392 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java @@ -254,7 +254,7 @@ public class ExecutablesManager extends PlatformObject this.projectsToRefresh = projectsToRefresh; super.schedule(); } - }; + } /** The search job. We only let one of these run at any one time */ private SearchJob searchJob = new SearchJob(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java index 0f26369e81f..0bb87d84493 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java @@ -53,5 +53,5 @@ public interface ICBreakpointExtension { */ default public String getExtensionMessage() { return ""; //$NON-NLS-1$ - }; + } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java index 10759123925..3c33105c145 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java @@ -27,7 +27,7 @@ public interface IChangeReverseMethodHandler extends IReverseToggleHandler, IDeb */ enum ReverseDebugMethod { OFF, SOFTWARE, HARDWARE, BRANCH_TRACE, PROCESSOR_TRACE, GDB_TRACE - }; + } /** * Sets the value for the reverse debugging method to be used when the button is toggled. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/IRegisterGroupDescriptor.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/IRegisterGroupDescriptor.java index 3b8fdf006b1..b55f1271606 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/IRegisterGroupDescriptor.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/IRegisterGroupDescriptor.java @@ -43,5 +43,5 @@ public interface IRegisterGroupDescriptor { */ default String getContainerId() { return null; - }; + } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java index da317b6ef36..9c4c56b998c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java @@ -170,7 +170,6 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { super.dispose(); } } - ; PlatformAction action = new PlatformAction(site); action.run(); action.dispose(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ReverseDebugAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ReverseDebugAction.java index 42847abdad9..dfcef5b7672 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ReverseDebugAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ReverseDebugAction.java @@ -61,7 +61,7 @@ public class ReverseDebugAction extends AbstractBreakpointAction { public static REVERSE_DEBUG_ACTIONS_ENUM getValue(int index) { return REVERSE_DEBUG_ACTIONS_ENUM.values()[index]; } - }; + } private REVERSE_DEBUG_ACTIONS_ENUM fOperation; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java index ece1362f9ab..9e77c4cb296 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java @@ -555,7 +555,6 @@ abstract public class AbstractToggleBreakpointAdapter job.schedule(); } } - ; watchpointTarget.getSize(new GetSizeRequest()); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java index 5b7d404b778..5e417546247 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java @@ -54,7 +54,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe public void setCanCreate(boolean value) { fCanCreate = value; } - }; + } /** * Record the target variable/expression diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java index 10359e566a5..c2a6e633097 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java @@ -168,7 +168,7 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { public void addValue(String value, String valueLabel) { valueLabels.put(value, valueLabel); - }; + } public void addContionEquals(String property, String value) { conditions.put(property, value); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java index 7032fe99b3e..96a70216e48 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java @@ -19,4 +19,4 @@ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; */ public enum VisualizerExecutionState { RUNNING, SUSPENDED, CRASHED, EXITED -}; +} 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 eaaa834912c..36b309643de 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 @@ -786,12 +786,12 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin @Override public void visualizerSelected() { updateActions(); - }; + } /** Invoked when another visualizer has been selected, hiding this one. */ @Override public void visualizerDeselected() { - }; + } // --- workbench selection management --- diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java index 840406179bd..a5e172ebf4d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java @@ -177,7 +177,6 @@ public class DsfTerminateCommand implements ITerminateHandler { class ScheduledFutureWrapper { ScheduledFuture<?> fFuture; } - ; final ScheduledFutureWrapper fFutureWrapper = new ScheduledFutureWrapper(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java index 6ebf4b46036..1bea0274341 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java @@ -80,7 +80,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler { request.setEnabled(false); } else { request.setEnabled(getData()); - ; + } request.done(); } @@ -226,7 +226,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler { rm.setData(contDmcs.toArray(new IContainerDMContext[contDmcs.size()])); } rm.done(); - }; + } }); } else { rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, "Service is not available.")); //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java index 60fa974eacf..7922ece5bc1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java @@ -112,7 +112,7 @@ public class GdbRestartCommand implements IRestartHandler { @Override protected void handleCompleted() { request.done(); - }; + } }); } else { request.done(); 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 b8bd0ed1830..17cb1a2a6b6 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 @@ -188,7 +188,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne return Status.OK_STATUS; } - }; + } /** * This job will prompt the user for a path to the binary to use, @@ -253,7 +253,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne fProcessNameToBinaryMap.put(fProcName, finalBinaryPath); } fRm.done(); - }; + } }); } else { @@ -380,7 +380,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne } } } - ; // Trigger the first query new ProcessRequestMonitor(ImmediateExecutor.getInstance()).done(); } @@ -641,7 +640,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne } } } - ; // Trigger the first attach. new AttachToProcessRequestMonitor().done(); 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 ea1be6b6d12..d4948f90740 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 @@ -137,7 +137,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem protected void handleCancel() { rm.cancel(); rm.done(); - }; + } @Override protected void handleSuccess() { @@ -150,7 +150,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem rm.setStatus(e.getStatus()); rm.done(); } - }; + } }); job.schedule(); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java index a54f8528aea..0eb5c815633 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java @@ -75,7 +75,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa @Override public void run() { fileName[0] = promptForFileName(); - }; + } }); if (fileName[0] != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java index 8adbe0769f4..e5192e19f80 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java @@ -99,7 +99,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem rm.done(); } }); - }; + } }); } else { rm.done(); @@ -146,7 +146,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem protected void handleSuccess() { rm.setData(!getData()); rm.done(); - }; + } }); } else { rm.setData(false); @@ -156,7 +156,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem rm.setData(false); rm.done(); } - }; + } }); } else { rm.setData(false); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java index d5bf4b79c55..2fb085dcb5b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java @@ -93,7 +93,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem rm.done(); } }); - }; + } }); } else { rm.done(); @@ -151,9 +151,9 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem protected void handleSuccess() { // Can do visualization if we are tracing. rm.done(!getData()); - }; + } }); - }; + } }); } else { rm.done(false); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java index 89f5dee0334..f52ade7deb0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java @@ -77,7 +77,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta @Override protected void handleCompleted() { traceControl.startTracing(dmc, rm); - }; + } }); } else { traceControl.startTracing(dmc, rm); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java index bfd23622594..1f71a6c8c29 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java @@ -94,7 +94,7 @@ public class GdbMemoryBlockAddressInfoRetrieval implements IMemoryBlockAddressIn @Override protected void handleCompleted() { request.done(); - }; + } }; for (final IGdbMemoryAddressInfoTypeRetrieval infoProvider : infoTypeProviders) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java index 622a992a63e..36040994a26 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java @@ -664,7 +664,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded return fDirection * (v1.compareTo(v2)); } } - }; + } @Override public void setFocus() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java index 1c7e36d23a1..9b2fb9821fc 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java @@ -144,7 +144,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements validate(); updateDialogButtons(); } - }; + } abstract class AbstractEditingSupport extends EditingSupport { @@ -189,7 +189,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements abstract Object doGetValue(CommandTimeoutEntry entry); abstract ICellEditorValidator getValidator(); - }; + } private TableViewer fViewer; private Button fAddButton; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java index fc55c146643..b6d3b87aeef 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java @@ -263,7 +263,7 @@ public class TraceControlModel { rm.setData(null); } rm.done(); - }; + } }); } else { @@ -314,7 +314,7 @@ public class TraceControlModel { rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Backend error", e)); //$NON-NLS-1$ rm.done(); - }; + } }); } else { FailedTraceVariableCreationException e = new FailedTraceVariableCreationException( @@ -374,7 +374,7 @@ public class TraceControlModel { new Hashtable<String, String>()); } }); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java index 31b2871d205..066d63777a9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java @@ -208,7 +208,7 @@ public class GdbVariableVMNode extends VariableVMNode { } return super.getAdapter(adapter); } - }; + } private static boolean isConvenienceVariable(String expr) { // GDB convenience variables are variables that start with a $ followed diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java index f1f0849d98d..f3ad964a3a0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java @@ -166,7 +166,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING CONTAINER - GREEN PIN */ new LabelImage( @@ -186,7 +186,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING CONTAINER - BLUE PIN */ new LabelImage( @@ -206,7 +206,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING CONTAINER - NO PIN */ new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)) { @@ -217,7 +217,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED)); - }; + } }, /* SUSPENDED CONTAINER - RED PIN */ @@ -234,7 +234,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED CONTAINER - GREEN PIN */ new LabelImage( @@ -250,7 +250,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED CONTAINER - BLUE PIN */ new LabelImage( @@ -266,7 +266,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED CONTAINER - NO PIN */ new LabelImage(DebugUITools diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java index cf58fccda4b..fa9ad60d29e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java @@ -143,7 +143,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING THREAD - GREEN PIN */ new LabelImage( @@ -163,7 +163,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING THREAD - BLUE PIN */ new LabelImage( @@ -183,7 +183,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING THREAD - NO PIN */ new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) { @@ -196,7 +196,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP // prop has been seen to be null during session shutdown [313823] Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED); return (prop != null) ? !prop.booleanValue() : false; - }; + } }, /* SUSPENDED THREAD - RED PIN */ new LabelImage( @@ -212,7 +212,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED THREAD - GREEN PIN */ new LabelImage( @@ -228,7 +228,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED THREAD - BLUE PIN */ new LabelImage( @@ -244,7 +244,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED THREAD - NO PIN */ new LabelImage( diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java index ed8aeed455e..f7fa35c3a9c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java @@ -95,7 +95,7 @@ public class GdbMemoryAddressInfoRegistersRetrieval implements IGdbMemoryAddress } }); - }; + } }); } else { // no valid registers diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java index 474c8f34977..64370c349e8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java @@ -463,7 +463,7 @@ public class FinalLaunchSequence extends ReflectionSequence { // fCommandControl.queueCommand( // new MIGDBSetSysroot(fCommandControl.getContext()), // new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor)); - }; + } }); } else { requestMonitor.done(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java index 4f0aa852c3a..8523e08b046 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java @@ -314,7 +314,7 @@ public class DebugNewProcessSequence extends ReflectionSequence { return Status.OK_STATUS; } - }; + } /** * If we are dealing with a postmortem session, connect to the core/trace file. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java index 77a3d2ec311..9577e2ad277 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java @@ -325,18 +325,18 @@ public class GDBBackend extends AbstractDsfService implements IGDBBackend, IMIBa @Override public OutputStream getMIOutputStream() { return fProcess.getOutputStream(); - }; + } @Override public InputStream getMIInputStream() { return fProcess.getInputStream(); - }; + } /** @since 4.1 */ @Override public InputStream getMIErrorStream() { return fProcess.getErrorStream(); - }; + } @Override public String getId() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java index 3f783563bd9..a1255e2d357 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java @@ -94,7 +94,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIOutputStream(); } return fMIPty.getOutputStream(); - }; + } @Override public InputStream getMIInputStream() { @@ -102,7 +102,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIInputStream(); } return fMIPty.getInputStream(); - }; + } @Override public InputStream getMIErrorStream() { @@ -110,7 +110,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIErrorStream(); } return fDummyErrorStream; - }; + } @Override protected String[] getDebuggerCommandLine() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java index c3006c344a7..f3111b18f8f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java @@ -54,7 +54,7 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 { private enum TracepointMode { FAST_THEN_NORMAL, FAST_ONLY, NORMAL_ONLY - }; + } private TracepointMode fTracepointMode = TracepointMode.NORMAL_ONLY; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 283436182db..0783c3d8732 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -128,7 +128,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements @Override public IDMContext[] getParents() { return fExprDelegate.getParents(); - }; + } @Override public <T> T getAdapter(Class<T> adapterType) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java index c277dadd323..50b1470ecc4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java @@ -1488,7 +1488,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse } rm.done(containerDmcs.toArray(new IMIContainerDMContext[containerDmcs.size()])); - }; + } }; fContainerCommandCache.execute(fCommandFactory.createMIListThreadGroups(controlDmc), @@ -1776,9 +1776,9 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse setData(getData()); super.handleCompleted(); - }; + } }); - }; + } }; IRunControl runControl = getServicesTracker().getService(IRunControl.class); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java index 9269d384465..7abc6db0a06 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java @@ -618,7 +618,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat // Detach failed getDetachedProcesses().remove(containerDmc.getGroupId()); super.handleFailure(); - }; + } }); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java index 592b80bb3f4..7bae81e398d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java @@ -1263,7 +1263,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService this.steps = steps; this.rm = rm; } - }; + } // The set of threads that we will actually be suspended to make the containers suspended. private Set<IMIExecutionDMContext> fExecutionDmcToSuspendSet = new HashSet<>(); @@ -1526,7 +1526,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService } }); } - }; + } /** * Suspended all the threads we have selected. @@ -1558,7 +1558,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService // We weren't able to suspend, so abort the operation fDisableNextSignalEventDmcSet.remove(thread); super.handleFailure(); - }; + } }); } } @@ -1568,7 +1568,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService Sequence.Step restoreStep = new RestoreTargetStateStep(); restoreStep.execute(rm); } - }; + } /** * This step of the sequence takes care of executing all the steps that @@ -1611,7 +1611,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService executeSteps(fOperationsPending.poll()); } } - }; + } /** * If the sequence had to interrupt the execution context of interest, @@ -1666,7 +1666,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService }); } } - }; + } /* ****************************************************************************** * End of section to support operations even when the target is unavailable. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java index ad757f61ff2..7aae7bb2c6f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java @@ -158,7 +158,7 @@ public interface IGDBTraceControl extends IDsfService { public static enum STOP_REASON_ENUM { REQUEST, PASSCOUNT, OVERFLOW, DISCONNECTION, ERROR, UNKNOWN - }; + } public interface ITraceStatusDMData extends IDMData { boolean isTracingSupported(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java index e44f338ff8c..fe87d246369 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java @@ -39,7 +39,7 @@ public interface IReverseRunControl { * @return the new state of reverse mode. */ boolean isReverseModeEnabled(); - }; + } /** * Establish if a reverse-resume operation is allowed on the specified context. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java index d8918a0e575..1cd49b35ac5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java @@ -50,7 +50,7 @@ public class StartOrRestartProcessSequence_7_12 extends StartOrRestartProcessSeq fReverseService = tracker.getService(GDBRunControl_7_12.class); tracker.dispose(); rm.done(); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java index ca54d11a493..0424ae5ad77 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java @@ -805,7 +805,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { protected void handleErrorOrWarning() { GdbPlugin.getDefault().getLog().log(getStatus()); super.handleErrorOrWarning(); - }; + } }); IStatus status = new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, IGdbDebugConstants.STATUS_HANDLER_CODE, @@ -916,7 +916,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { protected void handleErrorOrWarning() { GdbPlugin.getDefault().getLog().log(getStatus()); super.handleErrorOrWarning(); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java index b13e31dd6fe..d305eec564e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java @@ -38,7 +38,7 @@ public interface IGDBControl extends IMICommandControl { */ default Process getGDBBackendProcess() { return getCLIProcess(); - }; + } /** * @deprecated The return value of this method was too diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java index 69fb2dd21ef..71230919bc0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java @@ -28,7 +28,7 @@ public interface IMIBackend extends IDsfService { public enum State { NOT_INITIALIZED, STARTED, TERMINATED - }; + } /** * Event indicating that the back end process has started or terminated. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java index d63f4a741a5..dee021c89f9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java @@ -52,7 +52,7 @@ public interface IMIRunControl extends IRunControl2 { * @since 4.0 */ public interface IRunMode { - }; + } /** * The run-modes supported by GDB. @@ -61,7 +61,7 @@ public interface IMIRunControl extends IRunControl2 { */ public enum MIRunMode implements IRunMode { ALL_STOP, NON_STOP - }; + } /** * Returns the RunMode that is currently being used by this RunControl service. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java index 76c884b68cf..bbd1dd8cdc9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java @@ -55,7 +55,7 @@ public class MIBreakpointDMData implements IBreakpointDMData { TRACEPOINT, /** @since 4.4 */ DYNAMICPRINTF - }; + } /////////////////////////////////////////////////////////////////////////// // Constructors diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java index e66a5adb7ae..7ba106e31a4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java @@ -464,7 +464,7 @@ public class MIBreakpointsManager extends AbstractDsfService ((IMIBreakpointsTrackingListener) o).breakpointTrackingStarted(dmc); } rm.done(); - }; + } }); } }); @@ -1092,7 +1092,7 @@ public class MIBreakpointsManager extends AbstractDsfService rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, INVALID_PARAMETER, getStatus().getException())); rm.done(); - }; + } }); } }; @@ -1158,7 +1158,7 @@ public class MIBreakpointsManager extends AbstractDsfService protected void handleSuccess() { addBreakpointProblemMarker(breakpoint, errorMessage, IMarker.SEVERITY_WARNING); updateRM.setDoneCount(0); - }; + } }); } }; @@ -1619,7 +1619,7 @@ public class MIBreakpointsManager extends AbstractDsfService fBreakpointActionManager.executeActions(breakpoint, new BreakpointActionAdapter(getExecutor(), getServicesTracker(), context)); return Status.OK_STATUS; - }; + } }.schedule(); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java index 53a2b470ce9..b87ceda8e07 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java @@ -532,7 +532,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService } else { targetBreakpointModified(bpTargetDMC, plBpt, miBpt); } - }; + } /** * Some operations that are passed to platform require a number or delays before diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java index 9b2ebc116e8..402f340b09e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java @@ -276,7 +276,7 @@ public class MIModules extends AbstractDsfService implements IModules2, ICaching getProperties()); } rm.done(); - }; + } }); } }); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java index b76cb26d717..cb778923114 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java @@ -1049,7 +1049,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I this.steps = steps; this.rm = rm; } - }; + } // Keep track of if the target was available or not when we started the operation private boolean fTargetAvailable; @@ -1323,7 +1323,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I } }); } - }; + } /** * If the execution context of interest is not suspended, this step @@ -1351,7 +1351,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I // We weren't able to suspend, so abort the operation fDisableNextSignalEvent = false; super.handleFailure(); - }; + } }); } else { rm.done(); @@ -1363,7 +1363,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I Sequence.Step restoreStep = new RestoreTargetStateStep(); restoreStep.execute(rm); } - }; + } /** * This step of the sequence takes care of executing all the steps that @@ -1406,7 +1406,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I executeSteps(fOperationsPending.poll()); } } - }; + } /** * If the sequence had to interrupt the execution context of interest, @@ -1459,7 +1459,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I rm.done(); } } - }; + } /* ****************************************************************************** * End of section to support operations even when the target is unavailable. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java index e57157c0d8b..ae8580abde3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java @@ -304,7 +304,6 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi } else { clear(); } - ; } public FramesCacheInfo getThreadFramesCache(String threadId) { @@ -1120,7 +1119,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi // for more. There is chance that gdb will actually return correct frames later // and one frame is not enough in many case to debug anything rm.done(fFramesCache.getThreadFramesCache(threadId).getValidStackDepth()); - }; + } }); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java index 2f481d962cc..8b4e90f51e0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java @@ -500,14 +500,14 @@ public class MIVariableManager implements ICommandControl { */ public MIDisplayHint getDisplayHint() { return fDisplayHint; - }; + } /** * @since 4.3 */ public void setDisplayHint(MIDisplayHint displayHint) { this.fDisplayHint = displayHint; - }; + } /** * @since 4.0 @@ -2392,7 +2392,7 @@ public class MIVariableManager implements ICommandControl { } pendingRm.done(); } - }; + } }); } } else { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java index e0e424bd5aa..cc301e944f2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java @@ -39,7 +39,7 @@ public class MIReverseDebugEnabler implements IReverseDebugEnabler { private static enum REVERSE_DEBUG_MODE { ENABLE, DISABLE, TOGGLE - }; + } /** * @param executor diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java index 6d997302e2c..f54726a6193 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java @@ -100,7 +100,7 @@ public abstract class AbstractCLIProcess extends Process implements IEventListen // prompt but it isn't. So we do it ourselves. private enum PromptType { IN_PRIMARY_PROMPT, IN_SECONDARY_PROMPT, IN_SECONDARY_PROMPT_MISSING - }; + } private PromptType fPrompt = PromptType.IN_PRIMARY_PROMPT; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java index 0dde5725cfa..12389844802 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java @@ -33,7 +33,7 @@ public class CLIInfoBreak extends CLICommand<CLIInfoBreakInfo> { public CLIInfoBreak(IDMContext ctx) { super(ctx, INFO_BREAK); - }; + } public CLIInfoBreak(IDMContext ctx, int bpReference) { super(ctx, INFO_BREAK + Integer.toString(bpReference)); diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java index 06ef21dfedb..6d389bac9be 100644 --- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java @@ -76,7 +76,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING THREAD - GREEN PIN */ new LabelImage( @@ -96,7 +96,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING THREAD - BLUE PIN */ new LabelImage( @@ -116,7 +116,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING THREAD - NO PIN */ new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) { @@ -129,7 +129,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { // prop has been seen to be null during session shutdown [313823] Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED); return (prop != null) ? !prop.booleanValue() : false; - }; + } }, /* SUSPENDED THREAD - RED PIN */ new LabelImage( @@ -145,7 +145,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED THREAD - GREEN PIN */ new LabelImage( @@ -161,7 +161,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED THREAD - BLUE PIN */ new LabelImage( @@ -177,7 +177,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED THREAD - NO PIN */ new LabelImage( diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java index e4bdc6edcdd..bb467e61562 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java @@ -203,7 +203,7 @@ public class BaseTestCase { * @param launch The launch in which we can find the gdb version */ protected void validateGdbVersion(GdbLaunch launch) throws Exception { - }; + } /** * We listen for the target to stop at the main breakpoint. This listener is diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java index 74042b75e41..ea1c4fa5415 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java @@ -821,7 +821,7 @@ public class SyncUtil { @Override protected void handleSuccess() { rm.done(localsDMData.toArray(new IVariableDMData[localsDMData.size()])); - }; + } }; for (IVariableDMContext varDmc : varDmcs) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java index 3d359d35006..f6ae6ff2003 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java @@ -148,7 +148,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase @Override protected void handleSuccess() { rm.done(getData().getFormattedValue()); - }; + } }); return; } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java index c1439818630..ab964d53f29 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java @@ -55,7 +55,7 @@ public class ITestConstants { System.arraycopy(ALL_SUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, 0, ALL_SUPPORTED_VERSIONS.length); System.arraycopy(ALL_UNSUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, ALL_SUPPORTED_VERSIONS.length, ALL_UNSUPPORTED_VERSIONS.length); - }; + } // Attribute that allows a test to request not to start gdbserver even if the session is a remote one public static final String LAUNCH_GDB_SERVER = TestsPlugin.PLUGIN_ID + ".launchGdbServer"; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java index acf45f16b1d..7180a63026a 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java @@ -606,7 +606,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000)); IProcess[] launchProcesses = getGDBLaunch().getProcesses(); - ; + for (IProcess proc : launchProcesses) { if (proc instanceof InferiorRuntimeProcess) { assertThat(proc.getAttribute(IGdbDebugConstants.INFERIOR_EXITED_ATTR), is(notNullValue())); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java index 50cb3ae547e..7c7671a07e0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java @@ -487,7 +487,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { @Override protected void handleCompleted() { rm.done(); - }; + } }; int index; @@ -554,7 +554,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { @Override protected void handleCompleted() { rm.done(); - }; + } }; int index; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java index 961cfa508d0..dce2138b3d1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java @@ -106,7 +106,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { private abstract class AsyncRunnable<V> { public abstract void run(DataRequestMonitor<V> drm); - }; + } private <V> V runAsyncCall(final AsyncRunnable<V> runnable) throws Exception { return runAsyncCall(runnable, false); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java index bf0386689bc..ed1db18251c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java @@ -535,7 +535,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { } catch (CoreException e) { failed(e); } - }; + } }); } }); @@ -749,11 +749,11 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { } catch (CoreException e) { failed(e); } - }; + } }); } }); - }; + } }); } @@ -929,7 +929,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { notifyUser(getStatus().getMessage()); } - }; + } }); } } @@ -950,7 +950,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { notifyUser(getStatus().getMessage()); } - }; + } }); } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java index 9f51bf47198..e7e4ef071ae 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java @@ -386,7 +386,7 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper } detailComputed(null, finalResult.toString()); - }; + } }) }); } }) }); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java index d26bfa0554d..960f6453b18 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java @@ -261,7 +261,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger { rm.setData(Boolean.FALSE); } rm.done(); - }; + } }; int count = 0; for (final IContainerDMContext containerCtx : getData()) { @@ -273,7 +273,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger { rm.setData(Boolean.TRUE); } crm.done(); - }; + } }); count++; } @@ -340,7 +340,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger { rm.setData(Boolean.FALSE); } rm.done(); - }; + } }; int count = 0; for (IExecutionDMContext execCtx : getData()) { @@ -353,7 +353,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger { rm.setData(Boolean.TRUE); } crm.done(); - }; + } }); count++; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java index 8fa41bd7832..016b6c9b950 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java @@ -918,7 +918,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl @Override public void run() { fController.doneStepping(dmc, DsfSourceDisplayAdapter.this); - }; + } }); } catch (RejectedExecutionException e) { // Session is shutdown diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java index 4b41f1155c3..10a4b7eb6ed 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java @@ -60,7 +60,7 @@ public class AbstractDebugVMAdapter extends AbstractDMVMAdapter implements IStep @Override public void run() { fController.doneStepping(suspendedEvent.getDMContext(), AbstractDebugVMAdapter.this); - }; + } }); } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/ErrorLabelText.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/ErrorLabelText.java index d2b2170d0b8..88999e74be6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/ErrorLabelText.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/ErrorLabelText.java @@ -70,5 +70,5 @@ public class ErrorLabelText extends LabelText { return !status.isOK(); } return super.checkProperty(propertyName, status, properties); - }; + } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java index c9cd14274d2..6caaed1dc79 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java @@ -163,7 +163,7 @@ public class BreakpointVMProvider extends AbstractVMProvider { } }); } - }; + } private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>(); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointsChangedEvent.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointsChangedEvent.java index c68618fc7a4..8629c97d090 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointsChangedEvent.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointsChangedEvent.java @@ -21,7 +21,7 @@ import org.eclipse.debug.core.model.IBreakpoint; public class BreakpointsChangedEvent { public enum Type { ADDED, REMOVED, CHANGED - }; + } private final Type fType; private final IBreakpoint[] fBreakpoints; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java index 3080c3a15bc..d1b5914dc79 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java @@ -112,7 +112,7 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { return Boolean.TRUE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED)); - }; + } }, new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)), })); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java index d512be5d092..ed1ef7b3afb 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java @@ -116,7 +116,7 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED)); - }; + } }, new LabelImage( DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED)), })); return provider; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java index adc5fa78f80..cfce1eb28d3 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java @@ -216,7 +216,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy { rm.setData(getData() .getStateChangeReason() == IRunControl.StateChangeReason.CONTAINER); rm.done(); - }; + } }); } else { // If container is not suspended it's running, then do not override the selection. diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java index 096c68ce6a9..d21b30f05b7 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java @@ -169,7 +169,7 @@ public class StackFramesVMNode extends AbstractDMVMNode String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); return line != null && line >= 0 && file != null && !file.isEmpty() && function != null && function.contains(")"); //$NON-NLS-1$ - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__add_parens__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION, ILaunchVMConstants.PROP_FRAME_FILE, ILaunchVMConstants.PROP_FRAME_LINE, @@ -181,7 +181,7 @@ public class StackFramesVMNode extends AbstractDMVMNode String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); return line != null && line >= 0 && file != null && !file.isEmpty() && (function == null || !function.contains(")")); //$NON-NLS-1$ - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION, ILaunchVMConstants.PROP_FRAME_MODULE }) { @@ -191,7 +191,7 @@ public class StackFramesVMNode extends AbstractDMVMNode String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE); return function != null && !function.isEmpty() && function.contains(")") && //$NON-NLS-1$ module != null && !module.isEmpty(); - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__add_parens__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION, ILaunchVMConstants.PROP_FRAME_MODULE }) { @@ -201,14 +201,14 @@ public class StackFramesVMNode extends AbstractDMVMNode String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE); return function != null && !function.isEmpty() && !function.contains(")") && //$NON-NLS-1$ module != null && !module.isEmpty(); - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_function__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_MODULE }) { @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE); return module != null && !module.isEmpty(); - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION }) { @@ -216,7 +216,7 @@ public class StackFramesVMNode extends AbstractDMVMNode public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); return function != null && !function.isEmpty() && function.contains(")"); //$NON-NLS-1$ - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__add_parens__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION }) { @@ -224,7 +224,7 @@ public class StackFramesVMNode extends AbstractDMVMNode public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); return function != null && !function.isEmpty() && !function.contains(")"); //$NON-NLS-1$ - }; + } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__Address_only__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS }), new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME_RUNNING)) { @@ -235,7 +235,7 @@ public class StackFramesVMNode extends AbstractDMVMNode @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED)); - }; + } }, new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME)) })); return provider; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java index 6addf86c22e..272ee99587c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java @@ -104,7 +104,7 @@ public class ModulesVMNode extends AbstractDMVMNode implements IElementLabelProv return Boolean.TRUE.equals(properties.get(propertyName)); } return super.checkProperty(propertyName, status, properties); - }; + } }, new DsfUILabelImage(IDsfDebugUIConstants.IMG_OBJS_SHARED_LIBRARY_SYMBOLS_UNLOADED), new StaleDataLabelBackground(), new LabelFont(JFaceResources .getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0]) })); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java index d146a85daf5..b3dbfc60a88 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java @@ -546,7 +546,7 @@ public class FormattedValueRetriever { // Note: we must not call the update's done method, instead call counting RM done. countingRm.done(); - }; + } }); count++; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java index 1f73d0b61d6..d08ae709890 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java @@ -425,7 +425,7 @@ public class FormattedValueVMUtil { countingRm.done(); // Note: we must not call the update's done method - }; + } }); count++; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java index d821dc95729..72abad6d9b1 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java @@ -62,7 +62,7 @@ public class NumberFormatsPropertyTester extends PropertyTester { AVAILABLE_FORMATS.add(IFormattedValues.OCTAL_FORMAT); AVAILABLE_FORMATS.add(IFormattedValues.BINARY_FORMAT); AVAILABLE_FORMATS.add(IFormattedValues.STRING_FORMAT); - }; + } @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java index 426cc1ffd71..3a4056096b8 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java @@ -485,7 +485,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode for (int i = 0; i < updates.length; i++) { updates[i].done(); } - }; + } }; int count = 0; @@ -543,7 +543,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode for (final IPropertiesUpdate update : updates) { update.done(); } - }; + } }; int count = 0; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java index cfc91588032..143f56b8b48 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java @@ -459,7 +459,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode for (int i = 0; i < updates.length; i++) { updates[i].done(); } - }; + } }; int count = 0; @@ -522,7 +522,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode for (final IPropertiesUpdate update : updates) { update.done(); } - }; + } }; int count = 0; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java index f7d3c1b0221..4c324bab7df 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java @@ -398,7 +398,7 @@ public class VariableVMNode extends AbstractExpressionVMNode + FormattedValueVMUtil.getPropertyForFormatId(IFormattedValues.STRING_FORMAT)); return Boolean.TRUE.equals(stringChanged) || (Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged)); - }; + } }; columnNoColumnsBackground = new LabelBackground( @@ -511,7 +511,7 @@ public class VariableVMNode extends AbstractExpressionVMNode public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { Boolean changed = (Boolean) properties.get(PROP_VARIABLE_ADDRESS_CHANGED); return Boolean.TRUE.equals(changed); - }; + } }, new StaleDataLabelForeground(), new VariableLabelFont(), })); // Description column is shown in the expression view, but is not supported for variables. @@ -615,7 +615,7 @@ public class VariableVMNode extends AbstractExpressionVMNode Boolean activeChanged = (Boolean) properties .get(IDebugVMConstants.PROP_IS_ACTIVE_FORMATTED_VALUE_CHANGED); return Boolean.TRUE.equals(stringChanged) || Boolean.TRUE.equals(activeChanged); - }; + } }, columnNoColumnsBackground, new StaleDataLabelBackground(), new VariableLabelFont(), })); return provider; @@ -654,7 +654,7 @@ public class VariableVMNode extends AbstractExpressionVMNode for (int i = 0; i < updates.length; i++) { updates[i].done(); } - }; + } }; int count = 0; @@ -712,7 +712,7 @@ public class VariableVMNode extends AbstractExpressionVMNode for (final IPropertiesUpdate update : updates) { update.done(); } - }; + } }; int count = 0; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java index fe6ec9decb3..58d4fd9f28f 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java @@ -451,7 +451,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene } } fNodesListCache = list.toArray(new IVMNode[list.size()]); - ; + return fNodesListCache; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesUpdateStatus.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesUpdateStatus.java index 26df13d87f0..6bc33fb7973 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesUpdateStatus.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesUpdateStatus.java @@ -216,7 +216,7 @@ public class PropertiesUpdateStatus extends DsfMultiStatus { return false; } return s1.getMessage().equals(s2.getMessage()); - }; + } /** * Convenience method that returns and optionally creates a properties diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java index a8cc47eddaa..0d2eb1f4bdf 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java @@ -48,7 +48,7 @@ public abstract class AbstractCache<V> implements ICache<V> { } }); } - }; + } private RequestCanceledListener fRequestCanceledListener = new RequestCanceledListener(); diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/CountingRequestMonitor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/CountingRequestMonitor.java index b4bee553e6f..22766dc7aa5 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/CountingRequestMonitor.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/CountingRequestMonitor.java @@ -121,5 +121,5 @@ public class CountingRequestMonitor extends RequestMonitor { if ((getStatus() instanceof MultiStatus)) { ((MultiStatus) getStatus()).add(status); } - }; + } } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java index 871c5a2daf8..de95e4e856a 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java @@ -84,7 +84,7 @@ abstract public class Query<V> extends DsfRunnable implements Future<V> { fExecuted = true; return true; } - }; + } private final QueryRm fRm = new QueryRm(); diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ReflectionSequence.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ReflectionSequence.java index a1a8321fbcf..bf811054ca8 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ReflectionSequence.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ReflectionSequence.java @@ -150,7 +150,7 @@ abstract public class ReflectionSequence extends Sequence { assert executeMethod != null; fExecuteMethod = executeMethod; - ; + fRollbackMethod = rollbackMethod; } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java index 1a5fea490e5..3755a20cdfe 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java @@ -67,7 +67,7 @@ public abstract class RequestCache<V> extends AbstractCache<V> { @Override public boolean isCanceled() { return super.isCanceled() || RequestCache.this.isCanceled(); - }; + } }; retrieve(fRm); } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java index ffff271a449..255001912e6 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java @@ -441,12 +441,12 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> { protected void handleCancel() { Sequence.this.cancel(false); cancelExecution(); - }; + } @Override protected void handleErrorOrWarning() { abortExecution(getStatus(), true); - }; + } @Override protected void handleRejectedExecutionException() { diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java index 380e167384d..0516ceaa24e 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java @@ -369,7 +369,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi protected IStatus run(IProgressMonitor monitor) { fAttributeTranslator.updateBreakpointStatus(bp); return Status.OK_STATUS; - }; + } }.schedule(); countingRm.done(); @@ -424,7 +424,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi protected IStatus run(IProgressMonitor monitor) { fAttributeTranslator.updateBreakpointStatus(breakpoint); return Status.OK_STATUS; - }; + } }.schedule(); rm.done(); } @@ -503,7 +503,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi protected IStatus run(IProgressMonitor monitor) { fAttributeTranslator.updateBreakpointStatus(breakpoint); return Status.OK_STATUS; - }; + } }.schedule(); rm.done(); @@ -616,7 +616,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi protected IStatus run(IProgressMonitor monitor) { fAttributeTranslator.updateBreakpointStatus(breakpoint); return Status.OK_STATUS; - }; + } }.schedule(); super.handleCompleted(); @@ -854,7 +854,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi protected IStatus run(IProgressMonitor monitor) { breakpointChanged(breakpoint, delta); return Status.OK_STATUS; - }; + } }.schedule(); } } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java index dac53b96c55..acc7b20781a 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java @@ -82,7 +82,7 @@ import org.osgi.framework.BundleContext; public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpointsListener { public enum BreakpointEventType { ADDED, REMOVED, MODIFIED - }; + } /** * The attribute translator that this service will use to map the platform @@ -802,7 +802,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo targetBPs.put(dmc, getData().toArray(new ITargetBreakpointInfo[getData().size()])); super.handleSuccess(); - }; + } }); } }); @@ -1099,7 +1099,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo protected void handleSuccess() { targetBPs.put(dmc, getData().toArray(new ITargetBreakpointInfo[getData().size()])); super.handleSuccess(); - }; + } }); bpTargetsCoutingRMCount++; } else { @@ -1177,7 +1177,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo protected IStatus run(IProgressMonitor monitor) { fAttributeTranslator2.updateBreakpointsStatus(eventBPs, eventType); return Status.OK_STATUS; - }; + } }.schedule(); } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java index b8f08701dfb..9c414938cec 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java @@ -55,7 +55,7 @@ public interface IRunControl extends IDsfService { /** @since 2.1 */ EVENT_BREAKPOINT - }; + } /** * Indicates that the given thread has suspended. @@ -170,7 +170,7 @@ public interface IRunControl extends IDsfService { * @since 2.0 */ INSTRUCTION_STEP_RETURN - }; + } boolean isStepping(IExecutionDMContext context); diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java index ae990f81aac..9e92008b154 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java @@ -26,6 +26,6 @@ public interface ISignals extends IDsfService { * Marker interface for a context for which signals can be set. */ public interface ISignalsDMContext extends IDMContext { - }; + } } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java index b400275a6a8..c54fdaa783a 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java @@ -422,7 +422,7 @@ public class CommandCache implements ICommandListener { // protect against the cache being called in non-session thread, but at // the same time avoid adding extra dispatch cycles to command processing. if (fSession.getExecutor().isInExecutorThread()) { - ; + super.done(); } else { fSession.getExecutor().execute(new DsfRunnable() { diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java index c80ab6603ac..fe4b7aa298b 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java @@ -43,13 +43,13 @@ public interface ICommandControlService extends ICommandControl, IDsfService { * Event indicating that the back end process has started. */ public interface ICommandControlInitializedDMEvent extends IDMEvent<ICommandControlDMContext> { - }; + } /** * Event indicating that the back end process has terminated. */ public interface ICommandControlShutdownDMEvent extends IDMEvent<ICommandControlDMContext> { - }; + } /** * Returns the identifier of this command control service. It can be used diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java index be1dc5c3735..46c5f7ed020 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java @@ -428,7 +428,7 @@ public class PDARegisters extends AbstractDsfService implements IRegisters, IEve } rm.setData(groups); rm.done(); - }; + } }); } @@ -457,7 +457,7 @@ public class PDARegisters extends AbstractDsfService implements IRegisters, IEve } rm.setData(groups); rm.done(); - }; + } }); } diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAEventStopCommand.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAEventStopCommand.java index b3b8e72edcd..082c0f1a94d 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAEventStopCommand.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAEventStopCommand.java @@ -33,7 +33,7 @@ public class PDAEventStopCommand extends AbstractPDACommand<PDACommandResult> { public enum Event { UNIMPINSTR, NOSUCHLABEL - }; + } public PDAEventStopCommand(PDAVirtualMachineDMContext context, Event event, boolean enable) { super(context, diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAWatchCommand.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAWatchCommand.java index c25a48476e0..9732f976344 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAWatchCommand.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDAWatchCommand.java @@ -32,7 +32,7 @@ public class PDAWatchCommand extends AbstractPDACommand<PDACommandResult> { public enum WatchOperation { READ, WRITE, BOTH, NONE - }; + } private static int getWatchOperationCode(WatchOperation operation) { switch (operation) { diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java index 09263a25193..75d88e6cd2b 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java @@ -556,7 +556,7 @@ public class CacheTests { @Override protected synchronized void canceled() { canceledCalled[0] = true; - }; + } }; // Request data from cache @@ -657,13 +657,13 @@ public class CacheTests { @Override public synchronized void done() { // Avoid clearing cancel listeners list - }; + } @Override protected void handleSuccess() { rm.setData(fTestCache.getData()); rm.done(); - }; + } }; fTestCache.update(rmBad[0]); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java index 5070560cbff..3d33a47f479 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java @@ -331,7 +331,7 @@ public class RangeCacheTests { @Override public void run() { fTestCache.reset(); - }; + } }).get(); getRange(0, 100, new long[] { 0 }, new int[] { 100 }); @@ -359,7 +359,7 @@ public class RangeCacheTests { @Override public void run() { fTestCache.reset(); - }; + } }).get(); // Retrieve a range in-between two cached ranges @@ -398,7 +398,7 @@ public class RangeCacheTests { @Override public void run() { fTestCache.reset(); - }; + } }).get(); // Set the data without using an executor. @@ -424,7 +424,7 @@ public class RangeCacheTests { public void run() { fTestCache.set(0, 100, null, new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Cache invalid", null)); - }; + } }).get(); // Retrieve a range cache and check that it immediately contains the error status in it. diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java index a9cc7b24b62..d81e063e4cc 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java @@ -83,7 +83,7 @@ public class RmPerformanceTests extends TestCase { @Override protected void handleCompleted() { // do not call parent so it can be reused - }; + } }; rm.done(); } diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java index 638a3b303dd..0e9ce935a0b 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java @@ -62,7 +62,6 @@ public class CommandControlTestsBase { fCommandControl.initialize(rm); } } - ; fExecutor = new DefaultDsfExecutor(); fSession = DsfSession.startSession(fExecutor, "PDA Test"); @@ -104,7 +103,6 @@ public class CommandControlTestsBase { fCommandControl.shutdown(rm); } } - ; if (fExecutor != null) { ShutdownCommandServiceQuery shutdownQuery = new ShutdownCommandServiceQuery(); @@ -118,7 +116,6 @@ public class CommandControlTestsBase { fPDABackend.shutdown(rm); } } - ; if (fExecutor != null) { ShutdownBackendServiceQuery shutdownQuery = new ShutdownBackendServiceQuery(); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java index bfd0bf1549f..8621a32fb53 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java @@ -38,7 +38,6 @@ public class Launching { fBackendService.initialize(rm); } } - ; fBackendService = new PDABackend(session, launch, pdaProgram); InitializeBackendServiceQuery initQuery = new InitializeBackendServiceQuery(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java index 26be3410d2c..23a1a5576ba 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java @@ -616,7 +616,7 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega if (location != null) { String expandedLocation = VariablesPlugin.getDefault().getStringVariableManager() .performStringSubstitution(location); - ; + if (!expandedLocation.isEmpty()) { return new Path(expandedLocation); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java index 879a05e77fd..e822a7bea3c 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java @@ -68,7 +68,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat public static class LaunchElement { public static enum EPostLaunchAction { NONE, WAIT_FOR_TERMINATION, DELAY - }; + } /** * Allows us decouple the enum identifier in the code from its textual representation in the GUI diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java index b77ed8e2dc7..4daf3f87b9c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java @@ -23,7 +23,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -89,7 +89,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 0, 0, -182, 0, -205, 0, -193, 0, 0, -206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -103,7 +103,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 87, 11, 102, 24, 24, 21, 21, 40, 40, 70, 70, 1, 1, 2, 2, 2, 2, 3, 3, @@ -187,7 +187,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 214, 260, 1769, 486, 1663, 296, 1454, 260, 298, 1769, 952, 182, 1454, 1769, 261, 1769, 1472, 235, 193, 206, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1221, 1686, 1430, 1769, 1769, 1322, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1711, 1769, 0, 20, 180, 0, 1, 1996, 0, 1, 2007, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -201,7 +201,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 9, 10, 11, 0, 0, 14, 15, 16, 17, 18, 19, @@ -233,7 +233,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 0, 0, 0, 0, 0, 29, 29, 0, 0, 60, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -286,7 +286,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 625, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 547, 1769, 1769, 1078 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -305,7 +305,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 68, 7, 298, 332, 331, 231, 303, 199, 131, 251, 292, 292, 294, 282, 222, 429, 68, 68, 199, 339, 301, 225, 251, 278, 285, 251, 292, 294, 387, 294, 278, 111, 390, 328, 9, 281, 429, 222, 303, 251, 287, 294, 278, 9, 328, 26, 115, 68, 328, 9, 222, 199, 198, 278, 107, 9, 106, 22, 231, 278, 68, 329, 287, 9, 22 }; - }; + } public final static char asb[] = Asb.asb; @@ -331,7 +331,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 37, 17, 45, 28, 46, 38, 39, 8, 40, 41, 42, 1, 3, 49, 0, 5, 30, 16, 18, 19, 20, 21, 1, 3, 2, 14, 15, 11, 4, 9, 10, 22, 23, 0, 5, 29, 43, 60, 0, 16, 18, 19, 20, 21, 2, 14, 15, 11, 4, 9, 10, 22, 23, 1, 3, 44, 45, 46, 39, 31, 36, 34, 35, 33, 32, 37, 38, 40, 41, 42, 28, 25, 17, 24, 27, 26, 6, 7, 8, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -350,7 +350,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 52, 47, 47, 49, 103, 60, 42, 113, 57, 7, 62, 11, 57, 99, 15, 15, 60, 101, 59, 72, 57, 21, 83, 90, 7, 62, 42, 42, 21, 27, 42, 7, 30, 81, 99, 25, 120, 113, 55, 62, 21, 30, 7, 23, 29, 15, 7, 30, 25, 60, 60, 21, 84, 30, 42, 55, 49, 21, 15, 42, 55, 30, 74 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -365,7 +365,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 27, 51, 0, 21, 46, 45, 36, 34, 11, 0, 11, 21, 0, 60, 0, 66, 61, 62, 63, 64, 53, 28, 0, 46, 45, 36, 34, 27, 0, 11, 87, 0, 100, 0, 11, 70, 0, 5, 48, 42, 0, 11, 43, 68, 0, 21, 45, 46, 11, 0, 56, 0, 27, 51, 11, 25, 0, 11, 88, 0, 43, 11, 41, 0, 80, 11, 43, 0, 92, 67, 0, 93, 11, 25, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -379,7 +379,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 82, 83, 84, 12, 13, 44, 55, 60, 63, 72, 42, 90, 47, 52, 56, 61, 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 30, 89, 93, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 94, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -395,7 +395,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 133, 134, 135, 137, 0, 139, 144, 99, 103, 119, 122, 123, 124, 125, 126, 129, 0, 138, 142, 0, 0, 143, 152, 162, 95, 0, 0, 0, 141, 0, 151, 156, 161, 0, 163, 164, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -407,7 +407,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 public interface ScopePrefix { public final static char scopePrefix[] = { 82, 113, 92, 35, 41, 121, 12, 136, 21, 51, 69, 28, 47, 103, 158, 165, 169, 145, 1, 1, 32, 56, 79, 173, 6, 107, 152, 152, 127, 99, 59, 59, 59 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -419,7 +419,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 public interface ScopeSuffix { public final static char scopeSuffix[] = { 90, 90, 90, 4, 4, 90, 18, 142, 26, 4, 26, 26, 4, 101, 26, 26, 4, 149, 4, 4, 26, 4, 26, 26, 9, 110, 155, 162, 130, 101, 66, 61, 74 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -431,7 +431,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 public interface ScopeLhs { public final static char scopeLhs[] = { 63, 61, 63, 26, 26, 61, 42, 108, 47, 26, 39, 47, 26, 68, 6, 5, 5, 19, 100, 99, 45, 26, 36, 3, 86, 68, 7, 5, 109, 68, 39, 37, 39 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -443,7 +443,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 public interface ScopeLa { public final static byte scopeLa[] = { 43, 43, 43, 50, 50, 43, 43, 86, 30, 50, 30, 30, 50, 66, 30, 30, 50, 59, 50, 50, 30, 50, 30, 30, 60, 1, 30, 30, 92, 66, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -455,7 +455,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 public interface ScopeStateSet { public final static byte scopeStateSet[] = { 24, 24, 24, 28, 28, 24, 17, -1, 32, 28, 9, 32, 28, 5, 39, 39, 39, 69, 1, 3, 32, 28, 9, 39, 95, 5, 42, 39, -1, 5, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -473,7 +473,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 182, 159, 0, 172, 104, 13, 182, 159, 0, 197, 85, 0, 77, 2, 101, 97, 99, 0, 197, 114, 134, 2, 89, 0, 53, 0, 0, 134, 69, 111, 0, 29, 118, 0, 152, 2, 0, 97, 107, 0, 152, 2, 16, 0, 97, 105, 0, 181, 2, 98, 0, 134, 12, 98, 0, 134, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -489,7 +489,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 1300, 1099, 1418, 1397, 1386, 1352, 1536, 1528, 1515, 580, 570, 1432, 1375, 1070, 1060, 1012, 1002, 1078, 1040, 1020, 547, 982, 962, 941, 920, 451, 899, 514, 350, 878, 857, 836, 815, 794, 773, 752, 731, 710, 689, 668, 318, 647, 418, 493, 397, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -509,7 +509,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 13, 104, 188, 104, 120, 104, 113, 113, 143, 104, 2, 144, 13, 172, 136, 173, 104, 176, 94, 177, 153, 29, 190, 52, 12, 191, 104, 149, 104, 104, 104, 176, 153, 60, 29, 133, 60, 142, 52, 12, 149, 148, 186, 172, 184, 59, 143, 2, 104, 153, 142, 29, 29, 59, 144 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -546,7 +546,7 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9 "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java index e879dd92b40..b87d0ab173b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java @@ -23,7 +23,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -88,7 +88,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, -53, 0, 0, 0, 0, 0, 0, -150, -149, 0, -202, 0, 0, 0, -103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -161, -194, -195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -102,7 +102,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 87, 11, 102, 24, 24, 23, 23, 39, 39, 69, 69, 1, 1, 2, 2, 2, 2, 3, 3, @@ -186,7 +186,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 292, 342, 205, 1389, 1653, 1212, 938, 193, 1757, 1577, 1653, 1757, 260, 28, 1757, 1757, 1757, 1757, 1714, 1198, 1757, 1757, 225, 230, 234, 1757, 1757, 1757, 1449, 1757, 1757, 1757, 328, 1757, 0, 20, 179, 0, 1, 1983, 0, 1, 1994, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -200,7 +200,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 0, 10, 11, 12, 0, 14, 15, 16, 17, 18, 19, @@ -231,7 +231,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 9, 60, 0, 13, 0, 0, 0, 0, 0, 30, 0, 13, 13, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -280,7 +280,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1151, 1783, 1784, 1763, 268, 1983, 1151, 349, 253, 189, 268, 1786, 1422, 349, 253, 1757, 2601, 189, 189, 349, 492, 1757, 185, 1757, 1757, 1757, 1757, 1757, 1762, 1757, 184, 206, 1757, 1757, 1757, 1757, 1757, 1757, 464, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 1757, 374 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -300,7 +300,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 45, 45, 170, 305, 236, 289, 173, 200, 71, 173, 222, 224, 228, 224, 200, 78, 231, 263, 54, 100, 371, 286, 238, 173, 73, 224, 200, 54, 263, 3, 82, 45, 263, 54, 286, 170, 169, 200, 429, 54, 428, 67, 295, 200, 45, 264, 73, 54, 67 }; - }; + } public final static char asb[] = Asb.asb; @@ -326,7 +326,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 36, 34, 35, 33, 32, 37, 38, 40, 41, 42, 22, 18, 12, 17, 20, 19, 6, 7, 8, 0, 21, 23, 24, 25, 26, 1, 3, 2, 15, 16, 14, 4, 10, 11, 27, 28, 51, 0, 14, 4, 10, 11, 53, 54, 47, 48, 55, 56, 57, 58, 61, 62, 63, 64, 65, 68, 69, 60, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 50, 30, 43, 80, 13, 59, 66, 5, 29, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -345,7 +345,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 91, 121, 41, 105, 55, 7, 48, 9, 55, 57, 13, 13, 121, 89, 120, 75, 55, 70, 15, 113, 7, 48, 41, 41, 70, 20, 41, 7, 23, 25, 57, 27, 109, 105, 53, 48, 70, 23, 7, 42, 22, 13, 7, 23, 27, 121, 121, 70, 16, 23, 41, 53, 72, 70, 13, 41, 53, 23, 77 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -360,7 +360,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 23, 43, 42, 35, 33, 11, 0, 56, 0, 11, 88, 0, 65, 60, 61, 62, 63, 53, 28, 0, 39, 0, 27, 50, 0, 43, 42, 35, 33, 27, 0, 92, 66, 0, 23, 42, 43, 11, 0, 27, 50, 11, 25, 0, 52, 46, 0, 49, 11, 45, 0, 43, 42, 27, 0, 80, 11, 49, 0, 93, 11, 25, 0, 11, 49, 67, 0, 11, 87, 0, 11, 23, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -374,7 +374,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 60, 63, 68, 72, 81, 82, 83, 84, 12, 13, 42, 90, 47, 52, 56, 61, 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 30, 89, 93, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 94, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -390,7 +390,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 134, 135, 137, 0, 139, 144, 99, 103, 104, 119, 122, 123, 124, 125, 126, 129, 0, 138, 142, 0, 0, 143, 152, 162, 95, 0, 0, 0, 141, 0, 151, 156, 161, 0, 163, 164, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -402,7 +402,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopePrefix { public final static char scopePrefix[] = { 82, 113, 92, 35, 41, 121, 12, 136, 21, 51, 69, 28, 47, 103, 152, 162, 166, 145, 1, 1, 32, 56, 79, 170, 6, 107, 156, 127, 99, 59, 59, 59 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -414,7 +414,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeSuffix { public final static char scopeSuffix[] = { 90, 90, 90, 4, 4, 90, 18, 142, 26, 4, 26, 26, 4, 101, 26, 26, 4, 149, 4, 4, 26, 4, 26, 26, 9, 110, 159, 130, 101, 66, 61, 74 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -426,7 +426,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeLhs { public final static char scopeLhs[] = { 62, 60, 62, 26, 26, 60, 46, 108, 44, 26, 38, 44, 26, 67, 6, 5, 5, 19, 100, 99, 42, 26, 35, 3, 86, 67, 5, 109, 67, 38, 36, 38 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -438,7 +438,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeLa { public final static byte scopeLa[] = { 43, 43, 43, 50, 50, 43, 43, 86, 30, 50, 30, 30, 50, 66, 30, 30, 50, 59, 50, 50, 30, 50, 30, 30, 60, 1, 30, 92, 66, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -450,7 +450,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeStateSet { public final static byte scopeStateSet[] = { 23, 23, 23, 27, 27, 23, 17, -1, 31, 27, 9, 31, 27, 5, 38, 38, 38, 67, 1, 3, 31, 27, 9, 38, 93, 5, 38, -1, 5, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -467,7 +467,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 185, 44, 0, 142, 0, 99, 0, 184, 104, 142, 0, 104, 142, 0, 141, 99, 0, 172, 104, 13, 183, 94, 182, 158, 0, 172, 104, 13, 182, 158, 0, 197, 85, 0, 77, 2, 101, 97, 99, 0, 197, 116, 138, 2, 89, 0, 53, 0, 0, 138, 69, 111, 0, 29, 118, 0, 164, 2, 21, 0, 164, 2, 0, 97, 105, 0, 181, 2, 98, 0, 138, 9, 98, 0, 138, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -483,7 +483,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 470, 1535, 1520, 1509, 1308, 1140, 1020, 673, 1500, 1492, 1381, 1084, 1028, 483, 578, 1092, 1056, 1036, 492, 1000, 980, 959, 938, 586, 917, 557, 349, 896, 875, 854, 833, 812, 791, 770, 749, 728, 707, 686, 317, 639, 513, 417, 396, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -503,7 +503,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 104, 120, 104, 113, 113, 141, 104, 2, 143, 13, 172, 142, 173, 104, 176, 94, 177, 152, 29, 190, 52, 9, 191, 104, 149, 104, 104, 104, 176, 152, 60, 29, 132, 60, 140, 52, 9, 149, 148, 186, 172, 184, 59, 141, 2, 104, 152, 140, 29, 29, 59, 143 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -540,7 +540,7 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java index 0b42f9d7c35..9365f4802e6 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java @@ -23,7 +23,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -107,7 +107,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 0, 0, 0, 0, 0, 0, -285, 0, 0, 0, 0, 0, 0, 0, 0, 0, -158, 0, 0, 0, 0, 0, 0, 0, 0, 0, -168, 0, 0, 0, 0, 0, 0, 0, -170, 0, 0, 0, -171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -121,7 +121,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 107, 2, 125, 40, 40, 23, 23, 45, 45, 17, 17, 1, 1, 3, 3, 3, 3, 4, 4, @@ -239,7 +239,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 1014, 2340, 2340, 2340, 1033, 2340, 2340, 2340, 1125, 2340, 88, 2340, 2340, 2340, 2340, 2340, 1079, 2340, 0, 11, 227, 0, 2348, 1, 0, 1, 2578, 0, 8, 10, 0, 1845, 119, 0, 180, 20, 0, 1, 2567, 0, 113, 1830, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -253,7 +253,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -313,7 +313,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 0, 0, 0, 0, 0, 0, 66, 0, 60, 0, 57, 0, 0, 0, 78, 0, 67, 68, 0, 0, 80, 0, 67, 68, 0, 58, 57, 59, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 59, 59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -399,7 +399,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 1959, 2340, 2340, 2340, 2340, 2340, 2598, 2340, 2340, 2340, 2340, 2340, 2340, 724, 2340, 117, 2340, 1636, 2340, 2340, 2340, 533, 2340, 2074, 2061, 2340, 2340, 598, 2340, 2074, 2061, 2340, 1440, 500, 1285, 2340, 2340, 2340, 2340, 2340, 612, 2340, 2340, 2340, 2340, 2340, 2340, 2340, 2340, 2352, 2351 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -424,7 +424,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 341, 494, 451, 207, 45, 202, 449, 436, 451, 436, 436, 129, 201, 451, 200, 129, 330, 216, 338, 129, 22, 378, 241, 451, 44, 3, 202, 338, 252, 246, 451, 338, 161, 26, 99, 241, 451, 338, 3, 202, 436, 99, 436, 338, 436 }; - }; + } public final static char asb[] = Asb.asb; @@ -455,7 +455,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 48, 49, 21, 50, 51, 52, 1, 3, 6, 0, 73, 25, 41, 19, 42, 54, 26, 43, 27, 44, 45, 28, 20, 46, 47, 23, 55, 29, 56, 48, 49, 21, 50, 51, 52, 1, 3, 5, 22, 4, 24, 2, 0, 4, 60, 5, 2, 53, 0, 5, 25, 41, 19, 42, 54, 26, 43, 27, 44, 45, 28, 20, 46, 47, 23, 55, 29, 56, 48, 49, 21, 50, 51, 52, 1, 3, 64, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -478,7 +478,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 79, 38, 156, 157, 163, 26, 65, 65, 28, 163, 125, 125, 43, 92, 49, 33, 174, 128, 82, 128, 128, 52, 33, 43, 25, 52, 38, 89, 157, 52, 40, 25, 7, 43, 47, 174, 33, 157, 25, 112, 43, 157, 61, 54, 65, 7, 43, 157, 174, 33, 128, 65, 128, 157, 128 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -495,7 +495,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 2, 0, 112, 87, 0, 39, 44, 42, 37, 2, 0, 74, 69, 70, 71, 72, 64, 48, 0, 6, 55, 53, 0, 1, 29, 2, 30, 0, 113, 2, 24, 0, 95, 2, 57, 0, 2, 24, 47, 28, 0, 2, 57, 88, 0, 122, 2, 24, 0, 60, 61, 2, 23, 0, 2, 24, 103, 0, 2, 24, 36, 54, 0, 2, 57, 27, 0, 24, 47, 2, 63, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -509,7 +509,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 13, 48, 64, 76, 92, 69, 93, 44, 55, 60, 63, 72, 77, 45, 46, 49, 50, 51, 57, 58, 59, 65, 71, 47, 52, 56, 61, 62, 66, 67, 74, 75, 78, 79, 80, 1, 54, 70, 73, 42, 91, 29, 90, 31, 16, 17, 30, 89, 4, 14, 15, 18, 19, 20, 21, 94, 22, 23, 24, 25, 26, 53, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 88 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -525,7 +525,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 136, 0, 160, 166, 124, 137, 138, 139, 140, 143, 145, 165, 169, 103, 0, 128, 129, 130, 131, 132, 135, 141, 142, 0, 147, 152, 102, 119, 123, 127, 0, 146, 150, 0, 0, 151, 161, 164, 174, 179, 0, 0, 181, 0, 0, 0, 0, 149, 0, 162, 163, 168, 173, 0, 175, 176, 0, 177, 178, 180, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -537,7 +537,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym public interface ScopePrefix { public final static char scopePrefix[] = { 82, 113, 92, 35, 41, 121, 12, 136, 21, 51, 69, 28, 47, 103, 145, 162, 169, 173, 149, 1, 1, 32, 56, 79, 177, 6, 107, 156, 156, 127, 99, 59, 59, 59 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -549,7 +549,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym public interface ScopeSuffix { public final static char scopeSuffix[] = { 90, 90, 90, 4, 4, 90, 18, 142, 26, 4, 26, 26, 4, 101, 90, 26, 26, 4, 153, 4, 4, 26, 4, 26, 26, 9, 110, 159, 166, 130, 101, 66, 61, 74 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -561,7 +561,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym public interface ScopeLhs { public final static char scopeLhs[] = { 71, 69, 71, 46, 46, 69, 53, 33, 62, 46, 39, 62, 46, 88, 28, 7, 6, 6, 20, 121, 120, 60, 46, 37, 4, 102, 88, 8, 6, 34, 88, 39, 44, 39 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -573,7 +573,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym public interface ScopeLa { public final static byte scopeLa[] = { 58, 58, 58, 65, 65, 58, 58, 79, 60, 65, 60, 60, 65, 22, 58, 60, 60, 65, 59, 65, 65, 60, 65, 60, 60, 61, 1, 60, 60, 30, 22, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -585,7 +585,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym public interface ScopeStateSet { public final static byte scopeStateSet[] = { 119, 119, 119, 94, 94, 119, 25, 10, 98, 94, 105, 98, 94, 5, 9, 33, 33, 33, 63, 1, 3, 98, 94, 105, 33, 91, 5, 36, 33, 10, 5, 105, 107, 105 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -603,7 +603,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 95, 6, 202, 167, 0, 123, 35, 0, 77, 2, 100, 96, 98, 0, 123, 116, 120, 2, 38, 0, 53, 121, 0, 185, 95, 6, 0, 120, 82, 112, 0, 29, 117, 0, 170, 2, 0, 96, 106, 0, 170, 2, 12, 0, 96, 104, 0, 201, 2, 99, 0, 120, 53, 99, 0, 120, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -620,7 +620,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 1154, 1131, 1108, 789, 1085, 1062, 1039, 1016, 993, 970, 947, 924, 901, 878, 833, 766, 316, 812, 743, 556, 635, 500, 477, 0, 926, 783, 666, 610, 2088, 392, 1987, 1454, 2030, 1387, 0, 333, 376, 1636, 392, 1717, 1454, 1546, 1387, 1965, 1443, 1877, 1940, 1519, 0, 316, 658, 1544, 376, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -643,7 +643,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym 191, 171, 61, 57, 95, 168, 2, 169, 95, 147, 115, 115, 147, 95, 116, 116, 59, 209, 95, 156, 110, 116, 2, 116, 116, 187, 204, 59, 145, 171, 168, 95, 159, 171, 57, 211, 66, 53, 212, 110, 156, 120, 123, 57, 59, 159, 138, 61, 149, 66, 53, 156, 110, 116, 79, 149, 116, 156, 116 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -683,7 +683,7 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator", "external_declaration_list", "external_declaration", "declaration_list", "function_body" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java index 59a29fd8082..87a196a6cab 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java @@ -23,7 +23,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -88,7 +88,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab -1, -114, -163, 0, 0, 0, 0, 0, -53, 0, 0, 0, 0, 0, 0, -161, -149, 0, -202, 0, 0, 0, 0, 0, 0, 0, -203, 0, 0, 0, 0, 0, 0, -201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -194, 0, 0, -195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -102,7 +102,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 87, 11, 102, 24, 24, 23, 23, 39, 39, 69, 69, 1, 1, 2, 2, 2, 2, 3, 3, @@ -186,7 +186,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 87, 1352, 297, 397, 192, 1180, 342, 1765, 1765, 205, 1389, 1661, 1277, 938, 193, 1765, 1604, 1661, 1765, 260, 1765, 1765, 1765, 1765, 1765, 1720, 230, 1765, 1765, 234, 1765, 1765, 1765, 1765, 1765, 1449, 1765, 1765, 1765, 328, 1765, 0, 20, 179, 0, 1, 1991, 0, 1, 2002, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -200,7 +200,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 9, 10, 0, 12, 13, 0, 15, 16, 17, 18, 19, @@ -232,7 +232,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 66, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -282,7 +282,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 449, 189, 1794, 189, 2790, 189, 349, 1346, 1765, 1765, 1765, 1765, 1765, 1431, 376, 185, 1765, 184, 1765, 206, 1765, 1765, 1354, 1765, 1765, 1765, 1765, 1765, 1774, 1765, 1765, 1765, 1765, 1765, 1765, 1774 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -302,7 +302,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 45, 45, 170, 305, 231, 284, 173, 200, 71, 173, 222, 224, 292, 224, 200, 78, 295, 258, 54, 100, 371, 281, 233, 173, 73, 224, 200, 54, 258, 3, 82, 45, 258, 54, 281, 170, 169, 200, 301, 54, 300, 67, 290, 200, 45, 259, 73, 54, 67 }; - }; + } public final static char asb[] = Asb.asb; @@ -327,7 +327,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 40, 41, 42, 1, 3, 49, 0, 17, 18, 19, 20, 21, 2, 15, 16, 12, 4, 9, 10, 22, 23, 1, 3, 44, 45, 46, 39, 31, 36, 34, 35, 33, 32, 37, 38, 40, 41, 42, 28, 25, 13, 24, 27, 26, 6, 7, 8, 0, 17, 18, 19, 20, 21, 1, 3, 2, 15, 16, 12, 4, 9, 10, 22, 23, 51, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -346,7 +346,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 76, 95, 122, 41, 106, 59, 7, 48, 9, 59, 61, 13, 13, 122, 93, 121, 79, 59, 74, 15, 114, 7, 48, 41, 41, 74, 20, 41, 7, 23, 25, 61, 27, 110, 106, 57, 48, 74, 23, 7, 42, 22, 13, 7, 23, 27, 122, 122, 74, 16, 23, 41, 57, 76, 74, 13, 41, 57, 23, 81 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -361,7 +361,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5, 52, 46, 0, 23, 43, 42, 35, 33, 11, 0, 56, 0, 11, 88, 0, 65, 60, 61, 62, 63, 53, 28, 0, 39, 0, 27, 50, 0, 43, 42, 35, 33, 27, 0, 92, 66, 0, 23, 42, 43, 11, 0, 27, 50, 11, 25, 0, 49, 11, 45, 0, 43, 42, 27, 0, 80, 11, 49, 0, 93, 11, 25, 0, 11, 49, 67, 0, 11, 87, 0, 11, 23, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -375,7 +375,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 82, 83, 84, 12, 13, 44, 55, 60, 63, 72, 42, 90, 47, 52, 56, 61, 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 30, 89, 93, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 94, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -391,7 +391,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 134, 135, 137, 0, 139, 144, 99, 103, 104, 119, 122, 123, 124, 125, 126, 129, 0, 138, 142, 0, 0, 143, 152, 162, 95, 0, 0, 0, 141, 0, 151, 156, 161, 0, 163, 164, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -403,7 +403,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopePrefix { public final static char scopePrefix[] = { 82, 113, 92, 35, 41, 121, 12, 136, 21, 51, 69, 28, 47, 103, 161, 165, 145, 1, 1, 32, 56, 79, 169, 6, 107, 152, 152, 127, 99, 59, 59, 59 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -415,7 +415,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeSuffix { public final static char scopeSuffix[] = { 90, 90, 90, 4, 4, 90, 18, 142, 26, 4, 26, 26, 4, 101, 26, 4, 149, 4, 4, 26, 4, 26, 26, 9, 110, 155, 158, 130, 101, 66, 61, 74 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -427,7 +427,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeLhs { public final static char scopeLhs[] = { 62, 60, 62, 26, 26, 60, 46, 108, 44, 26, 38, 44, 26, 67, 5, 5, 19, 100, 99, 42, 26, 35, 3, 86, 67, 7, 5, 109, 67, 38, 36, 38 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -439,7 +439,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeLa { public final static byte scopeLa[] = { 43, 43, 43, 50, 50, 43, 43, 86, 30, 50, 30, 30, 50, 66, 30, 50, 59, 50, 50, 30, 50, 30, 30, 60, 1, 30, 30, 92, 66, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -451,7 +451,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeStateSet { public final static byte scopeStateSet[] = { 23, 23, 23, 27, 27, 23, 17, -1, 31, 27, 9, 31, 27, 5, 38, 38, 68, 1, 3, 31, 27, 9, 38, 94, 5, 41, 38, -1, 5, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -469,7 +469,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 182, 158, 0, 172, 104, 14, 182, 158, 0, 197, 85, 0, 77, 2, 101, 97, 99, 0, 197, 116, 138, 2, 89, 0, 53, 0, 0, 138, 69, 111, 0, 29, 118, 0, 164, 2, 0, 97, 107, 0, 97, 105, 0, 181, 2, 98, 0, 138, 11, 98, 0, 138, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -485,7 +485,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1402, 1391, 1361, 545, 470, 1543, 1528, 1517, 1308, 1140, 1508, 1500, 1492, 1381, 1028, 483, 1092, 1056, 1036, 492, 1000, 980, 959, 938, 586, 917, 557, 349, 896, 875, 854, 833, 812, 791, 770, 749, 728, 707, 686, 317, 639, 513, 417, 396, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -505,7 +505,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 104, 120, 104, 113, 113, 141, 104, 2, 143, 14, 172, 142, 173, 104, 176, 94, 177, 152, 29, 190, 52, 11, 191, 104, 149, 104, 104, 104, 176, 152, 60, 29, 132, 60, 140, 52, 11, 149, 148, 186, 172, 184, 59, 141, 2, 104, 152, 140, 29, 29, 59, 143 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -542,7 +542,7 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java index 6d98f5df294..6cc83c0b10b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java @@ -23,7 +23,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -234,7 +234,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -248,7 +248,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 154, 94, 94, 30, 30, 81, 81, 39, 39, 42, 42, 218, 1, 1, 16, @@ -594,7 +594,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 538, 6051, 0, 1, 263, 0, 263, 254, 0, 1, 919, 0, 1, 956, 0, 263, 253, 0, 6874, 1, 0, 6870, 1, 0, 1, 263, 3650, 0, 6871, 263, 0, 3651, 263, 0, 6874, 420, 0, 6873, 420, 0, 3661, 263, 0, 10, 12, 0, 8, 10, 12, 0, 3730, 227, 0, 218, 5239, 0, 3735, 420, 0, 8, 12, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -608,7 +608,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -754,7 +754,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 64, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -964,7 +964,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 6876, 6876, 6876, 6876, 6876, 6876, 6876, 6876, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6862, 6876, 6862, 6862, 6862, 6876, 6862, 6862, 6862, 6876 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1004,7 +1004,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 1082, 636, 655, 655, 653, 634, 655, 609, 609, 783, 633, 192, 772, 543, 225, 609, 222, 840, 636, 105, 704, 105, 653, 372, 831, 105, 833, 225, 154, 105, 105, 456, 636, 783, 636, 609, 372, 671, 636, 633, 542, 1068, 6, 6, 979, 671, 634, 17, 609, 105, 607, 224, 707, 636, 105, 609, 607, 607, 636 }; - }; + } public final static char asb[] = Asb.asb; @@ -1057,7 +1057,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 68, 64, 0, 40, 9, 3, 8, 6, 7, 5, 4, 1, 2, 71, 0, 53, 23, 13, 56, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 57, 33, 10, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 40, 63, 61, 65, 88, 27, 62, 54, 4, 5, 8, 6, 1, 2, 55, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1094,7 +1094,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 170, 170, 12, 180, 218, 118, 145, 180, 170, 12, 218, 222, 230, 175, 230, 217, 180, 12, 230, 149, 80, 61, 230, 230, 180, 222, 12, 222, 170, 175, 27, 222, 155, 145, 12, 63, 63, 173, 82, 12, 201, 170, 230, 147, 79, 237, 222, 230, 170, 147, 12, 222 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1116,7 +1116,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 2, 0, 2, 67, 0, 36, 5, 27, 198, 0, 137, 214, 136, 113, 135, 134, 0, 4, 10, 9, 13, 3, 1, 0, 132, 5, 50, 93, 0, 2, 4, 113, 110, 111, 112, 13, 69, 0, 39, 4, 2, 9, 10, 5, 172, 0, 113, 69, 13, 110, 111, 112, 190, 0, 5, 50, 93, 95, 0, 5, 52, 116, 0, 54, 4, 98, 27, 5, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1132,7 +1132,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1152,7 +1152,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 0, 178, 0, 193, 0, 0, 0, 202, 0, 205, 211, 0, 223, 224, 0, 0, 229, 232, 0, 234, 236, 0, 240, 241, 242, 245, 0, 0, 249, 124, 0, 150, 153, 0, 181, 0, 184, 0, 0, 208, 221, 226, 0, 0, 230, 231, 233, 235, 0, 238, 239, 244, 250, 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1168,7 +1168,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 551, 555, 645, 649, 653, 110, 7, 110, 410, 426, 439, 460, 479, 543, 129, 129, 245, 439, 566, 582, 593, 604, 220, 513, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 492, 499, 169, 69, 668, 123, 355, 414, 454, 486, 472, 69, 355, 401, 190, 117, 452, 657, 664, 657, 664, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1184,7 +1184,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 666, 11, 114, 379, 379, 379, 464, 483, 535, 133, 138, 249, 443, 570, 570, 570, 570, 224, 517, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 528, 5, 126, 358, 417, 457, 489, 475, 547, 538, 404, 193, 108, 108, 659, 659, 661, 661, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1200,7 +1200,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 12, 129, 178, 85, 84, 84, 64, 41, 157, 114, 114, 68, 84, 18, 18, 18, 18, 102, 20, 186, 182, 201, 100, 109, 74, 80, 73, 172, 89, 138, 86, 162, 161, 192, 157, 17, 178, 138, 116, 83, 22, 45, 157, 157, 85, 48, 178, 79, 155, 44, 155, 44, 185, 116, 110, 48, 48, 72 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1215,7 +1215,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 72, 113, 1, 72, 1, 40, 1, 40, 40, 73, 118, 72, 72, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 64, 64, 64, 64, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 40, 72, 118, 72, 6, 72, 1, 55, 70, 71, 72, 64, 1, 55, 75, 74, 40, 40, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1231,7 +1231,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 284, 284, 284, 284, 264, 6, 82, 95, 95, 95, 148, 344, 165, 183, 183, 124, 95, 284, 284, 284, 284, 174, 284, 30, 54, 24, 174, 176, 66, 170, 66, 60, 71, 185, 95, 57, 63, 168, 165, 284, 82, 185, 1, 95, 285, 140, 165, 165, 95, 85, 82, 11, 121, 189, 121, 189, 30, 1, 183, 85, 85, 66 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1269,7 +1269,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 197, 166, 126, 10, 0, 136, 2, 0, 126, 0, 227, 3, 124, 276, 166, 126, 10, 0, 276, 166, 126, 10, 0, 135, 2, 0, 126, 0, 227, 3, 135, 0, 227, 3, 140, 0, 158, 60, 140, 0, 278, 0, 31, 0, 31, 139, 0, 165, 0, 134, 0, 158, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1301,7 +1301,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 5670, 5647, 5624, 5601, 5578, 5554, 5524, 5501, 5435, 2983, 3270, 3228, 3171, 3129, 3072, 3030, 1481, 1431, 1368, 2144, 1321, 2097, 2050, 2003, 1956, 1909, 1862, 1815, 1768, 1721, 1674, 1627, 600, 1577, 1528, 1273, 1170, 1123, 1219, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1339,7 +1339,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP 158, 123, 188, 68, 127, 127, 164, 239, 64, 3, 71, 238, 174, 238, 320, 149, 75, 238, 127, 127, 53, 97, 337, 174, 152, 211, 152, 319, 127, 3, 152, 297, 325, 243, 152, 152, 127, 70, 204, 161, 286, 158, 203, 68, 70, 121, 317, 152, 203, 9, 152 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1395,7 +1395,7 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java index 2da2d68384b..1695588244e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java @@ -23,7 +23,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -233,7 +233,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -247,7 +247,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 154, 94, 94, 31, 31, 80, 80, 39, 39, 42, 42, 218, 1, 1, 16, @@ -591,7 +591,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 1, 743, 0, 1, 2001, 0, 262, 252, 0, 6862, 1, 0, 6858, 1, 0, 1, 262, 3576, 0, 6859, 262, 0, 3577, 262, 0, 6862, 419, 0, 6861, 419, 0, 3622, 262, 0, 10, 12, 0, 8, 10, 12, 0, 3627, 226, 0, 217, 5150, 0, 3631, 419, 0, 8, 12, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -605,7 +605,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -751,7 +751,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 64, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -961,7 +961,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 6850, 6850, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6864, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6850, 6864, 6850, 6850, 6850, 6864, 6850, 6850, 6850, 6864 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1001,7 +1001,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 327, 325, 306, 327, 569, 569, 733, 305, 147, 722, 388, 68, 569, 177, 792, 308, 53, 376, 53, 325, 239, 945, 53, 735, 68, 56, 53, 53, 708, 308, 733, 308, 569, 239, 343, 308, 305, 387, 1068, 117, 117, 979, 343, 306, 742, 569, 53, 567, 67, 379, 308, 53, 569, 567, 567, 308 }; - }; + } public final static char asb[] = Asb.asb; @@ -1054,7 +1054,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 70, 68, 64, 0, 40, 9, 3, 8, 6, 7, 5, 4, 1, 2, 71, 0, 53, 23, 13, 56, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 57, 33, 10, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 40, 63, 61, 65, 88, 27, 62, 54, 4, 5, 8, 6, 1, 2, 55, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1091,7 +1091,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 173, 292, 97, 142, 173, 208, 12, 292, 200, 236, 168, 236, 291, 173, 12, 236, 136, 67, 39, 236, 236, 173, 200, 12, 200, 208, 168, 157, 200, 89, 142, 12, 146, 146, 166, 69, 12, 231, 208, 236, 144, 66, 215, 200, 236, 208, 144, 12, 200 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1113,7 +1113,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 135, 134, 0, 4, 10, 9, 13, 3, 1, 0, 132, 5, 50, 93, 0, 5, 60, 36, 0, 113, 69, 13, 110, 111, 112, 190, 0, 2, 4, 113, 110, 111, 112, 13, 69, 0, 39, 4, 2, 9, 10, 5, 172, 0, 5, 50, 93, 95, 0, 197, 5, 60, 0, 101, 100, 53, 4, 68, 0, 5, 50, 93, 115, 48, 4, 0, 5, 60, 116, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1129,7 +1129,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1149,7 +1149,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 178, 0, 193, 0, 0, 0, 202, 0, 205, 211, 0, 223, 224, 0, 0, 229, 232, 0, 234, 236, 0, 240, 241, 242, 245, 0, 0, 249, 124, 0, 150, 153, 0, 181, 0, 184, 0, 0, 208, 221, 226, 0, 0, 230, 231, 233, 235, 0, 238, 239, 244, 250, 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1165,7 +1165,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 545, 549, 639, 643, 647, 110, 7, 110, 410, 426, 439, 460, 479, 537, 129, 129, 245, 439, 560, 576, 587, 598, 220, 507, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 486, 493, 169, 69, 662, 123, 355, 414, 454, 472, 69, 355, 401, 190, 117, 452, 651, 658, 651, 658, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1181,7 +1181,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 660, 11, 114, 379, 379, 379, 464, 483, 529, 133, 138, 249, 443, 564, 564, 564, 564, 224, 511, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 522, 5, 126, 358, 417, 457, 475, 541, 532, 404, 193, 108, 108, 653, 653, 655, 655, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1197,7 +1197,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 12, 129, 178, 85, 84, 84, 64, 41, 157, 114, 114, 68, 84, 18, 18, 18, 18, 102, 20, 186, 182, 201, 100, 109, 74, 79, 73, 172, 89, 138, 86, 162, 161, 192, 157, 17, 178, 138, 116, 83, 45, 157, 157, 85, 48, 178, 78, 155, 44, 155, 44, 185, 116, 110, 48, 48, 72 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1212,7 +1212,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 72, 113, 1, 72, 1, 40, 1, 40, 40, 73, 118, 72, 72, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 64, 64, 64, 64, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 40, 72, 118, 72, 6, 72, 1, 55, 70, 71, 64, 1, 55, 75, 74, 40, 40, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1228,7 +1228,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 284, 284, 284, 284, 264, 6, 82, 95, 95, 95, 148, 343, 178, 183, 183, 124, 95, 284, 284, 284, 284, 169, 284, 30, 54, 24, 169, 171, 63, 165, 63, 60, 68, 185, 95, 57, 79, 181, 178, 284, 82, 185, 1, 95, 140, 178, 178, 95, 85, 82, 11, 121, 189, 121, 189, 30, 1, 183, 85, 85, 63 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1265,7 +1265,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 64, 203, 54, 42, 0, 203, 54, 42, 0, 227, 3, 125, 197, 166, 126, 10, 0, 125, 197, 166, 126, 10, 0, 136, 2, 0, 126, 0, 227, 3, 124, 276, 166, 126, 10, 0, 276, 166, 126, 10, 0, 135, 2, 0, 126, 0, 227, 3, 135, 0, 227, 3, 140, 0, 158, 60, 140, 0, 278, 0, 31, 0, 31, 139, 0, 165, 0, 134, 0, 158, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1297,7 +1297,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5510, 5487, 5421, 5395, 5364, 5715, 2944, 3231, 3189, 3132, 3090, 3033, 1389, 1342, 2991, 1293, 2095, 2053, 599, 2006, 1959, 1912, 1865, 1818, 1771, 1724, 1677, 1630, 1583, 1536, 1489, 1439, 1207, 1058, 995, 1144, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1335,7 +1335,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 127, 127, 164, 239, 64, 3, 71, 238, 182, 238, 320, 149, 75, 238, 127, 127, 53, 97, 337, 182, 153, 211, 153, 319, 127, 3, 153, 297, 325, 243, 153, 153, 127, 70, 204, 161, 286, 158, 202, 68, 70, 121, 317, 153, 202, 9, 153 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1391,7 +1391,7 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java index 4dfa4d7b048..1346a3e3760 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java @@ -24,7 +24,7 @@ public class CPPNoFunctionDeclaratorParserprs 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -237,7 +237,7 @@ public class CPPNoFunctionDeclaratorParserprs 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -251,7 +251,7 @@ public class CPPNoFunctionDeclaratorParserprs @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 153, 93, 93, 30, 30, 80, 80, 39, 39, 42, 42, 218, 1, 1, 16, @@ -598,7 +598,7 @@ public class CPPNoFunctionDeclaratorParserprs 0, 8, 12, 0, 365, 95, 0, 35, 73, 0, 536, 6108, 0, 1, 263, 0, 313, 1581, 0, 263, 254, 0, 1, 1199, 0, 1, 2122, 0, 263, 253, 0, 6964, 1, 0, 6960, 1, 0, 1, 263, 3587, 0, 6961, 263, 0, 3588, 263, 0, 3643, 263, 0, 10, 12, 0, 8, 10, 12, 0, 3708, 227, 0, 218, 5172, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -612,7 +612,7 @@ public class CPPNoFunctionDeclaratorParserprs @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -754,7 +754,7 @@ public class CPPNoFunctionDeclaratorParserprs 28, 29, 30, 31, 32, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -957,7 +957,7 @@ public class CPPNoFunctionDeclaratorParserprs 6952, 569, 6952, 6952, 6952, 6952, 6952, 6952, 6952, 6952, 6952, 6805, 7251, 7249, 7258, 7257, 7253, 7254, 7252, 7255, 7256, 7259, 7250, 7246, 7323, 7324, 7240, 7247, 7243, 7219, 7245, 7244, 7241, 7242, 7220 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -997,7 +997,7 @@ public class CPPNoFunctionDeclaratorParserprs 137, 468, 487, 487, 485, 466, 487, 605, 605, 15, 465, 803, 233, 605, 125, 817, 468, 234, 536, 234, 485, 340, 1046, 234, 794, 803, 95, 184, 234, 234, 632, 468, 15, 468, 605, 340, 503, 468, 465, 1002, 806, 806, 1038, 503, 466, 24, 605, 234, 539, 468, 234, 605, 468 }; - }; + } public final static char asb[] = Asb.asb; @@ -1048,7 +1048,7 @@ public class CPPNoFunctionDeclaratorParserprs 38, 48, 43, 47, 12, 21, 11, 17, 15, 16, 18, 19, 14, 13, 20, 10, 42, 46, 44, 41, 49, 7, 5, 60, 8, 6, 4, 1, 2, 3, 0, 53, 23, 13, 55, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 56, 33, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 5, 39, 63, 65, 88, 27, 62, 54, 57, 61, 8, 1, 2, 6, 4, 10, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1085,7 +1085,7 @@ public class CPPNoFunctionDeclaratorParserprs 12, 12, 229, 12, 229, 169, 169, 180, 12, 169, 175, 175, 12, 205, 205, 226, 175, 12, 303, 229, 226, 200, 226, 302, 205, 12, 226, 54, 23, 303, 82, 226, 226, 205, 229, 12, 229, 175, 200, 162, 229, 115, 12, 130, 130, 198, 70, 12, 177, 175, 226, 259, 229, 226, 175, 229 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1107,7 +1107,7 @@ public class CPPNoFunctionDeclaratorParserprs 71, 0, 2, 69, 0, 139, 214, 138, 112, 137, 136, 0, 100, 99, 54, 75, 70, 4, 10, 9, 2, 0, 54, 4, 97, 27, 5, 0, 4, 10, 9, 13, 3, 1, 0, 134, 5, 50, 92, 0, 5, 50, 92, 94, 0, 112, 71, 13, 109, 110, 111, 190, 0, 5, 50, 92, 114, 48, 4, 0, 197, 5, 52, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1123,7 +1123,7 @@ public class CPPNoFunctionDeclaratorParserprs 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1143,7 +1143,7 @@ public class CPPNoFunctionDeclaratorParserprs 0, 193, 0, 0, 0, 202, 0, 205, 211, 0, 0, 223, 224, 0, 0, 229, 232, 0, 234, 236, 0, 240, 241, 242, 245, 0, 0, 249, 124, 0, 150, 153, 0, 181, 0, 184, 0, 0, 208, 221, 226, 0, 0, 230, 231, 233, 235, 0, 238, 239, 244, 250, 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1159,7 +1159,7 @@ public class CPPNoFunctionDeclaratorParserprs 551, 555, 645, 649, 653, 110, 7, 110, 410, 426, 439, 460, 479, 543, 129, 129, 245, 439, 566, 582, 593, 604, 220, 513, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 492, 499, 169, 69, 668, 123, 355, 414, 454, 486, 472, 69, 355, 401, 190, 117, 452, 657, 664, 657, 664, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1175,7 +1175,7 @@ public class CPPNoFunctionDeclaratorParserprs 666, 11, 114, 379, 379, 379, 464, 483, 535, 133, 138, 249, 443, 570, 570, 570, 570, 224, 517, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 528, 5, 126, 358, 417, 457, 489, 475, 547, 538, 404, 193, 108, 108, 659, 659, 661, 661, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1191,7 +1191,7 @@ public class CPPNoFunctionDeclaratorParserprs 12, 131, 178, 84, 83, 83, 64, 41, 156, 113, 113, 70, 83, 18, 18, 18, 18, 101, 20, 186, 182, 201, 99, 108, 68, 79, 67, 171, 88, 140, 85, 161, 160, 192, 156, 17, 178, 140, 115, 82, 22, 45, 156, 156, 84, 48, 178, 78, 154, 44, 154, 44, 185, 115, 109, 48, 48, 172 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1206,7 +1206,7 @@ public class CPPNoFunctionDeclaratorParserprs 72, 113, 1, 72, 1, 39, 1, 39, 39, 73, 118, 72, 72, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 64, 64, 64, 64, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 39, 72, 118, 72, 6, 72, 1, 57, 70, 71, 72, 64, 1, 57, 75, 74, 39, 39, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1222,7 +1222,7 @@ public class CPPNoFunctionDeclaratorParserprs 286, 286, 286, 286, 265, 6, 64, 77, 77, 77, 119, 346, 103, 136, 136, 180, 77, 286, 286, 286, 286, 146, 286, 28, 52, 196, 146, 148, 198, 142, 198, 61, 203, 138, 77, 55, 58, 106, 103, 286, 64, 138, 1, 77, 287, 111, 103, 103, 77, 67, 64, 11, 108, 155, 108, 155, 28, 1, 136, 67, 67, 61 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1260,7 +1260,7 @@ public class CPPNoFunctionDeclaratorParserprs 198, 166, 126, 10, 0, 136, 2, 0, 126, 0, 226, 3, 124, 275, 166, 126, 10, 0, 275, 166, 126, 10, 0, 135, 2, 0, 126, 0, 226, 3, 135, 0, 226, 3, 140, 0, 159, 60, 140, 0, 277, 0, 31, 0, 31, 139, 0, 165, 0, 134, 0, 159, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1292,7 +1292,7 @@ public class CPPNoFunctionDeclaratorParserprs 5700, 5677, 5654, 5631, 5608, 5579, 1266, 3013, 3298, 3256, 3200, 3158, 1462, 1415, 3102, 3060, 1367, 2900, 2127, 2080, 2033, 1986, 1939, 1892, 1845, 1798, 1751, 1704, 1657, 1610, 599, 1554, 1292, 1512, 1144, 991, 1219, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1330,7 +1330,7 @@ public class CPPNoFunctionDeclaratorParserprs 3, 3, 3, 203, 3, 123, 159, 123, 188, 228, 338, 238, 64, 3, 71, 237, 174, 237, 320, 149, 75, 237, 127, 127, 68, 53, 97, 337, 174, 152, 210, 152, 319, 127, 3, 152, 297, 245, 152, 152, 127, 70, 203, 161, 285, 159, 70, 121, 317, 152, 152 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1386,7 +1386,7 @@ public class CPPNoFunctionDeclaratorParserprs "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java index 46d8e5b0d59..4930ccbe01c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java @@ -23,7 +23,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -235,7 +235,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -249,7 +249,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 154, 94, 94, 30, 30, 81, 81, 39, 39, 42, 42, 191, 1, 1, 16, @@ -596,7 +596,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 271, 884, 0, 425, 32, 0, 424, 29, 0, 3597, 263, 0, 10, 12, 0, 4245, 128, 0, 4245, 127, 0, 1, 92, 0, 8, 10, 12, 0, 3672, 227, 0, 6929, 36, 0, 6928, 36, 0, 6929, 2, 37, 0, 6928, 2, 37, 0, 3678, 420, 0, 367, 95, 0, 35, 73, 0, 8, 12, 0, 313, 4056, 0, 218, 5309, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -610,7 +610,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -755,7 +755,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, 65, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -964,7 +964,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 6928, 6928, 6928, 7208, 7287, 7288, 7202, 7209, 7205, 7181, 7207, 7206, 7203, 7204, 7182, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6914, 6928, 6914, 6914, 6914, 6928, 6914, 6914, 6928 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1004,7 +1004,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 680, 212, 520, 112, 112, 810, 446, 668, 446, 270, 419, 481, 446, 443, 722, 722, 258, 55, 520, 520, 652, 660, 112, 112, 684, 71, 482, 376, 334, 797, 68, 68, 936, 481, 444, 71, 270, 112, 862, 1070, 652, 652, 685, 112, 376, 446, 112, 270, 839, 330, 652, 446, 563 }; - }; + } public final static char asb[] = Asb.asb; @@ -1058,7 +1058,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 20, 24, 21, 12, 11, 25, 9, 3, 7, 39, 62, 59, 64, 88, 27, 63, 54, 4, 8, 5, 6, 1, 2, 57, 0, 120, 73, 41, 23, 13, 55, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 56, 33, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 5, 39, 63, 27, 88, 64, 62, 57, 8, 1, 2, 6, 4, 10, 59, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1095,7 +1095,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 97, 188, 217, 12, 217, 178, 183, 149, 217, 111, 106, 12, 12, 32, 11, 11, 188, 141, 97, 97, 18, 58, 76, 104, 261, 12, 126, 126, 181, 76, 12, 196, 178, 97, 304, 12, 87, 188, 129, 97, 104, 217, 97, 178, 97, 239, 87, 217, 305 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1117,7 +1117,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 2, 0, 37, 5, 27, 198, 0, 52, 5, 197, 0, 137, 214, 136, 113, 135, 134, 0, 2, 132, 0, 4, 10, 9, 13, 3, 1, 0, 118, 92, 49, 5, 0, 2, 4, 113, 110, 111, 112, 13, 69, 0, 5, 49, 92, 95, 0, 113, 69, 13, 110, 111, 112, 190, 0, 5, 49, 92, 115, 47, 4, 0, 30, 5, 52, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1133,7 +1133,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1153,7 +1153,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 0, 177, 0, 192, 0, 0, 0, 201, 0, 204, 210, 0, 222, 223, 0, 0, 228, 231, 0, 233, 235, 0, 239, 240, 241, 244, 0, 0, 248, 0, 0, 149, 152, 0, 180, 0, 183, 0, 0, 207, 220, 225, 0, 0, 229, 230, 232, 234, 0, 237, 238, 243, 249, 252, 253, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1169,7 +1169,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 551, 555, 645, 649, 653, 110, 7, 110, 410, 426, 439, 460, 479, 543, 129, 129, 245, 439, 566, 582, 593, 604, 220, 513, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 492, 499, 169, 69, 668, 123, 355, 414, 454, 486, 472, 69, 355, 401, 190, 117, 452, 657, 664, 657, 664, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1185,7 +1185,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 666, 11, 114, 379, 379, 379, 464, 483, 535, 133, 138, 249, 443, 570, 570, 570, 570, 224, 517, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 528, 5, 126, 358, 417, 457, 489, 475, 547, 538, 404, 193, 108, 108, 659, 659, 661, 661, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1201,7 +1201,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 12, 131, 178, 85, 84, 84, 64, 41, 157, 114, 114, 68, 84, 18, 18, 18, 18, 102, 20, 186, 182, 201, 100, 109, 74, 80, 73, 172, 93, 138, 86, 162, 161, 192, 157, 17, 178, 138, 117, 83, 22, 45, 157, 157, 85, 47, 178, 79, 155, 44, 155, 44, 185, 117, 110, 47, 47, 72 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1216,7 +1216,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 72, 113, 1, 72, 1, 39, 1, 39, 39, 73, 118, 72, 72, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 65, 65, 65, 65, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 39, 72, 118, 72, 6, 72, 1, 57, 70, 71, 72, 65, 1, 57, 75, 74, 39, 39, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1232,7 +1232,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 245, 245, 245, 245, 245, 245, 225, 16, 97, 353, 353, 353, 80, 305, 37, 336, 336, 115, 353, 245, 245, 245, 245, 106, 245, 49, 21, 100, 106, 108, 156, 102, 156, 172, 161, 338, 353, 1, 8, 40, 37, 245, 97, 338, 11, 353, 246, 72, 37, 37, 353, 342, 97, 24, 69, 131, 69, 131, 49, 11, 336, 342, 342, 156 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1270,7 +1270,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 197, 166, 126, 10, 0, 135, 2, 0, 125, 0, 227, 3, 124, 276, 166, 126, 10, 0, 276, 166, 126, 10, 0, 134, 2, 0, 125, 0, 227, 3, 135, 0, 227, 3, 140, 0, 159, 61, 140, 0, 278, 0, 31, 0, 31, 138, 0, 165, 0, 133, 0, 159, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1302,7 +1302,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 5171, 598, 5992, 4351, 0, 6262, 6246, 6180, 5961, 5885, 5873, 6168, 6109, 6086, 6027, 5807, 5371, 5309, 5211, 5109, 5047, 4985, 4923, 4861, 4744, 4579, 4517, 0, 6262, 6246, 6180, 5961, 5885, 5873, 6168, 6109, 6086, 6027, 5807, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1340,7 +1340,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym 97, 337, 174, 152, 215, 152, 319, 127, 3, 152, 297, 203, 9, 60, 41, 189, 189, 229, 127, 227, 227, 127, 3, 61, 159, 4, 125, 152, 152, 127, 70, 204, 161, 286, 159, 3, 245, 127, 229, 280, 227, 226, 121, 317, 152, 338, 70, 127, 152, 68 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1396,7 +1396,7 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java index acba6cae119..5f1d9ae7661 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java @@ -23,7 +23,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -235,7 +235,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -249,7 +249,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 154, 94, 94, 32, 32, 80, 80, 39, 39, 42, 42, 218, 1, 1, 16, @@ -595,7 +595,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 1, 2404, 0, 261, 251, 0, 6904, 1, 0, 6900, 1, 0, 1, 261, 3555, 0, 6901, 261, 0, 3562, 261, 0, 6904, 418, 0, 6903, 418, 0, 3604, 261, 0, 10, 12, 0, 8, 10, 12, 0, 3611, 225, 0, 216, 5243, 0, 3649, 418, 0, 8, 12, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -609,7 +609,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -755,7 +755,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 64, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -965,7 +965,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 6906, 6906, 6906, 6906, 6906, 6906, 6906, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6892, 6906, 6892, 6892, 6892, 6906, 6892, 6892, 6892, 6906 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1005,7 +1005,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 450, 1082, 450, 469, 469, 467, 448, 469, 710, 710, 726, 447, 42, 715, 322, 83, 710, 72, 792, 450, 171, 518, 171, 467, 308, 945, 171, 774, 83, 399, 171, 171, 429, 450, 726, 450, 710, 308, 485, 450, 447, 321, 1068, 79, 79, 979, 485, 448, 223, 710, 171, 708, 82, 521, 450, 171, 710, 708, 708, 450 }; - }; + } public final static char asb[] = Asb.asb; @@ -1058,7 +1058,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 111, 112, 70, 68, 64, 0, 40, 9, 3, 8, 6, 7, 5, 4, 1, 2, 71, 0, 53, 23, 13, 56, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 57, 33, 10, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 40, 63, 61, 65, 88, 27, 62, 54, 4, 5, 8, 6, 1, 2, 55, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1095,7 +1095,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 12, 177, 154, 96, 138, 177, 167, 12, 154, 208, 232, 172, 232, 264, 177, 12, 232, 69, 61, 98, 232, 232, 177, 208, 12, 208, 167, 172, 195, 208, 100, 138, 12, 145, 145, 170, 63, 12, 242, 167, 232, 22, 60, 219, 208, 232, 167, 22, 12, 208 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1117,7 +1117,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5, 195, 0, 137, 214, 136, 113, 135, 134, 0, 4, 10, 9, 13, 3, 1, 0, 132, 5, 50, 93, 0, 60, 5, 197, 0, 2, 4, 113, 110, 111, 112, 13, 69, 0, 5, 50, 93, 95, 0, 5, 60, 116, 0, 39, 4, 2, 9, 10, 5, 172, 0, 113, 69, 13, 110, 111, 112, 190, 0, 5, 50, 93, 115, 48, 4, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1133,7 +1133,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1153,7 +1153,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 178, 0, 193, 0, 0, 0, 202, 0, 205, 211, 0, 223, 224, 0, 0, 229, 232, 0, 234, 236, 0, 240, 241, 242, 245, 0, 0, 249, 124, 0, 150, 153, 0, 181, 0, 184, 0, 0, 208, 221, 226, 0, 0, 230, 231, 233, 235, 0, 238, 239, 244, 250, 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1169,7 +1169,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 637, 641, 645, 110, 7, 110, 410, 426, 439, 460, 479, 539, 129, 129, 245, 439, 558, 574, 585, 596, 220, 513, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 492, 499, 169, 69, 660, 123, 355, 414, 454, 486, 472, 69, 355, 401, 190, 117, 452, 649, 656, 649, 656, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1185,7 +1185,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 114, 379, 379, 379, 464, 483, 531, 133, 138, 249, 443, 562, 562, 562, 562, 224, 517, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 524, 5, 126, 358, 417, 457, 489, 475, 543, 534, 404, 193, 108, 108, 651, 651, 653, 653, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1201,7 +1201,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 178, 85, 84, 84, 64, 41, 157, 114, 114, 68, 84, 18, 18, 18, 18, 102, 20, 186, 182, 201, 100, 109, 74, 79, 73, 172, 89, 138, 86, 162, 161, 192, 157, 17, 178, 138, 116, 83, 22, 45, 157, 157, 85, 48, 178, 78, 155, 44, 155, 44, 185, 116, 110, 48, 48, 72 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1216,7 +1216,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 72, 113, 1, 72, 1, 40, 1, 40, 40, 73, 118, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 64, 64, 64, 64, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 40, 72, 118, 72, 6, 72, 1, 55, 70, 71, 72, 64, 1, 55, 75, 74, 40, 40, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1232,7 +1232,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 284, 284, 264, 6, 82, 95, 95, 95, 148, 344, 165, 183, 183, 124, 95, 284, 284, 284, 284, 174, 284, 30, 54, 24, 174, 176, 66, 170, 66, 60, 71, 185, 95, 57, 63, 168, 165, 284, 82, 185, 1, 95, 285, 140, 165, 165, 95, 85, 82, 11, 121, 189, 121, 189, 30, 1, 183, 85, 85, 66 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1269,7 +1269,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 64, 203, 54, 42, 0, 203, 54, 42, 0, 227, 3, 125, 197, 166, 126, 10, 0, 125, 197, 166, 126, 10, 0, 136, 2, 0, 126, 0, 227, 3, 124, 276, 166, 126, 10, 0, 276, 166, 126, 10, 0, 135, 2, 0, 126, 0, 227, 3, 135, 0, 227, 3, 140, 0, 158, 60, 140, 0, 278, 0, 31, 0, 31, 139, 0, 165, 0, 134, 0, 158, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1301,7 +1301,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5657, 5633, 5603, 5580, 5514, 5488, 5457, 2943, 3230, 3188, 3131, 3089, 3032, 2990, 1388, 1341, 1292, 2094, 2052, 2005, 1958, 1911, 1864, 1817, 1770, 1723, 1676, 1629, 1582, 1535, 598, 1488, 1438, 1206, 1057, 994, 1143, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1339,7 +1339,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 68, 127, 127, 164, 239, 64, 3, 71, 238, 182, 238, 320, 149, 75, 238, 127, 127, 53, 97, 337, 182, 154, 211, 154, 319, 127, 3, 154, 297, 325, 243, 154, 154, 127, 70, 204, 161, 286, 158, 202, 68, 70, 121, 317, 154, 202, 9, 154 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1395,7 +1395,7 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java index bc5b25577a2..3525b870c55 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java @@ -24,7 +24,7 @@ public class CPPTemplateTypeParameterParserprs 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -238,7 +238,7 @@ public class CPPTemplateTypeParameterParserprs 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -252,7 +252,7 @@ public class CPPTemplateTypeParameterParserprs @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 191, 5, 154, 94, 94, 30, 30, 81, 81, 39, 39, 42, 42, 218, 1, 1, 16, @@ -604,7 +604,7 @@ public class CPPTemplateTypeParameterParserprs 0, 1, 263, 0, 367, 95, 0, 35, 73, 0, 263, 254, 0, 313, 4934, 0, 263, 253, 0, 6996, 1, 0, 6992, 1, 0, 1, 263, 3573, 0, 6993, 263, 0, 3574, 263, 0, 6996, 420, 0, 6995, 420, 0, 3586, 263, 0, 10, 12, 0, 8, 10, 12, 0, 3656, 227, 0, 218, 5147, 0, 3659, 420, 0, 8, 12, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -618,7 +618,7 @@ public class CPPTemplateTypeParameterParserprs @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -761,7 +761,7 @@ public class CPPTemplateTypeParameterParserprs 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 64, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -968,7 +968,7 @@ public class CPPTemplateTypeParameterParserprs 6998, 6998, 6998, 6998, 6998, 6998, 6998, 6998, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6984, 6998, 6984, 6984, 6984, 6998, 6984, 6984, 6984, 6998 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1008,7 +1008,7 @@ public class CPPTemplateTypeParameterParserprs 367, 608, 510, 709, 427, 955, 427, 436, 1050, 436, 455, 455, 453, 434, 455, 709, 709, 211, 433, 367, 64, 709, 770, 436, 912, 504, 912, 453, 353, 955, 912, 758, 64, 912, 912, 642, 436, 211, 436, 709, 353, 471, 436, 433, 366, 608, 608, 947, 471, 434, 871, 709, 912, 707, 63, 436, 912, 709, 707, 707, 436 }; - }; + } public final static char asb[] = Asb.asb; @@ -1060,7 +1060,7 @@ public class CPPTemplateTypeParameterParserprs 39, 9, 3, 8, 6, 7, 5, 4, 1, 2, 71, 0, 41, 23, 13, 56, 26, 14, 28, 29, 15, 16, 30, 31, 17, 18, 32, 57, 33, 10, 58, 19, 22, 20, 24, 21, 12, 11, 25, 9, 3, 7, 39, 63, 61, 65, 88, 27, 62, 54, 4, 5, 8, 6, 1, 2, 55, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -1097,7 +1097,7 @@ public class CPPTemplateTypeParameterParserprs 169, 12, 32, 153, 32, 169, 297, 206, 302, 160, 302, 296, 32, 12, 302, 155, 83, 302, 302, 32, 206, 12, 206, 169, 160, 31, 206, 116, 153, 137, 137, 158, 85, 12, 183, 169, 302, 75, 82, 206, 302, 169, 75, 12, 206 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1119,7 +1119,7 @@ public class CPPTemplateTypeParameterParserprs 10, 9, 13, 3, 1, 0, 133, 5, 50, 93, 0, 2, 132, 0, 2, 4, 113, 110, 111, 112, 13, 69, 0, 39, 4, 2, 9, 10, 5, 172, 0, 5, 50, 93, 95, 0, 5, 50, 93, 115, 48, 4, 0, 113, 69, 13, 110, 111, 112, 190, 0, 54, 4, 98, 5, 27, 0, 197, 5, 52, 0, 52, 5, 30, 0, 5, 52, 116, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1135,7 +1135,7 @@ public class CPPTemplateTypeParameterParserprs 58, 78, 44, 121, 33, 30, 118, 119, 96, 108, 49, 50, 56, 57, 59, 69, 71, 72, 85, 92, 17, 18, 65, 21, 22, 6, 23, 24, 25, 26, 27, 32, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 51, 80, 81, 82, 5, 117, 3, 123, 62, 116 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1155,7 +1155,7 @@ public class CPPTemplateTypeParameterParserprs 178, 0, 193, 0, 0, 0, 202, 0, 205, 211, 0, 223, 224, 0, 0, 229, 232, 0, 234, 236, 0, 240, 241, 242, 245, 0, 0, 249, 124, 0, 150, 153, 0, 181, 0, 184, 0, 0, 208, 221, 226, 0, 0, 230, 231, 233, 235, 0, 238, 239, 244, 250, 253, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1171,7 +1171,7 @@ public class CPPTemplateTypeParameterParserprs 551, 555, 645, 649, 653, 110, 7, 110, 410, 426, 439, 460, 479, 543, 129, 129, 245, 439, 566, 582, 593, 604, 220, 513, 69, 69, 169, 235, 238, 69, 254, 275, 238, 238, 69, 369, 492, 499, 169, 69, 668, 123, 355, 414, 454, 486, 472, 69, 355, 401, 190, 117, 452, 657, 664, 657, 664, 78, 420, 150, 117, 117, 264 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1187,7 +1187,7 @@ public class CPPTemplateTypeParameterParserprs 666, 11, 114, 379, 379, 379, 464, 483, 535, 133, 138, 249, 443, 570, 570, 570, 570, 224, 517, 72, 72, 5, 5, 241, 243, 257, 5, 278, 278, 243, 108, 5, 257, 5, 528, 5, 126, 358, 417, 457, 489, 475, 547, 538, 404, 193, 108, 108, 659, 659, 661, 661, 80, 422, 152, 215, 200, 266 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1203,7 +1203,7 @@ public class CPPTemplateTypeParameterParserprs 12, 130, 178, 85, 84, 84, 64, 41, 157, 114, 114, 68, 84, 18, 18, 18, 18, 102, 20, 186, 182, 201, 100, 109, 74, 80, 73, 172, 89, 139, 86, 162, 161, 192, 157, 17, 178, 139, 116, 83, 22, 45, 157, 157, 85, 48, 178, 79, 155, 44, 155, 44, 185, 116, 110, 48, 48, 72 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1218,7 +1218,7 @@ public class CPPTemplateTypeParameterParserprs 72, 113, 1, 72, 1, 39, 1, 39, 39, 73, 118, 72, 72, 72, 72, 72, 118, 1, 72, 1, 72, 72, 72, 71, 71, 4, 1, 1, 5, 72, 64, 64, 64, 64, 72, 3, 1, 1, 72, 72, 3, 1, 118, 72, 1, 1, 1, 39, 72, 118, 72, 6, 72, 1, 55, 70, 71, 72, 64, 1, 55, 75, 74, 39, 39, 4, 4, 4, 4, 3, 1, 69, 1, 1, 3 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -1234,7 +1234,7 @@ public class CPPTemplateTypeParameterParserprs 267, 267, 267, 267, 247, 6, 65, 78, 78, 78, 112, 327, 129, 175, 175, 134, 78, 267, 267, 267, 267, 362, 267, 26, 53, 24, 362, 364, 181, 358, 181, 59, 186, 177, 78, 50, 56, 132, 129, 267, 65, 177, 1, 78, 268, 104, 129, 129, 78, 68, 65, 11, 101, 150, 101, 150, 26, 1, 175, 68, 68, 181 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1272,7 +1272,7 @@ public class CPPTemplateTypeParameterParserprs 197, 166, 126, 10, 0, 136, 2, 0, 126, 0, 227, 3, 124, 276, 166, 126, 10, 0, 276, 166, 126, 10, 0, 135, 2, 0, 126, 0, 227, 3, 135, 0, 227, 3, 140, 0, 159, 60, 140, 0, 278, 0, 31, 0, 31, 139, 0, 165, 0, 134, 0, 159, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1304,7 +1304,7 @@ public class CPPTemplateTypeParameterParserprs 2052, 2005, 1958, 1911, 1864, 1817, 1770, 1723, 1676, 1629, 600, 1424, 1372, 1565, 1519, 1277, 1173, 1126, 1222, 0, 901, 891, 803, 653, 4666, 4585, 4572, 3167, 4435, 3889, 645, 3849, 0, 4727, 4850, 4724, 1076, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1342,7 +1342,7 @@ public class CPPTemplateTypeParameterParserprs 3, 123, 159, 123, 188, 127, 164, 239, 3, 71, 238, 174, 238, 320, 149, 75, 238, 127, 127, 97, 337, 174, 152, 211, 152, 319, 127, 3, 152, 297, 325, 152, 152, 127, 70, 204, 161, 286, 159, 203, 68, 121, 317, 152, 203, 9, 152 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1398,7 +1398,7 @@ public class CPPTemplateTypeParameterParserprs "template_argument_list", "template_argument", "type_name_specifier_inTemplate", "type_name_declaration_specifie" + "rs_inTemplate", "type_specifier_seq_inTemplate", "handler", "exception_declaration", "type_id_list" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java index ee31f92de52..f6e3cb81da3 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java @@ -23,7 +23,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -136,7 +136,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 0, 0, -358, 0, 0, 0, -118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -158, 0, 0, 0, -359, 0, 0, 0, -369, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -150,7 +150,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 121, 2, 122, 49, 49, 18, 18, 53, 53, 26, 26, 1, 1, 3, 3, 3, 3, 4, 4, @@ -321,7 +321,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 0, 500, 369, 0, 583, 369, 0, 623, 369, 0, 224, 236, 0, 3400, 1, 0, 623, 381, 0, 583, 381, 0, 500, 381, 0, 593, 32, 0, 2304, 32, 0, 623, 254, 0, 583, 254, 0, 500, 254, 0, 1, 3630, 0, 224, 237, 0, 180, 20, 0, 8, 10, 0, 1984, 119, 0, 1, 3619, 0, 367, 356, 0, 368, 357, 0, 113, 2556, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -335,7 +335,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -418,7 +418,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 61, 0, 0, 0, 0, 65, 0, 0, 0, 0, 84, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -538,7 +538,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 3392, 3392, 3392, 752, 596, 3392, 3392, 1600, 3392, 3392, 3392, 3392, 1378, 3392, 3392, 3392, 3392, 2239, 1676, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3392, 3777, 3392, 3392, 3392, 3392, 3392, 3404, 3392, 3392, 3392, 3392, 3392, 3403 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -566,7 +566,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 306, 28, 28, 509, 279, 470, 26, 13, 28, 13, 13, 384, 309, 504, 469, 28, 465, 73, 466, 504, 238, 249, 199, 504, 136, 193, 261, 582, 28, 79, 3, 310, 470, 249, 522, 73, 28, 466, 466, 331, 140, 593, 582, 28, 249, 310, 470, 13, 466, 28, 306, 13, 249, 306, 13 }; - }; + } public final static char asb[] = Asb.asb; @@ -604,7 +604,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 30, 51, 31, 52, 53, 32, 27, 54, 55, 28, 63, 33, 64, 56, 57, 25, 58, 59, 60, 5, 1, 9, 7, 8, 26, 3, 34, 4, 2, 6, 0, 6, 1, 35, 36, 3, 29, 49, 50, 62, 30, 51, 31, 52, 53, 32, 54, 55, 28, 63, 33, 64, 56, 57, 58, 59, 60, 2, 5, 9, 7, 8, 4, 69, 24, 27, 25, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -630,7 +630,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 139, 143, 102, 13, 58, 8, 63, 48, 155, 120, 187, 117, 187, 72, 72, 58, 58, 102, 110, 182, 195, 27, 173, 27, 27, 84, 58, 13, 182, 58, 43, 160, 87, 13, 48, 187, 16, 13, 55, 43, 60, 8, 58, 43, 10, 195, 182, 187, 43, 143, 58, 87, 163, 50, 60, 72, 8, 58, 187, 195, 182, 27, 163, 58, 72, 27, 187, 72, 27 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -648,7 +648,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 128, 2, 29, 0, 2, 58, 97, 0, 107, 2, 58, 0, 27, 46, 34, 2, 0, 18, 34, 46, 67, 68, 2, 0, 2, 29, 27, 63, 0, 46, 34, 2, 10, 0, 46, 48, 27, 34, 36, 0, 58, 30, 2, 31, 0, 137, 2, 29, 0, 31, 2, 26, 0, 67, 68, 2, 18, 0, 2, 29, 113, 0, 29, 60, 2, 71, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -663,7 +663,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 60, 61, 67, 73, 42, 49, 54, 58, 63, 64, 68, 69, 76, 77, 80, 81, 82, 29, 56, 72, 75, 93, 16, 17, 31, 30, 4, 14, 15, 18, 19, 20, 21, 91, 43, 44, 22, 23, 24, 25, 26, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 101, 55, 90 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -680,7 +680,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 177, 198, 0, 134, 135, 136, 137, 138, 139, 142, 0, 154, 158, 160, 169, 195, 197, 109, 126, 130, 0, 153, 157, 0, 159, 172, 182, 187, 0, 189, 0, 192, 0, 194, 0, 0, 0, 0, 0, 0, 156, 0, 170, 171, 176, 181, 0, 183, 184, 0, 185, 186, 188, 0, 0, 193, 0, 0, 196, 199, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -695,7 +695,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 381, 394, 408, 394, 348, 15, 27, 56, 8, 8, 117, 120, 172, 120, 197, 120, 247, 252, 255, 311, 436, 50, 87, 93, 133, 241, 87, 405, 415, 415, 8, 133, 276, 210, 372, 210, 276, 20, 20, 41, 233, 41, 41, 41, 41, 41, 309, 403, 20, 20, 45, 146, 175, 146, 175, 175 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -710,7 +710,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 352, 18, 18, 39, 6, 6, 39, 123, 6, 182, 39, 200, 250, 250, 250, 235, 39, 53, 90, 96, 148, 244, 306, 53, 418, 425, 11, 136, 271, 227, 375, 213, 279, 25, 33, 43, 235, 292, 294, 296, 298, 300, 235, 235, 22, 30, 47, 148, 184, 136, 177, 192 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -724,7 +724,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 11, 78, 43, 87, 7, 7, 116, 115, 70, 69, 59, 97, 60, 30, 7, 6, 6, 43, 42, 42, 24, 42, 43, 108, 83, 4, 136, 135, 67, 86, 59, 100, 34, 52, 79, 79, 79, 44, 4, 40, 70, 112, 63, 97, 60, 40, 8, 6, 146, 63, 78, 80, 43, 80, 78, 108, 83, 102, 97, 94, 93, 92, 91, 90, 60, 41, 108, 83, 144, 63, 36, 63, 48, 36 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -738,7 +738,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 36, 10, 26, 36, 36, 36, 36, 65, 10, 36, 77, 26, 26, 65, 36, 36, 77, 36, 36, 36, 61, 36, 26, 7, 7, 36, 77, 77, 36, 1, 77, 2, 36, 2, 2, 2, 2, 26, 36, 61, 2, 68, 6, 2, 2, 61, 36, 36, 69, 6, 10, 10, 37, 2, 2, 2, 2, 9, 26, 2, 62, 63, 63, 57, 26, 26, 2, 2, 69, 6, 1, 6, 1, 1 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -753,7 +753,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 38, 38, 5, 159, 65, 1, 3, 58, 60, 54, 217, 146, 152, 141, 141, 141, 38, 65, 38, 224, 135, 208, 8, 221, 38, 72, 65, 3, 208, 141, 141, 38, 141, 141, 5, 159, 142, 8, 142, 142, 142, 142, 142, 221, 38, 5, 159, 12, 208, 146, 208, 148, 146 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -781,7 +781,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 0, 139, 42, 0, 79, 2, 107, 103, 105, 0, 131, 1, 47, 0, 139, 118, 131, 1, 45, 0, 55, 128, 0, 131, 1, 45, 0, 103, 128, 55, 128, 0, 138, 0, 162, 39, 0, 131, 87, 123, 0, 29, 124, 0, 164, 1, 0, 103, 113, 0, 164, 1, 17, 0, 103, 111, 0, 223, 1, 106, 0, 131, 35, 106, 0, 131, 1, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -804,7 +804,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 535, 389, 2336, 2257, 3114, 2307, 3140, 3068, 2053, 2922, 2834, 2726, 2428, 2173, 2279, 621, 1072, 2702, 2696, 2853, 2688, 3089, 3064, 2662, 2654, 2636, 499, 1054, 485, 2477, 3060, 2143, 3032, 2972, 2883, 2879, 1865, 0, 1888, 1054, 485, 0, 2991, 1960, 1138, 1925, 1843, 1797, 1751, 2848, 2590, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -831,7 +831,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym 128, 61, 61, 231, 102, 171, 126, 118, 1, 118, 118, 163, 48, 206, 226, 61, 152, 127, 198, 188, 185, 175, 118, 188, 48, 233, 245, 70, 35, 101, 234, 126, 171, 131, 139, 48, 61, 198, 127, 153, 68, 162, 70, 35, 171, 126, 118, 99, 127, 69, 162, 118, 171, 162, 118 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -875,7 +875,7 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym "attribute_or_decl_specifier_se" + "q", "word", "extended_decl_modifier_seq", "extended_decl_modifier", "extended_asm_param", "case_range_expression", "typeof_declaration_specifiers", "typeof_type_specifier", "field_name_designator" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java index 4d2e55ed99d..b924824bb52 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java @@ -23,7 +23,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -131,7 +131,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -339, 0, 0, 0, 0, 0, 0, 0, 0, -344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -145,7 +145,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 117, 7, 118, 41, 41, 24, 24, 50, 50, 26, 26, 1, 1, 2, 2, 2, 2, 3, 3, @@ -303,7 +303,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 841, 366, 0, 856, 366, 0, 902, 366, 0, 1, 702, 0, 841, 378, 0, 856, 378, 0, 902, 378, 0, 1, 841, 0, 1, 856, 0, 1, 902, 0, 354, 364, 0, 841, 253, 0, 856, 253, 0, 902, 253, 0, 8, 10, 0, 1310, 118, 0, 1, 3444, 0, 1, 3455, 0, 112, 2448, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -317,7 +317,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -393,7 +393,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -502,7 +502,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 200, 3218, 372, 189, 902, 3218, 902, 841, 856, 841, 856, 373, 379, 3227, 3218, 902, 374, 206, 841, 856, 902, 3218, 3223, 841, 856, 3218, 375, 3218, 3218, 3218, 3218, 3218, 3218, 3218, 1408, 1996, 3218, 3218, 3218, 1583, 3218, 3218, 3218, 3218, 3218, 3218, 3218, 3218, 3221 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -529,7 +529,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 430, 254, 317, 272, 370, 468, 317, 47, 616, 372, 460, 544, 436, 62, 153, 360, 430, 31, 109, 272, 452, 253, 351, 316, 31, 312, 194, 313, 351, 272, 254, 317, 584, 431, 272, 371, 31, 250, 431, 194, 31, 313, 313, 584, 272, 272, 250, 313, 584 }; - }; + } public final static char asb[] = Asb.asb; @@ -563,7 +563,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5, 13, 68, 4, 8, 7, 0, 39, 41, 14, 45, 47, 42, 35, 43, 44, 40, 38, 46, 29, 17, 18, 19, 20, 1, 5, 2, 15, 16, 12, 6, 9, 10, 21, 22, 13, 23, 27, 3, 11, 0, 17, 18, 19, 20, 11, 1, 5, 2, 15, 16, 12, 6, 9, 10, 21, 22, 13, 23, 48, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -588,7 +588,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 38, 169, 87, 165, 121, 15, 36, 51, 8, 162, 179, 87, 27, 102, 179, 27, 102, 89, 140, 112, 27, 60, 50, 64, 8, 51, 38, 87, 87, 51, 36, 179, 51, 27, 137, 114, 36, 87, 162, 179, 151, 27, 87, 95, 51, 64, 27, 121, 51, 114, 140, 151, 87, 87, 64, 140, 151 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -605,7 +605,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 7, 28, 45, 43, 48, 0, 64, 63, 45, 43, 28, 0, 24, 63, 64, 7, 0, 7, 45, 43, 28, 0, 7, 60, 89, 0, 24, 64, 63, 43, 45, 7, 0, 43, 45, 7, 12, 0, 5, 59, 57, 0, 7, 31, 28, 61, 0, 1, 34, 7, 35, 0, 64, 63, 28, 0, 31, 66, 7, 67, 0, 105, 7, 60, 0, 125, 7, 31, 0, 7, 30, 118, 0, 30, 7, 26, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -620,7 +620,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 60, 61, 67, 73, 29, 42, 93, 49, 54, 58, 63, 64, 68, 69, 76, 77, 80, 81, 82, 56, 72, 75, 16, 17, 30, 31, 4, 14, 15, 18, 19, 20, 21, 91, 43, 44, 22, 23, 24, 25, 26, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 55, 101, 90 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -637,7 +637,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 153, 0, 155, 159, 161, 191, 194, 110, 127, 131, 135, 136, 137, 138, 139, 140, 143, 0, 154, 158, 0, 160, 171, 181, 0, 188, 0, 190, 0, 193, 102, 0, 0, 0, 0, 157, 0, 169, 170, 175, 180, 0, 182, 183, 0, 184, 185, 0, 0, 189, 0, 0, 192, 195, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -652,7 +652,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 390, 344, 15, 27, 56, 8, 8, 113, 116, 168, 116, 193, 116, 243, 248, 251, 307, 428, 50, 83, 89, 129, 237, 83, 401, 411, 411, 8, 129, 272, 206, 368, 206, 272, 20, 20, 41, 229, 41, 41, 41, 41, 41, 305, 399, 20, 20, 45, 142, 171, 142, 171, 171 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -667,7 +667,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 39, 6, 6, 39, 119, 6, 178, 39, 196, 246, 246, 246, 231, 39, 53, 86, 92, 144, 240, 302, 53, 414, 417, 11, 132, 267, 223, 371, 209, 275, 25, 33, 43, 231, 288, 290, 292, 294, 296, 231, 231, 22, 30, 47, 144, 180, 132, 173, 188 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -681,7 +681,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 13, 81, 39, 93, 111, 133, 78, 65, 52, 89, 66, 29, 5, 5, 39, 38, 38, 23, 38, 39, 106, 86, 3, 132, 131, 63, 77, 52, 124, 45, 51, 82, 82, 82, 40, 3, 36, 78, 110, 61, 89, 66, 36, 8, 5, 141, 61, 81, 83, 39, 83, 81, 106, 86, 116, 89, 102, 101, 100, 99, 98, 66, 37, 106, 86, 139, 61, 48, 61, 46, 48 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -695,7 +695,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 37, 14, 27, 37, 37, 50, 14, 37, 77, 27, 27, 50, 37, 77, 37, 37, 37, 48, 37, 27, 7, 7, 37, 77, 77, 37, 2, 77, 1, 37, 1, 1, 1, 1, 27, 37, 48, 1, 69, 6, 1, 1, 48, 37, 37, 68, 6, 14, 14, 35, 1, 1, 1, 1, 13, 27, 1, 63, 64, 64, 59, 27, 27, 1, 1, 68, 6, 2, 6, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -710,7 +710,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1, 27, 129, 4, 6, 103, 105, 99, 29, 17, 20, 48, 48, 48, 113, 129, 113, 124, 199, 92, 10, 33, 113, 136, 129, 6, 92, 48, 48, 113, 48, 48, 1, 27, 49, 10, 49, 49, 49, 49, 49, 33, 113, 1, 27, 31, 92, 17, 92, 17, 17 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -738,7 +738,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 108, 104, 106, 0, 130, 2, 47, 0, 135, 124, 130, 2, 45, 0, 55, 129, 0, 130, 2, 45, 0, 104, 129, 55, 129, 0, 134, 0, 158, 39, 0, 130, 87, 122, 0, 29, 125, 0, 179, 2, 0, 104, 114, 0, 104, 112, 0, 219, 2, 105, 0, 130, 36, 105, 0, 130, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -760,7 +760,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 2712, 2703, 2694, 2681, 639, 1610, 1583, 1559, 915, 1532, 687, 1508, 1481, 659, 589, 759, 1457, 1429, 1401, 887, 1373, 1297, 843, 815, 731, 1255, 1227, 1199, 1171, 1143, 1115, 1087, 1059, 1031, 1003, 975, 388, 943, 787, 556, 528, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -786,7 +786,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 107, 207, 180, 69, 49, 126, 167, 130, 135, 48, 124, 2, 49, 107, 128, 161, 148, 150, 69, 158, 70, 36, 175, 174, 225, 49, 204, 222, 48, 151, 128, 190, 180, 167, 126, 124, 98, 6, 1, 196, 68, 158, 49, 49, 48, 190, 128, 124, 167, 1, 158, 128, 124 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -829,7 +829,7 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "attribute_or_decl_specifier", "attribute_or_decl_specifier_se" + "q", "word", "extended_decl_modifier_seq", "extended_decl_modifier", "extended_asm_param", "case_range_expression", "typeof_declaration_specifiers", "typeof_type_specifier", "field_name_designator" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java index f333df722c5..db9f663d28a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java @@ -24,7 +24,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -279,7 +279,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -293,7 +293,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction0 { public final static char baseAction0[] = { 205, 5, 143, 103, 103, 32, 32, 102, 102, 47, 47, 36, 36, 205, 1, 1, @@ -712,7 +712,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 261, 0, 848, 261, 0, 923, 261, 0, 957, 261, 0, 9567, 261, 0, 9272, 261, 0, 9271, 261, 0, 9194, 261, 0, 9193, 261, 0, 9192, 261, 0, 9191, 261, 0, 9190, 261, 0, 9189, 261, 0, 9188, 261, 0, 9187, 261, 0, 1278, 423, 0, 8914 }; - }; + } public interface BaseAction1 { public final static char baseAction1[] = { 48, 0, 8913, 48, 0, 9167, 650, 0, 9166, 650, 0, 848, 650, 0, 923, @@ -745,7 +745,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 848, 656, 0, 600, 601, 0, 6948, 103, 0, 3838, 99, 0, 957, 95, 0, 923, 95, 0, 848, 95, 0, 8937, 95, 0, 366, 95, 0, 39, 95, 0, 8911, 649, 638, 419, 0, 649, 638, 0, 35, 73, 0, 957, 657, 658, 0, 923, 657, 658, 0, 848, 657, 658, 0, 657, 658, 0, 313, 6340, 0, 3622, 419, 0, 218, 6239, 0, 8, 12, 0 }; - }; + } public final static char baseAction[] = new char[BaseAction0.baseAction0.length + BaseAction1.baseAction1.length]; { @@ -753,7 +753,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym System.arraycopy(BaseAction0.baseAction0, 0, baseAction, index, BaseAction0.baseAction0.length); index += BaseAction0.baseAction0.length; System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length); - }; + } @Override public final int baseAction(int index) { @@ -765,7 +765,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static char termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -963,7 +963,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char termCheck[] = TermCheck.termCheck; @@ -1253,7 +1253,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8899, 8397, 8899, 8400 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1298,7 +1298,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 772, 580, 580, 1233, 528, 528, 1312, 219, 1190, 154, 564, 324, 856, 856, 856, 1190, 528, 470, 813, 773, 483, 634, 528, 583, 580, 528, 528, 1247, 1190, 1190, 736, 333, 856, 856, 775, 528, 634, 583, 583, 200, 200, 1249, 961, 422, 775, 583, 950, 853, 287 }; - }; + } public final static char asb[] = Asb.asb; @@ -1361,7 +1361,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 33, 19, 35, 20, 21, 37, 38, 22, 23, 64, 40, 13, 65, 24, 31, 25, 28, 26, 29, 129, 71, 68, 34, 39, 36, 90, 69, 54, 5, 11, 12, 46, 6, 7, 8, 9, 2, 4, 3, 1, 10, 0, 46, 11, 3, 9, 8, 76, 12, 10, 4, 1, 2, 6, 7, 5, 0 }; - }; + } public final static char asr[] = Asr.asr; @@ -1401,7 +1401,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 277, 238, 238, 12, 211, 40, 183, 62, 96, 221, 13, 221, 208, 157, 153, 221, 129, 70, 154, 13, 35, 35, 187, 339, 143, 59, 122, 13, 12, 277, 277, 102, 35, 96, 62, 13, 256, 208, 35, 154, 70, 35, 35, 154, 143, 13, 13, 77, 12, 12, 221, 35, 208, 122, 154, 52, 52, 231, 338, 13, 221, 122, 35, 194, 339 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1424,7 +1424,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 2, 4, 121, 118, 119, 120, 165, 13, 79, 0, 2, 82, 0, 5, 4, 10, 9, 2, 73, 27, 0, 126, 88, 51, 5, 0, 121, 79, 13, 118, 119, 120, 198, 0, 5, 51, 88, 98, 0, 41, 212, 31, 5, 0, 5, 51, 88, 123, 49, 4, 0, 47, 4, 2, 9, 10, 5, 183, 0, 31, 5, 4, 38, 107, 0, 110, 109, 38, 4, 83, 0, 32, 5, 54, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1440,7 +1440,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 96, 106, 19, 126, 82, 108, 1, 131, 100, 44, 123, 20, 30, 63, 83, 101, 33, 124, 113, 17, 18, 54, 55, 61, 62, 64, 70, 74, 76, 77, 90, 97, 21, 22, 32, 6, 23, 24, 25, 26, 27, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, 46, 56, 85, 86, 87, 5, 122, 3, 132, 67, 121 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1461,7 +1461,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 238, 245, 0, 249, 250, 251, 254, 0, 0, 258, 0, 266, 0, 268, 0, 271, 0, 0, 158, 161, 0, 189, 0, 192, 0, 0, 216, 229, 235, 0, 0, 239, 240, 242, 244, 0, 247, 248, 253, 259, 262, 263, 0, 0, 267, 0, 0, 270, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1479,7 +1479,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 370, 13, 13, 147, 498, 615, 622, 262, 147, 791, 1, 13, 54, 201, 476, 543, 583, 1, 598, 147, 216, 410, 476, 216, 216, 437, 530, 283, 437, 24, 24, 45, 45, 195, 45, 45, 45, 45, 581, 780, 787, 24, 24, 49, 344, 780, 787, 156, 549, 243, 195, 344, 195, 359 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1497,7 +1497,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 11, 333, 186, 43, 352, 43, 651, 43, 4, 16, 57, 204, 479, 546, 57, 612, 601, 670, 211, 413, 661, 219, 230, 454, 533, 286, 440, 29, 37, 47, 96, 186, 482, 484, 486, 488, 186, 782, 782, 26, 34, 51, 346, 784, 784, 158, 551, 245, 308, 339, 293, 361 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1514,7 +1514,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 111, 20, 134, 155, 17, 194, 190, 215, 109, 117, 68, 101, 67, 183, 84, 150, 95, 173, 172, 206, 168, 17, 18, 84, 92, 189, 150, 125, 92, 22, 55, 168, 122, 87, 168, 122, 122, 120, 94, 49, 120, 134, 155, 204, 228, 189, 176, 148, 147, 146, 90, 166, 53, 134, 155, 236, 83, 166, 53, 193, 125, 118, 49, 83, 49, 66 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1530,7 +1530,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 74, 74, 76, 76, 4, 1, 1, 10, 67, 74, 75, 75, 75, 75, 74, 3, 6, 6, 74, 1, 1, 74, 74, 3, 1, 127, 74, 1, 1, 1, 46, 74, 127, 74, 8, 74, 74, 6, 76, 1, 54, 80, 76, 74, 75, 1, 1, 67, 54, 1, 1, 67, 82, 79, 1, 1, 1, 29, 1, 46, 1, 63, 62, 62, 46, 4, 4, 1, 1, 98, 12, 4, 4, 3, 1, 67, 1, 10, 1, 3 }; - }; + } public final static char scopeLa[] = ScopeLa.scopeLa; @@ -1548,7 +1548,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 163, 184, 169, 187, 121, 5, 18, 61, 58, 266, 266, 169, 121, 480, 187, 13, 121, 271, 66, 58, 367, 468, 58, 367, 367, 367, 121, 441, 367, 179, 134, 370, 39, 480, 370, 369, 369, 369, 24, 63, 138, 179, 134, 365, 425, 63, 138, 55, 13, 367, 441, 425, 441, 163 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1590,7 +1590,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 0, 205, 66, 49, 0, 244, 3, 134, 220, 184, 135, 13, 0, 134, 220, 184, 135, 13, 0, 144, 2, 0, 134, 0, 244, 3, 133, 274, 184, 135, 13, 0, 274, 184, 135, 13, 0, 143, 2, 0, 134, 0, 244, 3, 144, 0, 244, 3, 149, 0, 172, 70, 149, 0, 298, 0, 31, 0, 31, 147, 0, 183, 0, 142, 0, 172, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1628,7 +1628,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 5000, 3898, 0, 7359, 7173, 6306, 6239, 6172, 6105, 6038, 5971, 5904, 5837, 5770, 5703, 5303, 5101, 7215, 6864, 6763, 6747, 7194, 7131, 7110, 7047, 7026, 6956, 6935, 6525, 0, 7215, 6864, 6763, 6747, 7194, 7131, 7110, 7047, 7026, 6956, 6935, 6525, 7359, 7173, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1669,7 +1669,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym 135, 31, 355, 213, 220, 136, 3, 70, 172, 163, 215, 163, 342, 136, 3, 163, 317, 136, 163, 134, 244, 244, 4, 3, 233, 73, 136, 75, 213, 135, 135, 300, 244, 237, 80, 222, 178, 306, 172, 246, 136, 98, 360, 185, 233, 11, 72, 62, 213, 213, 130, 340, 163, 136, 246, 163, 163, 136, 3, 262, 163, 136, 361, 80, 73 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1729,7 +1729,7 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym "attribute_or_decl_specifier", "attribute_or_decl_specifier_se" + "q", "word", "extended_decl_modifier_seq", "extended_decl_modifier", "extended_asm_param", "case_range_expression", "typeof_declaration_specifiers", "typeof_type_specifier" }; - }; + } public final static String name[] = Name.name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java index d82cd4817a9..1ba43a006c1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java @@ -24,7 +24,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -273,7 +273,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -287,7 +287,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction0 { public final static char baseAction0[] = { 205, 5, 141, 103, 103, 32, 32, 99, 99, 47, 47, 43, 43, 238, 1, 1, 16, @@ -704,7 +704,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 273, 0, 8943, 273, 0, 8942, 273, 0, 8941, 273, 0, 8940, 273, 0, 8939, 273, 0, 8958, 273, 0, 8957, 273, 0, 8956, 273, 0, 8955, 273, 0, 8954, 273, 0, 8953, 273, 0, 8952, 273, 0, 8951, 273, 0, 8950, 273, 0, 8949, 273, 0, 8948, 273, 0 }; - }; + } public interface BaseAction1 { public final static char baseAction1[] = { 9316, 273, 0, 9315, 273, 0, 39, 8668, 273, 0, 39, 8667, 273, 0, 8691, @@ -727,7 +727,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 216, 6262, 0, 261, 252, 0, 1, 2464, 0, 1, 3369, 0, 2025, 653, 0, 1990, 653, 0, 1968, 653, 0, 2025, 652, 0, 1990, 652, 0, 1968, 652, 0, 598, 599, 0, 8, 12, 0, 261, 251, 0, 8665, 1, 0, 2025, 653, 654, 0, 1990, 653, 654, 0, 1968, 653, 654, 0, 653, 654, 0 }; - }; + } public final static char baseAction[] = new char[BaseAction0.baseAction0.length + BaseAction1.baseAction1.length]; { @@ -735,7 +735,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab System.arraycopy(BaseAction0.baseAction0, 0, baseAction, index, BaseAction0.baseAction0.length); index += BaseAction0.baseAction0.length; System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length); - }; + } @Override public final int baseAction(int index) { @@ -747,7 +747,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static char termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -938,7 +938,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, 0, 0, 76, 76, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char termCheck[] = TermCheck.termCheck; @@ -1214,7 +1214,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 7592, 8653, 8653, 8658, 588, 8653, 8653, 8658, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 8653, 7710, 8653, 7713 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1259,7 +1259,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 661, 582, 582, 611, 611, 766, 763, 1079, 1079, 763, 821, 591, 682, 125, 268, 599, 268, 181, 181, 1311, 655, 425, 424, 436, 425, 436, 349, 349, 763, 763, 763, 1182, 673, 602, 424, 436, 381, 381, 763, 763, 1171, 602, 655, 350, 381, 418, 582, 349, 760 }; - }; + } public final static char asb[] = Asb.asb; @@ -1322,7 +1322,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 17, 62, 28, 18, 63, 33, 19, 35, 20, 21, 37, 38, 22, 23, 64, 40, 13, 65, 24, 31, 25, 29, 26, 16, 32, 30, 27, 15, 14, 12, 3, 11, 47, 70, 67, 95, 34, 39, 36, 69, 66, 4, 5, 10, 6, 7, 9, 8, 1, 2, 54, 0, 4, 12, 78, 72, 6, 7, 5, 0 }; - }; + } public final static char asr[] = Asr.asr; @@ -1362,7 +1362,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 13, 157, 157, 191, 295, 153, 338, 87, 87, 12, 13, 78, 247, 44, 97, 124, 97, 110, 110, 254, 36, 14, 261, 329, 14, 261, 13, 13, 12, 338, 338, 341, 135, 261, 305, 329, 342, 342, 12, 12, 97, 78, 36, 13, 342, 13, 157, 13, 30 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1385,7 +1385,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5, 64, 124, 0, 5, 209, 0, 37, 1, 0, 37, 84, 0, 2, 4, 121, 118, 119, 120, 165, 13, 78, 0, 5, 4, 10, 9, 2, 73, 27, 0, 121, 78, 13, 118, 119, 120, 198, 0, 144, 5, 52, 90, 0, 31, 5, 4, 37, 105, 0, 64, 5, 211, 0, 5, 52, 90, 123, 50, 4, 0, 44, 212, 31, 5, 0, 108, 107, 37, 4, 82, 0, 2, 81, 0, 32, 5, 64, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1401,7 +1401,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 96, 106, 19, 82, 100, 131, 108, 1, 126, 44, 63, 83, 123, 20, 30, 101, 33, 124, 113, 17, 18, 54, 55, 61, 62, 64, 74, 76, 77, 90, 97, 70, 21, 22, 32, 6, 23, 24, 25, 26, 27, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, 46, 56, 85, 86, 87, 5, 122, 3, 132, 67, 121 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1422,7 +1422,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 239, 246, 0, 250, 251, 252, 255, 0, 0, 259, 0, 267, 0, 269, 0, 272, 133, 0, 159, 162, 0, 190, 0, 193, 0, 0, 217, 230, 236, 0, 0, 240, 241, 243, 245, 0, 248, 249, 254, 260, 263, 264, 0, 0, 268, 0, 0, 271, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1440,7 +1440,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 494, 611, 618, 258, 143, 779, 1, 13, 54, 197, 472, 539, 579, 1, 594, 143, 212, 406, 472, 212, 212, 433, 526, 279, 433, 24, 24, 45, 45, 191, 45, 45, 45, 45, 577, 768, 775, 24, 24, 49, 340, 768, 775, 152, 545, 239, 191, 340, 191, 355 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1458,7 +1458,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 43, 348, 43, 643, 43, 4, 16, 57, 200, 475, 542, 57, 608, 597, 662, 207, 409, 653, 215, 226, 450, 529, 282, 436, 29, 37, 47, 92, 182, 478, 480, 482, 484, 182, 770, 770, 26, 34, 51, 342, 772, 772, 154, 547, 241, 304, 335, 289, 357 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1475,7 +1475,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 17, 194, 190, 215, 107, 115, 68, 98, 67, 183, 83, 150, 95, 173, 172, 206, 168, 17, 18, 83, 92, 189, 150, 124, 92, 22, 54, 168, 122, 89, 168, 122, 122, 120, 94, 50, 120, 132, 155, 204, 228, 189, 176, 148, 147, 146, 86, 166, 53, 132, 155, 236, 82, 166, 53, 193, 124, 118, 50, 82, 50, 66 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1491,7 +1491,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 4, 1, 1, 10, 72, 76, 77, 77, 77, 77, 76, 3, 6, 6, 76, 1, 1, 76, 76, 3, 1, 127, 76, 1, 1, 1, 47, 76, 127, 76, 8, 76, 76, 6, 78, 1, 54, 80, 78, 76, 77, 1, 1, 72, 54, 1, 1, 72, 82, 79, 1, 1, 1, 27, 1, 47, 1, 63, 62, 62, 47, 4, 4, 1, 1, 98, 11, 4, 4, 3, 1, 72, 1, 10, 1, 3 }; - }; + } public final static char scopeLa[] = ScopeLa.scopeLa; @@ -1509,7 +1509,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 159, 377, 377, 63, 114, 37, 177, 32, 114, 382, 134, 159, 181, 40, 159, 181, 181, 181, 114, 101, 181, 73, 28, 184, 82, 37, 184, 183, 183, 183, 87, 84, 255, 73, 28, 476, 239, 84, 255, 12, 32, 181, 101, 239, 101, 57 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1551,7 +1551,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 184, 135, 13, 0, 134, 215, 184, 135, 13, 0, 145, 2, 0, 135, 0, 242, 3, 133, 272, 184, 135, 13, 0, 272, 184, 135, 13, 0, 144, 2, 0, 135, 0, 242, 3, 144, 0, 242, 3, 149, 0, 175, 71, 149, 0, 298, 0, 31, 0, 31, 148, 0, 180, 0, 143, 0, 175, 3, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1589,7 +1589,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 2875, 2797, 3844, 3797, 1636, 3470, 1234, 3745, 3698, 3646, 1300, 1587, 1516, 1352, 3599, 1467, 1179, 2484, 2435, 2328, 2279, 2230, 2181, 2132, 2083, 2034, 1985, 1936, 1887, 1838, 1788, 671, 1739, 1685, 1418, 2375, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1630,7 +1630,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 41, 132, 326, 54, 13, 62, 263, 168, 73, 135, 31, 355, 212, 68, 136, 163, 136, 242, 136, 1, 163, 163, 136, 273, 136, 174, 73, 77, 66, 260, 260, 212, 135, 135, 3, 317, 244, 136, 136, 80, 80, 212, 212, 361, 136, 273, 326, 73, 77, 62, 260, 80 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1690,7 +1690,7 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "attribute_or_decl_specifier", "attribute_or_decl_specifier_se" + "q", "word", "extended_decl_modifier_seq", "extended_decl_modifier", "extended_asm_param", "case_range_expression", "typeof_declaration_specifiers", "typeof_type_specifier" }; - }; + } public final static String name[] = Name.name; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java index cf6e6e646c4..414473a9387 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java @@ -659,7 +659,7 @@ public class MemoryBrowser extends ViewPart } label += ' ' + renderingType; - ; + // Allow the memory block to customize the label. The platform's // Memory view support this (it was done in the call to diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java index fbd8a0a83f1..6d160e5c315 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java @@ -1380,6 +1380,6 @@ public class FindReplaceDialog extends SelectionDialog { interface IMemorySearchQuery extends ISearchQuery { public IMemoryRenderingSite getMemoryView(); - }; + } } diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java index e972256bc0b..d12933f93e5 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java @@ -1406,7 +1406,7 @@ abstract class CopyAction extends Action { // blocks on a Job. public enum CopyType { UNDEFINED, BINARY, TEXT, ADDRESS, ALL, DEFAULT - }; + } private Rendering fRendering; private int fClipboardType = DND.CLIPBOARD; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java index 23c2c92d64e..4698a694924 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java @@ -100,5 +100,5 @@ public class QtSyntaxChecker extends AbstractIndexAstChecker implements IChecker else reportProblem(Activator.QT_SYNTAX_ERR_ID, node, NLS.bind(message, args)); } - }; + } } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmldir/QMLDirectoryParser.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmldir/QMLDirectoryParser.java index 8e611767059..7ef5c267d2a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmldir/QMLDirectoryParser.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmldir/QMLDirectoryParser.java @@ -284,7 +284,7 @@ public class QMLDirectoryParser { } } throw unexpectedToken(); - }; + } private QDirInternalCommand parseInternalCommand() { QDirInternalCommand node = new QDirInternalCommand(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSIdentifier.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSIdentifier.java index 382c4c2ffcd..5d86d62d91d 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSIdentifier.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSIdentifier.java @@ -21,7 +21,7 @@ public interface IJSIdentifier extends IJSExpression, IJSPattern { @Override default public String getType() { return "Identifier"; //$NON-NLS-1$ - }; + } public String getName(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSLiteral.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSLiteral.java index b0ba9f4246d..490142836c2 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSLiteral.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IJSLiteral.java @@ -20,7 +20,7 @@ public interface IJSLiteral extends IJSExpression { @Override default public String getType() { return "Literal"; //$NON-NLS-1$ - }; + } /** * @return String, Boolean, Integer, Double, or Regular Expression diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlArrayBinding.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlArrayBinding.java index 0c99f23db84..eabaaee9cdc 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlArrayBinding.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlArrayBinding.java @@ -19,7 +19,7 @@ public interface IQmlArrayBinding extends IQmlBinding { @Override default public String getType() { return "QMLArrayBinding"; //$NON-NLS-1$ - }; + } public List<IQmlObjectDefinition> getElements(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlImport.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlImport.java index b6c043fb3b8..6529a7765f0 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlImport.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlImport.java @@ -17,7 +17,7 @@ public interface IQmlImport extends IQmlHeaderItem { @Override default public String getType() { return "QMLImport"; //$NON-NLS-1$ - }; + } public IQmlModule getModule(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectBinding.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectBinding.java index 643fabc094c..62601ffef23 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectBinding.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectBinding.java @@ -17,7 +17,7 @@ public interface IQmlObjectBinding extends IQmlBinding { @Override default public String getType() { return "QMLObjectBinding"; //$NON-NLS-1$ - }; + } public IQmlQualifiedID getIdentifier(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectDefinition.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectDefinition.java index 2a9923e5115..bfe205e3854 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectDefinition.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectDefinition.java @@ -17,7 +17,7 @@ public interface IQmlObjectDefinition extends IQmlObjectMember { @Override default public String getType() { return "QMLObjectDefinition"; //$NON-NLS-1$ - }; + } public IQmlQualifiedID getIdentifier(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectInitializer.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectInitializer.java index 3799e9b18dd..7c642b3e6a7 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectInitializer.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlObjectInitializer.java @@ -19,7 +19,7 @@ public interface IQmlObjectInitializer extends IQmlASTNode { @Override default public String getType() { return "QMLObjectInitializer"; //$NON-NLS-1$ - }; + } public List<IQmlObjectMember> getMembers(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlParameter.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlParameter.java index 0cd3798d4f7..ce0f11de4fd 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlParameter.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlParameter.java @@ -17,7 +17,7 @@ public interface IQmlParameter extends IQmlASTNode { @Override default public String getType() { return "QMLParameter"; //$NON-NLS-1$ - }; + } public IQmlPropertyType getKind(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPragma.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPragma.java index d2badd25b4d..0f78b56fb44 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPragma.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPragma.java @@ -17,7 +17,7 @@ public interface IQmlPragma extends IQmlHeaderItem { @Override default public String getType() { return "QMLPragma"; //$NON-NLS-1$ - }; + } public IQmlQualifiedID getIdentifier(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlProgram.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlProgram.java index 3dd8f447ed5..2143081e33b 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlProgram.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlProgram.java @@ -31,7 +31,7 @@ public interface IQmlProgram extends IQmlASTNode { @Override default public String getType() { return "QMLProgram"; //$NON-NLS-1$ - }; + } public Modes getMode(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyBinding.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyBinding.java index 1ff2d6952d6..6526b90e0a8 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyBinding.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyBinding.java @@ -17,7 +17,7 @@ public interface IQmlPropertyBinding extends IQmlObjectMember { @Override default public String getType() { return "QMLPropertyBinding"; //$NON-NLS-1$ - }; + } public IQmlQualifiedID getIdentifier(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyDeclaration.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyDeclaration.java index 04708700b2e..19e8a3ef04b 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyDeclaration.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyDeclaration.java @@ -17,7 +17,7 @@ public interface IQmlPropertyDeclaration extends IQmlObjectMember { @Override default public String getType() { return "QMLPropertyDeclaration"; //$NON-NLS-1$ - }; + } public boolean isReadonly(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyType.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyType.java index a30824ee062..3f6a1942492 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyType.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlPropertyType.java @@ -17,7 +17,7 @@ public interface IQmlPropertyType extends IQmlASTNode { @Override default public String getType() { return "QMLPropertyType"; //$NON-NLS-1$ - }; + } public boolean isPrimitive(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifiedID.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifiedID.java index 5f7aefaf276..ea714e794fd 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifiedID.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifiedID.java @@ -19,7 +19,7 @@ public interface IQmlQualifiedID extends IQmlASTNode { @Override default public String getType() { return "QMLQualifiedID"; //$NON-NLS-1$ - }; + } public List<IJSIdentifier> getParts(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifier.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifier.java index c08891daad8..690d033e2a5 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifier.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlQualifier.java @@ -17,7 +17,7 @@ public interface IQmlQualifier extends IQmlASTNode { @Override default public String getType() { return "QMLQualifier"; //$NON-NLS-1$ - }; + } public IJSIdentifier getIdentifier(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlScriptBinding.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlScriptBinding.java index c86ab7ae405..d4288588a49 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlScriptBinding.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlScriptBinding.java @@ -17,7 +17,7 @@ public interface IQmlScriptBinding extends IQmlBinding { @Override default public String getType() { return "QMLScriptBinding"; //$NON-NLS-1$ - }; + } public boolean isBlock(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlSignalDefinition.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlSignalDefinition.java index 5a562567f29..27a34f2b22a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlSignalDefinition.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlSignalDefinition.java @@ -19,7 +19,7 @@ public interface IQmlSignalDefinition extends IQmlObjectMember { @Override default public String getType() { return "QMLSignalDefinition"; //$NON-NLS-1$ - }; + } public IJSIdentifier getIdentifier(); diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlStatementBlock.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlStatementBlock.java index b255240c8ec..86ab220a22a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlStatementBlock.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlStatementBlock.java @@ -19,7 +19,7 @@ public interface IQmlStatementBlock extends IQmlASTNode { @Override default public String getType() { return "QMLStatementBlock"; //$NON-NLS-1$ - }; + } public List<IJSStatement> getBody(); } diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlVersionLiteral.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlVersionLiteral.java index 02fc7f6399a..b6e1f0d7082 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlVersionLiteral.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/qmljs/IQmlVersionLiteral.java @@ -17,7 +17,7 @@ public interface IQmlVersionLiteral extends IQmlASTNode { @Override default public String getType() { return "QMLVersionLiteral"; //$NON-NLS-1$ - }; + } public double getValue(); diff --git a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java index 77a07cecb04..11f61d66a32 100644 --- a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java +++ b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java @@ -187,5 +187,5 @@ public class QtContentAssistantTests extends TestCase { public CharSequence computeIdentifierPrefix() throws BadLocationException { return null; } - }; + } } diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParserprs.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParserprs.java index dd92bacf92c..cf182b9df9e 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParserprs.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParserprs.java @@ -23,7 +23,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -94,7 +94,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP -177, 0, -191, -215, -221, 0, -209, 0, -214, 0, 0, -198, 0, 0, -194, 0, -222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -218, 0, 0, 0, -223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -108,7 +108,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 89, 10, 105, 22, 22, 21, 21, 46, 46, 72, 72, 1, 1, 2, 2, 2, 2, 3, 3, @@ -202,7 +202,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 1940, 1940, 1940, 1940, 1940, 193, 1940, 1940, 709, 1940, 195, 210, 1940, 1940, 1940, 1940, 1851, 1672, 1940, 1290, 1940, 1940, 1940, 1940, 1940, 1787, 1850, 1940, 0, 330, 699, 0, 20, 180, 0, 1, 2167, 0, 1, 2178, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -216,7 +216,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, @@ -259,7 +259,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -327,7 +327,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 207, 472, 1940, 1940, 1940, 1940, 1940, 624, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 624, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1940, 1949 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -348,7 +348,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 304, 131, 352, 421, 421, 423, 308, 331, 53, 102, 102, 304, 427, 388, 337, 352, 382, 345, 352, 421, 423, 492, 423, 382, 105, 495, 418, 206, 307, 53, 331, 390, 352, 347, 423, 382, 206, 418, 60, 109, 102, 418, 206, 331, 304, 303, 382, 193, 206, 192, 225, 343, 382, 102, 419, 347, 206, 225 }; - }; + } public final static char asb[] = Asb.asb; @@ -377,7 +377,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 34, 42, 35, 43, 44, 36, 12, 45, 46, 32, 54, 37, 55, 47, 48, 14, 49, 50, 51, 1, 3, 25, 26, 27, 59, 0, 5, 39, 13, 15, 16, 17, 18, 1, 3, 2, 9, 10, 8, 4, 6, 7, 20, 21, 22, 23, 24, 28, 29, 30, 0, 2, 5, 38, 39, 75, 31, 68, 0, 5, 38, 52, 69, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -397,7 +397,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 7, 64, 13, 73, 124, 48, 48, 87, 94, 86, 75, 73, 103, 83, 99, 7, 64, 35, 35, 103, 23, 35, 7, 26, 81, 124, 42, 116, 120, 71, 64, 103, 26, 7, 21, 25, 48, 7, 26, 42, 87, 87, 103, 84, 26, 35, 71, 39, 103, 48, 35, 71, 26, 77 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -412,7 +412,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 0, 5, 10, 0, 68, 63, 64, 65, 66, 56, 35, 0, 94, 69, 0, 62, 0, 73, 0, 21, 51, 50, 42, 40, 10, 0, 51, 50, 42, 40, 30, 0, 102, 0, 10, 72, 0, 10, 21, 0, 21, 50, 51, 10, 0, 30, 54, 10, 27, 0, 10, 33, 70, 0, 46, 0, 33, 10, 31, 0, 10, 90, 0, 51, 50, 30, 0, 95, 10, 27, 0, 82, 10, 33, 0, 59, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -427,7 +427,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 89, 30, 107, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 108, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88, 99, 103, 104, 105, 106 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -443,7 +443,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 145, 146, 147, 148, 149, 151, 0, 153, 158, 113, 117, 133, 136, 137, 138, 139, 140, 143, 0, 152, 156, 0, 0, 157, 166, 176, 109, 0, 0, 0, 155, 0, 165, 170, 175, 0, 177, 178, 0, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -456,7 +456,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP public final static char scopePrefix[] = { 120, 151, 130, 59, 69, 159, 26, 186, 35, 87, 105, 75, 6, 12, 16, 40, 83, 52, 141, 208, 215, 219, 52, 52, 195, 52, 1, 1, 1, 44, 47, 92, 115, 47, 223, 20, 145, 202, 202, 177, 137, 165, 165, 165, 165, 165, 95, 95, 95 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -469,7 +469,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP public final static char scopeSuffix[] = { 128, 128, 128, 4, 4, 128, 32, 192, 10, 4, 10, 80, 10, 10, 10, 10, 4, 4, 139, 10, 10, 4, 56, 80, 199, 65, 4, 4, 4, 10, 50, 4, 10, 118, 10, 23, 148, 205, 212, 180, 139, 167, 169, 171, 173, 175, 102, 97, 110 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -482,7 +482,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP public final static char scopeLhs[] = { 65, 63, 65, 29, 29, 63, 32, 111, 52, 29, 45, 29, 6, 6, 6, 52, 29, 29, 70, 6, 5, 5, 29, 29, 19, 29, 103, 102, 101, 50, 61, 29, 42, 53, 3, 88, 70, 7, 5, 112, 70, 79, 78, 77, 76, 75, 45, 43, 45 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -495,7 +495,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP public final static byte scopeLa[] = { 52, 52, 52, 58, 58, 52, 52, 95, 39, 58, 39, 15, 39, 39, 39, 39, 58, 58, 75, 39, 39, 58, 4, 15, 68, 32, 58, 58, 58, 39, 2, 58, 39, 1, 39, 69, 1, 39, 39, 101, 75, 1, 53, 54, 54, 48, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -508,7 +508,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP public final static byte scopeStateSet[] = { 29, 29, 29, 33, 33, 29, 19, -1, 37, 33, 9, 33, 44, 44, 44, 37, 33, 33, 5, 44, 44, 44, 33, 33, 78, 33, 17, 1, 3, 37, 39, 33, 9, 11, 44, 105, 5, 50, 44, -1, 5, 30, 30, 30, 30, 30, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -528,7 +528,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 0, 148, 0, 147, 0, 146, 0, 145, 0, 144, 0, 214, 94, 0, 77, 2, 115, 111, 113, 0, 214, 128, 138, 2, 98, 0, 53, 0, 0, 138, 78, 125, 0, 29, 132, 0, 154, 2, 0, 111, 121, 0, 154, 2, 13, 0, 111, 119, 0, 197, 2, 112, 0, 138, 31, 112, 0, 138, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -544,7 +544,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 397, 409, 1211, 1270, 1358, 1450, 1437, 1403, 1531, 1512, 1475, 1463, 1240, 611, 1661, 1649, 1638, 647, 473, 1487, 1326, 1231, 1182, 1173, 722, 1191, 1153, 1133, 589, 1095, 1075, 1054, 1033, 737, 1012, 699, 678, 624, 991, 970, 949, 928, 907, 886, 865, 844, 823, 802, 781, 370, 760, 657, 487, 451, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -565,7 +565,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP 127, 160, 117, 2, 161, 19, 188, 140, 189, 117, 192, 108, 193, 169, 38, 206, 61, 31, 207, 117, 166, 117, 117, 117, 192, 169, 69, 38, 153, 69, 155, 61, 31, 166, 165, 202, 188, 200, 68, 160, 2, 117, 169, 155, 38, 38, 68, 161 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -604,7 +604,7 @@ public class UPCExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, UP "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator", "layout_qualifier" }; - }; + } public final static String name[] = Name.name; diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParserprs.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParserprs.java index ec2e2b60f18..0f4d098f517 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParserprs.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParserprs.java @@ -23,7 +23,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -93,7 +93,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, -217, 0, 0, 0, 0, 0, -191, 0, 0, 0, 0, 0, 0, 0, 0, 0, -42, 0, 0, 0, 0, 0, -218, 0, 0, 0, -59, 0, 0, 0, 0, 0, 0, -215, -211, -220, -219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -107,7 +107,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 89, 11, 105, 22, 22, 21, 21, 46, 46, 72, 72, 1, 1, 2, 2, 2, 2, 3, 3, @@ -201,7 +201,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1224, 1476, 234, 87, 1636, 297, 1921, 1921, 1921, 1921, 1921, 1921, 1860, 1921, 1921, 205, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 939, 1921, 0, 329, 701, 0, 20, 179, 0, 1, 2147, 0, 1, 2158, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -215,7 +215,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 16, 17, 18, 19, @@ -255,7 +255,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 15, 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, 75, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -317,7 +317,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 2137, 1131, 2251, 655, 2252, 1, 1915, 1272, 189, 1398, 1927, 1601, 1714, 1921, 189, 189, 1187, 1921, 1921, 1921, 1921, 1921, 1921, 185, 1921, 1921, 1921, 1921, 630, 184, 206, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1411, 1921, 1930, 1921, 1921, 1926 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -337,7 +337,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 170, 321, 397, 396, 267, 326, 318, 29, 357, 390, 390, 392, 77, 255, 162, 73, 73, 318, 404, 324, 261, 357, 387, 436, 357, 390, 392, 467, 392, 387, 3, 470, 354, 89, 76, 162, 255, 326, 357, 438, 392, 387, 89, 354, 31, 7, 73, 354, 89, 255, 318, 317, 387, 231, 89, 230, 108, 267, 387, 73, 355, 438, 89, 108 }; - }; + } public final static char asb[] = Asb.asb; @@ -366,7 +366,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1, 3, 12, 13, 14, 59, 0, 75, 5, 4, 1, 2, 68, 0, 18, 19, 20, 21, 22, 1, 3, 2, 16, 17, 11, 4, 6, 7, 24, 25, 26, 27, 28, 29, 30, 31, 60, 0, 5, 38, 52, 69, 0, 5, 39, 18, 19, 20, 21, 22, 1, 3, 2, 16, 17, 11, 4, 6, 7, 24, 25, 26, 27, 28, 29, 30, 31, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -385,7 +385,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 49, 68, 79, 35, 79, 24, 42, 79, 26, 26, 50, 49, 74, 15, 15, 57, 91, 10, 35, 114, 79, 7, 97, 17, 79, 110, 50, 50, 10, 89, 9, 38, 79, 44, 94, 70, 7, 97, 35, 35, 44, 23, 35, 7, 26, 46, 110, 36, 118, 114, 77, 97, 44, 26, 7, 112, 25, 50, 7, 26, 36, 10, 10, 44, 95, 26, 35, 77, 57, 44, 50, 35, 77, 26, 40 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -400,7 +400,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 5, 22, 0, 103, 0, 5, 11, 0, 29, 54, 0, 68, 63, 64, 65, 66, 56, 33, 0, 92, 0, 11, 37, 70, 0, 21, 50, 49, 42, 40, 11, 0, 94, 69, 0, 21, 49, 50, 11, 0, 29, 54, 11, 27, 0, 11, 72, 0, 62, 0, 11, 89, 0, 37, 11, 31, 0, 50, 49, 29, 0, 59, 0, 98, 0, 82, 11, 37, 0, 95, 11, 27, 0, 11, 90, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -415,7 +415,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 61, 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 89, 30, 107, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 108, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88, 99, 103, 104, 105, 106 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -431,7 +431,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 145, 146, 147, 148, 149, 151, 0, 153, 158, 113, 117, 133, 136, 137, 138, 139, 140, 143, 0, 152, 156, 0, 0, 157, 166, 176, 109, 0, 0, 0, 155, 0, 165, 170, 175, 0, 177, 178, 0, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -444,7 +444,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopePrefix[] = { 120, 151, 130, 59, 69, 159, 26, 186, 35, 87, 105, 75, 6, 12, 16, 40, 83, 52, 141, 202, 212, 216, 52, 52, 195, 52, 1, 1, 1, 44, 47, 92, 115, 47, 220, 20, 145, 206, 177, 137, 165, 165, 165, 165, 165, 95, 95, 95 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -457,7 +457,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopeSuffix[] = { 128, 128, 128, 4, 4, 128, 32, 192, 10, 4, 10, 80, 10, 10, 10, 10, 4, 4, 139, 10, 10, 4, 56, 80, 199, 65, 4, 4, 4, 10, 50, 4, 10, 118, 10, 23, 148, 209, 180, 139, 167, 169, 171, 173, 175, 102, 97, 110 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -470,7 +470,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopeLhs[] = { 65, 63, 65, 28, 28, 63, 32, 111, 51, 28, 45, 28, 6, 6, 6, 51, 28, 28, 70, 6, 5, 5, 28, 28, 19, 28, 103, 102, 101, 49, 61, 28, 42, 53, 3, 88, 70, 5, 112, 70, 79, 78, 77, 76, 75, 45, 43, 45 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -483,7 +483,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static byte scopeLa[] = { 52, 52, 52, 58, 58, 52, 52, 95, 39, 58, 39, 19, 39, 39, 39, 39, 58, 58, 75, 39, 39, 58, 4, 19, 68, 32, 58, 58, 58, 39, 2, 58, 39, 1, 39, 69, 1, 39, 101, 75, 1, 53, 54, 54, 48, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -496,7 +496,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static byte scopeStateSet[] = { 28, 28, 28, 32, 32, 28, 19, -1, 36, 32, 9, 32, 43, 43, 43, 36, 32, 32, 5, 43, 43, 43, 32, 32, 76, 32, 17, 1, 3, 36, 38, 32, 9, 11, 43, 103, 5, 43, -1, 5, 29, 29, 29, 29, 29, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -516,7 +516,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 148, 0, 147, 0, 146, 0, 145, 0, 144, 0, 214, 94, 0, 77, 2, 115, 111, 113, 0, 214, 128, 138, 2, 98, 0, 53, 0, 0, 138, 78, 125, 0, 29, 132, 0, 159, 2, 18, 0, 159, 2, 0, 111, 119, 0, 197, 2, 112, 0, 138, 23, 112, 0, 138, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -532,7 +532,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1492, 1425, 1481, 1465, 1454, 1414, 1675, 1667, 1656, 1284, 724, 1696, 1685, 1647, 1639, 1624, 1363, 1226, 1123, 1506, 1326, 1171, 1115, 1187, 1151, 1131, 591, 1095, 1075, 1054, 1033, 737, 1012, 701, 680, 630, 991, 970, 949, 928, 907, 886, 865, 844, 823, 802, 781, 369, 760, 659, 489, 450, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -553,7 +553,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 2, 161, 15, 188, 144, 189, 118, 192, 108, 193, 169, 38, 206, 61, 23, 207, 118, 166, 118, 118, 118, 192, 169, 69, 38, 153, 69, 154, 61, 23, 166, 165, 202, 188, 200, 68, 160, 2, 118, 169, 154, 38, 38, 68, 161 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -592,7 +592,7 @@ public class UPCNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator", "layout_qualifier" }; - }; + } public final static String name[] = Name.name; diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParserprs.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParserprs.java index 87f5c55fd7b..93384714537 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParserprs.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParserprs.java @@ -23,7 +23,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -136,7 +136,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym -311, 0, 0, 0, 0, 0, -313, 0, -337, 0, 0, 0, 0, 0, 0, -339, 0, -187, 0, 0, 0, 0, 0, -189, 0, 0, 0, 0, 0, 0, 0, 0, -190, 0, -288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -150,7 +150,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 111, 1, 130, 39, 39, 11, 11, 49, 49, 3, 3, 2, 2, 5, 5, 5, 5, 6, 6, 6, @@ -311,7 +311,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 2131, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 2347, 3262, 0, 328, 837, 0, 11, 227, 0, 3270, 1, 0, 1, 3500, 0, 8, 10, 0, 1656, 119, 0, 180, 20, 0, 1, 3489, 0, 113, 2099, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -325,7 +325,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -439,7 +439,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 73, 0, 0, 0, 0, 0, 0, 72, 79, 0, 0, 72, 0, 0, 0, 0, 0, 71, 71, 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, 0, 74, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -592,7 +592,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 3262, 558, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 1610, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 3262, 748, 3262, 3262, 3274, 3262, 3273 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -620,7 +620,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 638, 638, 182, 64, 481, 638, 638, 182, 638, 182, 82, 481, 639, 182, 64, 323, 64, 64, 481, 64, 481, 638, 64, 64, 481, 64, 481, 638, 64, 481, 638, 638, 182, 64, 481, 64, 64, 64, 481, 64, 64, 64, 481, 64, 64, 481, 64, 481, 638, 64, 64, 64, 64, 64, 64, 481, 64 }; - }; + } public final static char asb[] = Asb.asb; @@ -655,7 +655,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 54, 70, 63, 64, 45, 65, 66, 67, 1, 3, 46, 47, 48, 79, 4, 0, 4, 2, 55, 73, 5, 50, 56, 43, 57, 68, 51, 58, 52, 59, 60, 53, 44, 61, 62, 49, 69, 54, 70, 63, 64, 45, 65, 66, 67, 1, 3, 46, 47, 48, 79, 0, 27, 5, 73, 12, 13, 14, 15, 16, 1, 3, 2, 10, 11, 9, 4, 7, 8, 17, 18, 19, 20, 21, 22, 23, 24, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -682,7 +682,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 65, 177, 65, 71, 158, 174, 65, 39, 84, 39, 39, 158, 39, 158, 177, 39, 39, 158, 39, 158, 177, 39, 158, 177, 177, 65, 39, 158, 39, 39, 39, 158, 39, 39, 39, 158, 39, 39, 158, 39, 158, 177, 39, 39, 39, 39, 39, 39, 158, 39 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -699,7 +699,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 1, 33, 0, 1, 33, 2, 18, 96, 0, 33, 1, 127, 0, 79, 74, 75, 76, 77, 69, 54, 0, 43, 48, 41, 46, 40, 0, 11, 41, 46, 65, 66, 1, 0, 1, 33, 40, 61, 0, 43, 48, 46, 41, 1, 0, 8, 53, 50, 0, 65, 66, 1, 11, 0, 117, 1, 33, 0, 1, 58, 14, 0, 99, 1, 58, 0, 33, 51, 1, 68, 0, 1, 44, 11, 0, 1, 58, 92, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -714,7 +714,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 106, 48, 64, 76, 96, 97, 98, 69, 44, 55, 60, 63, 72, 1, 47, 52, 56, 61, 62, 66, 67, 74, 75, 78, 79, 80, 54, 70, 73, 42, 91, 90, 29, 31, 16, 17, 89, 30, 4, 14, 15, 18, 19, 20, 21, 108, 22, 23, 24, 25, 26, 53, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 88 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -730,7 +730,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 181, 184, 185, 186, 0, 0, 150, 0, 174, 180, 138, 151, 152, 153, 154, 157, 159, 179, 183, 0, 142, 143, 144, 145, 146, 149, 155, 156, 0, 161, 166, 116, 133, 137, 141, 0, 160, 164, 0, 0, 165, 175, 178, 188, 193, 0, 0, 195, 0, 0, 0, 0, 163, 0, 176, 177, 182, 187, 0, 189, 190, 0, 191, 192, 194, 196, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -743,7 +743,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym public final static char scopePrefix[] = { 120, 151, 130, 59, 69, 159, 26, 186, 35, 87, 105, 75, 6, 12, 16, 40, 83, 52, 141, 195, 212, 219, 223, 52, 52, 199, 52, 1, 1, 1, 44, 47, 92, 115, 47, 227, 20, 145, 206, 206, 177, 137, 165, 165, 165, 165, 165, 95, 95, 95 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -756,7 +756,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym public final static char scopeSuffix[] = { 128, 128, 128, 4, 4, 128, 32, 192, 10, 4, 10, 80, 10, 10, 10, 10, 4, 4, 139, 128, 10, 10, 4, 56, 80, 203, 65, 4, 4, 4, 10, 50, 4, 10, 118, 10, 23, 148, 209, 216, 180, 139, 167, 169, 171, 173, 175, 102, 97, 110 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -769,7 +769,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym public final static char scopeLhs[] = { 76, 74, 76, 52, 52, 74, 50, 22, 67, 52, 43, 52, 9, 9, 9, 67, 52, 52, 92, 16, 9, 8, 8, 52, 52, 32, 52, 128, 125, 124, 65, 81, 52, 41, 59, 6, 106, 92, 10, 8, 23, 92, 87, 86, 85, 84, 83, 43, 48, 43 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -782,7 +782,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym public final static byte scopeLa[] = { 72, 72, 72, 78, 78, 72, 72, 93, 73, 78, 73, 13, 73, 73, 73, 73, 78, 78, 25, 72, 73, 73, 78, 4, 13, 74, 49, 78, 78, 78, 73, 2, 78, 73, 1, 73, 75, 1, 73, 73, 28, 25, 1, 68, 69, 69, 64, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -795,7 +795,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym public final static char scopeStateSet[] = { 153, 153, 153, 126, 126, 153, 49, 10, 130, 126, 139, 126, 60, 60, 60, 130, 126, 126, 5, 9, 60, 60, 60, 126, 126, 94, 126, 137, 1, 3, 130, 132, 126, 139, 144, 60, 123, 5, 66, 60, 10, 5, 154, 154, 154, 154, 154, 139, 141, 139 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -815,7 +815,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 0, 153, 0, 152, 0, 151, 0, 150, 0, 126, 32, 0, 77, 2, 114, 110, 112, 0, 126, 118, 121, 2, 35, 0, 53, 135, 0, 203, 108, 6, 0, 121, 96, 138, 0, 29, 131, 0, 169, 2, 0, 110, 120, 0, 169, 2, 12, 0, 110, 118, 0, 219, 2, 115, 0, 121, 55, 115, 0, 121, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -834,7 +834,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 1373, 940, 1340, 1307, 1274, 1241, 1208, 1175, 1142, 1109, 1076, 1043, 1010, 905, 368, 973, 872, 640, 802, 837, 558, 519, 0, 1127, 1101, 552, 492, 369, 2898, 1838, 2781, 1811, 1628, 0, 450, 0, 500, 429, 369, 2767, 1760, 2613, 2575, 1838, 2560, 1811, 448, 678, 1898, 0, 1740, 368, 659, 429, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -862,7 +862,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym 121, 110, 121, 110, 175, 110, 118, 93, 167, 118, 118, 151, 118, 151, 110, 118, 118, 151, 118, 151, 110, 118, 151, 110, 110, 121, 118, 175, 118, 118, 118, 151, 118, 118, 118, 151, 118, 118, 151, 118, 151, 110, 118, 118, 118, 118, 118, 118, 151, 118 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -904,7 +904,7 @@ public class UPCParserprs implements lpg.lpgjavaruntime.ParseTable, UPCParsersym "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator", "external_declaration_list", "external_declaration", "declaration_list", "function_body", "layout_qualifier", "affinity" }; - }; + } public final static String name[] = Name.name; diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParserprs.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParserprs.java index 1cd441dd39a..f1183fcb399 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParserprs.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParserprs.java @@ -23,7 +23,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -93,7 +93,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -186, 0, 0, 0, -187, 0, 0, 0, -200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -107,7 +107,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 89, 11, 105, 21, 21, 26, 26, 41, 41, 71, 71, 1, 1, 2, 2, 2, 2, 3, 3, @@ -200,7 +200,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1907, 1907, 1907, 1907, 1907, 1907, 561, 1753, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1842, 1907, 0, 326, 673, 0, 20, 179, 0, 1, 2133, 0, 1, 2144, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -214,7 +214,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 0, 6, 7, 8, 9, 10, 11, 12, 13, 0, 15, 16, 17, 18, 19, @@ -252,7 +252,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -310,7 +310,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1907, 2165, 1907, 1907, 220, 1907, 1198, 30, 30, 207, 189, 189, 189, 1895, 1907, 1907, 1907, 1907, 597, 1907, 1907, 1907, 1907, 1907, 1137, 1907, 534, 1245, 576, 1333, 1907, 1907, 1158, 1907, 185, 184, 206, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 1907, 467, 1936, 2928 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -331,7 +331,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 286, 371, 338, 327, 198, 228, 60, 198, 231, 233, 427, 233, 228, 112, 430, 368, 149, 297, 53, 321, 340, 198, 62, 233, 228, 149, 368, 67, 116, 109, 368, 149, 321, 286, 285, 228, 293, 149, 292, 168, 333, 228, 109, 369, 62, 149, 168 }; - }; + } public final static char asb[] = Asb.asb; @@ -358,7 +358,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 42, 35, 43, 44, 36, 7, 45, 46, 19, 54, 37, 55, 47, 48, 8, 49, 50, 51, 1, 3, 9, 10, 11, 59, 0, 18, 20, 21, 22, 23, 1, 3, 2, 16, 17, 15, 4, 12, 13, 25, 26, 27, 28, 29, 30, 31, 32, 60, 0, 5, 38, 52, 69, 0, 5, 39, 18, 20, 21, 22, 23, 1, 3, 2, 16, 17, 15, 4, 12, 13, 25, 26, 27, 28, 29, 30, 31, 32, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -377,7 +377,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 28, 28, 42, 41, 61, 51, 51, 13, 97, 78, 37, 109, 66, 7, 82, 11, 66, 107, 42, 42, 78, 95, 77, 71, 66, 23, 16, 113, 7, 82, 37, 37, 23, 25, 37, 7, 28, 80, 107, 124, 117, 109, 64, 82, 23, 28, 7, 93, 27, 42, 7, 28, 124, 78, 78, 23, 17, 28, 37, 64, 13, 23, 42, 37, 64, 28, 73 }; - }; + } public final static byte nasb[] = Nasb.nasb; @@ -392,7 +392,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 49, 0, 28, 0, 67, 62, 63, 64, 65, 55, 30, 0, 26, 46, 45, 37, 35, 11, 0, 94, 68, 0, 46, 45, 37, 35, 29, 0, 11, 26, 0, 102, 0, 61, 0, 26, 45, 46, 11, 0, 46, 45, 29, 0, 98, 0, 29, 52, 11, 27, 0, 11, 89, 0, 51, 11, 48, 0, 58, 0, 82, 11, 51, 0, 11, 51, 69, 0, 95, 11, 27, 0, 11, 90, 0, 22, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -407,7 +407,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 61, 62, 66, 67, 74, 75, 78, 79, 80, 91, 54, 70, 73, 16, 17, 89, 30, 107, 4, 14, 15, 18, 19, 20, 21, 29, 31, 22, 23, 24, 25, 26, 92, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 108, 45, 46, 49, 50, 51, 53, 57, 58, 59, 65, 71, 77, 88, 99, 103, 104, 105, 106 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -423,7 +423,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 146, 147, 148, 149, 151, 0, 153, 158, 113, 117, 118, 133, 136, 137, 138, 139, 140, 143, 0, 152, 156, 0, 0, 157, 166, 176, 109, 0, 0, 0, 155, 0, 165, 170, 175, 0, 177, 178, 0, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -436,7 +436,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopePrefix[] = { 108, 139, 118, 47, 57, 147, 12, 174, 21, 75, 93, 63, 28, 71, 40, 129, 199, 203, 40, 40, 183, 40, 1, 1, 1, 32, 35, 80, 103, 35, 207, 6, 133, 190, 190, 165, 125, 153, 153, 153, 153, 153, 83, 83, 83 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -449,7 +449,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopeSuffix[] = { 116, 116, 116, 4, 4, 116, 18, 180, 26, 4, 26, 68, 26, 4, 4, 127, 26, 4, 44, 68, 187, 53, 4, 4, 4, 26, 38, 4, 26, 106, 26, 9, 136, 193, 196, 168, 127, 155, 157, 159, 161, 163, 90, 85, 98 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -462,7 +462,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static char scopeLhs[] = { 64, 62, 64, 28, 28, 62, 49, 111, 47, 28, 40, 28, 47, 28, 28, 69, 5, 5, 28, 28, 19, 28, 103, 102, 101, 45, 60, 28, 37, 50, 3, 88, 69, 7, 5, 112, 69, 79, 78, 77, 76, 75, 40, 38, 40 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -474,7 +474,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public interface ScopeLa { public final static byte scopeLa[] = { 52, 52, 52, 58, 58, 52, 52, 95, 39, 58, 39, 20, 39, 58, 58, 75, 39, 58, 4, 20, 68, 19, 58, 58, 58, 39, 2, 58, 39, 1, 39, 69, 1, 39, 39, 101, 75, 1, 53, 54, 54, 48, 2, 2, 2 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -487,7 +487,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab public final static byte scopeStateSet[] = { 25, 25, 25, 29, 29, 25, 19, -1, 33, 29, 9, 29, 33, 29, 29, 5, 40, 40, 29, 29, 74, 29, 17, 1, 3, 33, 35, 29, 9, 11, 40, 101, 5, 46, 40, -1, 5, 26, 26, 26, 26, 26, 9, 9, 9 }; - }; + } public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -506,7 +506,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 199, 108, 198, 174, 0, 188, 118, 24, 198, 174, 0, 187, 0, 148, 0, 147, 0, 146, 0, 145, 0, 144, 0, 214, 94, 0, 77, 2, 115, 111, 113, 0, 214, 133, 155, 2, 98, 0, 53, 0, 0, 155, 78, 125, 0, 29, 132, 0, 180, 2, 0, 111, 121, 0, 111, 119, 0, 197, 2, 112, 0, 155, 14, 112, 0, 155, 2, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -522,7 +522,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 1308, 534, 1396, 1383, 1350, 706, 695, 1469, 1458, 1426, 455, 1690, 1682, 1671, 1373, 1275, 1662, 1654, 1646, 1625, 1482, 1448, 1158, 1126, 1106, 576, 1074, 1054, 1033, 1012, 717, 991, 673, 652, 597, 970, 949, 928, 907, 886, 865, 844, 823, 802, 781, 760, 366, 739, 631, 467, 400, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -542,7 +542,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab 164, 199, 118, 24, 118, 204, 118, 136, 118, 127, 127, 157, 118, 2, 159, 24, 188, 158, 189, 118, 192, 108, 193, 168, 38, 206, 61, 14, 207, 118, 165, 118, 118, 118, 192, 168, 69, 38, 148, 69, 150, 61, 14, 165, 164, 202, 188, 200, 68, 157, 2, 118, 168, 150, 38, 38, 68, 159 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -581,7 +581,7 @@ public class UPCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab "abstract_declarator", "direct_abstract_declarator", "basic_direct_abstract_declarat" + "or", "array_direct_abstract_declarat" + "or", "initializer_seq", "designated_initializer", "designation", "designator_list", "designator", "layout_qualifier" }; - }; + } public final static String name[] = Name.name; diff --git a/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphControl.java b/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphControl.java index b2764f5a9b6..1a6266a2325 100644 --- a/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphControl.java +++ b/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphControl.java @@ -78,8 +78,8 @@ public class SourceGraphControl extends BufferedCanvas { int cmp = (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; // we want to sort in descending order, so negate result return -cmp; - }; - }; + } + } /** List of characters we discovered and their occurrences. */ ArrayList<CharStat> m_characters; diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java index ee4ff98a914..3877947fe0b 100755 --- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java +++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java @@ -155,12 +155,12 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe /** Invoked when visualizer has been selected. */ @Override public void visualizerSelected() { - }; + } /** Invoked when another visualizer has been selected, hiding this one. */ @Override public void visualizerDeselected() { - }; + } // --- control management --- diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java index ff229aede9d..9b788d3c33a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java @@ -23,7 +23,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -145,7 +145,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = BaseCheck.baseCheck; @@ -159,7 +159,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction { public final static char baseAction[] = { 127, 2, 128, 54, 54, 18, 18, 59, 59, 25, 25, 1, 1, 3, 3, 3, 3, 4, 4, @@ -351,7 +351,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 3997, 407, 0, 3996, 407, 0, 3947, 407, 0, 3946, 407, 0, 3945, 407, 0, 3944, 407, 0, 3943, 407, 0, 520, 410, 0, 535, 410, 0, 544, 410, 0, 4180, 410, 0, 4178, 410, 0, 180, 20, 0, 8, 10, 0, 2010, 119, 0, 1, 4201, 0, 1, 4200, 0, 1, 4199, 0, 1, 4008, 0, 367, 356, 0, 368, 357, 0, 113, 2742, 0 }; - }; + } public final static char baseAction[] = BaseAction.baseAction; @@ -365,7 +365,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static byte termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -475,7 +475,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 29, 30, 0, 32, 33, 34, 35, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte termCheck[] = TermCheck.termCheck; @@ -638,7 +638,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 3945, 369, 3946, 3944, 3999, 3947, 3943, 3781, 3640, 3634, 3637, 407, 3781, 3781, 3781, 3781, 3781, 3781, 3706, 3700, 3703, 3781, 3781, 3781, 3781, 3781, 3781, 3781, 3996, 3998, 3997, 3945, 3781, 3946, 3944, 3999, 3947, 3943, 3718, 3712, 3715, 3727, 3781, 3724, 3730, 3709, 3721, 3733 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -667,7 +667,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 18, 33, 18, 18, 350, 272, 463, 521, 33, 517, 93, 518, 463, 403, 417, 364, 463, 116, 233, 168, 662, 33, 102, 14, 273, 522, 417, 538, 93, 33, 518, 518, 297, 120, 532, 662, 33, 417, 273, 522, 18, 518, 33, 260, 18, 417, 260, 18 }; - }; + } public final static char asb[] = Asb.asb; @@ -708,7 +708,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 40, 34, 41, 42, 35, 29, 43, 44, 30, 69, 36, 70, 45, 61, 28, 62, 63, 64, 11, 1, 12, 8, 9, 5, 3, 4, 65, 66, 67, 31, 6, 38, 7, 2, 10, 0, 10, 32, 39, 27, 55, 68, 33, 40, 34, 41, 42, 35, 29, 43, 44, 30, 69, 36, 70, 45, 61, 28, 62, 63, 64, 2, 11, 12, 3, 4, 65, 66, 67, 89, 7, 9, 8, 5, 0 }; - }; + } public final static byte asr[] = Asr.asr; @@ -735,7 +735,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 186, 143, 161, 93, 161, 79, 79, 63, 63, 68, 70, 104, 202, 44, 140, 44, 44, 119, 63, 50, 104, 63, 34, 106, 122, 50, 124, 161, 155, 50, 60, 34, 12, 8, 63, 34, 40, 202, 104, 161, 34, 149, 63, 122, 42, 135, 12, 79, 8, 63, 161, 202, 104, 44, 42, 63, 79, 44, 161, 79, 44 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -753,7 +753,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 50, 0, 138, 0, 60, 42, 30, 2, 33, 0, 34, 38, 71, 70, 27, 0, 2, 34, 38, 27, 0, 6, 57, 55, 0, 70, 71, 2, 18, 0, 2, 29, 42, 118, 0, 18, 34, 38, 70, 71, 2, 0, 38, 40, 27, 34, 36, 0, 143, 2, 29, 42, 0, 2, 29, 27, 65, 0, 112, 2, 60, 0, 134, 2, 29, 0, 42, 29, 61, 2, 82, 0, 29, 2, 42, 144, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -768,7 +768,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 68, 69, 76, 42, 92, 79, 29, 47, 48, 51, 52, 53, 54, 59, 60, 61, 67, 73, 77, 80, 81, 82, 103, 104, 105, 56, 72, 75, 93, 16, 17, 31, 4, 14, 15, 18, 19, 20, 21, 43, 44, 22, 23, 24, 25, 26, 30, 5, 27, 28, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 91, 108, 55, 90, 106 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -785,7 +785,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 175, 181, 184, 138, 141, 142, 143, 144, 145, 146, 180, 204, 0, 0, 161, 165, 167, 176, 202, 0, 208, 0, 116, 133, 137, 0, 160, 164, 0, 166, 179, 189, 194, 0, 196, 0, 199, 0, 201, 0, 209, 0, 0, 0, 0, 0, 163, 0, 177, 178, 183, 188, 0, 190, 191, 0, 192, 193, 195, 0, 0, 200, 0, 0, 203, 206, 0, 0, 210, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -800,7 +800,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 373, 395, 408, 422, 408, 362, 34, 46, 75, 27, 27, 136, 139, 191, 139, 216, 139, 264, 269, 272, 325, 450, 14, 69, 106, 112, 152, 258, 106, 419, 429, 429, 1, 27, 152, 293, 229, 386, 229, 293, 39, 39, 60, 252, 60, 60, 60, 60, 60, 323, 417, 39, 39, 64, 165, 194, 165, 194, 194 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -815,7 +815,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 426, 412, 366, 37, 37, 58, 25, 25, 58, 142, 25, 201, 58, 219, 267, 267, 267, 12, 58, 17, 72, 109, 115, 167, 261, 17, 72, 432, 439, 4, 30, 155, 288, 246, 389, 232, 296, 44, 52, 62, 12, 309, 311, 313, 315, 317, 12, 12, 41, 49, 66, 167, 203, 155, 196, 211 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -830,7 +830,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 4, 142, 141, 70, 88, 58, 103, 34, 56, 75, 75, 75, 49, 4, 63, 45, 80, 117, 65, 100, 61, 45, 8, 6, 42, 152, 65, 74, 76, 48, 76, 74, 113, 84, 97, 100, 95, 94, 93, 92, 91, 61, 46, 113, 84, 150, 65, 36, 65, 40, 36 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -844,7 +844,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 47, 47, 18, 31, 31, 47, 47, 47, 47, 71, 18, 47, 103, 31, 31, 71, 47, 47, 103, 47, 47, 47, 49, 47, 31, 8, 8, 47, 103, 103, 47, 1, 103, 2, 47, 2, 2, 2, 2, 31, 47, 2, 49, 2, 74, 10, 2, 2, 49, 47, 47, 5, 89, 10, 18, 18, 48, 2, 2, 2, 2, 12, 31, 2, 68, 69, 69, 61, 31, 31, 2, 2, 89, 10, 1, 10, 1, 1 }; - }; + } public final static byte scopeLa[] = ScopeLa.scopeLa; @@ -859,7 +859,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 102, 38, 38, 5, 162, 66, 1, 3, 58, 60, 54, 227, 149, 155, 142, 142, 142, 38, 66, 238, 38, 241, 136, 218, 8, 238, 38, 73, 66, 231, 3, 218, 142, 142, 38, 142, 142, 5, 162, 144, 8, 144, 144, 144, 144, 144, 238, 38, 5, 162, 12, 218, 149, 218, 151, 149 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -888,7 +888,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 60, 0, 151, 125, 140, 1, 58, 0, 55, 135, 0, 140, 1, 58, 0, 110, 135, 55, 135, 0, 150, 0, 171, 51, 0, 140, 92, 130, 0, 29, 131, 0, 173, 1, 0, 110, 120, 0, 173, 1, 20, 0, 110, 118, 0, 236, 1, 113, 0, 140, 37, 113, 0, 140, 1, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -912,7 +912,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 2069, 2605, 1716, 1333, 576, 1221, 3408, 1339, 2951, 2918, 1279, 2904, 3351, 3081, 2889, 1062, 2470, 2231, 1320, 2177, 522, 2684, 3346, 2579, 3323, 3274, 3211, 3207, 2796, 0, 2082, 1320, 522, 0, 3170, 3149, 3135, 3124, 3103, 3086, 2110, 3078, 1263, 3268, 1224, 1102, 990, 951, 2334, 2504, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -940,7 +940,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers 189, 132, 125, 1, 125, 125, 172, 46, 218, 239, 49, 163, 134, 208, 205, 203, 193, 125, 205, 46, 246, 258, 75, 37, 108, 247, 132, 189, 140, 151, 46, 49, 208, 134, 166, 74, 171, 75, 37, 189, 132, 125, 105, 134, 89, 171, 125, 189, 171, 125 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -986,7 +986,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers "extended_asm_param", "case_range_expression", "typeof_declaration_specifiers", "typeof_type_specifier", "field_name_designator", "vector_type", "vector_type_specifier", "all_specifier_qualifiers", "all_specifier_qualifier_list" }; - }; + } public final static String name[] = Name.name; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java index 96919217523..7ad453ab4de 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java @@ -24,7 +24,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static byte isKeyword[] = IsKeyword.isKeyword; @@ -288,7 +288,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 0, 0, 0, 0, -234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -458, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -511, 0, 0, 0, 0, 0, -340, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public interface BaseCheck1 { public final static short baseCheck1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -308,7 +308,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static short baseCheck[] = new short[BaseCheck0.baseCheck0.length + BaseCheck1.baseCheck1.length]; { @@ -316,7 +316,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar System.arraycopy(BaseCheck0.baseCheck0, 0, baseCheck, index, BaseCheck0.baseCheck0.length); index += BaseCheck0.baseCheck0.length; System.arraycopy(BaseCheck1.baseCheck1, 0, baseCheck, index, BaseCheck1.baseCheck1.length); - }; + } @Override public final int baseCheck(int index) { @@ -328,7 +328,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar @Override public final int rhs(int index) { return rhs[index]; - }; + } public interface BaseAction0 { public final static char baseAction0[] = { 214, 5, 158, 82, 82, 32, 32, 106, 106, 48, 48, 41, 41, 214, 1, 1, 15, @@ -749,7 +749,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 106, 76, 77, 105, 3397, 9900, 9900, 9900, 9900, 4077, 5151, 35, 1703, 32, 4863, 9900, 27, 30, 31, 1654, 1590, 26, 28, 2249, 296, 23, 25, 50, 2263, 3864, 76, 77, 9900, 9900, 9900, 262, 9900, 9900, 9900, 9900, 9900, 9900, 9900, 9900, 759, 9900, 9900 }; - }; + } public interface BaseAction1 { public final static char baseAction1[] = { 9900, 9900, 9900, 9900, 9900, 9900, 9900, 9900, 239, 249, 4745, 700, @@ -835,7 +835,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 1198, 95, 0, 9938, 95, 0, 39, 95, 0, 366, 95, 0, 9912, 649, 638, 419, 0, 649, 638, 0, 35, 73, 0, 4155, 419, 0, 1358, 657, 658, 0, 1227, 657, 658, 0, 1198, 657, 658, 0, 657, 658, 0, 313, 4350, 0, 8, 12, 0, 218, 5723, 0 }; - }; + } public final static char baseAction[] = new char[BaseAction0.baseAction0.length + BaseAction1.baseAction1.length]; { @@ -843,7 +843,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar System.arraycopy(BaseAction0.baseAction0, 0, baseAction, index, BaseAction0.baseAction0.length); index += BaseAction0.baseAction0.length; System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length); - }; + } @Override public final int baseAction(int index) { @@ -855,7 +855,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar @Override public final int lhs(int index) { return lhs[index]; - }; + } public interface TermCheck { public final static char termCheck[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, @@ -1092,7 +1092,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 0, 72, 0, 0, 0, 0, 127, 128, 127, 128, 0, 65, 0, 0, 127, 128, 0, 0, 0, 73, 0, 129, 73, 75, 0, 0, 134, 0, 79, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char termCheck[] = TermCheck.termCheck; @@ -1447,7 +1447,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 9900, 9900, 9900, 9900, 9900, 9900, 9900, 1613, 9900, 9900, 9900, 9900, 4255, 1256, 4255, 1256, 9900, 9888, 9900, 9900, 4255, 1256, 9900, 9900, 9900, 9888, 9900, 9287, 8396, 9743, 9900, 9900, 9290, 9900, 9905, 9900, 9900, 9751 }; - }; + } public final static char termAction[] = TermAction.termAction; @@ -1494,7 +1494,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 994, 955, 952, 911, 911, 304, 1397, 1397, 1269, 1058, 891, 1343, 261, 261, 330, 330, 330, 261, 1397, 468, 994, 953, 598, 834, 1397, 914, 911, 1397, 1397, 318, 1566, 92, 330, 330, 955, 1397, 834, 914, 914, 156, 156, 320, 1299, 780, 955, 914, 1621, 1263, 363 }; - }; + } public final static char asb[] = Asb.asb; @@ -1566,7 +1566,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 59, 62, 60, 58, 63, 72, 1, 4, 3, 2, 5, 0, 65, 14, 5, 11, 10, 84, 13, 12, 6, 1, 4, 3, 2, 8, 9, 7, 0, 11, 10, 17, 15, 21, 22, 16, 20, 18, 19, 38, 44, 35, 40, 43, 42, 36, 39, 32, 33, 34, 41, 45, 78, 7, 1, 4, 13, 12, 6, 8, 9, 3, 2, 72, 5, 79, 14, 73, 0 }; - }; + } public final static char asr[] = Asr.asr; @@ -1609,7 +1609,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 12, 172, 156, 76, 150, 116, 215, 13, 215, 120, 191, 211, 215, 130, 122, 197, 13, 317, 317, 169, 262, 83, 13, 81, 13, 12, 240, 240, 79, 317, 116, 150, 13, 94, 120, 317, 197, 122, 317, 317, 197, 13, 74, 12, 12, 215, 317, 120, 83, 197, 141, 141, 266, 314, 13, 215, 83, 317, 151, 261 }; - }; + } public final static char nasb[] = Nasb.nasb; @@ -1633,7 +1633,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 116, 117, 128, 13, 67, 0, 110, 109, 43, 4, 87, 0, 118, 67, 13, 115, 116, 117, 204, 0, 57, 40, 5, 32, 0, 5, 40, 53, 92, 103, 0, 4, 10, 9, 13, 3, 1, 0, 48, 4, 2, 9, 10, 5, 189, 0, 5, 53, 92, 133, 51, 4, 0, 31, 5, 4, 43, 119, 0, 5, 57, 135, 0, 47, 221, 31, 5, 0 }; - }; + } public final static char nasr[] = Nasr.nasr; @@ -1649,7 +1649,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 128, 125, 58, 98, 68, 96, 106, 19, 1, 44, 100, 126, 82, 108, 20, 123, 136, 137, 63, 83, 30, 101, 33, 124, 17, 18, 113, 54, 55, 61, 62, 64, 70, 74, 76, 77, 90, 97, 21, 22, 32, 6, 23, 24, 25, 26, 27, 122, 4, 15, 16, 28, 29, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, 46, 5, 56, 85, 86, 87, 3, 138, 67, 121 }; - }; + } public final static char terminalIndex[] = TerminalIndex.terminalIndex; @@ -1670,7 +1670,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 217, 0, 226, 0, 238, 239, 0, 0, 245, 252, 0, 256, 257, 258, 261, 0, 0, 265, 0, 273, 0, 275, 0, 0, 282, 284, 285, 0, 0, 165, 168, 0, 196, 0, 199, 0, 0, 223, 236, 242, 0, 0, 246, 247, 249, 251, 0, 254, 255, 260, 266, 269, 270, 0, 0, 274, 0, 0, 277, 0, 283, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - }; + } public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; @@ -1688,7 +1688,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 198, 198, 311, 377, 64, 198, 398, 417, 64, 64, 198, 545, 662, 669, 311, 198, 838, 46, 52, 64, 105, 250, 523, 590, 630, 52, 33, 645, 198, 265, 457, 523, 265, 265, 484, 577, 332, 484, 75, 75, 96, 96, 244, 96, 96, 96, 96, 628, 827, 834, 75, 75, 100, 393, 827, 834, 207, 596, 292, 244, 393, 244, 406 }; - }; + } public final static char scopePrefix[] = ScopePrefix.scopePrefix; @@ -1706,7 +1706,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 380, 382, 16, 94, 62, 62, 382, 44, 94, 16, 94, 698, 94, 49, 55, 67, 108, 253, 526, 593, 108, 659, 36, 648, 717, 260, 460, 708, 268, 279, 501, 580, 335, 487, 80, 88, 98, 147, 44, 529, 531, 533, 535, 44, 829, 829, 77, 85, 102, 395, 831, 831, 209, 598, 294, 357, 388, 342, 408 }; - }; + } public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; @@ -1724,7 +1724,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 182, 181, 215, 177, 17, 66, 18, 88, 97, 195, 125, 135, 97, 22, 40, 58, 177, 121, 91, 177, 121, 121, 117, 99, 51, 117, 148, 141, 157, 237, 195, 137, 132, 131, 130, 94, 175, 56, 148, 141, 245, 87, 175, 56, 199, 135, 115, 51, 87, 51, 71 }; - }; + } public final static char scopeLhs[] = ScopeLhs.scopeLhs; @@ -1741,7 +1741,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 79, 79, 5, 1, 111, 79, 1, 1, 1, 65, 79, 111, 79, 10, 79, 1, 79, 8, 84, 1, 67, 86, 84, 79, 3, 78, 1, 1, 75, 67, 1, 1, 75, 90, 85, 1, 1, 1, 37, 1, 65, 1, 68, 66, 66, 65, 6, 6, 1, 1, 104, 13, 6, 6, 5, 1, 75, 1, 12, 1, 5 }; - }; + } public final static char scopeLa[] = ScopeLa.scopeLa; @@ -1759,7 +1759,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 138, 128, 130, 165, 124, 165, 187, 171, 378, 111, 5, 18, 56, 53, 268, 510, 268, 171, 111, 490, 378, 13, 111, 273, 493, 61, 53, 376, 478, 53, 376, 376, 376, 111, 466, 376, 24, 182, 380, 389, 490, 380, 385, 385, 385, 29, 58, 140, 24, 182, 374, 450, 58, 140, 50, 13, 376, 466, 450, 466, 165 }; - }; + } public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; @@ -1803,7 +1803,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 0, 217, 71, 59, 0, 261, 5, 140, 230, 193, 141, 23, 0, 140, 230, 193, 141, 23, 0, 151, 2, 0, 140, 0, 261, 5, 139, 295, 193, 141, 23, 0, 295, 193, 141, 23, 0, 150, 2, 0, 140, 0, 261, 5, 150, 0, 261, 5, 155, 0, 184, 72, 155, 0, 313, 0, 31, 0, 31, 154, 0, 192, 0, 149, 0, 184, 5, 0 }; - }; + } public final static char scopeRhs[] = ScopeRhs.scopeRhs; @@ -1844,7 +1844,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 6546, 4904, 8229, 0, 8396, 7230, 8273, 7953, 8433, 7949, 2658, 7579, 7555, 6751, 5329, 5617, 8363, 8336, 6971, 6776, 6029, 5795, 5723, 5651, 5579, 5507, 5435, 5363, 5291, 5219, 5147, 4739, 4636, 8149, 7215, 7083, 7004, 7951, 7934, 7644, 7577, 7510, 7439, 7422, 6546, 0 }; - }; + } public final static char scopeState[] = ScopeState.scopeState; @@ -1887,7 +1887,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar 225, 169, 357, 142, 5, 169, 329, 142, 169, 140, 261, 261, 6, 5, 142, 78, 243, 14, 223, 141, 141, 315, 261, 251, 86, 233, 185, 320, 184, 263, 142, 104, 375, 194, 74, 66, 223, 223, 136, 355, 169, 142, 263, 169, 169, 142, 5, 282, 169, 142, 376, 86, 73 }; - }; + } public final static char inSymb[] = InSymb.inSymb; @@ -1950,7 +1950,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar "typeof_declaration_specifiers", "typeof_type_specifier", "vector_type", "vector_type_specifier", "all_specifier_qualifiers", "all_specifier_qualifier_list", "array_modifier_type_qualifiers", "type_qualifier_list" }; - }; + } public final static String name[] = Name.name; |