From 77260206405ad29868c4dcd9006774a6a5a5f10c Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 24 Feb 2007 02:07:05 +0000 Subject: * parse.y, node.h, compile.c: change node tree structure. a purpose of this change is to unify argument structure of method and block. this change prohibits duplicate block parameter name. new argument infromation: NODE_ARGS [m: int, o: NODE_OPT_ARG, ->] NODE_ARGS_AUX [r: ID, b: ID, ->] NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*] optarg information: NODE_OPT_ARGS [idx, expr, ->] * vm_macro.def: ditto. * gc.c: ditto. * iseq.c: ditto. * compile.h: fix debug function name. * test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo| * test/ruby/test_lambda.rb: disalbe test temporarily. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'compile.h') diff --git a/compile.h b/compile.h index 9d4ba5baf..f1e7bfa86 100644 --- a/compile.h +++ b/compile.h @@ -41,27 +41,27 @@ #if CPDEBUG > 0 #define debugp(header, value) \ - (debug_indent(0, CPDEBUG, gl_node_level * 2), \ + (ruby_debug_indent(0, CPDEBUG, gl_node_level * 2), \ ruby_debug_value(0, CPDEBUG, header, value)) #define debugi(header, id) \ - (debug_indent(0, CPDEBUG, gl_node_level * 2), \ - debug_id(0, CPDEBUG, header, id)) + (ruby_debug_indent(0, CPDEBUG, gl_node_level * 2), \ + ruby_debug_id(0, CPDEBUG, header, id)) #define debugp_param(header, value) \ - (debug_indent(1, CPDEBUG, gl_node_level * 2), \ + (ruby_debug_indent(1, CPDEBUG, gl_node_level * 2), \ ruby_debug_value(1, CPDEBUG, header, value)) #define debugp_verbose(header, value) \ - (debug_indent(2, CPDEBUG, gl_node_level * 2), \ + (ruby_debug_indent(2, CPDEBUG, gl_node_level * 2), \ ruby_debug_value(2, CPDEBUG, header, value)) #define debugp_verbose_node(header, value) \ - (debug_indent(10, CPDEBUG, gl_node_level * 2), \ + (ruby_debug_indent(10, CPDEBUG, gl_node_level * 2), \ ruby_debug_value(10, CPDEBUG, header, value)) #define debug_nodeprint(node) \ - debug_indent(-1, CPDEBUG, gl_node_level*2); \ + ruby_debug_indent(-1, CPDEBUG, gl_node_level*2); \ printf("node: %s (%d)\n", ruby_node_name(nd_type(node)), nd_line(node)); \ gl_node_level ++; @@ -91,8 +91,8 @@ r_value(VALUE value) #endif #if CPDEBUG > 1 -#define debugs debug_indent(-1, CPDEBUG, gl_node_level*2), printf -#define debug_compile(msg, v) (debug_indent(-1, CPDEBUG, gl_node_level*2), printf("%s", msg), (v)) +#define debugs ruby_debug_indent(-1, CPDEBUG, gl_node_level*2), printf +#define debug_compile(msg, v) (ruby_debug_indent(-1, CPDEBUG, gl_node_level*2), printf("%s", msg), (v)) #else #define debugs if(0)printf #define debug_compile(msg, v) (v) -- cgit