Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp')
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPExpressionParser.g6
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoCastExpressionParser.g6
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoFunctionDeclaratorParser.g6
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g4
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPSizeofExpressionParser.g6
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPTemplateTypeParameterParser.g12
6 files changed, 35 insertions, 5 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPExpressionParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPExpressionParser.g
index 3af8f68ce6..b9ab4957b7 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPExpressionParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPExpressionParser.g
@@ -19,6 +19,10 @@ $Import
CPPGrammar.g
$End
+$Define
+ $ast_class /. IASTExpression ./
+$End
+
$Start
expression_parser_start
$End
@@ -28,6 +32,6 @@ $Rules
expression_parser_start
::= expression
| ERROR_TOKEN
- /. $Build consumeExpressionProblem(); $EndBuild ./
+ /. $Build consumeEmpty(); $EndBuild ./
$End \ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoCastExpressionParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoCastExpressionParser.g
index 7340ce79e0..ea1a9d944d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoCastExpressionParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoCastExpressionParser.g
@@ -22,6 +22,10 @@ $DropRules
$End
+$Define
+ $ast_class /. IASTExpression ./
+$End
+
$Start
no_cast_start
$End
@@ -31,6 +35,6 @@ $Rules
no_cast_start
::= expression
| ERROR_TOKEN
- /. $Build consumeExpressionProblem(); $EndBuild ./
+ /. $Build consumeEmpty(); $EndBuild ./
$End \ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoFunctionDeclaratorParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoFunctionDeclaratorParser.g
index bdbaf96e24..6e0bcc4cd3 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoFunctionDeclaratorParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPNoFunctionDeclaratorParser.g
@@ -25,6 +25,10 @@ $DropRules
$End
+$Define
+ $ast_class /. IASTDeclarator ./
+$End
+
$Start
no_function_declarator_start
$End
@@ -34,7 +38,7 @@ $Rules
no_function_declarator_start
::= init_declarator_complete
| ERROR_TOKEN
- /. $Build consumeDeclarationProblem(); $EndBuild ./
+ /. $Build consumeEmpty(); $EndBuild ./
-- redeclare this rule with no semantic action, prevents recursion
init_declarator_complete
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
index 47e91f6a41..8f4d80864d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
@@ -21,6 +21,10 @@ $Import
CPPGrammar.g
$End
+$Define
+ $ast_class /. IASTTranslationUnit ./
+$End
+
$Start
translation_unit
$End \ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPSizeofExpressionParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPSizeofExpressionParser.g
index ac3994d60c..124f023bb3 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPSizeofExpressionParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPSizeofExpressionParser.g
@@ -26,6 +26,10 @@ $DropRules
$End
+$Define
+ $ast_class /. IASTExpression ./
+$End
+
$Start
no_sizeof_type_id_start
$End
@@ -35,6 +39,6 @@ $Rules
no_sizeof_type_id_start
::= expression
| ERROR_TOKEN
- /. $Build consumeExpressionProblem(); $EndBuild ./
+ /. $Build consumeEmpty(); $EndBuild ./
$End \ No newline at end of file
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPTemplateTypeParameterParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPTemplateTypeParameterParser.g
index 6095b8b464..dfacf88d8e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPTemplateTypeParameterParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPTemplateTypeParameterParser.g
@@ -33,6 +33,16 @@ $Import
CPPGrammar.g
$End
+$Globals
+/.
+ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
+./
+$End
+
+$Define
+ $ast_class /. ICPPASTTemplateParameter ./
+$End
+
$Start
type_parameter_start
$End
@@ -42,6 +52,6 @@ $Rules
type_parameter_start
::= type_parameter
| ERROR_TOKEN
- /. $Build consumeDeclarationProblem(); $EndBuild ./
+ /. $Build consumeEmpty(); $EndBuild ./
$End \ No newline at end of file

Back to the top