mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

bug 234463, fixes for CompletionTest_ExceptionReference_NoPrefix and CompletionTest_ExceptionReference_Prefix

Browse source
This commit is contained in:
Mike Kucera 2008-05-28 19:22:15 +00:00
parent e26da8fa71
commit 3e8493f505
20 changed files with 16807 additions and 16842 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g
View file

@ -54,7 +54,7 @@ $Terminals
-- Special tokens used in content assist -- Special tokens used in content assist
Completion Completion
EndOfCompletion ::= 'EOC' EndOfCompletion
-- Unrecognized token, not actually used anywhere in the grammar, always leads to syntax error -- Unrecognized token, not actually used anywhere in the grammar, always leads to syntax error
@ -64,7 +64,6 @@ $Terminals
LeftBracket ::= '[' LeftBracket ::= '['
LeftParen ::= '(' LeftParen ::= '('
LeftBrace ::= '{'
Dot ::= '.' Dot ::= '.'
DotStar ::= '.*' DotStar ::= '.*'
Arrow ::= '->' Arrow ::= '->'
@ -112,6 +111,7 @@ $Terminals
RightParen RightParen
RightBrace RightBrace
SemiColon SemiColon
LeftBrace
$End $End
@ -306,6 +306,8 @@ $Rules
';' ::=? 'SemiColon' ';' ::=? 'SemiColon'
| 'EndOfCompletion' | 'EndOfCompletion'
'{' ::=? 'LeftBrace'
| 'EndOfCompletion'
@ -1476,9 +1478,6 @@ class_name
class_specifier class_specifier
::= class_head '{' <openscope-ast> member_declaration_list_opt '}' ::= class_head '{' <openscope-ast> member_declaration_list_opt '}'
/. $Build consumeClassSpecifier(); $EndBuild ./ /. $Build consumeClassSpecifier(); $EndBuild ./
-- need this for content assist to work properly for base specifiers
| class_head 'EOC' <openscope-ast> member_declaration_list_opt '}'
/. $Build consumeClassSpecifier(); $EndBuild ./
class_head class_head

29
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
View file

@ -27,6 +27,8 @@ import org.eclipse.cdt.core.parser.IScanner;
import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.util.ASTPrinter; import org.eclipse.cdt.core.parser.util.ASTPrinter;
import org.eclipse.cdt.core.parser.util.DebugUtil;
import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor; import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor;
import org.eclipse.cdt.internal.core.pdom.dom.IPDOMLinkageFactory; import org.eclipse.cdt.internal.core.pdom.dom.IPDOMLinkageFactory;
import org.eclipse.cdt.internal.core.pdom.dom.c.PDOMCLinkageFactory; import org.eclipse.cdt.internal.core.pdom.dom.c.PDOMCLinkageFactory;
@ -169,14 +171,13 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage implements
if(DEBUG_PRINT_GCC_AST) { if(DEBUG_PRINT_GCC_AST) {
ILanguage gppLanguage = GPPLanguage.getDefault(); ILanguage gppLanguage = GCCLanguage.getDefault();
IASTCompletionNode cn = gppLanguage.getCompletionNode(reader, scanInfo, fileCreator, index, log, offset); IASTCompletionNode cn = gppLanguage.getCompletionNode(reader, scanInfo, fileCreator, index, log, offset);
System.out.println(); System.out.println();
System.out.println("********************************************************"); System.out.println("********************************************************");
System.out.println("GPP AST:"); System.out.println("GPP AST:");
ASTPrinter.print(cn.getTranslationUnit()); printCompletionNode(cn);
System.out.println();
} }
// TODO temporary // TODO temporary
@ -196,15 +197,31 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage implements
if(DEBUG_PRINT_AST) { if(DEBUG_PRINT_AST) {
System.out.println("Base Extensible Language AST:"); System.out.println("Base Extensible Language AST:");
ASTPrinter.print(tu); printCompletionNode(completionNode);
System.out.println();
System.out.println("Completion Node: " + completionNode);
} }
return completionNode; return completionNode;
} }
/*
* For debugging.
*/
@SuppressWarnings("nls")
private static void printCompletionNode(IASTCompletionNode cn) {
ASTPrinter.print(cn.getTranslationUnit());
for(IASTName name : cn.getNames()) {
ASTNode context = (ASTNode)name.getCompletionContext();
System.out.printf("Name: %s, Context: %s, At: %d",
name, DebugUtil.safeClassName(context), context == null ? null : context.getOffset());
if(name.getTranslationUnit() == null) // some name nodes are not hooked up to the AST
System.out.print(", not hooked up");
System.out.println();
}
System.out.println();
}
public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) { public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
return GCCLanguage.getDefault().getSelectedNames(ast, start, length); return GCCLanguage.getDefault().getSelectedNames(ast, start, length);
} }

