1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/strscan/strscan.c (str_new): new function for allocate an string

Browse Source 
with encoding propagation.
  (extract_range): use str_new.
  (extract_beg_len): ditto.
  (strscan_peek): ditto.
  (strscan_rest): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-28 14:55:43 +00:00
parent f413b83814
commit 1c0416e6ee
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Dec 28 23:53:18 2007 Tanaka Akira <akr@fsij.org>
* ext/strscan/strscan.c (str_new): new function for allocate an string
with encoding propagation.
(extract_range): use str_new.
(extract_beg_len): ditto.
(strscan_peek): ditto.
(strscan_rest): ditto.
Fri Dec 28 20:18:42 2007 WATANABE Hirofumi <eban@ruby-lang.org> Fri Dec 28 20:18:42 2007 WATANABE Hirofumi <eban@ruby-lang.org>
* golf_prelude.rb (Object.say): derived from Perl 5.10. * golf_prelude.rb (Object.say): derived from Perl 5.10.

16
ext/strscan/strscan.c
View File

@ -126,13 +126,21 @@ infect(VALUE str, struct strscanner *p)
return str; return str;
} }
static VALUE
str_new(struct strscanner *p, const char *ptr, long len)
{
VALUE str = rb_str_new(ptr, len);
rb_enc_copy(str, p->str);
return str;
}
static VALUE static VALUE
extract_range(struct strscanner *p, long beg_i, long end_i) extract_range(struct strscanner *p, long beg_i, long end_i)
{ {
if (beg_i > S_LEN(p)) return Qnil; if (beg_i > S_LEN(p)) return Qnil;
if (end_i > S_LEN(p)) if (end_i > S_LEN(p))
end_i = S_LEN(p); end_i = S_LEN(p);
return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p); return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p);
} }
static VALUE static VALUE
@ -141,7 +149,7 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
if (beg_i > S_LEN(p)) return Qnil; if (beg_i > S_LEN(p)) return Qnil;
if (beg_i + len > S_LEN(p)) if (beg_i + len > S_LEN(p))
len = S_LEN(p) - beg_i; len = S_LEN(p) - beg_i;
return infect(rb_str_new(S_PBEG(p) + beg_i, len), p); return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
} }
/* ======================================================================= /* =======================================================================
@ -737,7 +745,7 @@ strscan_peek(VALUE self, VALUE vlen)
len = NUM2LONG(vlen); len = NUM2LONG(vlen);
if (EOS_P(p)) if (EOS_P(p))
return infect(rb_str_new("", 0), p); return infect(str_new(p, "", 0), p);
if (p->curr + len > S_LEN(p)) if (p->curr + len > S_LEN(p))
len = S_LEN(p) - p->curr; len = S_LEN(p) - p->curr;
@ -999,7 +1007,7 @@ strscan_rest(VALUE self)
GET_SCANNER(self, p); GET_SCANNER(self, p);
if (EOS_P(p)) { if (EOS_P(p)) {
return infect(rb_str_new("", 0), p); return infect(str_new(p, "", 0), p);
} }
return extract_range(p, p->curr, S_LEN(p)); return extract_range(p, p->curr, S_LEN(p));
} }

2
include/ruby/encoding.h
View File

@ -51,7 +51,7 @@ rb_encoding* rb_enc_compatible(VALUE,VALUE);
rb_encoding* rb_enc_check(VALUE,VALUE); rb_encoding* rb_enc_check(VALUE,VALUE);
void rb_enc_associate_index(VALUE, int); void rb_enc_associate_index(VALUE, int);
void rb_enc_associate(VALUE, rb_encoding*); void rb_enc_associate(VALUE, rb_encoding*);
void rb_enc_copy(VALUE, VALUE); void rb_enc_copy(VALUE dst, VALUE src);
VALUE rb_enc_str_new(const char*, long len, rb_encoding*); VALUE rb_enc_str_new(const char*, long len, rb_encoding*);
long rb_enc_strlen(const char*, const char*, rb_encoding*); long rb_enc_strlen(const char*, const char*, rb_encoding*);

13
test/strscan/test_stringscanner.rb
View File

@ -289,7 +289,7 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.getch assert_nil s.getch
s = StringScanner.new("\244\242".force_encoding("euc-jp")) s = StringScanner.new("\244\242".force_encoding("euc-jp"))
assert_equal "\244\242", s.getch assert_equal "\244\242".force_encoding("euc-jp"), s.getch
assert_nil s.getch assert_nil s.getch
s = StringScanner.new('test') s = StringScanner.new('test')
@ -317,8 +317,8 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s.get_byte assert_nil s.get_byte
s = StringScanner.new("\244\242".force_encoding("euc-jp")) s = StringScanner.new("\244\242".force_encoding("euc-jp"))
assert_equal "\244", s.get_byte assert_equal "\244".force_encoding("euc-jp"), s.get_byte
assert_equal "\242", s.get_byte assert_equal "\242".force_encoding("euc-jp"), s.get_byte
assert_nil s.get_byte assert_nil s.get_byte
s = StringScanner.new('test') s = StringScanner.new('test')
@ -414,7 +414,7 @@ class TestStringScanner < Test::Unit::TestCase
s = StringScanner.new("\244\242".force_encoding("euc-jp")) s = StringScanner.new("\244\242".force_encoding("euc-jp"))
s.getch s.getch
assert_equal "\244\242", s[0] assert_equal "\244\242".force_encoding("euc-jp"), s[0]
str = 'test' str = 'test'
str.taint str.taint
@ -536,4 +536,9 @@ class TestStringScanner < Test::Unit::TestCase
s.terminate s.terminate
assert_nil s.matched_size assert_nil s.matched_size
end end
def test_encoding
ss = StringScanner.new("\xA1\xA2".force_encoding("euc-jp"))
assert_equal(Encoding::EUC_JP, ss.scan(/./e).encoding)
end
end end