From: David Vazquez Date: Sat, 22 Dec 2012 15:42:53 +0000 (+0000) Subject: Console X-Git-Url: http://repo.macrolet.net/gitweb/?p=jscl.git;a=commitdiff_plain;h=303e467bad4e9f81e33fd5199356caeeae94191d Console --- diff --git a/.gitignore b/.gitignore index 61c0db2..8b097cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ test.js *~ *.fasl +/jqconsole.min.js +/jquery.js diff --git a/lispstrack.lisp b/lispstrack.lisp index 94f5a37..3b76ca4 100644 --- a/lispstrack.lisp +++ b/lispstrack.lisp @@ -636,11 +636,12 @@ (and (symbolp x) (eq (binding-type (lookup-function x *fenv*)) 'macro))) (defun ls-macroexpand-1 (form env fenv) - (when (macrop (car form)) - (let ((binding (lookup-function (car form) *env*))) - (if (eq (binding-type binding) 'macro) - (apply (eval (binding-translation binding)) (cdr form)) - form)))) + (if (macrop (car form)) + (let ((binding (lookup-function (car form) *env*))) + (if (eq (binding-type binding) 'macro) + (apply (eval (binding-translation binding)) (cdr form)) + form)) + form)) (defun compile-funcall (function args env fenv) (cond diff --git a/test.html b/test.html index 7ef4cf5..322ccbf 100644 --- a/test.html +++ b/test.html @@ -1,6 +1,74 @@ + + + + - +

+ + + + diff --git a/test.lisp b/test.lisp index 7652409..2333621 100644 --- a/test.lisp +++ b/test.lisp @@ -964,11 +964,12 @@ c(defmacro eval-when-compile (&body body) (and (symbolp x) (eq (binding-type (lookup-function x *fenv*)) 'macro))) (defun ls-macroexpand-1 (form env fenv) - (when (macrop (car form)) - (let ((binding (lookup-function (car form) *env*))) - (if (eq (binding-type binding) 'macro) - (apply (eval (binding-translation binding)) (cdr form)) - form)))) + (if (macrop (car form)) + (let ((binding (lookup-function (car form) *env*))) + (if (eq (binding-type binding) 'macro) + (apply (eval (binding-translation binding)) (cdr form)) + form)) + form)) (defun compile-funcall (function args env fenv) (cond