summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-13 10:37:52 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-13 10:37:52 +0000
commitaf64b09514410b05d3505d9937be36d845dee36f (patch)
tree2c8c7799571688bfa3608df2f58d5c3aeaf08189
parent4e4a76e8f4298a94d915559eca41211e09dd8695 (diff)
* parse.y (lex_state_name): Make it return the correct names.
Add new names to follow r51617; Indices ffs(2) returns are 1-origin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ad2aaedf82..f404d3fa7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 13 19:24:20 2015 Yuki Yugui Sonoda <yugui@yugui.jp>
+
+ * parse.y (lex_state_name): Make it return the correct names.
+ Add new names to follow r51617; Indices ffs(2) returns are 1-origin.
+
Sun Dec 13 18:40:45 2015 Yuki Yugui Sonoda <yugui@yugui.jp>
* parse.y: debug output of lex_state transition if PARSER_DEBUG
diff --git a/parse.y b/parse.y
index e309a9fc19..1ed56ac165 100644
--- a/parse.y
+++ b/parse.y
@@ -9186,9 +9186,11 @@ id_is_var_gen(struct parser_params *parser, ID id)
static const char *
lex_state_name(enum lex_state_e state)
{
- static const char names[][12] = {
+ static const char names[][13] = {
+ "EXPR_NONE",
"EXPR_BEG", "EXPR_END", "EXPR_ENDARG", "EXPR_ENDFN", "EXPR_ARG",
"EXPR_CMDARG", "EXPR_MID", "EXPR_FNAME", "EXPR_DOT", "EXPR_CLASS",
+ "EXPR_LABEL", "EXPR_LABELED",
};
if ((unsigned)state & ~(~0u << EXPR_MAX_STATE))