diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | eval.c | 12 | ||||
| -rw-r--r-- | object.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/.cvsignore b/.cvsignore index c1bdd084b3..2474526e2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ +Makefile parse.c newver.rb ruby @@ -92,6 +92,7 @@ lib/delegate.rb lib/e2mmap.rb lib/eregex.rb lib/find.rb +lib/final.rb lib/finalize.rb lib/ftplib.rb lib/ftools.rb @@ -1105,13 +1105,13 @@ mod_alias_method(mod, new, old) #if defined(C_ALLOCA) && defined(THREAD) # define TMP_PROTECT NODE *__protect_tmp=0 -# define ALLOCTMP(type,n) \ +# define TMP_ALLOC(type,n) \ (__protect_tmp = node_newnode(NODE_ALLOCA, \ str_new(0,sizeof(type)*(n)),0,__protect_tmp), \ (void*)RSTRING(__protect_tmp->nd_head)->ptr) #else # define TMP_PROTECT typedef int foobazzz -# define ALLOCTMP(type,n) ALLOCA_N(type,n) +# define TMP_ALLOC(type,n) ALLOCA_N(type,n) #endif #define SETUP_ARGS(anode) {\ @@ -1127,7 +1127,7 @@ mod_alias_method(mod, new, old) int line = sourceline;\ int i;\ n = anode;\ - argv = ALLOCTMP(VALUE,argc);\ + argv = TMP_ALLOC(VALUE,argc);\ for (i=0;i<argc;i++) {\ argv[i] = rb_eval(self,n->nd_head);\ n=n->nd_next;\ @@ -2349,7 +2349,7 @@ module_setup(module, node) if (node->nd_rval) the_frame->cbase = node->nd_rval; if (node->nd_tbl) { - VALUE *vars = ALLOCTMP(VALUE, node->nd_tbl[0]+1); + VALUE *vars = TMP_ALLOC(VALUE, node->nd_tbl[0]+1); *vars++ = (VALUE)node; the_scope->local_vars = vars; memclear(the_scope->local_vars, node->nd_tbl[0]); @@ -3239,7 +3239,7 @@ rb_call(class, recv, mid, argc, argv, scope) if (body->nd_rval) the_frame->cbase = body->nd_rval; if (body->nd_tbl) { - local_vars = ALLOCTMP(VALUE, body->nd_tbl[0]+1); + local_vars = TMP_ALLOC(VALUE, body->nd_tbl[0]+1); *local_vars++ = (VALUE)body; memclear(local_vars, body->nd_tbl[0]); the_scope->local_tbl = body->nd_tbl; @@ -3752,7 +3752,7 @@ f_load(obj, fname) if (top_scope->local_tbl) { int len = top_scope->local_tbl[0]+1; ID *tbl = ALLOC_N(ID, len); - VALUE *vars = ALLOCTMP(VALUE, len); + VALUE *vars = TMP_ALLOC(VALUE, len); *vars++ = 0; MEMCPY(tbl, top_scope->local_tbl, ID, len); MEMCPY(vars, top_scope->local_vars, ID, len-1); @@ -680,7 +680,7 @@ fail_to_flo(val) double big2dbl(); -static VALUE +VALUE f_float(obj, arg) VALUE obj, arg; { |