X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=base.lisp;h=feca6b151a1f79dc54e24e938d1de29546bf515f;hb=63a46255032f6cb25666c40205a23409677eb757;hp=85a59117fc1b81e94cf59e178e1a86de1011a5da;hpb=9c9a88110167cb4727f04677192fd7afd4c8b00f;p=lml.git diff --git a/base.lisp b/base.lisp index 85a5911..feca6b1 100644 --- a/base.lisp +++ b/base.lisp @@ -1,4 +1,4 @@ -;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.1 2002/12/29 09:10:41 kevin Exp $ +;;;; $Id: base.lisp,v 1.4 2003/01/14 08:41:22 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -59,7 +59,7 @@ `(lml-print "~D" ,form)) (symbol (when form - `(lml-print (string-downcase (symbol-name ,form))))) + `(lml-print ,form))) (cons form))) forms))) @@ -76,6 +76,14 @@ (decf *indent*) (lml-print "" ',tag)))) +(defmacro with-no-endtag-attr-string (tag attr-string) + (let ((attr (gensym))) + `(let ((,attr ,attr-string)) + (lml-print "<~(~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 @@ -92,37 +100,83 @@ (kv (gensym))) `(progn (let ((,attr '())) - (dolist (,kv ',keyargs) - (awhen (cadr ,kv) + (dolist (,kv ,keyargs) + (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))) + `(progn + (let ((,attr '())) + (dolist (,kv ,keyargs) + (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) + `(list ,(car keyarg) ,(cdr keyarg))) + +(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)) + (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) + (list ,@(mapcar #'(lambda (ka) + (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 '()) - (n (length args))) - (do ((i 0 (1+ i))) - ((> i (1- n))) - (let ((arg (nth i args)) - (value (when (< (1+ i) n) - (nth (1+ i) args)))) - (if (keyword-symbol? arg) - (progn - (push (list arg value) keyargs) - (incf i)) - (push arg body)))) - `(with-keyargs ,tag ,keyargs ,@(nreverse body)))) - - -(defmacro keyargs-string (&rest args) - "Returns a string of attributes and values. Result contains a leading space." - (let ((keyarg-list '())) - (loop for ( name val ) on args by #'cddr - do - (when val - (push (one-keyarg-string name val) keyarg-list))) - (list-to-spaced-string (nreverse keyarg-list)))) - + (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))) + (push (cons arg value) keyargs)) + (setq keyargs (nreverse keyargs)) + (setq body (nreverse body)) + `(let ((,bound-keyargs ,(macroexpand `(bind-all-keyargs ,keyargs)))) + ,(macroexpand `(with-keyargs ,tag ,bound-keyargs ,@body))))) + +(defmacro with-no-endtag (tag &rest args) + "Return a list of keyargs body of LML form" + (let ((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))) + (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 xhtml-prologue () `(progn @@ -133,20 +187,13 @@ `(with a :href ,dest ,@body)) (defmacro link-c (class dest &body body) - `(with a :href ,dest :class ,class ,@body)) + `(with a :href ,dest :class (quote ,class) ,@body)) -(defmacro img (dest &key class id alt style width height align) - (let ((attr - (eval `(keyargs-string :class ,class :id ,id :alt ,alt :style ,style - :width ,width :height ,height :align ,align)))) - `(lml-print ,(format nil "" dest attr)))) +(defmacro img (dest &rest args) + `(with-no-endtag :src ,dest ,@args)) -(defmacro input (&key name class id type style size maxlength value checked) - (let ((attr - (eval `(keyargs-string :name ,name :class ,class :id ,id :style ,style - :size ,size :maxlength ,maxlength :value ,value - :type ,type :checked ,checked)))) - `(lml-print ,(format nil "" attr)))) +(defmacro input (&rest args) + `(with-no-endtag input ,@args)) (defmacro meta (name content) `(with meta :name ,name :content ,content)) @@ -154,11 +201,11 @@ (defmacro meta-key (&key name content http-equiv) `(with meta :name ,name :content ,content :http-equiv ,http-equiv)) -(defmacro br () - `(lml-print "
")) +(defmacro br (&rest args) + `(with-no-endtag br ,@args)) -(defmacro hr () - `(lml-print "
")) +(defmacro hr (&rest args) + `(with-no-endtag hr ,@args)) (defmacro lml-tag-macro (tag) `(progn @@ -170,7 +217,7 @@ (let ((name (intern (format nil "~A-~A" tag :c)))) `(progn (defmacro ,name (&body body) - `(with ,',tag :class ,(car body) ,@(cdr body))) + `(with ,',tag :class (quote ,(car body)) ,@(cdr body))) (export ',name)))) (eval-when (:compile-toplevel :load-toplevel :execute)