diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-20 15:44:54 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-20 15:44:54 +0000 |
commit | bde7125880217dc322cf9b82f9e71906256500d6 (patch) | |
tree | 522856b14c7f46ddbdbe7eb9137e41094310c4f2 | |
parent | c58a4a50326dd56b4cc81fd8379712a6058f3fb3 (diff) | |
download | ruby-bde7125880217dc322cf9b82f9e71906256500d6.tar.gz |
* parse.y (parser_yylex): update paren_nest for brackets [].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | parse.y | 3 | ||||
-rw-r--r-- | regexec.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat Aug 20 23:55:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * parse.y (parser_yylex): update paren_nest for brackets []. + Sun Aug 21 00:10:23 2005 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> * lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add @@ -6325,8 +6325,8 @@ parser_yylex(parser) } case ')': - paren_nest--; case ']': + paren_nest--; case '}': COND_LEXPOP(); CMDARG_LEXPOP(); @@ -6452,6 +6452,7 @@ parser_yylex(parser) return c; case '[': + paren_nest++; if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) { lex_state = EXPR_ARG; if ((c = nextc()) == ']') { @@ -1170,7 +1170,7 @@ code_is_in_cclass_node(void* node, OnigCodePoint code, int enclen) unsigned int in_cc; CClassNode* cc = (CClassNode* )node; - if (enclen == 1) { + if (enclen == 1 && code < SINGLE_BYTE_SIZE) { in_cc = BITSET_AT(cc->bs, code); } else { |