make chars convert to unsigned first before comparing (solving issue #357)

Author: hanickadot

include/ctre/atoms_characters.hpp

@@ -40,7 +40,7 @@ template <auto V> struct character {
 				}
 			}	
 		}
-		return value == V;
+		return static_cast<std::make_unsigned_t<CharT>>(value) == V;
 	}
 };
 
@@ -79,7 +79,7 @@ template <auto A, auto B> struct char_range {
 				}
 			}	
 		}
-		return (value >= A) && (value <= B);
+		return (static_cast<std::make_unsigned_t<CharT>>(value) >= A) && (static_cast<std::make_unsigned_t<CharT>>(value) <= B);
 	}
 };
 using word_chars = set<char_range<'A','Z'>, char_range<'a','z'>, char_range<'0','9'>, character<'_'> >;

include/ctre/atoms_unicode.hpp

@@ -28,7 +28,7 @@ template <auto Type, auto Value> using make_property = property<std::remove_cons
 // unicode TS#18 level 1.2 general_category
 template <uni::detail::binary_prop Property> struct binary_property<uni::detail::binary_prop, Property> {
 	template <typename CharT> inline static constexpr bool match_char(CharT c, const flags &) noexcept {
-		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(c));
+		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(static_cast<std::make_unsigned_t<CharT>>(c)));
 	}
 };
 

single-header/ctre-unicode.hpp

@@ -1598,7 +1598,7 @@ template <auto V> struct character {
 				}
 			}	
 		}
-		return value == V;
+		return static_cast<std::make_unsigned_t<CharT>>(value) == V;
 	}
 };
 
@@ -1637,7 +1637,7 @@ template <auto A, auto B> struct char_range {
 				}
 			}	
 		}
-		return (value >= A) && (value <= B);
+		return (static_cast<std::make_unsigned_t<CharT>>(value) >= A) && (static_cast<std::make_unsigned_t<CharT>>(value) <= B);
 	}
 };
 using word_chars = set<char_range<'A','Z'>, char_range<'a','z'>, char_range<'0','9'>, character<'_'> >;
@@ -1899,7 +1899,7 @@ template <auto Type, auto Value> using make_property = property<std::remove_cons
 // unicode TS#18 level 1.2 general_category
 template <uni::detail::binary_prop Property> struct binary_property<uni::detail::binary_prop, Property> {
 	template <typename CharT> inline static constexpr bool match_char(CharT c, const flags &) noexcept {
-		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(c));
+		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(static_cast<std::make_unsigned_t<CharT>>(c)));
 	}
 };
 

single-header/ctre.hpp

@@ -1595,7 +1595,7 @@ template <auto V> struct character {
 				}
 			}	
 		}
-		return value == V;
+		return static_cast<std::make_unsigned_t<CharT>>(value) == V;
 	}
 };
 
@@ -1634,7 +1634,7 @@ template <auto A, auto B> struct char_range {
 				}
 			}	
 		}
-		return (value >= A) && (value <= B);
+		return (static_cast<std::make_unsigned_t<CharT>>(value) >= A) && (static_cast<std::make_unsigned_t<CharT>>(value) <= B);
 	}
 };
 using word_chars = set<char_range<'A','Z'>, char_range<'a','z'>, char_range<'0','9'>, character<'_'> >;
@@ -1896,7 +1896,7 @@ template <auto Type, auto Value> using make_property = property<std::remove_cons
 // unicode TS#18 level 1.2 general_category
 template <uni::detail::binary_prop Property> struct binary_property<uni::detail::binary_prop, Property> {
 	template <typename CharT> inline static constexpr bool match_char(CharT c, const flags &) noexcept {
-		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(c));
+		return uni::detail::get_binary_prop<Property>(static_cast<char32_t>(static_cast<std::make_unsigned_t<CharT>>(c)));
 	}
 };
 

tests/matching3.cpp

@@ -246,3 +246,7 @@ TEST_NOT_MATCH(233, "[^]", "");
 TEST_MATCH(234, "[^]+", "x");
 TEST_MATCH(235, "[^]?", "");
 
+// issue #357 (unsigned chars vs signed chars)
+TEST_MATCH(236, "«««", "«««");
+
+