kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (regexp): dregexp has literal string only at the head

Browse source 
and successors are array.  [ruby-core:32682]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-04 03:43:50 +00:00
parent 25eebc3ad5
commit d3dabbca71
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Oct 4 12:43:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (regexp): dregexp has literal string only at the head
and successors are array. [ruby-core:32682]
Mon Oct 4 10:22:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
* random.c (rand_init): This checks the value is in 32bit or not,

3
parse.y
View file

@ -3897,7 +3897,8 @@ regexp : tREGEXP_BEG regexp_contents tREGEXP_END
if (nd_type(list->nd_head) == NODE_STR) {
VALUE tail = list->nd_head->nd_lit;
if (reg_fragment_check(tail, options) && prev && !NIL_P(prev->nd_lit)) {
if (!literal_concat0(parser, prev->nd_lit, tail)) {
VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit;
if (!literal_concat0(parser, lit, tail)) {
node = 0;
break;
}

2
test/ruby/test_literal.rb
View file

@ -110,6 +110,8 @@ class TestRubyLiteral < Test::Unit::TestCase
def test_dregexp
assert_instance_of Regexp, /re#{'ge'}xp/
assert_equal(/regexp/, /re#{'ge'}xp/)
bug3903 = '[ruby-core:32682]'
assert_raise(SyntaxError, bug3903) {eval('/[#{"\x80"}]/')}
end
def test_array