aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-29 14:01:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-29 14:01:13 +0000
commit963e19a792d7ba527510ea61bf155ec64ac249ef (patch)
tree588516dda3445f9c71312fafce9789eea30f5ff1
parente664cc77225fadf54d036f6eae21c47b85b23da9 (diff)
downloadruby-963e19a792d7ba527510ea61bf155ec64ac249ef.tar.gz
indent
* encoding.c (enc_compatible_latter): adjust indent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--encoding.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ef8a4059e6..1247c73eef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Thu Oct 29 18:42:30 2015 Koichi Sasada <ko1@atdot.net>
Thu Oct 29 18:05:22 2015 Koichi Sasada <ko1@atdot.net>
* encoding.c (rb_enc_check_str): add for performance.
- This function only accept T_STRING (and T_REGEXP).
+ This function only accepts T_STRING (and T_REGEXP).
This patch improves performance of a tiny_segmenter benchmark
(num=2) 2.54sec -> 2.42sec on my machine.
diff --git a/encoding.c b/encoding.c
index d11e6f6e59..e94f11b6a8 100644
--- a/encoding.c
+++ b/encoding.c
@@ -890,19 +890,19 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
isstr2 = RB_TYPE_P(str2, T_STRING);
if (isstr2 && RSTRING_LEN(str2) == 0)
- return enc1;
+ return enc1;
isstr1 = RB_TYPE_P(str1, T_STRING);
if (isstr1 && RSTRING_LEN(str1) == 0)
- return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
+ return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
return 0;
}
/* objects whose encoding is the same of contents */
if (!isstr2 && idx2 == ENCINDEX_US_ASCII)
- return enc1;
+ return enc1;
if (!isstr1 && idx1 == ENCINDEX_US_ASCII)
- return enc2;
+ return enc2;
if (!isstr1) {
VALUE tmp = str1;
@@ -931,7 +931,7 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
}
}
if (cr1 == ENC_CODERANGE_7BIT)
- return enc2;
+ return enc2;
}
return 0;
}