;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id: lml.cl,v 1.6 2002/09/16 09:36:27 kevin Exp $
+;;;; $Id: lml.cl,v 1.9 2002/09/16 09:58:57 kevin Exp $
;;;;
;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(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 (make-array 1024 :fill-pointer 0 :adjustable t :element-type 'character))
(got-comma nil))
(do ((ch (read-char stream t nil t) (read-char stream t nil t)))
((eql ch #\]))
(if (eql ch #\()
;; Starting top-level ,(
(progn
- (princ curr-string)
+ (push `(lml-print ,curr-string) forms)
(setf (fill-pointer curr-string) 0)
(setq got-comma nil)
(vector-push #\( curr-string)
(return nil))
(vector-push-extend ch curr-string))
(vector-push-extend #\) curr-string)
- (princ (eval (read-from-string curr-string)))
+ (let ((eval-string (read-from-string curr-string))
+ (result (gensym)))
+ (push
+ `(let ((,res ,eval-string))
+ (when ,res
+ (lml-print ,res)))
+ forms))
(setf (fill-pointer curr-string) 0))
;; read comma, then non #\( char
(progn
(progn
(setq got-comma nil)
(vector-push-extend ch curr-string)))))
- (princ curr-string))
- t))
+ (push `(lml-print ,curr-string) forms)
+ `(progn ,(nreverse forms)))))