projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Add continuations
[fw/altos]
/
src
/
lisp
/
ao_lisp_builtin.c
diff --git
a/src/lisp/ao_lisp_builtin.c
b/src/lisp/ao_lisp_builtin.c
index ebc69f7759ec0d348f427c2480b3682170173061..4c845307b45ac5b101b07faf7923646778a29c31 100644
(file)
--- a/
src/lisp/ao_lisp_builtin.c
+++ b/
src/lisp/ao_lisp_builtin.c
@@
-41,9
+41,11
@@
const struct ao_lisp_type ao_lisp_builtin_type = {
#ifdef AO_LISP_MAKE_CONST
char *ao_lisp_builtin_name(enum ao_lisp_builtin_id b) {
#ifdef AO_LISP_MAKE_CONST
char *ao_lisp_builtin_name(enum ao_lisp_builtin_id b) {
+ (void) b;
return "???";
}
char *ao_lisp_args_name(uint8_t args) {
return "???";
}
char *ao_lisp_args_name(uint8_t args) {
+ (void) args;
return "???";
}
#else
return "???";
}
#else
@@
-84,6
+86,7
@@
static const ao_poly builtin_names[] = {
[builtin_led] = _ao_lisp_atom_led,
[builtin_save] = _ao_lisp_atom_save,
[builtin_restore] = _ao_lisp_atom_restore,
[builtin_led] = _ao_lisp_atom_led,
[builtin_save] = _ao_lisp_atom_save,
[builtin_restore] = _ao_lisp_atom_restore,
+ [builtin_call_cc] = _ao_lisp_atom_call2fcc,
};
};
@@
-104,6
+107,7
@@
static const ao_poly ao_lisp_args_atoms[] = {
char *
ao_lisp_args_name(uint8_t args)
{
char *
ao_lisp_args_name(uint8_t args)
{
+ args &= AO_LISP_FUNC_MASK;
if (args < sizeof ao_lisp_args_atoms / sizeof ao_lisp_args_atoms[0])
return ao_lisp_poly_atom(ao_lisp_args_atoms[args])->name;
return "(unknown)";
if (args < sizeof ao_lisp_args_atoms / sizeof ao_lisp_args_atoms[0])
return ao_lisp_poly_atom(ao_lisp_args_atoms[args])->name;
return "(unknown)";
@@
-114,9
+118,7
@@
void
ao_lisp_builtin_print(ao_poly b)
{
struct ao_lisp_builtin *builtin = ao_lisp_poly_builtin(b);
ao_lisp_builtin_print(ao_poly b)
{
struct ao_lisp_builtin *builtin = ao_lisp_poly_builtin(b);
- printf("[builtin %s %s]",
- ao_lisp_args_name(builtin->args),
- ao_lisp_builtin_name(builtin->func));
+ printf("%s", ao_lisp_builtin_name(builtin->func));
}
ao_poly
}
ao_poly
@@
-210,9
+212,9
@@
ao_lisp_last(struct ao_lisp_cons *cons)
ao_poly
ao_lisp_length(struct ao_lisp_cons *cons)
{
ao_poly
ao_lisp_length(struct ao_lisp_cons *cons)
{
- if (!ao_lisp_check_argc(_ao_lisp_atom_l
ast
, cons, 1, 1))
+ if (!ao_lisp_check_argc(_ao_lisp_atom_l
ength
, cons, 1, 1))
return AO_LISP_NIL;
return AO_LISP_NIL;
- if (!ao_lisp_check_argt(_ao_lisp_atom_l
ast
, cons, 0, AO_LISP_CONS, 1))
+ if (!ao_lisp_check_argt(_ao_lisp_atom_l
ength
, cons, 0, AO_LISP_CONS, 1))
return AO_LISP_NIL;
return ao_lisp_int_poly(ao_lisp_cons_length(ao_lisp_poly_cons(ao_lisp_arg(cons, 0))));
}
return AO_LISP_NIL;
return ao_lisp_int_poly(ao_lisp_cons_length(ao_lisp_poly_cons(ao_lisp_arg(cons, 0))));
}
@@
-596,5
+598,6
@@
const ao_lisp_func_t ao_lisp_builtins[] = {
[builtin_delay] = ao_lisp_delay,
[builtin_save] = ao_lisp_save,
[builtin_restore] = ao_lisp_restore,
[builtin_delay] = ao_lisp_delay,
[builtin_save] = ao_lisp_save,
[builtin_restore] = ao_lisp_restore,
+ [builtin_call_cc] = ao_lisp_call_cc,
};
};