Update domain name to kpe.io

[lml.git] / files.lisp

diff --git a/files.lisp b/files.lisp
index fd2366b3ff30961f8174128324b6541a2b7272d8..0194ba6592a763a0d930773a2b7e338fc037a603 100644 (file)
--- a/files.lisp
+++ b/files.lisp
@@ -14,8 +14,7 @@
 ;;;; (http://www.gnu.org/licenses/gpl.html)
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :lml)
+(in-package #:lml)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *output-dir* nil)
@@ -24,51 +23,56 @@
 
 (defvar *html-output* *standard-output*)
 
-(defmacro lml-file-name (file &optional (type :source))
-  (let ((f file))
-    (when (and (consp f) (eql (car f) 'cl:quote))
-      (setq f (cadr f)))
-    (when (symbolp f)
-      (setq f (string-downcase (symbol-name f))))
-    (when (stringp f)
-      (unless (position #\. f)
-       (setq f (concatenate 'string f ".html"))))
-    (if *sources-dir*
-       (make-pathname :defaults (ecase type
-                                  (:source *sources-dir*)
-                                  (:output *output-dir*))
-                      :name `,(pathname-name f)
-                      :type `,(pathname-type f))
+(defun lml-file-name (f &optional (type :source))
+  (when (and (consp f) (eql (car f) 'cl:quote))
+    (setq f (cadr f)))
+  (when (symbolp f)
+    (setq f (string-downcase (symbol-name f))))
+  (when (stringp f)
+    (unless (position #\. f)
+      (setq f (concatenate 'string f ".html"))))
+  (if *sources-dir*
+      (make-pathname :defaults (ecase type
+                                 (:source *sources-dir*)
+                                 (:output *output-dir*))
+                     :name (pathname-name f)
+                     :type (pathname-type f))
       (if (stringp f)
-         (parse-namestring f)
-       f))))
+          (nth-value 0 (parse-namestring f))
+          f)))
 
-(defmacro with-dir ((output-dir &key sources) &body body)
-  (when (stringp output-dir)
-    (setq output-dir (parse-namestring output-dir)))
-  (unless sources
-    (setq sources output-dir))
-  `(let ((*output-dir* ,output-dir)
-        (*sources-dir* ,sources))
-     ,@body))
+(defmacro with-dir ((output &key sources) &body body)
+  (let ((output-dir (gensym))
+        (sources-dir (gensym)))
+  `(let ((,output-dir ,output)
+         (,sources-dir ,sources))
+    (when (stringp ,output-dir)
+      (setq ,output-dir (parse-namestring ,output-dir)))
+    (when (stringp ,sources-dir)
+      (setq ,sources-dir (parse-namestring ,sources-dir)))
+    (unless ,sources-dir
+      (setq ,sources-dir ,output-dir))
+    (let ((*output-dir* ,output-dir)
+          (*sources-dir* ,sources-dir))
+      ,@body))))
 
 (defun lml-load-path (file)
   (if (probe-file file)
       (with-open-file (in file :direction :input)
-        (do ((form (read in nil 'lml::eof) (read in nil 'lml::eof)))
-           ((eq form 'lml::eof))
-         (eval form)))
+        (do ((form (read in nil 'eof) (read in nil 'eof)))
+            ((eq form 'eof))
+          (eval form)))
     (format *trace-output* "Warning: unable to load LML file ~S" file)))
 
 (defun process-dir (dir &key sources)
   (with-dir (dir :sources sources)
     (let ((lml-files (directory
-                     (make-pathname :defaults *sources-dir*
-                                    :name :wild
-                                    :type "lml"))))
+                      (make-pathname :defaults *sources-dir*
+                                     :name :wild
+                                     :type "lml"))))
       (dolist (file lml-files)
-       (format *trace-output* "~&; Processing ~A~%" file)
-       (lml-load-path file)))))
+        (format *trace-output* "~&; Processing ~A~%" file)
+        (lml-load-path file)))))
 
 (defun lml-load (file)
   (lml-load-path (eval `(lml-file-name ,file :source))))