projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Change lisp objects to use ao_poly everywhere. Add const
[fw/altos]
/
src
/
lisp
/
ao_lisp_atom.c
diff --git
a/src/lisp/ao_lisp_atom.c
b/src/lisp/ao_lisp_atom.c
index 65282142cdb4ca64e85a8fad5c22642b575c358b..aaa84b8d1bcf872554548251429fb075ff9c777e 100644
(file)
--- a/
src/lisp/ao_lisp_atom.c
+++ b/
src/lisp/ao_lisp_atom.c
@@
-34,12
+34,9
@@
static void atom_mark(void *addr)
{
struct ao_lisp_atom *atom = addr;
{
struct ao_lisp_atom *atom = addr;
- if (atom->next == AO_LISP_ATOM_CONST)
- return;
-
for (;;) {
ao_lisp_poly_mark(atom->val);
for (;;) {
ao_lisp_poly_mark(atom->val);
- atom = a
tom->next
;
+ atom = a
o_lisp_poly_atom(atom->next)
;
if (!atom)
break;
if (ao_lisp_mark_memory(atom, atom_size(atom)))
if (!atom)
break;
if (ao_lisp_mark_memory(atom, atom_size(atom)))
@@
-51,49
+48,50
@@
static void atom_move(void *addr)
{
struct ao_lisp_atom *atom = addr;
{
struct ao_lisp_atom *atom = addr;
- if (atom->next == AO_LISP_ATOM_CONST)
- return;
-
for (;;) {
struct ao_lisp_atom *next;
atom->val = ao_lisp_poly_move(atom->val);
for (;;) {
struct ao_lisp_atom *next;
atom->val = ao_lisp_poly_move(atom->val);
- next = ao_lisp_move_memory(atom->next, atom_size(atom->next));
+ next = ao_lisp_poly_atom(atom->next);
+ next = ao_lisp_move_memory(next, atom_size(next));
if (!next)
break;
if (!next)
break;
- atom->next =
next
;
+ atom->next =
ao_lisp_atom_poly(next)
;
atom = next;
}
}
atom = next;
}
}
-const struct ao_lisp_
mem_
type ao_lisp_atom_type = {
+const struct ao_lisp_type ao_lisp_atom_type = {
.mark = atom_mark,
.size = atom_size,
.move = atom_move,
};
.mark = atom_mark,
.size = atom_size,
.move = atom_move,
};
-struct ao_lisp_atom *atoms;
+struct ao_lisp_atom *a
o_lisp_a
toms;
struct ao_lisp_atom *
ao_lisp_atom_intern(char *name)
{
struct ao_lisp_atom *atom;
struct ao_lisp_atom *
ao_lisp_atom_intern(char *name)
{
struct ao_lisp_atom *atom;
-
int b;
+
//
int b;
- for (atom = atoms; atom; atom = atom->next) {
+ for (atom = ao_lisp_atoms; atom; atom = ao_lisp_poly_atom(atom->next)) {
+ if (!strcmp(atom->name, name))
+ return atom;
+ }
+#ifdef ao_builtin_atoms
+ for (atom = ao_lisp_poly_atom(ao_builtin_atoms); atom; atom = ao_lisp_poly_atom(atom->next)) {
if (!strcmp(atom->name, name))
return atom;
}
if (!strcmp(atom->name, name))
return atom;
}
- for (b = 0; ao_lisp_builtins[b]; b++)
- if (!strcmp(ao_lisp_builtins[b]->name, name))
- return (struct ao_lisp_atom *) ao_lisp_builtins[b];
- if (!atoms)
- ao_lisp_root_add(&ao_lisp_atom_type, (void **) &atoms);
+#endif
+ if (!ao_lisp_atoms)
+ ao_lisp_root_add(&ao_lisp_atom_type, (void **) &ao_lisp_atoms);
atom = ao_lisp_alloc(name_size(name));
if (atom) {
atom->type = AO_LISP_ATOM;
atom = ao_lisp_alloc(name_size(name));
if (atom) {
atom->type = AO_LISP_ATOM;
- atom->next = a
toms
;
- atoms = atom;
+ atom->next = a
o_lisp_atom_poly(ao_lisp_atoms)
;
+ a
o_lisp_a
toms = atom;
strcpy(atom->name, name);
atom->val = AO_LISP_NIL;
}
strcpy(atom->name, name);
atom->val = AO_LISP_NIL;
}
@@
-101,7
+99,8
@@
ao_lisp_atom_intern(char *name)
}
void
}
void
-ao_lisp_atom_print(
struct ao_lisp_atom *
a)
+ao_lisp_atom_print(
ao_poly
a)
{
{
- fputs(a->name, stdout);
+ struct ao_lisp_atom *atom = ao_lisp_poly_atom(a);
+ printf("%s", atom->name);
}
}