merge revision(s) r46649: [Backport ruby#10005]

	* node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
	  keyword argument is required


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nagachika

ChangeLog

@@ -1,3 +1,8 @@
+Sun Aug  3 00:06:10 2014  Charlie Somerville  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* compile.c (rb_iseq_compile_node): put start label of block after

node.c

@@ -300,7 +300,12 @@ dump_node(VALUE buf, VALUE indent, int comment, NODE *node)
 	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:

version.h

@@ -1,10 +1,10 @@
 #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"