mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

added support for namespaces nested inside classes

Browse source
This commit is contained in:
Mike Kucera 2008-05-13 20:25:16 +00:00
parent 4e2a3b2bfc
commit 8a42979447
19 changed files with 13018 additions and 13230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1190,36 +1190,15 @@ namespace_name
::= identifier_name ::= identifier_name
--namespace_name
-- ::= original_namespace_name
-- | namespace_alias
--original_namespace_name
-- ::= identifier_name
--namespace_alias
-- ::= identifier_token
namespace_definition namespace_definition
::= named_namespace_definition ::= named_namespace_definition
| unnamed_namespace_definition | unnamed_namespace_definition
-- In the spec grammar this is broken down into original_namespace_definition and extension_namespace_definition.
-- But since we are not tracking identifiers it becomes the same thing, so its simplified here.
named_namespace_definition named_namespace_definition
::= original_namespace_definition ::= 'namespace' namespace_name '{' <openscope-ast> declaration_seq_opt '}'
| extension_namespace_definition
original_namespace_definition
::= 'namespace' identifier_name '{' <openscope-ast> declaration_seq_opt '}'
/. $Build consumeNamespaceDefinition(true); $EndBuild ./
extension_namespace_definition
::= 'namespace' original_namespace_name '{' <openscope-ast> declaration_seq_opt '}'
/. $Build consumeNamespaceDefinition(true); $EndBuild ./ /. $Build consumeNamespaceDefinition(true); $EndBuild ./
@ -1228,18 +1207,11 @@ unnamed_namespace_definition
/. $Build consumeNamespaceDefinition(false); $EndBuild ./ /. $Build consumeNamespaceDefinition(false); $EndBuild ./
namespace_alias_definition namespace_alias_definition
::= 'namespace' identifier_token '=' dcolon_opt nested_name_specifier_opt namespace_name ';' ::= 'namespace' identifier_token '=' dcolon_opt nested_name_specifier_opt namespace_name ';'
/. $Build consumeNamespaceAliasDefinition(); $EndBuild ./ /. $Build consumeNamespaceAliasDefinition(); $EndBuild ./
--qualified_namespace_specifier
-- ::= dcolon_opt nested_name_specifier_opt namespace_name
-- make more lenient! -- make more lenient!
-- using_declaration -- using_declaration
-- ::= 'using' typename_opt dcolon_opt nested_name_specifier unqualified_id_name ';' -- ::= 'using' typename_opt dcolon_opt nested_name_specifier unqualified_id_name ';'
@ -1579,7 +1551,8 @@ member_declaration
/. $Build consumeMemberDeclarationQualifiedId(); $EndBuild ./ /. $Build consumeMemberDeclarationQualifiedId(); $EndBuild ./
| using_declaration | using_declaration
| template_declaration | template_declaration
| explicit_specialization -- is this spec? | explicit_specialization -- not spec
| namespace_definition -- not spec
| visibility_label | visibility_label
| ERROR_TOKEN | ERROR_TOKEN
/. $Build consumeDeclarationProblem(); $EndBuild ./ /. $Build consumeDeclarationProblem(); $EndBuild ./
@ -1840,7 +1813,7 @@ handler
exception_declaration exception_declaration
::= type_specifier_seq <openscope-ast> declarator ::= type_specifier_seq <openscope-ast> declarator
/. $Build consumeDeclarationSimple(true); $EndBuild ./ /. $Build consumeDeclarationSimple(true); $EndBuild ./
| type_specifier_seq <openscope-ast> abstract_declarator -- TODO might need to be abstract_declarator_without_function, might be too lenient, what exactly can you catch? | type_specifier_seq <openscope-ast> abstract_declarator
/. $Build consumeDeclarationSimple(true); $EndBuild ./ /. $Build consumeDeclarationSimple(true); $EndBuild ./
| type_specifier_seq | type_specifier_seq
/. $Build consumeDeclarationSimple(false); $EndBuild ./ /. $Build consumeDeclarationSimple(false); $EndBuild ./

569
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionStatementParser.java
View file

File diff suppressed because it is too large Load diff

