projects
/
muddle-interpreter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define UVECTOR and ATOM
[muddle-interpreter.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 6c6124eb5bfacf2530675665342404db8f342819..6645f6e4564f72f72f67d1bea7949761452be844 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-28,8
+28,8
@@
License along with this file. If not, see
// TODO: put these in interpreter-wide ctx object
pool_object *pool;
pool_ptr ptop;
// TODO: put these in interpreter-wide ctx object
pool_object *pool;
pool_ptr ptop;
-
char
*vhp_base;
-
char *
vhp;
+
object
*vhp_base;
+
heap_ptr
vhp;
// TODO: store these in current PROCESS
frame *cf;
// TODO: store these in current PROCESS
frame *cf;
@@
-71,7
+71,7
@@
main ()
vhp_base =
mmap (0, VECTOR_OBJCT * sizeof (object), PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
vhp_base =
mmap (0, VECTOR_OBJCT * sizeof (object), PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- vhp =
vhp_base
;
+ vhp =
1
;
// Reader stack (TODO: dynamically allocate as VECTOR).
object rst_base[READER_OBJCT];
// Reader stack (TODO: dynamically allocate as VECTOR).
object rst_base[READER_OBJCT];
@@
-85,7
+85,7
@@
main ()
{
// mock GC (no object persistence)
ptop = 1;
{
// mock GC (no object persistence)
ptop = 1;
- vhp =
vhp_base
;
+ vhp =
1
;
// terminate input
assert (buf[n - 1] == '\n');
buf[n - 1] = '\0';
// terminate input
assert (buf[n - 1] == '\n');
buf[n - 1] = '\0';
@@
-105,9
+105,9
@@
main ()
// Eval the thing
cf->prevcst = cst;
push_frame (eval, new_tuple (st.pos, 1), 0);
// Eval the thing
cf->prevcst = cst;
push_frame (eval, new_tuple (st.pos, 1), 0);
- while (cf->cont.fn)
+ while (cf->cont.
val.
fn)
{
{
- cf->cont.fn ();
+ cf->cont.
val.
fn ();
}
// Print the thing
print_object (&ret);
}
// Print the thing
print_object (&ret);