From 08d81f26833a7741eb85525d0e8f641f8b8a53b6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Mar 2012 15:26:03 +0000
Subject: fix ripper

* parse.y (new_args_gen, new_args_tail_gen): fix ripper.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 37fb8f9e87..3ba0e96de6 100644
--- a/parse.y
+++ b/parse.y
@@ -543,19 +543,6 @@ static VALUE ripper_id2sym(ID);
 #define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \
         dispatch7(params, (pars), (opts), (rest), (pars2), (kws), (kwrest), (blk))
 
-static inline VALUE
-new_args(VALUE f, VALUE o, VALUE r, VALUE p, NODE *t)
-{
-    VALUE k = t->u1.value, kr = t->u2.value, b = t->u3.value;
-    return params_new(f, o, r, p, k, kr, escape_Qundef(b));
-}
-
-static inline NODE *
-new_args_tail(VALUE k, VALUE kr, VALUE b)
-{
-    return rb_node_newnode(NODE_MEMO, k, kr, b);
-}
-
 #define blockvar_new(p,v) dispatch2(block_var, (p), (v))
 #define blockvar_add_star(l,a) dispatch2(block_var_add_star, (l), (a))
 #define blockvar_add_block(l,a) dispatch2(block_var_add_block, (l), (a))
@@ -566,6 +553,22 @@ new_args_tail(VALUE k, VALUE kr, VALUE b)
 
 #define escape_Qundef(x) ((x)==Qundef ? Qnil : (x))
 
+static inline VALUE
+new_args_gen(struct parser_params *parser, VALUE f, VALUE o, VALUE r, VALUE p, VALUE tail)
+{
+    NODE *t = (NODE *)tail;
+    VALUE k = t->u1.value, kr = t->u2.value, b = t->u3.value;
+    return params_new(f, o, r, p, k, kr, escape_Qundef(b));
+}
+#define new_args(f,o,r,p,t) new_args_gen(parser, (f),(o),(r),(p),(t))
+
+static inline VALUE
+new_args_tail_gen(struct parser_params *parser, VALUE k, VALUE kr, VALUE b)
+{
+    return (VALUE)rb_node_newnode(NODE_MEMO, k, kr, b);
+}
+#define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b))
+
 #define FIXME 0
 
 #endif /* RIPPER */
-- 
cgit v1.2.3