FIXED: Correctly recognize DCG grammar rules in 'C-c C-d'

* sweeprolog.el (sweeprolog-beginning-of-predicate-at-point): Also
return the module and neck operator of the predicate at point.
(sweeprolog-insert-predicate-documentation)
(sweeprolog-read-predicate-documentation-function)
(sweeprolog-read-predicate-documentation-with-holes)
(sweeprolog-read-predicate-documentation-default-function)
(sweeprolog-read-predicate-documentation)
(sweeprolog-document-predicate-at-point): Adapt to support DCGs and
non-local predicates.

diff --git a/README.org b/README.org
index 36471cdab98551f091b261a511ef4d8d56209542..5c5462717f60900b637bf118d01c1d57eb73c163 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1465,13 +1465,12 @@ commands, see [[info:emacs#Comment Commands][Comment Commands in the Emacs manua
   to use for determining the initial contents of documentation
   comments inserted with ~sweeprolog-document-predicate-at-point~.
 #+FINDEX: sweeprolog-read-predicate-documentation-default-function
-- Function: sweeprolog-read-predicate-documentation-default-function functor arity :: Prompt
-  and read from the minibuffer the arguments modes, determinism
-  specification and initial summary for the documentation of the
-  predicate FUNCTOR/ARITY.
+- Function: sweeprolog-read-predicate-documentation-default-function :: Prompt
+  and read from the minibuffer the argument modes, determinism
+  specification and initial summary of the given predicate.
 #+FINDEX: sweeprolog-read-predicate-documentation-with-holes
-- Function: sweeprolog-read-predicate-documentation-with-holes functor arity :: Use
-  holes for the initial documentation of the predicate FUNCTOR/ARITY.
+- Function: sweeprolog-read-predicate-documentation-with-holes :: Use
+  holes for the initial documentation of the given predicate.
 
 Sweep also includes a dedicated command called
 ~sweeprolog-document-predicate-at-point~ for interactively creating

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 48cce1629237df526dfdcbffda36c8c86964dedd..a3edf682b0f6917dd4b156853b803fabc6ff4565 100644 (file)
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -1291,6 +1291,44 @@ bar :- foo.
 "
                      ))))
 
