1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: made a variable name more grammatically correct

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-01-12 09:42:07 +00:00
parent f23658f1c1
commit 4a5d3572e6
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Jan 12 18:41:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c: made a variable name more grammatically correct
Mon Jan 12 18:34:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Mon Jan 12 18:34:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c: minor grammar fix [ci skip] * string.c: minor grammar fix [ci skip]

36
string.c
View File

@ -5593,26 +5593,26 @@ rb_str_check_dummy_enc(rb_encoding *enc)
} }
static OnigCaseFoldType static OnigCaseFoldType
check_case_options(int argc, VALUE *argv, OnigCaseFoldType flag) check_case_options(int argc, VALUE *argv, OnigCaseFoldType flags)
{ {
if (argc==0) if (argc==0)
return flag; return flags;
if (argc>2) if (argc>2)
rb_raise(rb_eArgError, "too many options"); rb_raise(rb_eArgError, "too many options");
if (argv[0]==sym_turkic) { if (argv[0]==sym_turkic) {
flag &= ONIGENC_CASE_FOLD_TURKISH_AZERI; flags &= ONIGENC_CASE_FOLD_TURKISH_AZERI;
if (argc==2) { if (argc==2) {
if (argv[1]==sym_lithuanian) if (argv[1]==sym_lithuanian)
flag &= ONIGENC_CASE_FOLD_LITHUANIAN; flags &= ONIGENC_CASE_FOLD_LITHUANIAN;
else else
rb_raise(rb_eArgError, "invalid second option"); rb_raise(rb_eArgError, "invalid second option");
} }
} }
else if (argv[0]==sym_lithuanian) { else if (argv[0]==sym_lithuanian) {
flag &= ONIGENC_CASE_FOLD_LITHUANIAN; flags &= ONIGENC_CASE_FOLD_LITHUANIAN;
if (argc==2) { if (argc==2) {
if (argv[1]==sym_turkic) if (argv[1]==sym_turkic)
flag &= ONIGENC_CASE_FOLD_TURKISH_AZERI; flags &= ONIGENC_CASE_FOLD_TURKISH_AZERI;
else else
rb_raise(rb_eArgError, "invalid second option"); rb_raise(rb_eArgError, "invalid second option");
} }
@ -5620,16 +5620,16 @@ check_case_options(int argc, VALUE *argv, OnigCaseFoldType flag)
else if (argc>1) else if (argc>1)
rb_raise(rb_eArgError, "too many options"); rb_raise(rb_eArgError, "too many options");
else if (argv[0]==sym_ascii) else if (argv[0]==sym_ascii)
flag &= ONIGENC_CASE_ASCII_ONLY; flags &= ONIGENC_CASE_ASCII_ONLY;
else if (argv[0]==sym_fold) { else if (argv[0]==sym_fold) {
if ((flag & (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE)) == ONIGENC_CASE_DOWNCASE) if ((flags & (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE)) == ONIGENC_CASE_DOWNCASE)
flag &= ONIGENC_CASE_FOLD; flags &= ONIGENC_CASE_FOLD;
else else
rb_raise(rb_eArgError, "option :fold only allowed for downcasing"); rb_raise(rb_eArgError, "option :fold only allowed for downcasing");
} }
else else
rb_raise(rb_eArgError, "invalid option"); rb_raise(rb_eArgError, "invalid option");
return flag; return flags;
} }
/* /*
@ -5648,9 +5648,9 @@ rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
char *s, *send; char *s, *send;
int modify = 0; int modify = 0;
int n; int n;
OnigCaseFoldType flag = ONIGENC_CASE_UPCASE; OnigCaseFoldType flags = ONIGENC_CASE_UPCASE;
flag = check_case_options(argc, argv, flag); flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc); rb_str_check_dummy_enc(enc);
@ -5732,9 +5732,9 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str)
rb_encoding *enc; rb_encoding *enc;
char *s, *send; char *s, *send;
int modify = 0; int modify = 0;
OnigCaseFoldType flag = ONIGENC_CASE_DOWNCASE; OnigCaseFoldType flags = ONIGENC_CASE_DOWNCASE;
flag = check_case_options(argc, argv, flag); flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc); rb_str_check_dummy_enc(enc);
@ -5824,10 +5824,10 @@ rb_str_capitalize_bang(int argc, VALUE *argv, VALUE str)
int modify = 0; int modify = 0;
unsigned int c; unsigned int c;
int n; int n;
OnigCaseFoldType flag = ONIGENC_CASE_UPCASE | OnigCaseFoldType flags = ONIGENC_CASE_UPCASE |
ONIGENC_CASE_TITLECASE | ONIGENC_CASE_ONCEONLY; ONIGENC_CASE_TITLECASE | ONIGENC_CASE_ONCEONLY;
flag = check_case_options(argc, argv, flag); flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc); rb_str_check_dummy_enc(enc);
@ -5892,9 +5892,9 @@ rb_str_swapcase_bang(int argc, VALUE *argv, VALUE str)
char *s, *send; char *s, *send;
int modify = 0; int modify = 0;
int n; int n;
OnigCaseFoldType flag = ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE; OnigCaseFoldType flags = ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE;
flag = check_case_options(argc, argv, flag); flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc); rb_str_check_dummy_enc(enc);