Created
August 26, 2014 19:53
-
-
Save jroelofs/8c6091f79ae2327f1ccb to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 0cb5f0beda174e9fae584b90c940d443cfa89a8e | |
Author: Jonathan Roelofs <jonathan@codesourcery.com> | |
Date: Thu Aug 14 12:59:50 2014 -0600 | |
[libcxx] Newlib's isprint mask isn't a single bit. Test masking appropriately. | |
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp | |
index d0819ee..4256419 100644 | |
--- a/libcxx/src/locale.cpp | |
+++ b/libcxx/src/locale.cpp | |
@@ -1248,16 +1248,16 @@ ctype_byname<wchar_t>::do_is(mask m, char_type c) const | |
#else | |
bool result = false; | |
wint_t ch = static_cast<wint_t>(c); | |
- if (m & space) result |= (iswspace_l(ch, __l) != 0); | |
- if (m & print) result |= (iswprint_l(ch, __l) != 0); | |
- if (m & cntrl) result |= (iswcntrl_l(ch, __l) != 0); | |
- if (m & upper) result |= (iswupper_l(ch, __l) != 0); | |
- if (m & lower) result |= (iswlower_l(ch, __l) != 0); | |
- if (m & alpha) result |= (iswalpha_l(ch, __l) != 0); | |
- if (m & digit) result |= (iswdigit_l(ch, __l) != 0); | |
- if (m & punct) result |= (iswpunct_l(ch, __l) != 0); | |
- if (m & xdigit) result |= (iswxdigit_l(ch, __l) != 0); | |
- if (m & blank) result |= (iswblank_l(ch, __l) != 0); | |
+ if ((m & space) == space) result |= (iswspace_l(ch, __l) != 0); | |
+ if ((m & print) == print) result |= (iswprint_l(ch, __l) != 0); | |
+ if ((m & cntrl) == cntrl) result |= (iswcntrl_l(ch, __l) != 0); | |
+ if ((m & upper) == upper) result |= (iswupper_l(ch, __l) != 0); | |
+ if ((m & lower) == lower) result |= (iswlower_l(ch, __l) != 0); | |
+ if ((m & alpha) == alpha) result |= (iswalpha_l(ch, __l) != 0); | |
+ if ((m & digit) == digit) result |= (iswdigit_l(ch, __l) != 0); | |
+ if ((m & punct) == punct) result |= (iswpunct_l(ch, __l) != 0); | |
+ if ((m & xdigit) == xdigit) result |= (iswxdigit_l(ch, __l) != 0); | |
+ if ((m & blank) == blank) result |= (iswblank_l(ch, __l) != 0); | |
return result; | |
#endif | |
} | |
@@ -1306,16 +1306,16 @@ ctype_byname<wchar_t>::do_scan_is(mask m, const char_type* low, const char_type* | |
break; | |
#else | |
wint_t ch = static_cast<wint_t>(*low); | |
- if (m & space && iswspace_l(ch, __l)) break; | |
- if (m & print && iswprint_l(ch, __l)) break; | |
- if (m & cntrl && iswcntrl_l(ch, __l)) break; | |
- if (m & upper && iswupper_l(ch, __l)) break; | |
- if (m & lower && iswlower_l(ch, __l)) break; | |
- if (m & alpha && iswalpha_l(ch, __l)) break; | |
- if (m & digit && iswdigit_l(ch, __l)) break; | |
- if (m & punct && iswpunct_l(ch, __l)) break; | |
- if (m & xdigit && iswxdigit_l(ch, __l)) break; | |
- if (m & blank && iswblank_l(ch, __l)) break; | |
+ if ((m & space) == space && iswspace_l(ch, __l)) break; | |
+ if ((m & print) == print && iswprint_l(ch, __l)) break; | |
+ if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l)) break; | |
+ if ((m & upper) == upper && iswupper_l(ch, __l)) break; | |
+ if ((m & lower) == lower && iswlower_l(ch, __l)) break; | |
+ if ((m & alpha) == alpha && iswalpha_l(ch, __l)) break; | |
+ if ((m & digit) == digit && iswdigit_l(ch, __l)) break; | |
+ if ((m & punct) == punct && iswpunct_l(ch, __l)) break; | |
+ if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l)) break; | |
+ if ((m & blank) == blank && iswblank_l(ch, __l)) break; | |
#endif | |
} | |
return low; | |
@@ -1331,16 +1331,16 @@ ctype_byname<wchar_t>::do_scan_not(mask m, const char_type* low, const char_type | |
break; | |
#else | |
wint_t ch = static_cast<wint_t>(*low); | |
- if (m & space && iswspace_l(ch, __l)) continue; | |
- if (m & print && iswprint_l(ch, __l)) continue; | |
- if (m & cntrl && iswcntrl_l(ch, __l)) continue; | |
- if (m & upper && iswupper_l(ch, __l)) continue; | |
- if (m & lower && iswlower_l(ch, __l)) continue; | |
- if (m & alpha && iswalpha_l(ch, __l)) continue; | |
- if (m & digit && iswdigit_l(ch, __l)) continue; | |
- if (m & punct && iswpunct_l(ch, __l)) continue; | |
- if (m & xdigit && iswxdigit_l(ch, __l)) continue; | |
- if (m & blank && iswblank_l(ch, __l)) continue; | |
+ if ((m & space) == space && iswspace_l(ch, __l)) continue; | |
+ if ((m & print) == print && iswprint_l(ch, __l)) continue; | |
+ if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l)) continue; | |
+ if ((m & upper) == upper && iswupper_l(ch, __l)) continue; | |
+ if ((m & lower) == lower && iswlower_l(ch, __l)) continue; | |
+ if ((m & alpha) == alpha && iswalpha_l(ch, __l)) continue; | |
+ if ((m & digit) == digit && iswdigit_l(ch, __l)) continue; | |
+ if ((m & punct) == punct && iswpunct_l(ch, __l)) continue; | |
+ if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l)) continue; | |
+ if ((m & blank) == blank && iswblank_l(ch, __l)) continue; | |
break; | |
#endif | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment