FILE:CONTAINS-INI-SETTINGS: fix inserting section's remaining keys

When we insert the section's remaining keys they should appear before any
blank lines, comments etc. that appear between sections.

This undoes a change in generated output inadvertently introduced by
1a19be7ea65fbfa0b192b2bf18a735f230f16675, and also simplifies the code by
eliminating redundant regexp matching: that's the job of CONFIG-FILE-MAP.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

1 files changed, 26 insertions, 26 deletions

diff --git a/src/property/file.lisp b/src/property/file.lisp
index 10eb6ee..4c09f6e 100644
--- a/src/property/file.lisp
+++ b/src/property/file.lisp
@@ -472,39 +472,39 @@ removed, and semicolon comment chars will be replaced with '#'."
        :map
        (lambda (lines)
          (let ((new-lines
-                 (loop with current-section
-                       for line in lines
-                       for sec
-                         = (etypecase line
-                             (list (cadr line))
-                             (string
-                              (multiple-value-bind (match groups)
-                                  (re:scan-to-strings parse-section line)
-                                (and match (elt groups 0)))))
+                 (loop with current
+                       for (line . rest) on lines
+                       for upcoming
+                         = (loop for line in rest until (listp line)
+                                 finally
+                                    (alet (cadr line)
+                                      (return
+                                        (and (not (string= it current))
+                                             it))))
                        and key = (and (listp line) (caddr line))
-                       for pair = (cons sec key)
-                       for val = (and (listp line) (gethash pair keys))
-
-                       ;; If we've reached a new section insert any
-                       ;; remaining pairs in this section, as that's
-                       ;; better than inserting a new section with the
-                       ;; same name at the end of the file.
-                       if (and sec (not (string= sec current-section)))
+                       for pair = (and key (cons (cadr line) key))
+                       for val  = (and key (gethash pair keys))
+
+                       if (eql val :done)
+                         collect (cons t (cdr line))
+                       else if val
+                              collect (list nil (cadr line) key val)
+                              and do (setf (gethash pair keys) :done)
+                       else collect line
+
+                       ;; If we're about to reach a new section insert any
+                       ;; remaining pairs in this section, as that's better
+                       ;; than inserting a new section with the same name at
+                       ;; the end of the file.
+                       if upcoming
                          nconc (loop for pair being the hash-keys in keys
                                        using (hash-value v)
                                      for (s . k) = pair
-                                     when (and (string= current-section s)
+                                     when (and (string= current s)
                                                (not (eql v :done)))
                                        collect (list nil s k v)
                                        and do (setf (gethash pair keys) :done))
-                         and do (setq current-section sec)
-
-                       if (eql val :done)
-                         collect (cons t (cdr line))
-                       else if val
-                              collect (list nil sec key val)
-                              and do (setf (gethash pair keys) :done)
-                       else collect line)))
+                         and do (setq current upcoming))))
            (loop for pair being the hash-keys in keys using (hash-value v)
                  for (s . k) = pair
                  unless (eql v :done)