r2716: *** empty log message ***

[lml.git] / lml.cl

diff --git a/lml.cl b/lml.cl
index 8efdc39a063e09a594c30b37eec09f84dc1eecc7..96da5827cb4231b6aa75239eca84049c91928309 100644 (file)
--- a/lml.cl
+++ b/lml.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: lml.cl,v 1.7 2002/09/16 09:43:51 kevin Exp $
+;;;; $Id: lml.cl,v 1.12 2002/09/16 10:11:25 kevin Exp $
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -201,10 +201,15 @@
      (html :xmlns "http://www.w3.org/1999/xhtml"
        ,@body)))
 
+(defun new-string ()
+  (make-array 1024 :fill-pointer 0 :adjustable t :element-type 'character))
+
 (set-macro-character #\[
   #'(lambda (stream char)
       (declare (ignore char))
-      (let ((curr-string (make-array 1024 :fill-pointer 0 :adjustable t :element-type 'character))
+      (let ((forms '())
+           (curr-string (new-string))
+           (paren-level 0)
            (got-comma nil))
        (do ((ch (read-char stream t nil t) (read-char stream t nil t)))
            ((eql ch #\]))
@@ -212,21 +217,30 @@
              (if (eql ch #\()
                  ;; Starting top-level ,(
                  (progn
-                   (princ curr-string)
-                   (setf (fill-pointer curr-string) 0)
+                   (push `(lml-print ,curr-string) forms)
+                   (setq curr-string (new-string))
                    (setq got-comma nil)
                    (vector-push #\( curr-string)
                    (do ((ch (read-char stream t nil t) (Read-char stream t nil t)))
-                       ((eql ch #\)))
+                       ((and (eql ch #\)) (zerop paren-level)))
                      (when (eql ch #\])
                        (format *trace-output* "Syntax error reading #\]")
                        (return nil))
+                     (case ch
+                       (#\(
+                        (incf paren-level))
+                       (#\)
+                        (decf paren-level)))
                      (vector-push-extend ch curr-string))
                    (vector-push-extend #\) curr-string)
-                   (let ((result (eval (read-from-string curr-string))))
-                     (when result
-                       (princ result)))
-                   (setf (fill-pointer curr-string) 0))
+                   (let ((eval-string (read-from-string curr-string))
+                         (res (gensym)))
+                     (push
+                      `(let ((,res ,eval-string))
+                         (when ,res
+                           (lml-print ,res)))
+                      forms))
+                   (setq curr-string (new-string)))
                ;; read comma, then non #\( char
                (progn
                  (unless (eql ch #\,)
@@ -239,7 +253,7 @@
              (progn
                (setq got-comma nil)
                (vector-push-extend ch curr-string)))))
-       (princ curr-string))
-      t))
+       (push `(lml-print ,curr-string) forms)
+       `(progn ,@(nreverse forms)))))