From 4e1ea795aa8ee15366b12ba806ff6846d9f871b2 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 29 Oct 2015 14:01:13 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 +- encoding.c | 10 +++++----- 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 Thu Oct 29 18:05:22 2015 Koichi Sasada * 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; }