From 611c2ec874a125955b27f5e7ca54864402fa264e Mon Sep 17 00:00:00 2001
From: Watson <watson1978@gmail.com>
Date: Thu, 29 Mar 2012 16:35:26 +0900
Subject: [PATCH] avoid to use a RB_TYPE_P(). fix #1477 and #1482

because currently MacRuby does not behave like CRuby in RB_TYPE_P().
---
 parse.y | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/parse.y b/parse.y
index c59e1089f..b3ee1990b 100644
--- a/parse.y
+++ b/parse.y
@@ -4973,7 +4973,9 @@ ripper_yylval_id(ID x)
 #else
 #define ripper_flush(p) (p->tokp = p->parser_lex_p)
 
+#if !WITH_OBJC
 #define yylval_rval *(RB_TYPE_P(yylval.val, T_NODE) ? &yylval.node->nd_rval : &yylval.val)
+#endif
 
 static int
 ripper_has_scan_event(struct parser_params *parser)
@@ -4996,7 +4998,11 @@ static void
 ripper_dispatch_scan_event(struct parser_params *parser, int t)
 {
     if (!ripper_has_scan_event(parser)) return;
+#if WITH_OBJC
+    yylval.val = ripper_scan_event_val(parser, t);
+#else
     yylval_rval = ripper_scan_event_val(parser, t);
+#endif
 }
 
 static void
@@ -5014,7 +5020,11 @@ ripper_dispatch_delayed_token(struct parser_params *parser, int t)
 
     ruby_sourceline = parser->delayed_line;
     parser->tokp = lex_pbeg + parser->delayed_col;
+#if WITH_OBJC
+    yylval.val = ripper_dispatch1(parser, ripper_token2eventid(t), parser->delayed);
+#else
     yylval_rval = ripper_dispatch1(parser, ripper_token2eventid(t), parser->delayed);
+#endif
     parser->delayed = Qnil;
     ruby_sourceline = saved_line;
     parser->tokp = saved_tokp;
@@ -10055,22 +10065,30 @@ ripper_id2sym(ID id)
 static ID
 ripper_get_id(VALUE v)
 {
+#if WITH_OBJC
+    return v;
+#else
     NODE *nd;
     if (!RB_TYPE_P(v, T_NODE)) return 0;
     nd = (NODE *)v;
     if (nd_type(nd) != NODE_LASGN) return 0;
     return nd->nd_vid;
+#endif
 }
 
 static VALUE
 ripper_get_value(VALUE v)
 {
+#if WITH_OBJC
+    return v;
+#else
     NODE *nd;
     if (v == Qundef) return Qnil;
     if (!RB_TYPE_P(v, T_NODE)) return v;
     nd = (NODE *)v;
     if (nd_type(nd) != NODE_LASGN) return Qnil;
     return nd->nd_rval;
+#endif
 }
 
 static void