--- stack/stack.c 2002/03/10 06:34:01 1.95 +++ stack/stack.c 2002/03/10 07:55:13 1.96 @@ -48,7 +48,7 @@ { int i; - env->gc_limit= 20; + env->gc_limit= 200; env->gc_count= 0; env->gc_ref= NULL; env->gc_protect= NULL; @@ -83,7 +83,6 @@ free(temp); /* Free the old top stack item */ env->gc_limit--; - gc_init(env); } /* Returns a pointer to a pointer to an element in the hash table. */ @@ -129,16 +128,12 @@ env->gc_count++; - protect(env, nval); - gc_init(env); - unprotect(env); - return nval; } /* Mark values recursively. Marked values are not collected by the GC. */ -void gc_mark(value *val) +inline void gc_mark(value *val) { stackitem *iterator; @@ -157,6 +152,14 @@ } } +inline void gc_maybe(environment *env) +{ + if(env->gc_count < env->gc_limit) + return; + else + return gc_init(env); +} + /* Start GC */ extern void gc_init(environment *env) { @@ -164,9 +167,6 @@ symbol *tsymb; int i; - if(env->gc_count < env->gc_limit) - return; - /* Garb by default */ iterator= env->gc_ref; while(iterator!=NULL) { @@ -613,6 +613,8 @@ eval_start: + gc_maybe(env); + if(env->head==NULL) { printerr("Too Few Arguments"); env->err=1; @@ -869,7 +871,7 @@ } env->gc_limit= 0; - gc_init(env); + gc_maybe(env); if(env->free_string!=NULL) free(env->free_string); @@ -980,7 +982,7 @@ } if(myenv.interactive) { - printf("Stack version $Revision: 1.95 $\n\ + printf("Stack version $Revision: 1.96 $\n\ Copyright (C) 2002 Mats Alritzson and Teddy Hogeborn\n\ Stack comes with ABSOLUTELY NO WARRANTY; for details type `warranty;'.\n\ This is free software, and you are welcome to redistribute it\n\ @@ -1008,7 +1010,7 @@ toss(&myenv); /* No error check in main */ eval(&myenv); } - gc_init(&myenv); + gc_maybe(&myenv); } quit(&myenv); return EXIT_FAILURE;