simon/post-scarcity
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Seem to have fixed the 'oblist getting lost' problem.

Browse source
This commit is contained in:
Simon Brooke 2018-12-31 14:43:47 +00:00
parent e7dffcad2c
commit 72ab4af20e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/fact.lisp
View file

@ -1,5 +1,6 @@
(set! fact (set! fact
(lambda (n) (lambda (n)
"Compute the factorial of `n`, expected to be an integer."
(cond ((= n 1) 1) (cond ((= n 1) 1)
(t (* n (fact (- n 1))))))) (t (* n (fact (- n 1)))))))

7
src/ops/lispops.c
View file

@ -1015,11 +1015,11 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
struct cons_pointer prompt_name = c_string_to_lisp_symbol( L"*prompt*" ); struct cons_pointer prompt_name = c_string_to_lisp_symbol( L"*prompt*" );
struct cons_pointer old_oblist = oblist; struct cons_pointer old_oblist = oblist;
struct cons_pointer new_env = env; struct cons_pointer new_env = env;
inc_ref(env);
inc_ref( input ); inc_ref( input );
inc_ref( output ); inc_ref( output );
inc_ref( prompt_name ); inc_ref( prompt_name );
inc_ref( new_env );
/* TODO: this is subtly wrong. If we were evaluating /* TODO: this is subtly wrong. If we were evaluating
* (print (eval (read))) * (print (eval (read)))
@ -1039,6 +1039,7 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
struct cons_pointer cursor = oblist; struct cons_pointer cursor = oblist;
while ( !nilp( cursor ) && !eq( cursor, old_oblist ) ) { while ( !nilp( cursor ) && !eq( cursor, old_oblist ) ) {
struct cons_pointer old_new_env = new_env;
debug_print debug_print
( L"lisp_repl: copying new oblist binding into REPL environment:\n", ( L"lisp_repl: copying new oblist binding into REPL environment:\n",
DEBUG_REPL ); DEBUG_REPL );
@ -1046,6 +1047,8 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
debug_println( DEBUG_REPL ); debug_println( DEBUG_REPL );
new_env = make_cons( c_car( cursor ), new_env ); new_env = make_cons( c_car( cursor ), new_env );
inc_ref( new_env);
dec_ref( old_new_env);
cursor = c_cdr( cursor ); cursor = c_cdr( cursor );
} }
old_oblist = oblist; old_oblist = oblist;
@ -1078,7 +1081,7 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
dec_ref( input ); dec_ref( input );
dec_ref( output ); dec_ref( output );
dec_ref( prompt_name ); dec_ref( prompt_name );
dec_ref( new_env ); dec_ref( env );
return expr; return expr;
} }