Merge pull request #317 from plaflamme/fix-type-argument-return-position

fix: support generic argument in rule's return position
kevinmehall · Sep 25, 2022 · 74c48c4 · 74c48c4
2 parents c0e882b + 4cf66e7
commit 74c48c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/peg-macros/grammar.rs b/peg-macros/grammar.rs
@@ -50,7 +50,7 @@ pub mod peg {
             &mut __err_state,
             ::peg::Parse::start(__input),
         ) {
-            ::peg::RuleResult::Matched(__pos, __value) => {
+            ::peg::RuleResult::<Grammar>::Matched(__pos, __value) => {
                 if ::peg::Parse::is_eof(__input, __pos) {
                     panic!(
                         "Parser is nondeterministic: succeeded when reparsing for error position"

diff --git a/peg-macros/translate.rs b/peg-macros/translate.rs
@@ -389,7 +389,7 @@ fn compile_rule_export(context: &Context, rule: &Rule) -> TokenStream {
             __err_state.reparse_for_error();
 
             match #parse_fn(__input, &mut __state, &mut __err_state, ::peg::Parse::start(__input) #extra_args_call #(, #rule_params_call)*) {
-                ::peg::RuleResult::Matched(__pos, __value) => {
+                ::peg::RuleResult::<#ret_ty>::Matched(__pos, __value) => {
                     if #eof_check {
                         panic!("Parser is nondeterministic: succeeded when reparsing for error position");
                     } else {

diff --git a/tests/run-pass/rule_args.rs b/tests/run-pass/rule_args.rs
@@ -32,6 +32,7 @@ peg::parser!( grammar ra() for str {
     pub rule ty_arg<T>(x: &T) = ""
     pub rule ty_arg_bound<T: Copy>(x: T) = ""
     pub rule ty_arg_bound2<'a, T: std::marker::Copy + ?Sized + 'a>(x: T) = ""
+    pub rule ty_arg_bound_ret<T: std::str::FromStr>() -> T = {? "".parse().or(Err("oops")) }
 });
 
 use ra::*;