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

initial library support

This commit is contained in:
Yuichi Nishiwaki 2013-12-07 03:02:39 -08:00
parent a1e2e41840
commit acbcde3b6a
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/picrin/macro.h
View File

@ -21,7 +21,10 @@ struct pic_syntax {
PIC_STX_BEGIN, PIC_STX_BEGIN,
PIC_STX_MACRO, PIC_STX_MACRO,
PIC_STX_DEFMACRO, PIC_STX_DEFMACRO,
PIC_STX_DEFSYNTAX PIC_STX_DEFSYNTAX,
PIC_STX_DEFLIBRARY,
PIC_STX_IMPORT,
PIC_STX_EXPORT
} kind; } kind;
pic_sym sym; pic_sym sym;
struct pic_proc *macro; struct pic_proc *macro;

19
src/macro.c
View File

@ -55,6 +55,9 @@ pic_core_syntactic_env(pic_state *pic)
register_core_syntax(pic, senv, PIC_STX_BEGIN, "begin"); register_core_syntax(pic, senv, PIC_STX_BEGIN, "begin");
register_core_syntax(pic, senv, PIC_STX_DEFMACRO, "define-macro"); register_core_syntax(pic, senv, PIC_STX_DEFMACRO, "define-macro");
register_core_syntax(pic, senv, PIC_STX_DEFSYNTAX, "define-syntax"); register_core_syntax(pic, senv, PIC_STX_DEFSYNTAX, "define-syntax");
register_core_syntax(pic, senv, PIC_STX_DEFLIBRARY, "define-library");
register_core_syntax(pic, senv, PIC_STX_IMPORT, "import");
register_core_syntax(pic, senv, PIC_STX_EXPORT, "export");
return senv; return senv;
} }
@ -207,6 +210,22 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
car = macroexpand(pic, pic_car(pic, expr), senv); car = macroexpand(pic, pic_car(pic, expr), senv);
if (pic_syntax_p(car)) { if (pic_syntax_p(car)) {
switch (pic_syntax(car)->kind) { switch (pic_syntax(car)->kind) {
case PIC_STX_DEFLIBRARY: {
pic_value program;
struct pic_senv *senv;
/* FIXME: replace it with null-env once import is implemented */
senv = pic_core_syntactic_env(pic);
program = macroexpand_list(pic, pic_cddr(pic, expr), senv);
return pic_cons(pic, pic_symbol_value(pic->sBEGIN), program);
}
case PIC_STX_IMPORT:
case PIC_STX_EXPORT: {
puts("FIXME: import/export");
abort();
}
case PIC_STX_DEFSYNTAX: { case PIC_STX_DEFSYNTAX: {
pic_value var, val; pic_value var, val;
struct pic_proc *proc; struct pic_proc *proc;