* parse.y (parser_parse_string): set the mark of term to `nd_func`

  because in this version `u2.id` is not used for this purpose.
  fixed failure of ruby/spec introduced at r58518.
  see also [Backport #13363]



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

3 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e8071de182..ab9a6bf182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May  1 06:36:57 2017  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_parse_string): set the mark of term to `nd_func`
+	  because in this version `u2.id` is not used for this purpose.
+	  fixed failure of ruby/spec introduced at r58518.
+	  see also [Backport #13363]
+
 Sun Apr 30 23:01:00 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	class.c: ensure_includable
diff --git a/parse.y b/parse.y
index 53c09b6a52..ee90cb9950 100644
--- a/parse.y
+++ b/parse.y
@@ -6509,7 +6509,7 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
 	    else {
 		compile_error(PARSER_ARG "unterminated string meets end of file");
 	    }
-	    quote->u2.id = -1;
+	    quote->nd_func = -1;
 	}
     }
 
diff --git a/version.h b/version.h
index 303de5dc62..2968e52004 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.5"
-#define RUBY_RELEASE_DATE "2017-04-30"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_RELEASE_DATE "2017-05-01"
+#define RUBY_PATCHLEVEL 310
 
 #define RUBY_RELEASE_YEAR 2017
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"