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

cleanup

This commit is contained in:
Yuichi Nishiwaki 2017-04-15 02:48:20 +09:00
parent af6a756edd
commit dfe8e87e65
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cont.c
View File

@ -112,9 +112,13 @@ pic_values(pic_state *pic, int n, ...)
pic_value pic_value
pic_vvalues(pic_state *pic, int n, va_list ap) pic_vvalues(pic_state *pic, int n, va_list ap)
{ {
pic_value *retv = pic_alloca(pic, sizeof(pic_value) * n); pic_value *retv;
int i; int i;
if (n == 1) {
return va_arg(ap, pic_value);
}
retv = pic_alloca(pic, sizeof(pic_value) * n);
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
retv[i] = va_arg(ap, pic_value); retv[i] = va_arg(ap, pic_value);
} }
@ -129,6 +133,9 @@ pic_cont_values(pic_state *pic)
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
if (argc == 1) {
return argv[0];
}
return valuesk(pic, argc, argv); return valuesk(pic, argc, argv);
} }

13
lib/state.c
View File

@ -279,26 +279,15 @@ pic_close(pic_state *pic)
pic_value pic_value
pic_global_ref(pic_state *pic, pic_value sym) pic_global_ref(pic_state *pic, pic_value sym)
{ {
pic_value val;
if (! pic_dict_has(pic, pic->globals, sym)) { if (! pic_dict_has(pic, pic->globals, sym)) {
pic_error(pic, "undefined variable", 1, sym); pic_error(pic, "undefined variable", 1, sym);
} }
val = pic_dict_ref(pic, pic->globals, sym); return pic_dict_ref(pic, pic->globals, sym);
/* FIXME */
/* if (pic_invalid_p(pic, val)) { */
/* pic_error(pic, "uninitialized global variable", 1, sym); */
/* } */
return val;
} }
void void
pic_global_set(pic_state *pic, pic_value sym, pic_value value) pic_global_set(pic_state *pic, pic_value sym, pic_value value)
{ {
/* FIXME */
/* if (! pic_dict_has(pic, pic->globals, sym)) { */
/* pic_error(pic, "undefined variable", 1, sym); */
/* } */
pic_dict_set(pic, pic->globals, sym, value); pic_dict_set(pic, pic->globals, sym, value);
} }

1
piclib/library.scm
View File

@ -221,7 +221,6 @@
cond case else => cond case else =>
do when unless do when unless
parameterize define-record-type)) parameterize define-record-type))
(export-keyword 'boolean?)
(dictionary-for-each export-keyword (global-objects))) (dictionary-for-each export-keyword (global-objects)))
(set! eval (set! eval
(let ((e eval)) (let ((e eval))