;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id: lml.cl,v 1.10 2002/09/16 10:00:47 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
;;;;
(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 ((forms '())
- (curr-string (make-array 1024 :fill-pointer 0 :adjustable t :element-type 'character))
+ (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 #\]))
;; Starting top-level ,(
(progn
(push `(lml-print ,curr-string) forms)
- (setf (fill-pointer curr-string) 0)
+ (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 ((eval-string (read-from-string curr-string))
- (result (gensym)))
+ (res (gensym)))
(push
`(let ((,res ,eval-string))
(when ,res
(lml-print ,res)))
forms))
- (setf (fill-pointer curr-string) 0))
+ (setq curr-string (new-string)))
;; read comma, then non #\( char
(progn
(unless (eql ch #\,)