fmt

etc.lisp

@@ -32,3 +32,8 @@
       (loop
         for a in s
         append (flatten a)))))
+
+(defun write-file (file s)
+  (with-open-file (*standard-output* file :direction :output :if-exists
+                   :supersede :if-does-not-exist :create)
+          (princ s)))

write.lisp → fmt.lisp

@@ -345,13 +345,6 @@ across
   )
 )
 
-(defun write-all (s)
-    (dolist (a s)
-      (format t "~a~%" (fmt 0 a))
-    )
-)
-
-(defun write-file (file s)
-  (with-open-file (*standard-output* file :direction :output :if-exists
-                   :supersede)
-          (write-all s)))
+(defun fmt-all (s)
+  (format nil "~a~%"
+    (fmt-lines-indent-separator s)))

main.lisp

@@ -12,7 +12,7 @@
 (load "add-blanks")
 (load "etc")
 (load "read")
-(load "write")
+(load "fmt")
 
 ;Code transformations
 (load "comment-case")
@@ -107,15 +107,14 @@
 )
 
 (defun do-file (file)
-      (let ((s (read-file file))
+      (let ((s(fmt-all(transform (read-file file))))
             (backup (make-pathname
                       :defaults file
                       :directory "/tmp/")))
         (ignore-errors
           (delete-file backup))
         (ignore-errors
           (rename-file file backup))
-        (setf s(transform s))
         (write-file file s))
 )
 

test.lisp

@@ -180,5 +180,5 @@ do(lex)))
       (let ((s (read-file file))
            )
         (setf s(transform s))
-        (write-all s))
+        (princ(fmt-all s)))
     ))