X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=base.lisp;h=77ffa089e5d0fe726ec731b24f46bd6503ebffee;hp=4a03e71632aa245ba6cd35bccd957a553d3bad60;hb=HEAD;hpb=b2d601fcc40acb08a61cb3607f4455bfbd3126fc diff --git a/base.lisp b/base.lisp index 4a03e71..77ffa08 100644 --- a/base.lisp +++ b/base.lisp @@ -2,12 +2,12 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: lml.cl +;;;; Name: base.lisp ;;;; Purpose: Lisp Markup Language functions ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.11 2003/02/17 06:48:46 kevin Exp $ +;;;; $Id$ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,17 +16,16 @@ ;;;; (http://www.gnu.org/licenses/gpl.html) ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 3) (compilation-speed 0))) -(in-package :lml) +(in-package #:lml) (defun html4-prologue-string () "") (defun xml-prologue-string () - "") + "") (defun xhtml-prologue-string () - "") + "") (defvar *print-spaces* nil) (defvar *indent* 0) @@ -37,10 +36,9 @@ (when (streamp *html-output*) (when *print-spaces* (indent-spaces *indent* *html-output*)) (if args - (apply #'format *html-output* str args) - (princ str *html-output*)) - (when *print-spaces* (format *html-output* "~%")) - (values))) + (apply #'format *html-output* str args) + (write-string str *html-output*)) + (when *print-spaces* (write-char #\newline *html-output*)))) (defun lml-princ (s) (princ s *html-output*)) @@ -49,34 +47,37 @@ (format *html-output* "~A~%" s)) (defun lml-write-char (char) - (write-char char *html-output)) + (write-char char *html-output*)) + +(defun lml-write-string (str) + (write-string str *html-output*)) (defun lml-print-date (date) - (lml-princ (date-string date))) + (lml-write-string (date-string date))) (defmacro lml-exec-body (&body forms) `(progn ,@(mapcar #'(lambda (form) - (etypecase form - (string - `(lml-princ ,form)) - (number - `(lml-format "~D" ,form)) - (symbol - (when form - `(lml-princ ,form))) - (cons - form))) + (etypecase form + (string + `(lml-princ ,form)) + (number + `(lml-format "~D" ,form)) + (symbol + (when form + `(lml-princ ,form))) + (cons + form))) forms))) (defmacro with-attr-string (tag attr-string &body body) (let ((attr (gensym))) `(let ((,attr ,attr-string)) - (lml-format "<~(~A~) ~A>" ',tag - (if (and (stringp ,attr) (plusp (length ,attr))) - (format nil "~A" ,attr) - "")) + (lml-format "<~(~A~)~A>" ',tag + (if (and (stringp ,attr) (plusp (length ,attr))) + (format nil " ~A" ,attr) + "")) (incf *indent*) (lml-exec-body ,@body) (decf *indent*) @@ -85,40 +86,40 @@ (defmacro with-no-endtag-attr-string (tag attr-string) (let ((attr (gensym))) `(let ((,attr ,attr-string)) - (lml-format "<~(~A~) ~A />" ',tag - (if (and (stringp ,attr) (plusp (length ,attr))) - (format nil "~A" ,attr) - ""))))) + (lml-format "<~(~A~)~A />" ',tag + (if (and (stringp ,attr) (plusp (length ,attr))) + (format nil " ~A" ,attr) + ""))))) (defun one-keyarg-string (key value) "Return attribute string for keys" (format nil "~(~A~)=\"~A\"" key - (typecase value - (symbol - (string-downcase (symbol-name value))) - (string - value) - (t - (eval value))))) + (typecase value + (symbol + (string-downcase (symbol-name value))) + (string + value) + (t + (eval value))))) (defmacro with-keyargs (tag keyargs &body body) (let ((attr (gensym)) - (kv (gensym))) + (kv (gensym))) `(progn (let ((,attr '())) (dolist (,kv ,keyargs) - (awhen (cdr ,kv) - (push (one-keyarg-string (car ,kv) it) ,attr))) + (awhen (cdr ,kv) + (push (one-keyarg-string (car ,kv) it) ,attr))) (with-attr-string ,tag (list-to-spaced-string (nreverse ,attr)) ,@body))))) (defmacro with-no-endtag-keyargs (tag keyargs) (let ((attr (gensym)) - (kv (gensym))) + (kv (gensym))) `(progn (let ((,attr '())) (dolist (,kv ,keyargs) - (awhen (cdr ,kv) - (push (one-keyarg-string (car ,kv) it) ,attr))) + (awhen (cdr ,kv) + (push (one-keyarg-string (car ,kv) it) ,attr))) (with-no-endtag-attr-string ,tag (list-to-spaced-string (nreverse ,attr))))))) (defmacro bind-one-keyarg (keyarg) @@ -127,39 +128,39 @@ (defmacro bind-all-keyargs (keyargs) "Convert a list of keyarg pairs and convert eval/bind arguments" (let* ((npairs (length keyargs)) - (syms (make-array npairs)) - (ipair 0) - (ipair2 0)) + (syms (make-array npairs)) + (ipair 0) + (ipair2 0)) (declare (dynamic-extent syms)) (dotimes (i npairs) (setf (aref syms i) (gensym))) `(let ,(mapcar #'(lambda (ka) - (prog1 - (list (aref syms ipair) (cdr ka)) - (incf ipair))) - keyargs) + (prog1 + (list (aref syms ipair) (cdr ka)) + (incf ipair))) + keyargs) (list ,@(mapcar #'(lambda (ka) - (prog1 - `(cons ,(car ka) ,(aref syms ipair2)) - (incf ipair2))) - keyargs))))) + (prog1 + `(cons ,(car ka) ,(aref syms ipair2)) + (incf ipair2))) + keyargs))))) (defmacro with (tag &rest args) "Return a list of keyargs and also the body of LML form" (let ((body '()) - (keyargs '()) - (bound-keyargs (gensym))) + (keyargs '()) + (bound-keyargs (gensym))) (do* ((n (length args)) - (i 0 (+ 2 i)) - (arg (nth i args) (nth i args)) - (value (when (< (1+ i) n) - (nth (1+ i) args)) - (when (< (1+ i) n) - (nth (1+ i) args)))) - ((or (not (keyword-symbol? arg)) - (>= i n)) - (dotimes (j (- n i)) - (push (nth (+ i j) args) body))) + (i 0 (+ 2 i)) + (arg (nth i args) (nth i args)) + (value (when (< (1+ i) n) + (nth (1+ i) args)) + (when (< (1+ i) n) + (nth (1+ i) args)))) + ((or (not (keyword-symbol? arg)) + (>= i n)) + (dotimes (j (- n i)) + (push (nth (+ i j) args) body))) (push (cons arg value) keyargs)) (setq keyargs (nreverse keyargs)) (setq body (nreverse body)) @@ -169,21 +170,25 @@ (defmacro with-no-endtag (tag &rest args) "Return a list of keyargs body of LML form" (let ((keyargs '()) - (bound-keyargs (gensym))) + (bound-keyargs (gensym))) (do* ((n (length args)) - (i 0 (+ 2 i)) - (arg (nth i args) (nth i args)) - (value (when (< (1+ i) n) - (nth (1+ i) args)) - (when (< (1+ i) n) - (nth (1+ i) args)))) - ((or (not (keyword-symbol? arg)) - (>= i n))) + (i 0 (+ 2 i)) + (arg (nth i args) (nth i args)) + (value (when (< (1+ i) n) + (nth (1+ i) args)) + (when (< (1+ i) n) + (nth (1+ i) args)))) + ((or (not (keyword-symbol? arg)) + (>= i n))) (push (cons arg value) keyargs)) (setq keyargs (nreverse keyargs)) `(let ((,bound-keyargs ,(macroexpand `(bind-all-keyargs ,keyargs)))) ,(macroexpand `(with-no-endtag-keyargs ,tag ,bound-keyargs))))) +(defmacro jscript (&body body) + `(with script :language "JavaScript" :type "text/javascript" + ,@body)) + (defmacro xhtml-prologue () `(progn (lml-format "~A~%" (xml-prologue-string)) @@ -223,14 +228,16 @@ (let ((name (intern (format nil "~A-~A" tag :c)))) `(progn (defmacro ,name (&body body) - `(with ,',tag :class (quote ,(car body)) ,@(cdr body))) + `(with ,',tag :class (quote ,(car body)) ,@(cdr body))) (export ',name)))) (eval-when (:compile-toplevel :load-toplevel :execute) (defparameter *macro-list* - '(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body head - html title pre tt u dl dt dd kbd code form textarea)) - (export '(alink alink br hr img input meta link meta-key)) + '(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body + head html title pre tt u dl dt dd kbd code form textarea blockquote + var strong small samp big cite address dfn em q area del ins + object param caption col colgroup script noscript)) + (export '(jscript alink alink-c br hr img input meta link meta-key)) (export *macro-list*)) (loop for i in *macro-list* @@ -246,9 +253,9 @@ (defmacro page (out-file &body body) `(with-open-file (*html-output* - (lml-file-name ,out-file :output) - :direction :output - :if-exists :supersede) + (lml-file-name ',out-file :output) + :direction :output + :if-exists :supersede) (xhtml-prologue) (html :xmlns "http://www.w3.org/1999/xhtml" ,@body))) @@ -256,64 +263,6 @@ (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 (new-string)) - (paren-level 0) - (got-comma nil)) - (declare (type fixnum paren-level)) - (do ((ch (read-char stream t nil t) (read-char stream t nil t))) - ((eql ch #\])) - (if got-comma - (if (eql ch #\() - ;; Starting top-level ,( - (progn - #+cmu - (setf curr-string (coerce curr-string `(simple-array character (*)))) - - (push `(lml-princ ,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))) - ((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)) - (res (gensym))) - (push - `(let ((,res ,eval-string)) - (when ,res - (lml-princ ,res))) - forms)) - (setq curr-string (new-string))) - ;; read comma, then non #\( char - (progn - (unless (eql ch #\,) - (setq got-comma nil)) - (vector-push-extend #\, curr-string) ;; push previous command - (vector-push-extend ch curr-string))) - ;; previous character is not a comma - (if (eql ch #\,) - (setq got-comma t) - (progn - (setq got-comma nil) - (vector-push-extend ch curr-string))))) - - #+cmu - (setf curr-string (coerce curr-string `(simple-array character (*)))) - - (push `(lml-princ ,curr-string) forms) - `(progn ,@(nreverse forms))))) - - + + +