diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-24 08:56:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-24 08:56:24 +0000 |
| commit | 2ccdcb5a206abf179bf27ee795f92a0f18a166e3 (patch) | |
| tree | 674c99ac960bddb835e796760116d66af28160c8 /ext/strscan | |
| parent | b31821ca3bc38645e12fdffc1e23c5a649fcb872 (diff) | |
| download | ruby-2ccdcb5a206abf179bf27ee795f92a0f18a166e3.tar.gz ruby-2ccdcb5a206abf179bf27ee795f92a0f18a166e3.tar.xz ruby-2ccdcb5a206abf179bf27ee795f92a0f18a166e3.zip | |
* ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
encoding of the target string instead of setting to StringScanner
instance. [ruby-dev:31831]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/strscan')
| -rw-r--r-- | ext/strscan/strscan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index ac07b3978..fc4a7cf4e 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -190,7 +190,6 @@ strscan_initialize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "11", &str, &need_dup); StringValue(str); p->str = str; - rb_enc_associate(self, rb_enc_get(str)); return self; } @@ -654,14 +653,13 @@ strscan_getch(VALUE self) { struct strscanner *p; long len; - rb_encoding *enc = rb_enc_get(self); GET_SCANNER(self, p); CLEAR_MATCH_STATUS(p); if (EOS_P(p)) return Qnil; - len = rb_enc_mbclen(CURPTR(p), S_PEND(p), enc); + len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str)); if (p->curr + len > S_LEN(p)) { len = S_LEN(p) - p->curr; } |