(with-peg-rules): Build proper `peg-function`s

* lisp/progmodes/peg.el (with-peg-rules): Use the new (FUNC EXP)
feature in `cl-labels`.

(cherry picked from commit 986621ae1ff4d3cfad31adb20216f1f71ce0747c)

diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el
index 0b069e9556371b6356778c194ff700f864a6380f..115f692a030e1874a7fc73870046eb4196917671 100644 (file)
--- a/lisp/progmodes/peg.el
+++ b/lisp/progmodes/peg.el
@@ -438,10 +438,9 @@ rulesets defined previously with `define-peg-ruleset'."
     (macroexpand-all
      `(cl-labels
           ,(mapcar (lambda (rule)
-                    ;; FIXME: Use `peg--lambda' as well.
                     `(,(peg--rule-id (car rule))
-                      ()
-                      ,(peg--translate-rule-body (car rule) (cdr rule))))
+                      (peg--lambda ',(cdr rule) ()
+                        ,(peg--translate-rule-body (car rule) (cdr rule)))))
                   rules)
         ,@body)
      `((:peg-rules ,@(append rules (cdr ctx)))