#60 disabling special case for [-], if you wan't to use minus in character class use escaping

Author: Hana Dusíková

include/ctre/pcre.gram

@@ -72,7 +72,6 @@ block_name2->alphanum_characters,[push_name],<block_name2>|epsilon
 
 
 character_class->sopen,<set>,[set_make],sclose|sopen,caret,<set2a>,[set_make_negative],sclose
-set->minus,[push_character],[set_start],<set2b>
 set-><setitem>,[set_start],<set2b>
 set2a-><setitem2>,[set_start],<set2b>|epsilon
 set2b-><setitem2>,[set_combine],<set2b>|epsilon

include/ctre/pcre.hpp

@@ -202,9 +202,8 @@ struct pcre {
 	static constexpr auto rule(c, ctll::term<'\\'>) -> ctll::push<ctll::anything, e, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, ctll::set<'!','$','\x28','\x29','*','+',',','.',':','<','=','>','?','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','0','s','t','u','v','w','x','y','z','\x7B','\x7D','1','2','3','4','5','6','7','8','9'>) -> ctll::push<ctll::anything, push_character, range, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, _others) -> ctll::push<ctll::anything, push_character, range, set_start, set2b, set_make, ctll::term<']'>>;
-	static constexpr auto rule(c, ctll::term<'-'>) -> ctll::push<ctll::anything, push_character, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, ctll::term<'^'>) -> ctll::push<ctll::anything, set2a, set_make_negative, ctll::term<']'>>;
-	static constexpr auto rule(c, ctll::set<']','|'>) -> ctll::reject;
+	static constexpr auto rule(c, ctll::set<'-',']','|'>) -> ctll::reject;
 
 	static constexpr auto rule(class_named_name, ctll::term<'x'>) -> ctll::push<ctll::anything, ctll::term<'d'>, ctll::term<'i'>, ctll::term<'g'>, ctll::term<'i'>, ctll::term<'t'>, class_named_xdigit>;
 	static constexpr auto rule(class_named_name, ctll::term<'d'>) -> ctll::push<ctll::anything, ctll::term<'i'>, ctll::term<'g'>, ctll::term<'i'>, ctll::term<'t'>, class_named_digit>;

tests/matching2-msvc-greedy.cpp

@@ -220,8 +220,9 @@ static_assert(CTRE_CREATE("[(-)]").match(")"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("a"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("_"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("Z"));
-static_assert(CTRE_CREATE("[-]").match("-"));
-static_assert(CTRE_CREATE("[-x]").match("x"));
+// FIXME: maybe in future I will allow this again
+// static_assert(CTRE_CREATE("[-]").match("-"));
+// static_assert(CTRE_CREATE("[-x]").match("x"));
 // FIXME: due current limitation of LL1 grammar parser I can make this work "[x-]" without significant change in grammar
 static_assert(CTRE_CREATE("<").match("<"));
 static_assert(CTRE_CREATE("(<)").match("<"));
@@ -272,7 +273,6 @@ static_assert(CTRE_CREATE("(<[a-z]+>)\\g{1}").match("<aloha><aloha>"sv));
 static_assert(CTRE_CREATE("[^\\^]").match("a"sv));
 static_assert(CTRE_CREATE("[^^]").match("a"sv));
 static_assert(CTRE_CREATE("[\\-]").match("-"sv));
-static_assert(CTRE_CREATE("[-]").match("-"sv));
 static_assert(CTRE_CREATE("[\\--\\-]").match("-"sv));
 
 // msvc

tests/matching2.cpp

@@ -218,8 +218,8 @@ static_assert(CTRE_CREATE("[(-)]").match(")"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("a"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("_"));
 static_assert(CTRE_CREATE("[A-Z_a-z]").match("Z"));
-static_assert(CTRE_CREATE("[-]").match("-"));
-static_assert(CTRE_CREATE("[-x]").match("x"));
+// static_assert(CTRE_CREATE("[-]").match("-"));
+// static_assert(CTRE_CREATE("[-x]").match("x"));
 // FIXME: due current limitation of LL1 grammar parser I can make this work "[x-]" without significant change in grammar
 static_assert(CTRE_CREATE("<").match("<"));
 static_assert(CTRE_CREATE("(<)").match("<"));
@@ -270,5 +270,5 @@ static_assert(CTRE_CREATE("(<[a-z]+>)\\g{1}").match("<aloha><aloha>"sv));
 static_assert(CTRE_CREATE("[^\\^]").match("a"sv));
 static_assert(CTRE_CREATE("[^^]").match("a"sv));
 static_assert(CTRE_CREATE("[\\-]").match("-"sv));
-static_assert(CTRE_CREATE("[-]").match("-"sv));
+//static_assert(CTRE_CREATE("[-]").match("-"sv));
 static_assert(CTRE_CREATE("[\\--\\-]").match("-"sv));