Allow string-slice to take zero-length matches

* lisp/emacs-lisp/subr-x.el (string-slice): Allow zero-length
matches.  Code adapted from s.el by Magnar Sveen.

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 09c4649817a6aa3864471b353566c0ac60590f67..8a9424cbb3d2f9e006fa0cf7ae38fe22a57fbd8f 100644 (file)
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -308,19 +308,16 @@ If OMIT-NULLS, empty lines will be removed from the results."
 
 (defun string-slice (string regexp)
   "Split STRING at REGEXP boundaries and return a list of slices.
-The boundaries that match REGEXP are included in the result."
-  (let ((start-substring 0)
-        (start-search 0)
-        (result nil))
-    (save-match-data
-      (while (string-match regexp string start-search)
-        (if (zerop (match-beginning 0))
-            (setq start-search (match-end 0))
-          (push (substring string start-substring (match-beginning 0)) result)
-          (setq start-substring (match-beginning 0)
-                start-search (match-end 0))))
-      (push (substring string start-substring) result)
-      (nreverse result))))
+The boundaries that match REGEXP are included in the result.
+
+Also see `split-string'."
+  (if (zerop (length string))
+      (list "")
+    (let ((i (string-match-p regexp string 1)))
+      (if i
+          (cons (substring string 0 i)
+                (string-slice (substring string i) regexp))
+        (list string)))))
 
 (defun string-pad (string length &optional padding start)
   "Pad STRING to LENGTH using PADDING.

diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el
index 854d61ed28e86c3a16eb00d4f09ad09183251e7b..3fc5f1d3ed30835f3af1802aea54473319ce09db 100644 (file)
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -608,7 +608,9 @@
   (should (equal (string-slice "foo-bar" "-") '("foo" "-bar")))
   (should (equal (string-slice "foo-bar-" "-") '("foo" "-bar" "-")))
   (should (equal (string-slice "-foo-bar-" "-") '("-foo" "-bar" "-")))
-  (should (equal (string-slice "ooo" "lala") '("ooo"))))
+  (should (equal (string-slice "ooo" "lala") '("ooo")))
+  (should (equal (string-slice "foo bar" "\\b") '("foo" " " "bar" "")))
+  (should (equal (string-slice "foo bar" "\\b\\|a") '("foo" " " "b" "ar" ""))))
 
 (ert-deftest subr-string-pad ()
   (should (equal (string-pad "foo" 5) "foo  "))