[前][次][番号順一覧][スレッド一覧]

ruby-changes:47584

From: nobu <ko1@a...>
Date: Thu, 31 Aug 2017 17:08:05 +0900 (JST)
Subject: [ruby-changes:47584] nobu:r59700 (trunk): string.c: adjust indent [ci skip]

nobu	2017-08-31 17:07:59 +0900 (Thu, 31 Aug 2017)

  New Revision: 59700

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59700

  Log:
    string.c: adjust indent [ci skip]
    
    * string.c (rb_str_enumerate_grapheme_clusters): adjust indent.
      [Feature #13780]

  Modified files:
    trunk/string.c
Index: string.c
===================================================================
--- string.c	(revision 59699)
+++ string.c	(revision 59700)
@@ -8093,66 +8093,66 @@ rb_str_enumerate_grapheme_clusters(VALUE https://github.com/ruby/ruby/blob/trunk/string.c#L8093
     VALUE ary;
 
     if (!unicode_p) {
-   return rb_str_enumerate_codepoints(str, wantarray);
+	return rb_str_enumerate_codepoints(str, wantarray);
     }
 
     /* synchronize */
     if (encidx == rb_utf8_encindex() && reg_grapheme_cluster_utf8) {
-   reg_grapheme_cluster = reg_grapheme_cluster_utf8;
+	reg_grapheme_cluster = reg_grapheme_cluster_utf8;
     }
     if (!reg_grapheme_cluster) {
-   const OnigUChar source[] = "\\X";
-   int r = onig_new(&reg_grapheme_cluster, source, source + sizeof(source) - 1,
-       ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, NULL);
-   if (r) {
-       rb_bug("cannot compile grapheme cluster regexp");
-   }
-   if (encidx == rb_utf8_encindex()) {
-       reg_grapheme_cluster_utf8 = reg_grapheme_cluster;
-   }
+	const OnigUChar source[] = "\\X";
+	int r = onig_new(&reg_grapheme_cluster, source, source + sizeof(source) - 1,
+			 ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, NULL);
+	if (r) {
+	    rb_bug("cannot compile grapheme cluster regexp");
+	}
+	if (encidx == rb_utf8_encindex()) {
+	    reg_grapheme_cluster_utf8 = reg_grapheme_cluster;
+	}
     }
 
     ptr = RSTRING_PTR(str);
     end = RSTRING_END(str);
 
     if (rb_block_given_p()) {
-   if (wantarray) {
+	if (wantarray) {
 #if STRING_ENUMERATORS_WANTARRAY
-       rb_warn("given block not used");
-       ary = rb_ary_new_capa(str_strlen(str, enc)); /* str's enc*/
+	    rb_warn("given block not used");
+	    ary = rb_ary_new_capa(str_strlen(str, enc)); /* str's enc*/
 #else
-       rb_warning("passing a block to String#grapheme_clusters is deprecated");
-       wantarray = 0;
+	    rb_warning("passing a block to String#grapheme_clusters is deprecated");
+	    wantarray = 0;
 #endif
-   }
+	}
     }
     else {
-   if (wantarray)
-       ary = rb_ary_new_capa(str_strlen(str, enc)); /* str's enc*/
-   else
-       return SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
+	if (wantarray)
+	    ary = rb_ary_new_capa(str_strlen(str, enc)); /* str's enc*/
+	else
+	    return SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
     }
 
     while (ptr < end) {
-   VALUE grapheme_cluster;
-   OnigPosition len = onig_match(reg_grapheme_cluster,
-       (const OnigUChar *)ptr, (const OnigUChar *)end,
-       (const OnigUChar *)ptr, NULL, 0);
-   if (len == 0) break;
-   if (len < 0) {
-       break;
-   }
-   grapheme_cluster = rb_enc_str_new(ptr, len, enc);
-   if (wantarray)
-       rb_ary_push(ary, grapheme_cluster);
-   else
-       rb_yield(grapheme_cluster);
-   ptr += len;
+	VALUE grapheme_cluster;
+	OnigPosition len = onig_match(reg_grapheme_cluster,
+				      (const OnigUChar *)ptr, (const OnigUChar *)end,
+				      (const OnigUChar *)ptr, NULL, 0);
+	if (len == 0) break;
+	if (len < 0) {
+	    break;
+	}
+	grapheme_cluster = rb_enc_str_new(ptr, len, enc);
+	if (wantarray)
+	    rb_ary_push(ary, grapheme_cluster);
+	else
+	    rb_yield(grapheme_cluster);
+	ptr += len;
     }
     if (wantarray)
-   return ary;
+	return ary;
     else
-   return str;
+	return str;
 }
 
 /*

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]