[macruby-changes] [559] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 559
          http://trac.macosforge.org/projects/ruby/changeset/559
Author:   lsansonetti at apple.com
Date:     2008-09-05 16:10:45 -0700 (Fri, 05 Sep 2008)
Log Message:
-----------
fixes for ripper

Modified Paths:
--------------
    MacRuby/trunk/object.c
    MacRuby/trunk/parse.y

Modified: MacRuby/trunk/object.c
===================================================================
--- MacRuby/trunk/object.c	2008-09-05 23:10:24 UTC (rev 558)
+++ MacRuby/trunk/object.c	2008-09-05 23:10:45 UTC (rev 559)
@@ -1530,8 +1530,9 @@
     if (init_obj != Qnil) {
 	p = CLASS_OF(init_obj);
 	while (p != 0) {
-	    if (p == klass)
+	    if (p == klass) {
 		return init_obj;
+	    }
 	    p = RCLASS_SUPER(p);
 	}
     }

Modified: MacRuby/trunk/parse.y
===================================================================
--- MacRuby/trunk/parse.y	2008-09-05 23:10:24 UTC (rev 558)
+++ MacRuby/trunk/parse.y	2008-09-05 23:10:45 UTC (rev 559)
@@ -523,6 +523,8 @@
 #define dispatch4(n,a,b,c,d)    ripper_dispatch4(parser, TOKEN_PASTE(ripper_id_, n), a, b, c, d)
 #define dispatch5(n,a,b,c,d,e)  ripper_dispatch5(parser, TOKEN_PASTE(ripper_id_, n), a, b, c, d, e)
 
+#define named_arg(id, flag)
+
 #define yyparse ripper_yyparse
 
 static VALUE ripper_intern(const char*);
@@ -9723,7 +9725,9 @@
     parser->parser_lpar_beg = 0;
     parser->parser_in_single = 0;
     parser->parser_in_def = 0;
+#if WITH_OBJC
     parser->parser_in_def_named_args = 0;
+#endif
     parser->parser_in_defined = 0;
     parser->parser_compile_for_eval = 0;
     parser->parser_cur_mid = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080905/e68816cb/attachment.html