From a923614c73274179d56e78d35d17aef149c23a03 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 20 Nov 2018 16:20:42 +0000 Subject: Bug 540373: Cleanup: Organize Imports This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Organize Imports and completing the wizard Change-Id: Ia7b305a4c967d0e6f4e8fb8c1041e7028b24006c --- .../upc/tests/UPCLanguageExtensionTests.java | 4 +- .../cdt/core/parser/upc/tests/UPCTests.java | 4 +- .../cdt/core/dom/parser/upc/DOMToUPCTokenMap.java | 192 ++++++++++++++++++++- .../cdt/core/dom/parser/upc/UPCParserAction.java | 5 +- .../core/dom/parser/upc/UPCExpressionParser.java | 36 ++-- .../dom/parser/upc/UPCNoCastExpressionParser.java | 36 ++-- .../internal/core/dom/parser/upc/UPCParser.java | 34 ++-- .../dom/parser/upc/UPCSizeofExpressionParser.java | 36 ++-- .../managedbuilder/bupc/ui/UPCWizardsPlugin.java | 6 +- 9 files changed, 272 insertions(+), 81 deletions(-) (limited to 'upc') diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java index 160ef04d51f..23a8757095d 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression; @@ -47,6 +45,8 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTTypeIdSizeofExpression; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.lrparser.tests.ParseHelper; +import junit.framework.TestCase; + @SuppressWarnings("nls") public class UPCLanguageExtensionTests extends TestCase { diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java index 9404f78363d..0921699f043 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.upc.UPCLanguage; import org.eclipse.cdt.core.lrparser.tests.LRTests; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + /** * Run the C99 tests against the UPC parser * diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java index 096afa69e7b..c84ca241dc9 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java @@ -13,8 +13,196 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.parser.upc; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Bool; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IToken; diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java index 206b842400c..74b3f8dbfae 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java @@ -17,7 +17,6 @@ import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Compl import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_relaxed; import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_shared; import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_strict; -import lpg.lpgjavaruntime.IToken; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTExpression; @@ -25,8 +24,8 @@ import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; import org.eclipse.cdt.core.dom.ast.c.ICASTDeclSpecifier; -import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ISecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTDeclSpecifier; @@ -34,6 +33,8 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTForallStatement; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTKeywordExpression; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSynchronizationStatement; +import lpg.lpgjavaruntime.IToken; + /** * Extension to the C99ParserAction that adds support fot building * an AST with UPC specific nodes. diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java index 2737b9a6b62..ca37ad62c5c 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -66,6 +48,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser, ISecondaryParser { private static ParseTable prs = new UPCExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java index 56026015e78..ade5075117e 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -65,6 +47,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCNoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser, ISecondaryParser { private static ParseTable prs = new UPCNoCastExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java index 6dc2a134ed0..694f1e0fff0 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java @@ -19,23 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -62,6 +45,23 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java index 499987b63ab..7e90b77d25d 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -65,6 +47,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser, ISecondaryParser { private static ParseTable prs = new UPCSizeofExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java index ee7e4104900..0a4ef649362 100644 --- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java +++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java @@ -14,10 +14,12 @@ ****************************************************************************/ package org.eclipse.cdt.managedbuilder.bupc.ui; -import org.eclipse.ui.plugin.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import java.util.*; /** * Based on plugin class for PLDT Wizards (MPI & OpenMP) -- cgit v1.2.3