conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

define 'define' as a user-level macro

This commit is contained in:
Yuichi Nishiwaki 2014-08-06 01:34:07 +09:00
parent 610e1013f7
commit 1d42771b54
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
piclib/picrin/base.scm
View File

@ -1,5 +1,17 @@
(define-library (picrin base) (define-library (picrin base)
(import (picrin base core)) (import (rename (picrin base core) (define define*))
(scheme base)
(picrin macro))
(define-syntax define
(lambda (form use-env mac-env)
(if (symbol? (cadr form))
(cons (make-identifier 'define* mac-env) (cdr form))
(list (make-identifier 'define mac-env)
(car (cadr form))
(cons (make-identifier 'lambda mac-env)
(cons (cdr (cadr form))
(cddr form)))))))
(export define (export define
set! set!

30
src/macro.c
View File

@ -160,36 +160,24 @@ macroexpand_lambda(pic_state *pic, pic_value expr, struct pic_senv *senv)
static pic_value static pic_value
macroexpand_define(pic_state *pic, pic_value expr, struct pic_senv *senv) macroexpand_define(pic_state *pic, pic_value expr, struct pic_senv *senv)
{ {
pic_sym sym; pic_sym sym, rename;
pic_value formal, body, var, val; pic_value var, val;
if (pic_length(pic, expr) < 2) { if (pic_length(pic, expr) != 3) {
pic_error(pic, "syntax error"); pic_error(pic, "syntax error");
} }
formal = pic_cadr(pic, expr); var = pic_cadr(pic, expr);
if (pic_pair_p(formal)) {
var = pic_car(pic, formal);
} else {
if (pic_length(pic, expr) != 3) {
pic_error(pic, "syntax error");
}
var = formal;
}
if (! pic_sym_p(var)) { if (! pic_sym_p(var)) {
pic_error(pic, "binding to non-symbol object"); pic_error(pic, "binding to non-symbol object");
} }
sym = pic_sym(var); sym = pic_sym(var);
if (! pic_find_rename(pic, senv, sym, NULL)) { if (! pic_find_rename(pic, senv, sym, &rename)) {
pic_add_rename(pic, senv, sym); rename = pic_add_rename(pic, senv, sym);
} }
body = pic_cddr(pic, expr); val = macroexpand(pic, pic_list_ref(pic, expr, 2), senv);
if (pic_pair_p(formal)) {
val = macroexpand_lambda(pic, pic_cons(pic, pic_false_value(), pic_cons(pic, pic_cdr(pic, formal), body)), senv); return pic_list3(pic, pic_sym_value(pic->rDEFINE), pic_sym_value(rename), val);
} else {
val = macroexpand(pic, pic_car(pic, body), senv);
}
return pic_list3(pic, pic_sym_value(pic->rDEFINE), macroexpand_symbol(pic, sym, senv), val);
} }
static pic_value static pic_value