FIXED: tokenizing adjacent operators

Make Sweep's Prolog tokenization functions more careful in their
handling of unrelated adjacent operators.  This fixes an issue that
affects term-based movement commands and other commands that rely on
'sweeprolog--forward-sexp' and friends.

* sweeprolog.el (sweeprolog-next-token-boundaries)
(sweeprolog-last-token-boundaries): Fix handling of
adjacent (distinct) operators.

* sweeprolog-tests.el
(forward-sexp-with-adjacent-operators): New test case.

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 48b35cefd37af301850c8f7169ca07e66be2d7b3..2748ee01c5b35aa583d6d5adb5802bdfe4aeb4a0 100644 (file)
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -1791,4 +1791,16 @@ head,
     body.
 "))
 
+(ert-deftest forward-sexp-with-adjacent-operators ()
+  "Tests detecting the fullstop in presence of `.=.'."
+  (with-temp-buffer
+    (sweeprolog-mode)
+    (insert "a,+b.")
+    (goto-char (point-min))
+    (sweeprolog--forward-sexp)
+    (should (= (point) 2))
+    (goto-char (point-max))
+    (sweeprolog--backward-sexp)
+    (should (= (point) 4))))
+
 ;;; sweeprolog-tests.el ends here

diff --git a/sweeprolog.el b/sweeprolog.el
index 457413489e1ccecbab75411f9123fd98b42a1699..39f5c90b9b1c0326f0b88a7c10d08553433626cc 100644 (file)
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -3800,7 +3800,14 @@ work."
            ((or (= syn ?.)
                 (= syn ?\\))
             (skip-syntax-forward ".")
-            (list 'operator beg (point)))
+            (let ((end (point)))
+              (while (and (< beg (point))
+                          (not (sweeprolog--query-once
+                                "sweep" "sweep_op_info"
+                                (cons (buffer-substring-no-properties beg (point))
+                                      (buffer-file-name)))))
+                (forward-char -1))
+              (list 'operator beg (if (= beg (point)) end (point)))))
            ((= syn ?\()
             (list 'open beg (point)))
            ((= syn ?\))
@@ -3836,9 +3843,16 @@ work."
             (skip-syntax-backward "w_")
             (list 'functor (point) end))
            ((or (= syn ?.)
-                (= syn ?\\))  ; specifically, the backslash character
+                (= syn ?\\))   ; specifically, the backslash character
             (skip-syntax-backward ".")
-            (list 'operator (point) end))
+            (let ((beg (point)))
+              (while (and (< (point) end)
+                          (not (sweeprolog--query-once
+                                "sweep" "sweep_op_info"
+                                (cons (buffer-substring-no-properties (point) end)
+                                      (buffer-file-name)))))
+                (forward-char 1))
+              (list 'operator (if (= end (point)) beg (point)) end)))
            ((= syn ?\()
             (list 'open (1- end) end))
            ((= syn ?\))