tiny.el (tiny-extract-sexps): can handle e.g. %0.1f(...) style formatting.

* tiny.el (tiny-format-str): new constant
* tiny-test.el (tiny-extract-sexps): add test

diff --git a/tiny-test.el b/tiny-test.el
index 77cfdc7820c09fc1adc2a7431d80100f41f5d028..e959345ee529d2e4d612c58f5ae53bc2fb70c8a2 100644 (file)
--- a/tiny-test.el
+++ b/tiny-test.el
@@ -40,7 +40,10 @@ with point at the end of TXT."
 (ert-deftest tiny-extract-sexps ()
   (should (equal (tiny-extract-sexps "expr1 %(+ x x), nothing %%  char %c, hex %x, and expr2 %(* x x), float %0.2f and sym %s")
                  '("expr1 %s, nothing %%  char %c, hex %x, and expr2 %s, float %0.2f and sym %s"
-                   "(+ x x)" nil nil "(* x x)" nil nil))))
+                   "(+ x x)" nil nil "(* x x)" nil nil)))
+  (should (equal (tiny-extract-sexps "m1\n5| (%c(+ x ?a -1)) %0.1f(* x 0.2)")
+                 '("m1
+5| (%c) %0.1f" "(+ x ?a -1)" "(* x 0.2)"))))
 
 (ert-deftest tiny-mapconcat ()
   (should (equal (with-text-value "m10" (lambda()(eval (read (tiny-mapconcat)))))

diff --git a/tiny.el b/tiny.el
index 319fc24843044ef24e88247f94caa192c4398e54..4cd862648ed94374b4022d591212eb063eca26e6 100644 (file)
--- a/tiny.el
+++ b/tiny.el
@@ -186,6 +186,14 @@ expression."
            n2
            s1))))))
 
+(defconst tiny-format-str
+  (let ((flags "[+ #-0]\\{0,1\\}")
+        (width "[0-9]*")
+        (precision "\\(?:\\.[0-9]+\\)?")
+        (character "[sdoxXefgcS]?"))
+    (format "\\(%s%s%s%s\\)("
+            flags width precision character)))
+
 (defun tiny-extract-sexps (str)
   "Returns (STR & FORMS), where each element of FORMS
 corresponds to a `format'-style % form in STR.
@@ -197,16 +205,21 @@ corresponds to a `format'-style % form in STR.
         forms beg)
     (condition-case nil
         (while (setq beg (string-match "%" str start))
-          (incf beg)
-          (setq start beg)
-          (case (aref str beg)
-            (?% (incf start))
-            (?\( (destructuring-bind (sexp . end) (read-from-string str beg)
+          (setq start (1+ beg))
+
+          (cond ((= ?% (aref str (1+ beg)))
+                 (incf start))
+
+                ((and (eq beg (string-match tiny-format-str str beg))
+                      (setq fexp (match-string-no-properties 1 str)))
+                 (incf beg (length fexp))
+                 (destructuring-bind (sexp . end)
+                     (read-from-string str beg)
                    (push (substring str beg end) forms)
                    (setq str (concat (substring str 0 beg)
-                                     "s"
+                                     (if (string= fexp "%") "s" "")
                                      (substring str end)))))
-            (t (push nil forms))))
+                (t (push nil forms))))
       (error (message "Malformed sexp: %s" (substring str beg))))
     (cons str (nreverse forms))))