Merge pull request #195 from hamishknight/to-some-extent

Author: hamishknight

Sources/_MatchingEngine/Regex/Parse/CharacterPropertyClassification.swift

@@ -381,7 +381,7 @@ extension Source {
       return .generalCategory(cat)
     }
     if let script = classifyScriptProperty(value) {
-      return .script(script)
+      return .scriptExtension(script)
     }
     if let posix = classifyPOSIX(value) {
       return .posix(posix)

Tests/RegexTests/MatchTests.swift

@@ -695,6 +695,7 @@ extension RegexTests {
     firstMatchTest(#"\p{ISBAMUM}"#, input: "123ꚠꚡꚢxyz", match: "ꚠ")
     firstMatchTest(#"\p{Script=Unknown}"#, input: "\u{10FFFF}", match: "\u{10FFFF}")
     firstMatchTest(#"\p{scx=Gujr}"#, input: "\u{a839}", match: "\u{a839}")
+    firstMatchTest(#"\p{Gujr}"#, input: "\u{a839}", match: "\u{a839}")
 
     firstMatchTest(#"\p{alpha}"#, input: "123abcXYZ", match: "a")
     firstMatchTest(#"\P{alpha}"#, input: "123abcXYZ", match: "1")

Tests/RegexTests/ParseTests.swift

@@ -1053,13 +1053,13 @@ extension RegexTests {
 
     parseTest(#"\p{sc=grek}"#, prop(.script(.greek)))
     parseTest(#"\p{sc=isGreek}"#, prop(.script(.greek)))
-    parseTest(#"\p{Greek}"#, prop(.script(.greek)))
-    parseTest(#"\p{isGreek}"#, prop(.script(.greek)))
+    parseTest(#"\p{Greek}"#, prop(.scriptExtension(.greek)))
+    parseTest(#"\p{isGreek}"#, prop(.scriptExtension(.greek)))
     parseTest(#"\P{Script=Latn}"#, prop(.script(.latin), inverted: true))
     parseTest(#"\p{script=zzzz}"#, prop(.script(.unknown)))
     parseTest(#"\p{ISscript=iszzzz}"#, prop(.script(.unknown)))
     parseTest(#"\p{scx=bamum}"#, prop(.scriptExtension(.bamum)))
-    parseTest(#"\p{ISBAMUM}"#, prop(.script(.bamum)))
+    parseTest(#"\p{ISBAMUM}"#, prop(.scriptExtension(.bamum)))
 
     parseTest(#"\p{alpha}"#, prop(.binary(.alphabetic)))
     parseTest(#"\p{DEP}"#, prop(.binary(.deprecated)))