artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove macro expansion from apply.

Browse source 
mes.c (apply_env): Remove macro expansion.
This commit is contained in:
Jan Nieuwenhuizen 2016-10-17 18:26:07 +02:00
parent 3098f84e9e
commit 0eae7674b6
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mes.c
View file

@ -1,4 +1,4 @@
/*
/* -*-comment-start: "//";comment-end:""-*-
* Mes --- Maxwell Equations of Software
* Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
*
@ -18,13 +18,6 @@
* along with Mes. If not, see <http://www.gnu.org/licenses/>.
*/
// (setq comment-start "//")
// (setq comment-end "")
/*
* The Maxwell Equations of Software -- John McCarthy page 13
* http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf
*/
#define STRING_MAX 2048
#define _GNU_SOURCE
#include <assert.h>
@ -325,7 +318,6 @@ evlis (scm *m, scm *a)
scm *
apply_env (scm *fn, scm *x, scm *a)
{
scm *macro;
if (fn->type != PAIR)
{
if (fn == &scm_car) return x->car->car;
@ -348,11 +340,6 @@ apply_env (scm *fn, scm *x, scm *a)
scm *p = pairlis (args, x, a);
return eval_env (cons (&symbol_begin, body), cons (cons (&symbol_closure, p), p));
}
else if ((macro = lookup_macro (car (fn), a)) != &scm_f) {
scm *r = apply_env (eval_env (macro, a), cdr (fn), a);
scm *e = eval_env (r, a);
return apply_env (e, x, a);
}
scm *efn = eval_env (fn, a);
if (efn->type == NUMBER || efn == &scm_f || efn == &scm_t) assert (!"apply bool");
return apply_env (efn, x, a);