nagachika	2014-08-03 00:14:49 +0900 (Sun, 03 Aug 2014)

  New Revision: 47035

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

  Log:
    merge revision(s) r46649: [Backport #10005]
    
    * node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
      keyword argument is required

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/node.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47034)
+++ ruby_2_1/ChangeLog	(revision 47035)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Aug  3 00:06:10 2014  Charlie Somerville  <charliesome@r...>
+
+	* node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
+	  keyword argument is required
+
 Thu Jul 31 01:56:11 2014  Koichi Sasada  <ko1@a...>
 
 	* compile.c (rb_iseq_compile_node): put start label of block after
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47034)
+++ ruby_2_1/version.h	(revision 47035)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-07-31"
-#define RUBY_PATCHLEVEL 186
+#define RUBY_RELEASE_DATE "2014-08-03"
+#define RUBY_PATCHLEVEL 187
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 3
 
 #include "ruby/version.h"
 
Index: ruby_2_1/node.c
===================================================================
--- ruby_2_1/node.c	(revision 47034)
+++ ruby_2_1/node.c	(revision 47035)
@@ -300,7 +300,12 @@ dump_node(VALUE buf, VALUE indent, int c https://github.com/ruby/ruby/blob/trunk/ruby_2_1/node.c#L300
 	asgn:
 	F_ID(nd_vid, "variable");
 	LAST_NODE;
-	F_NODE(nd_value, "rvalue");
+	if (node->nd_value == (NODE *)-1) {
+	    F_MSG(nd_value, "rvalue", "(required keyword argument)");
+	}
+	else {
+	    F_NODE(nd_value, "rvalue");
+	}
 	break;
 
       case NODE_GASGN:

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46649


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