1547
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java
View file

File diff suppressed because it is too large Load diff

3907
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
View file

File diff suppressed because it is too large Load diff

142
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParsersym.java
View file

@ -15,87 +15,86 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPExpressionParsersym { public interface CPPExpressionParsersym {
public final static int public final static int
TK_asm = 63, TK_asm = 60,
TK_auto = 48, TK_auto = 48,
TK_bool = 14, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 15, TK_char = 15,
TK_class = 61, TK_class = 61,
TK_const = 46, TK_const = 46,
TK_const_cast = 32, TK_const_cast = 31,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 64, TK_delete = 62,
TK_do = 82, TK_do = 81,
TK_double = 16, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 68, TK_enum = 69,
TK_explicit = 49, TK_explicit = 49,
TK_export = 75, TK_export = 87,
TK_extern = 17, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 82,
TK_friend = 50, TK_friend = 50,
TK_goto = 84, TK_goto = 83,
TK_if = 85, TK_if = 84,
TK_inline = 51, TK_inline = 51,
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 52, TK_mutable = 52,
TK_namespace = 57, TK_namespace = 57,
TK_new = 65, TK_new = 63,
TK_operator = 7, TK_operator = 7,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 53, TK_register = 53,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 85,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 54, TK_static = 54,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 69, TK_struct = 70,
TK_switch = 87, TK_switch = 86,
TK_template = 31, TK_template = 44,
TK_this = 38, TK_this = 37,
TK_throw = 58, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 38,
TK_typedef = 55, TK_typedef = 55,
TK_typeid = 40, TK_typeid = 39,
TK_typename = 10, TK_typename = 10,
TK_union = 70, TK_union = 71,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 59, TK_using = 59,
TK_virtual = 41, TK_virtual = 45,
TK_void = 24, TK_void = 24,
TK_volatile = 47, TK_volatile = 47,
TK_wchar_t = 25, TK_wchar_t = 25,
TK_while = 77, TK_while = 76,
TK_integer = 42, TK_integer = 40,
TK_floating = 43, TK_floating = 41,
TK_charconst = 44, TK_charconst = 42,
TK_stringlit = 29, TK_stringlit = 28,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 8,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 56, TK_LeftBracket = 56,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 11, TK_Plus = 11,
TK_Minus = 12, TK_Minus = 12,
@ -105,8 +104,8 @@ public interface CPPExpressionParsersym {
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
TK_LeftShift = 89, TK_LeftShift = 89,
TK_LT = 28, TK_LT = 29,
TK_GT = 62, TK_GT = 64,
TK_LE = 93, TK_LE = 93,
TK_GE = 94, TK_GE = 94,
TK_EQ = 97, TK_EQ = 97,
@ -116,27 +115,28 @@ public interface CPPExpressionParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 66, TK_Assign = 67,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 67, TK_Comma = 65,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 68,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_LeftBrace = 66,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 45, TK_0 = 43,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -148,8 +148,8 @@ public interface CPPExpressionParsersym {
"Tilde", "Tilde",
"Star", "Star",
"operator", "operator",
"And",
"EndOfCompletion", "EndOfCompletion",
"And",
"typename", "typename",
"Plus", "Plus",
"Minus", "Minus",
@ -168,10 +168,9 @@ public interface CPPExpressionParsersym {
"wchar_t", "wchar_t",
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT",
"stringlit", "stringlit",
"LT",
"Bang", "Bang",
"template",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
@ -181,11 +180,12 @@ public interface CPPExpressionParsersym {
"this", "this",
"true", "true",
"typeid", "typeid",
"virtual",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"template",
"virtual",
"const", "const",
"volatile", "volatile",
"auto", "auto",
@ -200,22 +200,21 @@ public interface CPPExpressionParsersym {
"namespace", "namespace",
"throw", "throw",
"using", "using",
"LeftBrace",
"class",
"GT",
"asm", "asm",
"class",
"delete", "delete",
"new", "new",
"Assign", "GT",
"Comma", "Comma",
"LeftBrace",
"Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightBrace",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -228,6 +227,7 @@ public interface CPPExpressionParsersym {
"if", "if",
"return", "return",
"switch", "switch",
"export",
"RightShift", "RightShift",
"LeftShift", "LeftShift",
"ArrowStar", "ArrowStar",
@ -243,9 +243,6 @@ public interface CPPExpressionParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,6 +254,9 @@ public interface CPPExpressionParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"catch", "catch",

1543
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
View file

File diff suppressed because it is too large Load diff

3897
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
View file

File diff suppressed because it is too large Load diff

142
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParsersym.java
View file

@ -15,87 +15,86 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPNoCastExpressionParsersym { public interface CPPNoCastExpressionParsersym {
public final static int public final static int
TK_asm = 63, TK_asm = 60,
TK_auto = 48, TK_auto = 48,
TK_bool = 14, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 15, TK_char = 15,
TK_class = 61, TK_class = 61,
TK_const = 46, TK_const = 46,
TK_const_cast = 32, TK_const_cast = 31,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 64, TK_delete = 62,
TK_do = 82, TK_do = 81,
TK_double = 16, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 68, TK_enum = 69,
TK_explicit = 49, TK_explicit = 49,
TK_export = 75, TK_export = 87,
TK_extern = 17, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 82,
TK_friend = 50, TK_friend = 50,
TK_goto = 84, TK_goto = 83,
TK_if = 85, TK_if = 84,
TK_inline = 51, TK_inline = 51,
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 52, TK_mutable = 52,
TK_namespace = 57, TK_namespace = 57,
TK_new = 65, TK_new = 63,
TK_operator = 7, TK_operator = 7,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 53, TK_register = 53,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 85,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 54, TK_static = 54,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 69, TK_struct = 70,
TK_switch = 87, TK_switch = 86,
TK_template = 31, TK_template = 44,
TK_this = 38, TK_this = 37,
TK_throw = 58, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 38,
TK_typedef = 55, TK_typedef = 55,
TK_typeid = 40, TK_typeid = 39,
TK_typename = 10, TK_typename = 10,
TK_union = 70, TK_union = 71,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 59, TK_using = 59,
TK_virtual = 41, TK_virtual = 45,
TK_void = 24, TK_void = 24,
TK_volatile = 47, TK_volatile = 47,
TK_wchar_t = 25, TK_wchar_t = 25,
TK_while = 77, TK_while = 76,
TK_integer = 42, TK_integer = 40,
TK_floating = 43, TK_floating = 41,
TK_charconst = 44, TK_charconst = 42,
TK_stringlit = 29, TK_stringlit = 28,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 8,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 56, TK_LeftBracket = 56,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 11, TK_Plus = 11,
TK_Minus = 12, TK_Minus = 12,
@ -105,8 +104,8 @@ public interface CPPNoCastExpressionParsersym {
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
TK_LeftShift = 89, TK_LeftShift = 89,
TK_LT = 28, TK_LT = 29,
TK_GT = 62, TK_GT = 64,
TK_LE = 93, TK_LE = 93,
TK_GE = 94, TK_GE = 94,
TK_EQ = 97, TK_EQ = 97,
@ -116,27 +115,28 @@ public interface CPPNoCastExpressionParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 66, TK_Assign = 67,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 67, TK_Comma = 65,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 68,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_LeftBrace = 66,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 45, TK_0 = 43,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -148,8 +148,8 @@ public interface CPPNoCastExpressionParsersym {
"Tilde", "Tilde",
"Star", "Star",
"operator", "operator",
"And",
"EndOfCompletion", "EndOfCompletion",
"And",
"typename", "typename",
"Plus", "Plus",
"Minus", "Minus",
@ -168,10 +168,9 @@ public interface CPPNoCastExpressionParsersym {
"wchar_t", "wchar_t",
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT",
"stringlit", "stringlit",
"LT",
"Bang", "Bang",
"template",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
@ -181,11 +180,12 @@ public interface CPPNoCastExpressionParsersym {
"this", "this",
"true", "true",
"typeid", "typeid",
"virtual",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"template",
"virtual",
"const", "const",
"volatile", "volatile",
"auto", "auto",
@ -200,22 +200,21 @@ public interface CPPNoCastExpressionParsersym {
"namespace", "namespace",
"throw", "throw",
"using", "using",
"LeftBrace",
"class",
"GT",
"asm", "asm",
"class",
"delete", "delete",
"new", "new",
"Assign", "GT",
"Comma", "Comma",
"LeftBrace",
"Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightBrace",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -228,6 +227,7 @@ public interface CPPNoCastExpressionParsersym {
"if", "if",
"return", "return",
"switch", "switch",
"export",
"RightShift", "RightShift",
"LeftShift", "LeftShift",
"ArrowStar", "ArrowStar",
@ -243,9 +243,6 @@ public interface CPPNoCastExpressionParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,6 +254,9 @@ public interface CPPNoCastExpressionParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"catch", "catch",

1543
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java
View file

File diff suppressed because it is too large Load diff

3794
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
View file

File diff suppressed because it is too large Load diff

164
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParsersym.java
View file

@ -15,92 +15,91 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPNoFunctionDeclaratorParsersym { public interface CPPNoFunctionDeclaratorParsersym {
public final static int public final static int
TK_asm = 63, TK_asm = 60,
TK_auto = 48, TK_auto = 48,
TK_bool = 15, TK_bool = 15,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 120,
TK_char = 16, TK_char = 16,
TK_class = 61, TK_class = 61,
TK_const = 33, TK_const = 46,
TK_const_cast = 34, TK_const_cast = 31,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 64, TK_delete = 63,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 17,
TK_dynamic_cast = 35, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 68, TK_enum = 69,
TK_explicit = 49, TK_explicit = 49,
TK_export = 75, TK_export = 87,
TK_extern = 12, TK_extern = 14,
TK_false = 36, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 82,
TK_friend = 50, TK_friend = 50,
TK_goto = 84, TK_goto = 83,
TK_if = 85, TK_if = 84,
TK_inline = 51, TK_inline = 51,
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 52, TK_mutable = 52,
TK_namespace = 57, TK_namespace = 57,
TK_new = 65, TK_new = 64,
TK_operator = 7, TK_operator = 7,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 53, TK_register = 53,
TK_reinterpret_cast = 37, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 85,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 38, TK_sizeof = 35,
TK_static = 54, TK_static = 54,
TK_static_cast = 39, TK_static_cast = 36,
TK_struct = 69, TK_struct = 70,
TK_switch = 87, TK_switch = 86,
TK_template = 30, TK_template = 37,
TK_this = 40, TK_this = 38,
TK_throw = 59, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 41, TK_true = 39,
TK_typedef = 55, TK_typedef = 55,
TK_typeid = 42, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 70, TK_union = 71,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 58, TK_using = 59,
TK_virtual = 32, TK_virtual = 41,
TK_void = 24, TK_void = 24,
TK_volatile = 43, TK_volatile = 47,
TK_wchar_t = 25, TK_wchar_t = 25,
TK_while = 77, TK_while = 76,
TK_integer = 44, TK_integer = 42,
TK_floating = 45, TK_floating = 43,
TK_charconst = 46, TK_charconst = 44,
TK_stringlit = 29, TK_stringlit = 29,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 8,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 56, TK_LeftBracket = 56,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 60, TK_Dot = 121,
TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 13, TK_Plus = 12,
TK_Minus = 14, TK_Minus = 13,
TK_Tilde = 5, TK_Tilde = 5,
TK_Bang = 31, TK_Bang = 30,
TK_Slash = 91, TK_Slash = 91,
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
@ -116,28 +115,29 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 66, TK_Assign = 67,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 67, TK_Comma = 65,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 68,
TK_SemiColon = 11, TK_SemiColon = 11,
TK_LeftBrace = 66,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 47, TK_0 = 45,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 119;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
"", "",
@ -148,13 +148,13 @@ public interface CPPNoFunctionDeclaratorParsersym {
"Tilde", "Tilde",
"Star", "Star",
"operator", "operator",
"And",
"EndOfCompletion", "EndOfCompletion",
"And",
"typename", "typename",
"SemiColon", "SemiColon",
"extern",
"Plus", "Plus",
"Minus", "Minus",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
@ -170,24 +170,24 @@ public interface CPPNoFunctionDeclaratorParsersym {
"MinusMinus", "MinusMinus",
"LT", "LT",
"stringlit", "stringlit",
"template",
"Bang", "Bang",
"virtual",
"const",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
"reinterpret_cast", "reinterpret_cast",
"sizeof", "sizeof",
"static_cast", "static_cast",
"template",
"this", "this",
"true", "true",
"typeid", "typeid",
"volatile", "virtual",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"const",
"volatile",
"auto", "auto",
"explicit", "explicit",
"friend", "friend",
@ -198,24 +198,23 @@ public interface CPPNoFunctionDeclaratorParsersym {
"typedef", "typedef",
"LeftBracket", "LeftBracket",
"namespace", "namespace",
"using",
"throw", "throw",
"LeftBrace", "using",
"asm",
"class", "class",
"GT", "GT",
"asm",
"delete", "delete",
"new", "new",
"Assign",
"Comma", "Comma",
"LeftBrace",
"Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightBrace",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -228,6 +227,7 @@ public interface CPPNoFunctionDeclaratorParsersym {
"if", "if",
"return", "return",
"switch", "switch",
"export",
"RightShift", "RightShift",
"LeftShift", "LeftShift",
"ArrowStar", "ArrowStar",
@ -243,9 +243,6 @@ public interface CPPNoFunctionDeclaratorParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,11 +254,14 @@ public interface CPPNoFunctionDeclaratorParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"EOF_TOKEN",
"catch", "catch",
"Dot", "Dot",
"EOF_TOKEN",
"else", "else",
"Invalid" "Invalid"
}; };

1543
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java
View file

File diff suppressed because it is too large Load diff

4077
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
View file

File diff suppressed because it is too large Load diff

146
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParsersym.java
View file

@ -15,98 +15,97 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPParsersym { public interface CPPParsersym {
public final static int public final static int
TK_asm = 60, TK_asm = 59,
TK_auto = 35, TK_auto = 35,
TK_bool = 13, TK_bool = 13,
TK_break = 78, TK_break = 78,
TK_case = 79, TK_case = 79,
TK_catch = 119, TK_catch = 119,
TK_char = 14, TK_char = 14,
TK_class = 59, TK_class = 60,
TK_const = 32, TK_const = 33,
TK_const_cast = 43, TK_const_cast = 36,
TK_continue = 80, TK_continue = 80,
TK_default = 81, TK_default = 81,
TK_delete = 67, TK_delete = 63,
TK_do = 82, TK_do = 82,
TK_double = 15, TK_double = 15,
TK_dynamic_cast = 44, TK_dynamic_cast = 37,
TK_else = 122, TK_else = 122,
TK_enum = 64, TK_enum = 64,
TK_explicit = 36, TK_explicit = 38,
TK_export = 75, TK_export = 75,
TK_extern = 12, TK_extern = 12,
TK_false = 45, TK_false = 39,
TK_float = 16, TK_float = 16,
TK_for = 83, TK_for = 83,
TK_friend = 37, TK_friend = 40,
TK_goto = 84, TK_goto = 84,
TK_if = 85, TK_if = 85,
TK_inline = 38, TK_inline = 41,
TK_int = 17, TK_int = 17,
TK_long = 18, TK_long = 18,
TK_mutable = 39, TK_mutable = 42,
TK_namespace = 46, TK_namespace = 56,
TK_new = 68, TK_new = 65,
TK_operator = 7, TK_operator = 7,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 40, TK_register = 43,
TK_reinterpret_cast = 47, TK_reinterpret_cast = 44,
TK_return = 86, TK_return = 86,
TK_short = 19, TK_short = 19,
TK_signed = 20, TK_signed = 20,
TK_sizeof = 48, TK_sizeof = 45,
TK_static = 41, TK_static = 46,
TK_static_cast = 49, TK_static_cast = 47,
TK_struct = 65, TK_struct = 66,
TK_switch = 87, TK_switch = 87,
TK_template = 29, TK_template = 30,
TK_this = 50, TK_this = 48,
TK_throw = 61, TK_throw = 61,
TK_try = 76, TK_try = 76,
TK_true = 51, TK_true = 49,
TK_typedef = 42, TK_typedef = 50,
TK_typeid = 52, TK_typeid = 51,
TK_typename = 10, TK_typename = 10,
TK_union = 66, TK_union = 67,
TK_unsigned = 21, TK_unsigned = 21,
TK_using = 57, TK_using = 57,
TK_virtual = 30, TK_virtual = 31,
TK_void = 22, TK_void = 22,
TK_volatile = 33, TK_volatile = 34,
TK_wchar_t = 23, TK_wchar_t = 23,
TK_while = 77, TK_while = 77,
TK_integer = 53, TK_integer = 52,
TK_floating = 54, TK_floating = 53,
TK_charconst = 55, TK_charconst = 54,
TK_stringlit = 31, TK_stringlit = 29,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 8,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 58, TK_LeftBracket = 58,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 62,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 24, TK_Plus = 24,
TK_Minus = 25, TK_Minus = 25,
TK_Tilde = 5, TK_Tilde = 5,
TK_Bang = 34, TK_Bang = 32,
TK_Slash = 91, TK_Slash = 91,
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
TK_LeftShift = 89, TK_LeftShift = 89,
TK_LT = 28, TK_LT = 28,
TK_GT = 63, TK_GT = 62,
TK_LE = 93, TK_LE = 93,
TK_GE = 94, TK_GE = 94,
TK_EQ = 97, TK_EQ = 97,
@ -116,27 +115,28 @@ public interface CPPParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 69, TK_Assign = 70,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 70, TK_Comma = 68,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 71,
TK_SemiColon = 11, TK_SemiColon = 11,
TK_LeftBrace = 69,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 56, TK_0 = 55,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -148,8 +148,8 @@ public interface CPPParsersym {
"Tilde", "Tilde",
"Star", "Star",
"operator", "operator",
"And",
"EndOfCompletion", "EndOfCompletion",
"And",
"typename", "typename",
"SemiColon", "SemiColon",
"extern", "extern",
@ -169,50 +169,50 @@ public interface CPPParsersym {
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT", "LT",
"stringlit",
"template", "template",
"virtual", "virtual",
"stringlit", "Bang",
"const", "const",
"volatile", "volatile",
"Bang",
"auto", "auto",
"const_cast",
"dynamic_cast",
"explicit", "explicit",
"false",
"friend", "friend",
"inline", "inline",
"mutable", "mutable",
"register", "register",
"static",
"typedef",
"const_cast",
"dynamic_cast",
"false",
"namespace",
"reinterpret_cast", "reinterpret_cast",
"sizeof", "sizeof",
"static",
"static_cast", "static_cast",
"this", "this",
"true", "true",
"typedef",
"typeid", "typeid",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"namespace",
"using", "using",
"LeftBracket", "LeftBracket",
"class",
"asm", "asm",
"class",
"throw", "throw",
"LeftBrace",
"GT", "GT",
"delete",
"enum", "enum",
"new",
"struct", "struct",
"union", "union",
"delete",
"new",
"Assign",
"Comma", "Comma",
"Colon", "LeftBrace",
"Assign",
"RightBrace", "RightBrace",
"Colon",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export", "export",
@ -243,9 +243,6 @@ public interface CPPParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,6 +254,9 @@ public interface CPPParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"catch", "catch",

1539
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java
View file

File diff suppressed because it is too large Load diff

3869
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
View file

File diff suppressed because it is too large Load diff

142
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParsersym.java
View file

@ -15,87 +15,86 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPSizeofExpressionParsersym { public interface CPPSizeofExpressionParsersym {
public final static int public final static int
TK_asm = 63, TK_asm = 60,
TK_auto = 48, TK_auto = 48,
TK_bool = 14, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 15, TK_char = 15,
TK_class = 61, TK_class = 61,
TK_const = 46, TK_const = 46,
TK_const_cast = 32, TK_const_cast = 31,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 64, TK_delete = 62,
TK_do = 82, TK_do = 81,
TK_double = 16, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 68, TK_enum = 69,
TK_explicit = 49, TK_explicit = 49,
TK_export = 75, TK_export = 87,
TK_extern = 17, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 82,
TK_friend = 50, TK_friend = 50,
TK_goto = 84, TK_goto = 83,
TK_if = 85, TK_if = 84,
TK_inline = 51, TK_inline = 51,
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 52, TK_mutable = 52,
TK_namespace = 57, TK_namespace = 57,
TK_new = 65, TK_new = 63,
TK_operator = 7, TK_operator = 7,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 53, TK_register = 53,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 85,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 54, TK_static = 54,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 69, TK_struct = 70,
TK_switch = 87, TK_switch = 86,
TK_template = 31, TK_template = 44,
TK_this = 38, TK_this = 37,
TK_throw = 58, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 38,
TK_typedef = 55, TK_typedef = 55,
TK_typeid = 40, TK_typeid = 39,
TK_typename = 10, TK_typename = 10,
TK_union = 70, TK_union = 71,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 59, TK_using = 59,
TK_virtual = 41, TK_virtual = 45,
TK_void = 24, TK_void = 24,
TK_volatile = 47, TK_volatile = 47,
TK_wchar_t = 25, TK_wchar_t = 25,
TK_while = 77, TK_while = 76,
TK_integer = 42, TK_integer = 40,
TK_floating = 43, TK_floating = 41,
TK_charconst = 44, TK_charconst = 42,
TK_stringlit = 29, TK_stringlit = 28,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 8,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 56, TK_LeftBracket = 56,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 11, TK_Plus = 11,
TK_Minus = 12, TK_Minus = 12,
@ -105,8 +104,8 @@ public interface CPPSizeofExpressionParsersym {
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
TK_LeftShift = 89, TK_LeftShift = 89,
TK_LT = 28, TK_LT = 29,
TK_GT = 62, TK_GT = 64,
TK_LE = 93, TK_LE = 93,
TK_GE = 94, TK_GE = 94,
TK_EQ = 97, TK_EQ = 97,
@ -116,27 +115,28 @@ public interface CPPSizeofExpressionParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 66, TK_Assign = 67,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 67, TK_Comma = 65,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 68,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_LeftBrace = 66,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 45, TK_0 = 43,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -148,8 +148,8 @@ public interface CPPSizeofExpressionParsersym {
"Tilde", "Tilde",
"Star", "Star",
"operator", "operator",
"And",
"EndOfCompletion", "EndOfCompletion",
"And",
"typename", "typename",
"Plus", "Plus",
"Minus", "Minus",
@ -168,10 +168,9 @@ public interface CPPSizeofExpressionParsersym {
"wchar_t", "wchar_t",
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT",
"stringlit", "stringlit",
"LT",
"Bang", "Bang",
"template",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
@ -181,11 +180,12 @@ public interface CPPSizeofExpressionParsersym {
"this", "this",
"true", "true",
"typeid", "typeid",
"virtual",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"template",
"virtual",
"const", "const",
"volatile", "volatile",
"auto", "auto",
@ -200,22 +200,21 @@ public interface CPPSizeofExpressionParsersym {
"namespace", "namespace",
"throw", "throw",
"using", "using",
"LeftBrace",
"class",
"GT",
"asm", "asm",
"class",
"delete", "delete",
"new", "new",
"Assign", "GT",
"Comma", "Comma",
"LeftBrace",
"Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightBrace",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -228,6 +227,7 @@ public interface CPPSizeofExpressionParsersym {
"if", "if",
"return", "return",
"switch", "switch",
"export",
"RightShift", "RightShift",
"LeftShift", "LeftShift",
"ArrowStar", "ArrowStar",
@ -243,9 +243,6 @@ public interface CPPSizeofExpressionParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,6 +254,9 @@ public interface CPPSizeofExpressionParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"catch", "catch",

1547
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java
View file

File diff suppressed because it is too large Load diff

3901
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
View file

File diff suppressed because it is too large Load diff

162
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParsersym.java
View file

@ -15,92 +15,91 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp;
public interface CPPTemplateTypeParameterParsersym { public interface CPPTemplateTypeParameterParsersym {
public final static int public final static int
TK_asm = 63, TK_asm = 61,
TK_auto = 48, TK_auto = 48,
TK_bool = 15, TK_bool = 15,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 16, TK_char = 16,
TK_class = 59, TK_class = 60,
TK_const = 33, TK_const = 46,
TK_const_cast = 34, TK_const_cast = 32,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 64, TK_delete = 63,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 17,
TK_dynamic_cast = 35, TK_dynamic_cast = 33,
TK_else = 122, TK_else = 122,
TK_enum = 68, TK_enum = 69,
TK_explicit = 49, TK_explicit = 49,
TK_export = 75, TK_export = 87,
TK_extern = 12, TK_extern = 14,
TK_false = 36, TK_false = 34,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 82,
TK_friend = 50, TK_friend = 50,
TK_goto = 84, TK_goto = 83,
TK_if = 85, TK_if = 84,
TK_inline = 51, TK_inline = 51,
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 52, TK_mutable = 52,
TK_namespace = 57, TK_namespace = 57,
TK_new = 65, TK_new = 64,
TK_operator = 7, TK_operator = 8,
TK_private = 103, TK_private = 114,
TK_protected = 104, TK_protected = 115,
TK_public = 105, TK_public = 116,
TK_register = 53, TK_register = 53,
TK_reinterpret_cast = 37, TK_reinterpret_cast = 35,
TK_return = 86, TK_return = 85,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 38, TK_sizeof = 36,
TK_static = 54, TK_static = 54,
TK_static_cast = 39, TK_static_cast = 37,
TK_struct = 69, TK_struct = 70,
TK_switch = 87, TK_switch = 86,
TK_template = 29, TK_template = 31,
TK_this = 40, TK_this = 38,
TK_throw = 60, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 41, TK_true = 39,
TK_typedef = 55, TK_typedef = 55,
TK_typeid = 42, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 70, TK_union = 71,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 58, TK_using = 59,
TK_virtual = 32, TK_virtual = 41,
TK_void = 24, TK_void = 24,
TK_volatile = 43, TK_volatile = 47,
TK_wchar_t = 25, TK_wchar_t = 25,
TK_while = 77, TK_while = 76,
TK_integer = 44, TK_integer = 42,
TK_floating = 45, TK_floating = 43,
TK_charconst = 46, TK_charconst = 44,
TK_stringlit = 30, TK_stringlit = 29,
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 7,
TK_Invalid = 123, TK_Invalid = 123,
TK_LeftBracket = 56, TK_LeftBracket = 56,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 61,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 106, TK_Arrow = 103,
TK_ArrowStar = 90, TK_ArrowStar = 90,
TK_PlusPlus = 26, TK_PlusPlus = 26,
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 9,
TK_Star = 6, TK_Star = 6,
TK_Plus = 13, TK_Plus = 12,
TK_Minus = 14, TK_Minus = 13,
TK_Tilde = 5, TK_Tilde = 5,
TK_Bang = 31, TK_Bang = 30,
TK_Slash = 91, TK_Slash = 91,
TK_Percent = 92, TK_Percent = 92,
TK_RightShift = 88, TK_RightShift = 88,
@ -116,27 +115,28 @@ public interface CPPTemplateTypeParameterParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 71, TK_Colon = 72,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 66, TK_Assign = 67,
TK_StarAssign = 107, TK_StarAssign = 104,
TK_SlashAssign = 108, TK_SlashAssign = 105,
TK_PercentAssign = 109, TK_PercentAssign = 106,
TK_PlusAssign = 110, TK_PlusAssign = 107,
TK_MinusAssign = 111, TK_MinusAssign = 108,
TK_RightShiftAssign = 112, TK_RightShiftAssign = 109,
TK_LeftShiftAssign = 113, TK_LeftShiftAssign = 110,
TK_AndAssign = 114, TK_AndAssign = 111,
TK_CaretAssign = 115, TK_CaretAssign = 112,
TK_OrAssign = 116, TK_OrAssign = 113,
TK_Comma = 67, TK_Comma = 65,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 73,
TK_RightBrace = 72, TK_RightBrace = 68,
TK_SemiColon = 11, TK_SemiColon = 11,
TK_LeftBrace = 66,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_0 = 47, TK_0 = 45,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -147,14 +147,14 @@ public interface CPPTemplateTypeParameterParsersym {
"ColonColon", "ColonColon",
"Tilde", "Tilde",
"Star", "Star",
"EndOfCompletion",
"operator", "operator",
"And", "And",
"EndOfCompletion",
"typename", "typename",
"SemiColon", "SemiColon",
"extern",
"Plus", "Plus",
"Minus", "Minus",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
@ -169,11 +169,9 @@ public interface CPPTemplateTypeParameterParsersym {
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT", "LT",
"template",
"stringlit", "stringlit",
"Bang", "Bang",
"virtual", "template",
"const",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
@ -183,11 +181,13 @@ public interface CPPTemplateTypeParameterParsersym {
"this", "this",
"true", "true",
"typeid", "typeid",
"volatile", "virtual",
"integer", "integer",
"floating", "floating",
"charconst", "charconst",
"0", "0",
"const",
"volatile",
"auto", "auto",
"explicit", "explicit",
"friend", "friend",
@ -198,24 +198,23 @@ public interface CPPTemplateTypeParameterParsersym {
"typedef", "typedef",
"LeftBracket", "LeftBracket",
"namespace", "namespace",
"throw",
"using", "using",
"class", "class",
"throw",
"LeftBrace",
"GT",
"asm", "asm",
"GT",
"delete", "delete",
"new", "new",
"Assign",
"Comma", "Comma",
"LeftBrace",
"Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightBrace",
"RightParen", "RightParen",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -228,6 +227,7 @@ public interface CPPTemplateTypeParameterParsersym {
"if", "if",
"return", "return",
"switch", "switch",
"export",
"RightShift", "RightShift",
"LeftShift", "LeftShift",
"ArrowStar", "ArrowStar",
@ -243,9 +243,6 @@ public interface CPPTemplateTypeParameterParsersym {
"Or", "Or",
"AndAnd", "AndAnd",
"OrOr", "OrOr",
"private",
"protected",
"public",
"Arrow", "Arrow",
"StarAssign", "StarAssign",
"SlashAssign", "SlashAssign",
@ -257,6 +254,9 @@ public interface CPPTemplateTypeParameterParsersym {
"AndAssign", "AndAssign",
"CaretAssign", "CaretAssign",
"OrAssign", "OrAssign",
"private",
"protected",
"public",
"Question", "Question",
"RightBracket", "RightBracket",
"catch", "catch",