3699
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionStatementParserprs.java
View file

File diff suppressed because it is too large Load diff

74
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionStatementParsersym.java
View file

@ -17,26 +17,26 @@ public interface CPPExpressionStatementParsersym {
public final static int public final static int
TK_asm = 62, TK_asm = 62,
TK_auto = 49, TK_auto = 49,
TK_bool = 15, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 16, TK_char = 15,
TK_class = 63, TK_class = 63,
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 = 64,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 121, TK_else = 121,
TK_enum = 69, TK_enum = 68,
TK_explicit = 50, TK_explicit = 50,
TK_export = 75, TK_export = 82,
TK_extern = 14, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 83,
TK_friend = 51, TK_friend = 51,
@ -46,38 +46,38 @@ public interface CPPExpressionStatementParsersym {
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 53, TK_mutable = 53,
TK_namespace = 60, TK_namespace = 57,
TK_new = 65, TK_new = 65,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
TK_protected = 115, TK_protected = 115,
TK_public = 116, TK_public = 116,
TK_register = 54, TK_register = 54,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 86,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 55, TK_static = 55,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 70, TK_struct = 69,
TK_switch = 87, TK_switch = 87,
TK_template = 31, TK_template = 37,
TK_this = 38, TK_this = 38,
TK_throw = 57, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 39,
TK_typedef = 56, TK_typedef = 56,
TK_typeid = 40, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 71, TK_union = 70,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 58, TK_using = 59,
TK_virtual = 45, 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 = 41, TK_integer = 41,
TK_floating = 42, TK_floating = 42,
TK_charconst = 43, TK_charconst = 43,
@ -85,10 +85,10 @@ public interface CPPExpressionStatementParsersym {
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 48, TK_LeftBracket = 48,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 59, TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -116,7 +116,7 @@ public interface CPPExpressionStatementParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 67, TK_Assign = 67,
@ -133,12 +133,11 @@ public interface CPPExpressionStatementParsersym {
TK_Comma = 66, TK_Comma = 66,
TK_zero = 44, TK_zero = 44,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 68, TK_RightBrace = 73,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 122, TK_EOF_TOKEN = 122;
TK_EOF_TOKEN = 123;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
"", "",
@ -155,10 +154,10 @@ public interface CPPExpressionStatementParsersym {
"Plus", "Plus",
"Minus", "Minus",
"SemiColon", "SemiColon",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
"extern",
"float", "float",
"int", "int",
"long", "long",
@ -172,13 +171,13 @@ public interface CPPExpressionStatementParsersym {
"LT", "LT",
"stringlit", "stringlit",
"Bang", "Bang",
"template",
"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",
@ -198,10 +197,10 @@ public interface CPPExpressionStatementParsersym {
"register", "register",
"static", "static",
"typedef", "typedef",
"namespace",
"throw", "throw",
"using", "using",
"LeftBrace", "LeftBrace",
"namespace",
"GT", "GT",
"asm", "asm",
"class", "class",
@ -209,14 +208,13 @@ public interface CPPExpressionStatementParsersym {
"new", "new",
"Comma", "Comma",
"Assign", "Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -224,6 +222,7 @@ public interface CPPExpressionStatementParsersym {
"continue", "continue",
"default", "default",
"do", "do",
"export",
"for", "for",
"goto", "goto",
"if", "if",
@ -263,7 +262,6 @@ public interface CPPExpressionStatementParsersym {
"catch", "catch",
"Dot", "Dot",
"else", "else",
"original_namespace_name",
"EOF_TOKEN", "EOF_TOKEN",
"Invalid" "Invalid"
}; };

569
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

3755
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

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

@ -17,26 +17,26 @@ public interface CPPNoCastExpressionParsersym {
public final static int public final static int
TK_asm = 62, TK_asm = 62,
TK_auto = 49, TK_auto = 49,
TK_bool = 15, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 16, TK_char = 15,
TK_class = 63, TK_class = 63,
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 = 64,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 69, TK_enum = 68,
TK_explicit = 50, TK_explicit = 50,
TK_export = 75, TK_export = 82,
TK_extern = 14, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 83,
TK_friend = 51, TK_friend = 51,
@ -46,38 +46,38 @@ public interface CPPNoCastExpressionParsersym {
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 53, TK_mutable = 53,
TK_namespace = 60, TK_namespace = 57,
TK_new = 65, TK_new = 65,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
TK_protected = 115, TK_protected = 115,
TK_public = 116, TK_public = 116,
TK_register = 54, TK_register = 54,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 86,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 55, TK_static = 55,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 70, TK_struct = 69,
TK_switch = 87, TK_switch = 87,
TK_template = 31, TK_template = 37,
TK_this = 38, TK_this = 38,
TK_throw = 57, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 39,
TK_typedef = 56, TK_typedef = 56,
TK_typeid = 40, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 71, TK_union = 70,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 58, TK_using = 59,
TK_virtual = 45, 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 = 41, TK_integer = 41,
TK_floating = 42, TK_floating = 42,
TK_charconst = 43, TK_charconst = 43,
@ -85,10 +85,10 @@ public interface CPPNoCastExpressionParsersym {
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 48, TK_LeftBracket = 48,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 59, TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -116,7 +116,7 @@ public interface CPPNoCastExpressionParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 67, TK_Assign = 67,
@ -133,11 +133,10 @@ public interface CPPNoCastExpressionParsersym {
TK_Comma = 66, TK_Comma = 66,
TK_zero = 44, TK_zero = 44,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 68, TK_RightBrace = 73,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 123,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -155,10 +154,10 @@ public interface CPPNoCastExpressionParsersym {
"Plus", "Plus",
"Minus", "Minus",
"SemiColon", "SemiColon",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
"extern",
"float", "float",
"int", "int",
"long", "long",
@ -172,13 +171,13 @@ public interface CPPNoCastExpressionParsersym {
"LT", "LT",
"stringlit", "stringlit",
"Bang", "Bang",
"template",
"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",
@ -198,10 +197,10 @@ public interface CPPNoCastExpressionParsersym {
"register", "register",
"static", "static",
"typedef", "typedef",
"namespace",
"throw", "throw",
"using", "using",
"LeftBrace", "LeftBrace",
"namespace",
"GT", "GT",
"asm", "asm",
"class", "class",
@ -209,14 +208,13 @@ public interface CPPNoCastExpressionParsersym {
"new", "new",
"Comma", "Comma",
"Assign", "Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -224,6 +222,7 @@ public interface CPPNoCastExpressionParsersym {
"continue", "continue",
"default", "default",
"do", "do",
"export",
"for", "for",
"goto", "goto",
"if", "if",
@ -264,7 +263,6 @@ public interface CPPNoCastExpressionParsersym {
"Dot", "Dot",
"EOF_TOKEN", "EOF_TOKEN",
"else", "else",
"original_namespace_name",
"Invalid" "Invalid"
}; };

573
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

3719
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

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

@ -18,24 +18,24 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_asm = 62, TK_asm = 62,
TK_auto = 49, TK_auto = 49,
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 = 63, TK_class = 63,
TK_const = 46, TK_const = 46,
TK_const_cast = 32, TK_const_cast = 32,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 65, TK_delete = 65,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 17,
TK_dynamic_cast = 33, TK_dynamic_cast = 33,
TK_else = 122, TK_else = 122,
TK_enum = 69, TK_enum = 68,
TK_explicit = 50, TK_explicit = 50,
TK_export = 75, TK_export = 82,
TK_extern = 12, TK_extern = 14,
TK_false = 34, TK_false = 34,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 83,
@ -46,7 +46,7 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 53, TK_mutable = 53,
TK_namespace = 59, TK_namespace = 57,
TK_new = 66, TK_new = 66,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
@ -60,24 +60,24 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_sizeof = 36, TK_sizeof = 36,
TK_static = 55, TK_static = 55,
TK_static_cast = 37, TK_static_cast = 37,
TK_struct = 70, TK_struct = 69,
TK_switch = 87, TK_switch = 87,
TK_template = 30, TK_template = 31,
TK_this = 38, TK_this = 38,
TK_throw = 60, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 39,
TK_typedef = 56, TK_typedef = 56,
TK_typeid = 40, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 71, TK_union = 70,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 57, TK_using = 59,
TK_virtual = 41, TK_virtual = 41,
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 = 42,
TK_floating = 43, TK_floating = 43,
TK_charconst = 44, TK_charconst = 44,
@ -85,10 +85,10 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 48, TK_LeftBracket = 48,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 58, TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -97,10 +97,10 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 8,
TK_Star = 6, TK_Star = 6,
TK_Plus = 13, TK_Plus = 11,
TK_Minus = 14, TK_Minus = 12,
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,7 +116,7 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 67, TK_Assign = 67,
@ -133,11 +133,10 @@ public interface CPPNoFunctionDeclaratorParsersym {
TK_Comma = 64, TK_Comma = 64,
TK_zero = 45, TK_zero = 45,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 68, TK_RightBrace = 73,
TK_SemiColon = 11, TK_SemiColon = 13,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 123,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -152,10 +151,10 @@ public interface CPPNoFunctionDeclaratorParsersym {
"And", "And",
"EndOfCompletion", "EndOfCompletion",
"typename", "typename",
"SemiColon",
"extern",
"Plus", "Plus",
"Minus", "Minus",
"SemiColon",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
@ -171,8 +170,8 @@ public interface CPPNoFunctionDeclaratorParsersym {
"MinusMinus", "MinusMinus",
"LT", "LT",
"stringlit", "stringlit",
"template",
"Bang", "Bang",
"template",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
"false", "false",
@ -198,10 +197,10 @@ public interface CPPNoFunctionDeclaratorParsersym {
"register", "register",
"static", "static",
"typedef", "typedef",
"using",
"LeftBrace",
"namespace", "namespace",
"throw", "throw",
"using",
"LeftBrace",
"GT", "GT",
"asm", "asm",
"class", "class",
@ -209,14 +208,13 @@ public interface CPPNoFunctionDeclaratorParsersym {
"delete", "delete",
"new", "new",
"Assign", "Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -224,6 +222,7 @@ public interface CPPNoFunctionDeclaratorParsersym {
"continue", "continue",
"default", "default",
"do", "do",
"export",
"for", "for",
"goto", "goto",
"if", "if",
@ -264,7 +263,6 @@ public interface CPPNoFunctionDeclaratorParsersym {
"Dot", "Dot",
"EOF_TOKEN", "EOF_TOKEN",
"else", "else",
"original_namespace_name",
"Invalid" "Invalid"
}; };

565
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

3713
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

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

@ -22,7 +22,7 @@ public interface CPPParsersym {
TK_case = 79, TK_case = 79,
TK_catch = 119, TK_catch = 119,
TK_char = 14, TK_char = 14,
TK_class = 61, TK_class = 60,
TK_const = 33, TK_const = 33,
TK_const_cast = 36, TK_const_cast = 36,
TK_continue = 80, TK_continue = 80,
@ -46,7 +46,7 @@ public interface CPPParsersym {
TK_int = 17, TK_int = 17,
TK_long = 18, TK_long = 18,
TK_mutable = 42, TK_mutable = 42,
TK_namespace = 58, TK_namespace = 56,
TK_new = 67, TK_new = 67,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
@ -64,7 +64,7 @@ public interface CPPParsersym {
TK_switch = 87, TK_switch = 87,
TK_template = 29, TK_template = 29,
TK_this = 48, TK_this = 48,
TK_throw = 62, TK_throw = 61,
TK_try = 76, TK_try = 76,
TK_true = 49, TK_true = 49,
TK_typedef = 50, TK_typedef = 50,
@ -72,7 +72,7 @@ public interface CPPParsersym {
TK_typename = 10, TK_typename = 10,
TK_union = 69, TK_union = 69,
TK_unsigned = 21, TK_unsigned = 21,
TK_using = 56, TK_using = 58,
TK_virtual = 31, TK_virtual = 31,
TK_void = 22, TK_void = 22,
TK_volatile = 34, TK_volatile = 34,
@ -85,10 +85,10 @@ public interface CPPParsersym {
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 57, TK_LeftBracket = 57,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 60, TK_LeftBrace = 62,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -116,7 +116,7 @@ public interface CPPParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 70, TK_Assign = 70,
@ -133,11 +133,10 @@ public interface CPPParsersym {
TK_Comma = 64, TK_Comma = 64,
TK_zero = 55, TK_zero = 55,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 71, TK_RightBrace = 73,
TK_SemiColon = 11, TK_SemiColon = 11,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 123,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -197,13 +196,13 @@ public interface CPPParsersym {
"floating", "floating",
"charconst", "charconst",
"zero", "zero",
"using",
"LeftBracket",
"namespace", "namespace",
"LeftBracket",
"using",
"asm", "asm",
"LeftBrace",
"class", "class",
"throw", "throw",
"LeftBrace",
"GT", "GT",
"Comma", "Comma",
"delete", "delete",
@ -212,9 +211,9 @@ public interface CPPParsersym {
"struct", "struct",
"union", "union",
"Assign", "Assign",
"RightBrace",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export", "export",
"try", "try",
@ -264,7 +263,6 @@ public interface CPPParsersym {
"Dot", "Dot",
"EOF_TOKEN", "EOF_TOKEN",
"else", "else",
"original_namespace_name",
"Invalid" "Invalid"
}; };

569
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

3745
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

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

@ -17,26 +17,26 @@ public interface CPPSizeofExpressionParsersym {
public final static int public final static int
TK_asm = 62, TK_asm = 62,
TK_auto = 49, TK_auto = 49,
TK_bool = 15, TK_bool = 14,
TK_break = 78, TK_break = 77,
TK_case = 79, TK_case = 78,
TK_catch = 119, TK_catch = 119,
TK_char = 16, TK_char = 15,
TK_class = 63, TK_class = 63,
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 = 64,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 16,
TK_dynamic_cast = 33, TK_dynamic_cast = 32,
TK_else = 122, TK_else = 122,
TK_enum = 69, TK_enum = 68,
TK_explicit = 50, TK_explicit = 50,
TK_export = 75, TK_export = 82,
TK_extern = 14, TK_extern = 17,
TK_false = 34, TK_false = 33,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 83,
TK_friend = 51, TK_friend = 51,
@ -46,38 +46,38 @@ public interface CPPSizeofExpressionParsersym {
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 53, TK_mutable = 53,
TK_namespace = 60, TK_namespace = 57,
TK_new = 65, TK_new = 65,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
TK_protected = 115, TK_protected = 115,
TK_public = 116, TK_public = 116,
TK_register = 54, TK_register = 54,
TK_reinterpret_cast = 35, TK_reinterpret_cast = 34,
TK_return = 86, TK_return = 86,
TK_short = 21, TK_short = 21,
TK_signed = 22, TK_signed = 22,
TK_sizeof = 36, TK_sizeof = 35,
TK_static = 55, TK_static = 55,
TK_static_cast = 37, TK_static_cast = 36,
TK_struct = 70, TK_struct = 69,
TK_switch = 87, TK_switch = 87,
TK_template = 31, TK_template = 37,
TK_this = 38, TK_this = 38,
TK_throw = 57, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 39,
TK_typedef = 56, TK_typedef = 56,
TK_typeid = 40, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 71, TK_union = 70,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 58, TK_using = 59,
TK_virtual = 45, 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 = 41, TK_integer = 41,
TK_floating = 42, TK_floating = 42,
TK_charconst = 43, TK_charconst = 43,
@ -85,10 +85,10 @@ public interface CPPSizeofExpressionParsersym {
TK_identifier = 1, TK_identifier = 1,
TK_Completion = 2, TK_Completion = 2,
TK_EndOfCompletion = 9, TK_EndOfCompletion = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 48, TK_LeftBracket = 48,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 59, TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -116,7 +116,7 @@ public interface CPPSizeofExpressionParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 67, TK_Assign = 67,
@ -133,11 +133,10 @@ public interface CPPSizeofExpressionParsersym {
TK_Comma = 66, TK_Comma = 66,
TK_zero = 44, TK_zero = 44,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 68, TK_RightBrace = 73,
TK_SemiColon = 13, TK_SemiColon = 13,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 123,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -155,10 +154,10 @@ public interface CPPSizeofExpressionParsersym {
"Plus", "Plus",
"Minus", "Minus",
"SemiColon", "SemiColon",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
"extern",
"float", "float",
"int", "int",
"long", "long",
@ -172,13 +171,13 @@ public interface CPPSizeofExpressionParsersym {
"LT", "LT",
"stringlit", "stringlit",
"Bang", "Bang",
"template",
"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",
@ -198,10 +197,10 @@ public interface CPPSizeofExpressionParsersym {
"register", "register",
"static", "static",
"typedef", "typedef",
"namespace",
"throw", "throw",
"using", "using",
"LeftBrace", "LeftBrace",
"namespace",
"GT", "GT",
"asm", "asm",
"class", "class",
@ -209,14 +208,13 @@ public interface CPPSizeofExpressionParsersym {
"new", "new",
"Comma", "Comma",
"Assign", "Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -224,6 +222,7 @@ public interface CPPSizeofExpressionParsersym {
"continue", "continue",
"default", "default",
"do", "do",
"export",
"for", "for",
"goto", "goto",
"if", "if",
@ -264,7 +263,6 @@ public interface CPPSizeofExpressionParsersym {
"Dot", "Dot",
"EOF_TOKEN", "EOF_TOKEN",
"else", "else",
"original_namespace_name",
"Invalid" "Invalid"
}; };

569
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

3780
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

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

@ -15,27 +15,27 @@ 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 = 62, TK_asm = 63,
TK_auto = 49, TK_auto = 49,
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 = 63, TK_class = 62,
TK_const = 46, TK_const = 46,
TK_const_cast = 32, TK_const_cast = 32,
TK_continue = 80, TK_continue = 79,
TK_default = 81, TK_default = 80,
TK_delete = 65, TK_delete = 65,
TK_do = 82, TK_do = 81,
TK_double = 17, TK_double = 17,
TK_dynamic_cast = 33, TK_dynamic_cast = 33,
TK_else = 122, TK_else = 122,
TK_enum = 69, TK_enum = 68,
TK_explicit = 50, TK_explicit = 50,
TK_export = 75, TK_export = 82,
TK_extern = 12, TK_extern = 14,
TK_false = 34, TK_false = 34,
TK_float = 18, TK_float = 18,
TK_for = 83, TK_for = 83,
@ -46,7 +46,7 @@ public interface CPPTemplateTypeParameterParsersym {
TK_int = 19, TK_int = 19,
TK_long = 20, TK_long = 20,
TK_mutable = 53, TK_mutable = 53,
TK_namespace = 59, TK_namespace = 57,
TK_new = 66, TK_new = 66,
TK_operator = 7, TK_operator = 7,
TK_private = 114, TK_private = 114,
@ -60,35 +60,35 @@ public interface CPPTemplateTypeParameterParsersym {
TK_sizeof = 36, TK_sizeof = 36,
TK_static = 55, TK_static = 55,
TK_static_cast = 37, TK_static_cast = 37,
TK_struct = 70, TK_struct = 69,
TK_switch = 87, TK_switch = 87,
TK_template = 29, TK_template = 30,
TK_this = 38, TK_this = 38,
TK_throw = 60, TK_throw = 58,
TK_try = 76, TK_try = 75,
TK_true = 39, TK_true = 39,
TK_typedef = 56, TK_typedef = 56,
TK_typeid = 40, TK_typeid = 40,
TK_typename = 10, TK_typename = 10,
TK_union = 71, TK_union = 70,
TK_unsigned = 23, TK_unsigned = 23,
TK_using = 57, TK_using = 59,
TK_virtual = 41, TK_virtual = 41,
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 = 42,
TK_floating = 43, TK_floating = 43,
TK_charconst = 44, 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 = 9,
TK_Invalid = 124, TK_Invalid = 123,
TK_LeftBracket = 48, TK_LeftBracket = 48,
TK_LeftParen = 3, TK_LeftParen = 3,
TK_LeftBrace = 58, TK_LeftBrace = 60,
TK_Dot = 120, TK_Dot = 120,
TK_DotStar = 96, TK_DotStar = 96,
TK_Arrow = 103, TK_Arrow = 103,
@ -97,8 +97,8 @@ public interface CPPTemplateTypeParameterParsersym {
TK_MinusMinus = 27, TK_MinusMinus = 27,
TK_And = 8, TK_And = 8,
TK_Star = 6, TK_Star = 6,
TK_Plus = 13, TK_Plus = 11,
TK_Minus = 14, TK_Minus = 12,
TK_Tilde = 5, TK_Tilde = 5,
TK_Bang = 31, TK_Bang = 31,
TK_Slash = 91, TK_Slash = 91,
@ -116,7 +116,7 @@ public interface CPPTemplateTypeParameterParsersym {
TK_AndAnd = 101, TK_AndAnd = 101,
TK_OrOr = 102, TK_OrOr = 102,
TK_Question = 117, TK_Question = 117,
TK_Colon = 72, TK_Colon = 71,
TK_ColonColon = 4, TK_ColonColon = 4,
TK_DotDotDot = 95, TK_DotDotDot = 95,
TK_Assign = 67, TK_Assign = 67,
@ -133,11 +133,10 @@ public interface CPPTemplateTypeParameterParsersym {
TK_Comma = 64, TK_Comma = 64,
TK_zero = 45, TK_zero = 45,
TK_RightBracket = 118, TK_RightBracket = 118,
TK_RightParen = 73, TK_RightParen = 72,
TK_RightBrace = 68, TK_RightBrace = 73,
TK_SemiColon = 11, TK_SemiColon = 13,
TK_ERROR_TOKEN = 74, TK_ERROR_TOKEN = 74,
TK_original_namespace_name = 123,
TK_EOF_TOKEN = 121; TK_EOF_TOKEN = 121;
public final static String orderedTerminalSymbols[] = { public final static String orderedTerminalSymbols[] = {
@ -152,10 +151,10 @@ public interface CPPTemplateTypeParameterParsersym {
"And", "And",
"EndOfCompletion", "EndOfCompletion",
"typename", "typename",
"SemiColon",
"extern",
"Plus", "Plus",
"Minus", "Minus",
"SemiColon",
"extern",
"bool", "bool",
"char", "char",
"double", "double",
@ -170,8 +169,8 @@ public interface CPPTemplateTypeParameterParsersym {
"PlusPlus", "PlusPlus",
"MinusMinus", "MinusMinus",
"LT", "LT",
"template",
"stringlit", "stringlit",
"template",
"Bang", "Bang",
"const_cast", "const_cast",
"dynamic_cast", "dynamic_cast",
@ -198,25 +197,24 @@ public interface CPPTemplateTypeParameterParsersym {
"register", "register",
"static", "static",
"typedef", "typedef",
"using",
"LeftBrace",
"namespace", "namespace",
"throw", "throw",
"using",
"LeftBrace",
"GT", "GT",
"asm",
"class", "class",
"asm",
"Comma", "Comma",
"delete", "delete",
"new", "new",
"Assign", "Assign",
"RightBrace",
"enum", "enum",
"struct", "struct",
"union", "union",
"Colon", "Colon",
"RightParen", "RightParen",
"RightBrace",
"ERROR_TOKEN", "ERROR_TOKEN",
"export",
"try", "try",
"while", "while",
"break", "break",
@ -224,6 +222,7 @@ public interface CPPTemplateTypeParameterParsersym {
"continue", "continue",
"default", "default",
"do", "do",
"export",
"for", "for",
"goto", "goto",
"if", "if",
@ -264,7 +263,6 @@ public interface CPPTemplateTypeParameterParsersym {
"Dot", "Dot",
"EOF_TOKEN", "EOF_TOKEN",
"else", "else",
"original_namespace_name",
"Invalid" "Invalid"
}; };