+(ert-deftest document-predicate ()
+  "Tests documenting a predicate."
+  (let ((temp (make-temp-file "sweeprolog-test"
+                              nil
+                              "pl"
+                              "foo(Bar) :- baz(Bar).
+")))
+    (find-file-literally temp)
+    (sweeprolog-mode)
+    (goto-char (point-max))
+    (let ((sweeprolog-read-predicate-documentation-function
+           #'sweeprolog-read-predicate-documentation-with-holes))
+      (sweeprolog-document-predicate-at-point (point)))
+    (should (string= (buffer-string)
+                     "%!  foo(_) is Det.
+
+foo(Bar) :- baz(Bar).
+"))))
+
+(ert-deftest document-non-terminal ()
+  "Tests documenting a DCG non-terminal."
+  (let ((temp (make-temp-file "sweeprolog-test"
+                              nil
+                              "pl"
+                              "foo(Bar) --> baz(Bar).
+")))
+    (find-file-literally temp)
+    (sweeprolog-mode)
+    (goto-char (point-max))
+    (let ((sweeprolog-read-predicate-documentation-function
+           #'sweeprolog-read-predicate-documentation-with-holes))
+      (sweeprolog-document-predicate-at-point (point)))
+    (should (string= (buffer-string)
+                     "%!  foo(_)// is Det.
+
+foo(Bar) --> baz(Bar).
+"))))
+
 (ert-deftest dwim-define-non-terminal ()
   "Tests defining an undefined DCG non-terminal."
   (with-temp-buffer

diff --git a/sweeprolog.el b/sweeprolog.el
index 3c736e307a4325fa18ddaed22bbbee0865a1e78a..325e79d0bc31fd7c56bf947827c485cf5ef7f26d 100644 (file)
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -361,12 +361,20 @@ non-terminals)."
 
 (defcustom sweeprolog-read-predicate-documentation-function
   #'sweeprolog-read-predicate-documentation-default-function
-  "Function returning information for initial predicate documentation.
-
-The function should take two arguments, the functor name and
-arity of the predicate, and return a list of three strings.  The
-first string is the predicate's head template, the second is its
-determinism specification, and the third is a summary line."
+  "Function used for filling in information for predicate documentation.
+
+The function should take four arguments, MODULE, FUNCTOR, ARITY
+and NECK, which have the same meaning as in
+`sweeprolog-definition-at-point'.
+
+It should return a list with four elements (MOD HEAD DET SUM),
+where HEAD is a string that contains a template head term for
+calling the documented predicate (e.g. \"foo(+Bar, -Baz)\"), MOD
+is the module name to qualify HEAD with, or nil if the documented
+predicate is local to the current module and shouldn't be
+module-qualified, DET is the determinism specification of the
+predicate, and SUM is the first line of the predicate's
+documentation, acting as a short summary."
   :package-version '((sweeprolog "0.10.1"))
   :type '(choice
           (const
@@ -3814,27 +3822,30 @@ marks the next predicate after the ones already marked."
 (defun sweeprolog-beginning-of-predicate-at-point (&optional point)
   "Find the beginning of the predicate definition at or above POINT.
 
-Return a cons cell (FUN . ARI) where FUN is the functor name of
-the defined predicate and ARI is its arity, or nil if there is no
-predicate definition at or directly above POINT."
-  (when-let* ((def (sweeprolog-definition-at-point point)))
-    (unless (sweeprolog-at-beginning-of-top-term-p)
-      (sweeprolog-beginning-of-top-term))
-    (let ((point (point))
-          (fun (cadr def))
-          (ari (caddr def)))
-      (while (and point (not (bobp)))
-        (sweeprolog-beginning-of-top-term)
-        (if-let* ((moved (< (point) point))
-                  (ndef (sweeprolog-definition-at-point (point)))
-                  (nfun (cadr ndef))
-                  (nari (caddr ndef))
-                  (same (and (string= fun nfun)
-                             (=       ari nari))))
-            (setq point (point))
-          (goto-char point)
-          (setq point nil)))
-      (cons fun ari))))
+If there is no predicate definition at or directly above point,
+return nil.  Otherwise, return a list (MOD FUN ARI NECK), where
+MOD, FUN, ARI and NECK have the same meaning as in
+`sweeprolog-definition-at-point'."
+  (setq point (or point (point)))
+  (goto-char point)
+  (unless (sweeprolog-at-beginning-of-top-term-p)
+    (sweeprolog-beginning-of-top-term))
+  (when-let ((def (sweeprolog-definition-at-point)))
+    (let ((start (point))
+          (go t))
+      (while (and go (sweeprolog-beginning-of-top-term-once))
+        (let ((ndef (sweeprolog-definition-at-point)))
+          (if (and (string= (nth 5 def)
+                            (nth 5 ndef))
+                   (string= (nth 1 def)
+                            (nth 1 ndef))
+                   (= (nth 2 def)
+                      (nth 2 ndef)))
+              (setq start (point)
+                    def ndef)
+            (setq go nil)
+            (goto-char start)))))
+    (list (nth 5 def) (nth 1 def) (nth 2 def) (nth 4 def))))
 
 (defun sweeprolog-format-term-with-holes (functor arity &optional pre)
   (let ((term-format
@@ -3869,18 +3880,25 @@ predicate definition at or directly above POINT."
       term)))
 
 (defun sweeprolog-read-predicate-documentation-with-holes
-    (functor arity)
-  "Use holes for initial documentation for predicate FUNCTOR/ARITY."
-  (list (sweeprolog-format-term-with-holes functor arity)
+    (module functor arity neck)
+  "Use holes for documentation of predicate MODULE:FUNCTOR/ARITY.
+NECK is the neck operator the this predicate uses."
+  (list module
+        (concat (sweeprolog-format-term-with-holes
+                 functor
+                 (- arity (if (string= neck "-->") 2 0)))
+                (if (string= neck "-->") "//" ""))
         (sweeprolog--hole "Det")
         nil))
 
 (defun sweeprolog-read-predicate-documentation-default-function
-    (functor arity)
-  "Prompt for initial documentation for predicate FUNCTOR/ARITY."
+    (module functor arity neck)
+  "Prompt for documentation of the predicate MODULE:FUNCTOR/ARITY.
+NECK is the neck operator the this predicate uses."
   (let ((cur 1)
+        (ari (- arity (if (string= neck "-->") 2 0)))
         (arguments nil))
-    (while (<= cur arity)
+    (while (<= cur ari)
       (let ((num (pcase cur
                    (1 "First")
                    (2 "Second")
@@ -3898,42 +3916,46 @@ predicate definition at or directly above POINT."
                         (?m "multi"     "Succeeds at least once")
                         (?u "undefined" "Undefined")))))
           (summary (read-string "Summary: ")))
-      (list (concat (sweeprolog-format-string-as-atom functor)
+      (list module
+            (concat (sweeprolog-format-string-as-atom functor)
                     (if arguments
                         (concat "("
                                 (mapconcat #'identity arguments ", ")
                                 ")")
-                      ""))
+                      "")
+                    (if (string= neck "-->") "//" ""))
             det
             (and (not (string-empty-p summary))
                  summary)))))
 
-(defun sweeprolog-insert-predicate-documentation (head det sum)
-  (combine-after-change-calls
-    (insert "%!  " head " is " det ".\n"
-            (if sum (concat "%\n%   " sum "\n") "")
-            "\n")
-    (forward-char -2)
-    (fill-paragraph t)))
+(defun sweeprolog-insert-predicate-documentation (module head det sum)
+  (insert
+   (concat "%!  " (when module (concat module ":")) head " is " det "."
+           "\n"
+           (when sum (concat "%\n%   " sum "\n"))
+           "\n"))
+  (forward-char -2)
+  (fill-paragraph t))
+
+(defun sweeprolog-read-predicate-documentation (mod fun ari neck)
+  "Return information for initial documentation of MOD:FUN/ARI.
 
-(defun sweeprolog-read-predicate-documentation (fun ari)
-  "Return information for initial predicate documentation of FUN/ARI.
+NECK is the neck operator the this predicate uses.
 
 Calls the function specified by
 `sweeprolog-read-predicate-documentation-function' to do the
 work."
-  (funcall sweeprolog-read-predicate-documentation-function fun ari))
+  (funcall sweeprolog-read-predicate-documentation-function
+           mod fun ari neck))
 
 (defun sweeprolog-document-predicate-at-point (point)
   "Insert documentation comment for the predicate at or above POINT."
   (interactive "d" sweeprolog-mode)
-  (when-let* ((pred (sweeprolog-beginning-of-predicate-at-point point))
-              (fun (car pred))
-              (ari (cdr pred))
-              (doc (sweeprolog-read-predicate-documentation fun ari)))
-    (sweeprolog-insert-predicate-documentation (car doc)
-                                               (cadr doc)
-                                               (caddr doc))))
+  (pcase (sweeprolog-beginning-of-predicate-at-point point)
+    (`(,mod ,fun ,ari ,neck)
+     (apply #'sweeprolog-insert-predicate-documentation
+            (sweeprolog-read-predicate-documentation mod fun ari neck)))
+    (_ (user-error "No predicate found at point"))))
 
 (defun sweeprolog-token-boundaries (&optional pos)
   (let ((point (or pos (point))))