diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-08 14:17:53 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-08 14:17:53 +0000 |
| commit | ceb972c776c43e643ad69d3cb88da683f0ec9ea0 (patch) | |
| tree | facd3ae86d8ea6fbb70c362cc9a1e22fbaf54b56 /string.c | |
| parent | f7e5a801507490cd7d215f2c2c896ed0e1942870 (diff) | |
| download | ruby-ceb972c776c43e643ad69d3cb88da683f0ec9ea0.tar.gz ruby-ceb972c776c43e643ad69d3cb88da683f0ec9ea0.tar.xz ruby-ceb972c776c43e643ad69d3cb88da683f0ec9ea0.zip | |
* eval.c (rb_thread_restore_context): save current value of
lastline and lastmatch in the thread struct for later restore.
* eval.c (rb_thread_save_context): restore lastline and lastmatch.
* numeric.c (flo_to_s): should handle negative float value.
* class.c (rb_include_module): should check whole ancestors to
avoid duplicate module inclusion.
* string.c (trnext): should check backslash before updating "now"
position.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1967,11 +1967,11 @@ trnext(t) for (;;) { if (!t->gen) { if (t->p == t->pend) return -1; - t->now = *(USTR)t->p++; if (t->p < t->pend - 1 && *t->p == '\\') { t->p++; } - else if (t->p < t->pend - 1 && *t->p == '-') { + t->now = *(USTR)t->p++; + if (t->p < t->pend - 1 && *t->p == '-') { t->p++; if (t->p < t->pend) { if (t->now > *(USTR)t->p) { |