* parse.y (rb_intern3): do not call rb_enc_mbclen() if *m is

  ASCII.  [ruby-talk:287225]

* string.c (rb_str_each_line): use rb_enc_is_newline() to gain
  performance if the record separator ($/) is not modified.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 2 deletions

diff --git a/parse.y b/parse.y
index 3f4b8c29ce..8f7c90a3cd 100644
--- a/parse.y
+++ b/parse.y
@@ -8966,8 +8966,13 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
     mb = 0;
     if (!rb_enc_isdigit(*m, enc)) {
 	while (m <= name + last && is_identchar(m, e, enc)) {
-	    if (!ISASCII(*m)) mb = 1;
-	    m += rb_enc_mbclen(m, e, enc);
+	    if (ISASCII(*m)) {
+		m++;
+	    }
+	    else {
+		mb = 1;
+		m += rb_enc_mbclen(m, e, enc);
+	    }
 	}
     }
     if (m - name < len) id = ID_JUNK;