andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: set!: Check for undefined variables. 

* src/eval-apply.c (set_x): Add the 'define_p' argument and if it is
not set, signal an error on an undefined variable.
(eval_apply): When evaluating 'set-x!' forms, leave 'define_p'
unset; when evaluating 'define' forms, set 'define_p'.
* include/mes/mes.h (set_x): Adjust declaration accordingly.
This commit is contained in:
Timothy Sample 2022-04-24 23:34:01 -06:00
parent 01d658a356
commit 5167f70038
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mes/mes.h
View File

@ -157,7 +157,7 @@ struct scm *make_variable_type ();
struct scm *make_vector_ (long k, struct scm *e);
struct scm *mes_builtins (struct scm *a);
struct scm *push_cc (struct scm *p1, struct scm *p2, struct scm *a, struct scm *c);
struct scm *set_x (struct scm *x, struct scm *e);
struct scm *set_x (struct scm *x, struct scm *e, int define_p);
struct scm *struct_ref_ (struct scm *x, long i);
struct scm *struct_set_x_ (struct scm *x, long i, struct scm *e);
struct scm *vector_ref_ (struct scm *x, long i);

13
src/eval-apply.c
View File

@ -122,7 +122,7 @@ set_cdr_x (struct scm *x, struct scm *e)
}
struct scm *
set_x (struct scm *x, struct scm *e)
set_x (struct scm *x, struct scm *e, int define_p)
{
struct scm *binding;
@ -137,7 +137,12 @@ set_x (struct scm *x, struct scm *e)
if (binding->lexical_p != 0)
set_cdr_x (binding->binding, e);
else
variable_set_x (binding->binding->cdr, e);
{
struct scm *variable = binding->binding->cdr;
if (define_p == 0 && variable_ref (variable) == cell_undefined)
return error (cell_symbol_unbound_variable, binding->binding->car);
variable_set_x (binding->binding->cdr, e);
}
return cell_unspecified;
}
@ -639,7 +644,7 @@ eval:
push_cc (R1->cdr->cdr->car, R1, R0, cell_vm_eval_set_x);
goto eval;
eval_set_x:
R1 = set_x (R2->cdr->car, R1);
R1 = set_x (R2->cdr->car, R1, 0);
goto vm_return;
}
else if (c == cell_vm_macro_expand)
@ -729,7 +734,7 @@ eval:
}
else if (global_p != 0)
{
set_x (name, R1);
set_x (name, R1, 1);
}
else
{