diff options
| author | Mike Kucera | 2008-05-28 19:22:15 +0000 |
|---|---|---|
| committer | Mike Kucera | 2008-05-28 19:22:15 +0000 |
| commit | 3e8493f50536a5b4fb97460e990b65e50ae842fc (patch) | |
| tree | c0d3439133150cf1ce043b2e044a542cc5de4494 /lrparser/org.eclipse.cdt.core.lrparser/grammar | |
| parent | e26da8fa71eb7f0cbfa331ba2d300faadd32a353 (diff) | |
| download | org.eclipse.cdt-3e8493f50536a5b4fb97460e990b65e50ae842fc.tar.gz org.eclipse.cdt-3e8493f50536a5b4fb97460e990b65e50ae842fc.tar.xz org.eclipse.cdt-3e8493f50536a5b4fb97460e990b65e50ae842fc.zip | |
bug 234463, fixes for CompletionTest_ExceptionReference_NoPrefix and CompletionTest_ExceptionReference_Prefix
Diffstat (limited to 'lrparser/org.eclipse.cdt.core.lrparser/grammar')
| -rw-r--r-- | lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g index f36a36d8263..e00df4ffae1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g +++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g @@ -54,7 +54,7 @@ $Terminals -- Special tokens used in content assist Completion - EndOfCompletion ::= 'EOC' + EndOfCompletion -- Unrecognized token, not actually used anywhere in the grammar, always leads to syntax error @@ -64,7 +64,6 @@ $Terminals LeftBracket ::= '[' LeftParen ::= '(' - LeftBrace ::= '{' Dot ::= '.' DotStar ::= '.*' Arrow ::= '->' @@ -112,6 +111,7 @@ $Terminals RightParen RightBrace SemiColon + LeftBrace $End @@ -306,6 +306,8 @@ $Rules ';' ::=? 'SemiColon' | 'EndOfCompletion' +'{' ::=? 'LeftBrace' + | 'EndOfCompletion' @@ -1476,11 +1478,8 @@ class_name class_specifier ::= class_head '{' <openscope-ast> member_declaration_list_opt '}' /. $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_keyword identifier_name_opt <openscope-ast> base_clause_opt /. $Build consumeClassHead(false); $EndBuild ./ |