nobu	2009-10-03 04:34:28 +0900 (Sat, 03 Oct 2009)

  New Revision: 25201

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25201

  Log:
    * parse.y (assignable_gen): parser_yyerror takes two arguments.

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25200)
+++ ChangeLog	(revision 25201)
@@ -1,3 +1,7 @@
+Sat Oct  3 04:34:25 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (assignable_gen): parser_yyerror takes two arguments.
+
 Sat Oct  3 04:07:52 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rake: updated to rake code to rake-0.8.7 source code base.
Index: parse.y
===================================================================
--- parse.y	(revision 25200)
+++ parse.y	(revision 25201)
@@ -5226,7 +5226,7 @@
 		    rb_str_buf_cat(parser->delayed,
 				   parser->tokp, lex_pend - parser->tokp);
 		    parser->delayed_line = ruby_sourceline;
-		    parser->delayed_col = parser->tokp - lex_pbeg;
+		    parser->delayed_col = (int)(parser->tokp - lex_pbeg);
 		}
 		else {
 		    rb_str_buf_cat(parser->delayed,
@@ -6354,7 +6354,7 @@
     rb_encoding *enc;
     int mb;
 #ifdef RIPPER
-    int fallthru = Qfalse;
+    int fallthru = FALSE;
 #endif
 
     if (lex_strterm) {
@@ -6416,7 +6416,7 @@
 	lex_p = lex_pend;
 #ifdef RIPPER
         ripper_dispatch_scan_event(parser, tCOMMENT);
-        fallthru = Qtrue;
+        fallthru = TRUE;
 #endif
 	/* fall through */
       case '\n':
@@ -6430,7 +6430,7 @@
             if (!fallthru) {
                 ripper_dispatch_scan_event(parser, tIGNORED_NL);
             }
-            fallthru = Qfalse;
+            fallthru = FALSE;
 #endif
 	    goto retry;
 	  default:
@@ -6528,7 +6528,7 @@
 	    /* skip embedded rd document */
 	    if (strncmp(lex_p, "begin", 5) == 0 && ISSPACE(lex_p[5])) {
 #ifdef RIPPER
-                int first_p = Qtrue;
+                int first_p = TRUE;
 
                 lex_goto_eol(parser);
                 ripper_dispatch_scan_event(parser, tEMBDOC_BEG);
@@ -6539,7 +6539,7 @@
                     if (!first_p) {
                         ripper_dispatch_scan_event(parser, tEMBDOC);
                     }
-                    first_p = Qfalse;
+                    first_p = FALSE;
 #endif
 		    c = nextc();
 		    if (c == -1) {
@@ -8014,7 +8014,7 @@
 #ifdef RIPPER
     ID id = get_id(lhs);
 # define assignable_result(x) get_value(lhs)
-# define parser_yyerror(x) dispatch1(assign_error, lhs)
+# define parser_yyerror(parser, x) dispatch1(assign_error, lhs)
 #else
 # define assignable_result(x) x
 #endif
@@ -9721,7 +9721,7 @@
 
     parser->result = Qnil;
     parser->parsing_thread = Qnil;
-    parser->toplevel_p = Qtrue;
+    parser->toplevel_p = TRUE;
 #endif
 #ifdef YYMALLOC
     parser->heap = NULL;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/