summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-06 13:23:39 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-06 13:23:39 +0000
commita4fde3b60cc16672c69bdfd986e8655a08b39fa4 (patch)
treed4544388f4a862ac86ef9d5c1c6f2e249d152dfa
parent52dbede23b21074b08c1064634a3442437c7d9f4 (diff)
{ext,test}/strscan: Specify frozen_string_literal: true.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/strscan/extconf.rb2
-rw-r--r--test/strscan/test_stringscanner.rb58
2 files changed, 30 insertions, 30 deletions
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index c968f81..714fa99 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
require 'mkmf'
$INCFLAGS << " -I$(top_srcdir)"
create_makefile 'strscan'
diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
index ee97e45..bc5db79 100644
--- a/test/strscan/test_stringscanner.rb
+++ b/test/strscan/test_stringscanner.rb
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
#
# test/strscan/test_stringscanner.rb
#
@@ -14,7 +14,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal false, s.eos?
assert_equal false, s.tainted?
- str = 'test string'
+ str = 'test string'.dup
str.taint
s = StringScanner.new(str, false)
assert_instance_of StringScanner, s
@@ -22,7 +22,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_same str, s.string
assert_equal true, s.string.tainted?
- str = 'test string'
+ str = 'test string'.dup
str.taint
s = StringScanner.new(str)
assert_equal true, s.string.tainted?
@@ -96,7 +96,7 @@ class TestStringScanner < Test::Unit::TestCase
end
def test_inspect
- str = 'test string'
+ str = 'test string'.dup
str.taint
s = StringScanner.new(str, false)
assert_instance_of String, s.inspect
@@ -124,7 +124,7 @@ class TestStringScanner < Test::Unit::TestCase
s.scan(/\w+/)
assert_equal true, s.eos?
- s = StringScanner.new('test')
+ s = StringScanner.new('test'.dup)
s.scan(/te/)
s.string.replace ''
assert_equal true, s.eos?
@@ -181,11 +181,11 @@ class TestStringScanner < Test::Unit::TestCase
end
def test_string_append
- s = StringScanner.new('tender')
+ s = StringScanner.new('tender'.dup)
s << 'love'
assert_equal 'tenderlove', s.string
- s.string = 'tender'
+ s.string = 'tender'.dup
s << 'love'
assert_equal 'tenderlove', s.string
end
@@ -213,7 +213,7 @@ class TestStringScanner < Test::Unit::TestCase
end
def test_concat
- s = StringScanner.new('a')
+ s = StringScanner.new('a'.dup)
s.scan(/a/)
s.concat 'b'
assert_equal false, s.eos?
@@ -246,7 +246,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.scan(/\w+/)
- str = 'stra strb strc'
+ str = 'stra strb strc'.dup
str.taint
s = StringScanner.new(str, false)
tmp = s.scan(/\w+/)
@@ -267,7 +267,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.scan(/\w+/)
assert_nil s.scan(/\w+/)
- s = StringScanner.new('test')
+ s = StringScanner.new('test'.dup)
s.scan(/te/)
# This assumes #string does not duplicate string,
# but it is implementation specific issue.
@@ -293,7 +293,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.skip(/\s+/)
assert_equal true, s.eos?
- s = StringScanner.new('test')
+ s = StringScanner.new('test'.dup)
s.scan(/te/)
s.string.replace ''
assert_equal nil, s.skip(/./)
@@ -313,7 +313,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal 'e', s.getch
assert_nil s.getch
- str = 'abc'
+ str = 'abc'.dup
str.taint
s = StringScanner.new(str)
assert_equal true, s.getch.tainted?
@@ -321,11 +321,11 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal true, s.getch.tainted?
assert_nil s.getch
- s = StringScanner.new("\244\242".force_encoding("euc-jp"))
- assert_equal "\244\242".force_encoding("euc-jp"), s.getch
+ s = StringScanner.new("\244\242".dup.force_encoding("euc-jp"))
+ assert_equal "\244\242".dup.force_encoding("euc-jp"), s.getch
assert_nil s.getch
- s = StringScanner.new('test')
+ s = StringScanner.new('test'.dup)
s.scan(/te/)
s.string.replace ''
assert_equal nil, s.getch
@@ -341,7 +341,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.get_byte
assert_nil s.get_byte
- str = 'abc'
+ str = 'abc'.dup
str.taint
s = StringScanner.new(str)
assert_equal true, s.get_byte.tainted?
@@ -349,12 +349,12 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal true, s.get_byte.tainted?
assert_nil s.get_byte
- s = StringScanner.new("\244\242".force_encoding("euc-jp"))
- assert_equal "\244".force_encoding("euc-jp"), s.get_byte
- assert_equal "\242".force_encoding("euc-jp"), s.get_byte
+ s = StringScanner.new("\244\242".dup.force_encoding("euc-jp"))
+ assert_equal "\244".dup.force_encoding("euc-jp"), s.get_byte
+ assert_equal "\242".dup.force_encoding("euc-jp"), s.get_byte
assert_nil s.get_byte
- s = StringScanner.new('test')
+ s = StringScanner.new('test'.dup)
s.scan(/te/)
s.string.replace ''
assert_equal nil, s.get_byte
@@ -387,7 +387,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal 't', s.matched
assert_equal false, s.matched.tainted?
- str = 'test'
+ str = 'test'.dup
str.taint
s = StringScanner.new(str)
s.scan(/\w+/)
@@ -447,11 +447,11 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s[0]
- s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+ s = StringScanner.new("\244\242".dup.force_encoding("euc-jp"))
s.getch
- assert_equal "\244\242".force_encoding("euc-jp"), s[0]
+ assert_equal "\244\242".dup.force_encoding("euc-jp"), s[0]
- str = 'test'
+ str = 'test'.dup
str.taint
s = StringScanner.new(str)
s.scan(/(t)(e)(s)(t)/)
@@ -496,7 +496,7 @@ class TestStringScanner < Test::Unit::TestCase
s.scan(/never match/)
assert_nil s.pre_match
- str = 'test string'
+ str = 'test string'.dup
str.taint
s = StringScanner.new(str)
s.scan(/\w+/)
@@ -530,7 +530,7 @@ class TestStringScanner < Test::Unit::TestCase
s.scan(/./)
assert_nil s.post_match
- str = 'test string'
+ str = 'test string'.dup
str.taint
s = StringScanner.new(str)
s.scan(/\w+/)
@@ -585,14 +585,14 @@ class TestStringScanner < Test::Unit::TestCase
end
def test_encoding
- ss = StringScanner.new("\xA1\xA2".force_encoding("euc-jp"))
+ ss = StringScanner.new("\xA1\xA2".dup.force_encoding("euc-jp"))
assert_equal(Encoding::EUC_JP, ss.scan(/./e).encoding)
end
def test_generic_regexp
- ss = StringScanner.new("\xA1\xA2".force_encoding("euc-jp"))
+ ss = StringScanner.new("\xA1\xA2".dup.force_encoding("euc-jp"))
t = ss.scan(/./)
- assert_equal("\xa1\xa2".force_encoding("euc-jp"), t)
+ assert_equal("\xa1\xa2".dup.force_encoding("euc-jp"), t)
end
def test_set_pos