@@ -42,12 +42,13 @@

         (end (subseq base point)))

     (concatenate 'string begin new end)))

 (defmethod edit ((base editable-string) (operation insert))

-  (let ((current-transform (transform base))

-        (op-point (point operation))

-        (string-to-edit (string-to-edit base)))

-    (setf (point operation) (funcall current-transform op-point)

-          (string-to-edit base) (do-insert string-to-edit (value operation) (point operation))

-          (transform base) (alexandria:compose (transform-for-op operation) current-transform))

+  (let* ((current-transform (transform base))

+         (op-point (point operation))

+         (string-to-edit (string-to-edit base))

+         (transformed-op (insert (funcall current-transform op-point)

+                                 (value operation))))

+    (setf (string-to-edit base) (do-insert string-to-edit (value transformed-op) (point transformed-op))

+          (transform base) (alexandria:compose (transform-for-op transformed-op) current-transform))

     base))

 (fw.lu:defclass+ replace-char (op)

@@ -68,12 +69,13 @@

         (end (subseq base (1+ point))))

     (concatenate 'string begin new end)))

 (defmethod edit ((base editable-string) (operation replace-char))

-  (let ((current-transform (transform base))

-        (op-point (point operation))

-        (string-to-edit (string-to-edit base)))

-    (setf (point operation) (funcall current-transform op-point)

-          (string-to-edit base) (do-replace-char string-to-edit (value operation) (point operation))

-          (transform base) (alexandria:compose (transform-for-op operation) current-transform))

+  (let* ((current-transform (transform base))

+         (op-point (point operation))

+         (string-to-edit (string-to-edit base))

+         (transformed-op (replace-char (funcall current-transform op-point)

+                                       (value operation))))

+    (setf (string-to-edit base) (do-replace-char string-to-edit (value transformed-op) (point transformed-op))

+          (transform base) (alexandria:compose (transform-for-op transformed-op) current-transform))

     base))

@@ -81,4 +83,23 @@

   (assert (equal (apply-edits "ac" (list (insert 0 "z")

                                          (insert 1 "b")

                                          (insert 2 "d")))

-                 "zabcd")))

+                 "zabcd"))

+  (assert

+   (let ((ops (list (insert 1 "fff")

+                    (insert 1 "ggg")

+                    (insert 1 "hhh"))))

+     (list (equal (apply-edits #1="abcd" ops)

+                  (apply-edits #1# (reverse ops)))

+           (equal (apply-edits #1# (reverse ops))

+                  (apply-edits #1# (serapeum:reshuffle ops)))

+           (equal (apply-edits #1# (reverse ops))

+                  "afffggghhhbcd"))))

+  (let ((ops (lambda ()

+               (list (insert 2 "fff")

+                     (insert 1 "bbb")

+                     (insert 1 "ddd")))))

+    (:printv (funcall ops))

+    (assert (equal (:printv (apply-edits "ac" (:printv (serapeum:reshuffle (funcall ops)))))

+                   (:printv (apply-edits "ac" (:printv (serapeum:reshuffle (funcall ops)))))))

+    (assert (equal (:printv (apply-edits "ace" (serapeum:reshuffle (funcall ops))))

+                   (:printv (apply-edits "ace" (serapeum:reshuffle (funcall ops))))))))