diff options
Diffstat (limited to 'lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom')
15 files changed, 510 insertions, 208 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java index 6ee544bfc2e..d1942165a46 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java @@ -16,28 +16,52 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +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 C99ExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java index 0d0550b11dd..d1aec14f116 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java @@ -16,28 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +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 C99NoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java index ba7dfef971c..011cc7bf8e2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java @@ -16,24 +16,48 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; + +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 C99Parser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java index 6fa2fa3ad35..eb472080d1a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java @@ -16,28 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +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 C99SizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java index 111167f1b3e..273ba36cb53 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +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 CPPExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java index e9f1c77a09b..3e97046ad6f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +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 CPPNoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java index e325e255e01..baac3dd691d 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTDeclarator; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +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 CPPNoFunctionDeclaratorParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTDeclarator>, ISecondaryParser<IASTDeclarator> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java index 70f695d9542..9eaecd071bc 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java @@ -16,25 +16,47 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.ast.cpp.*; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; + +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 CPPParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java index 7e703117e92..0d61e686ebd 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import java.util.Map; import java.util.HashMap; +import java.util.Map; public class CPPRules { static Map fRules = new HashMap(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java index d0f077afe4b..9ba3c8bf77c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java @@ -16,29 +16,50 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +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 CPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java index d0e99cb7652..a8044972e2b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java @@ -16,31 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; +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 CPPTemplateTypeParameterParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<ICPPASTTemplateParameter>, ISecondaryParser<ICPPASTTemplateParameter> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java index f0d1497e450..550bfaa011a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java @@ -16,29 +16,49 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gcc; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +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 GCCParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java index c29d6e6e87a..b61e1f616e1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java @@ -16,33 +16,53 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gcc; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; -import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +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 GCCSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java index bd89af415e4..ab3c2e7ed2f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java @@ -16,31 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.ast.cpp.*; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.*; +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 GPPParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java index 49230324045..61af36c4800 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java @@ -16,35 +16,54 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.*; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +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 GPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { |