Add Unknown script

Manishearth · Manishearth · commit 2ac1251ae3db · 2020-01-01T14:28:23.000+05:30
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -194,6 +194,8 @@ def emit_enums(f, script_list, extension_list, longforms):
 #[allow(non_camel_case_types)]
 /// A value of the Script property
 pub enum Script {
+    /// Unknown script
+    Unknown,
 """)
     for script in script_list:
         f.write("    /// %s\n    %s,\n" % (script, longforms[script]))
@@ -233,6 +235,7 @@ def emit_enums(f, script_list, extension_list, longforms):
 impl Script {
     pub(crate) fn inner_full_name(self) -> &'static str {
         match self {
+            Script::Unknown => "Unknown",
 """)
     for script in script_list:
         f.write("            Script::%s => \"%s\",\n" % (longforms[script], longforms[script]))
@@ -241,6 +244,7 @@ def emit_enums(f, script_list, extension_list, longforms):
 
     pub(crate) fn inner_short_name(self) -> &'static str {
         match self {
+            Script::Unknown => "",
 """)
     for script in script_list:
         f.write("            Script::%s => \"%s\",\n" % (longforms[script], script))
@@ -276,6 +280,8 @@ def emit_enums(f, script_list, extension_list, longforms):
     #[inline]
     pub(crate) fn inner_intersects(self, other: Self) -> bool {
         match (self, other) {
+            (ScriptExtension::Single(Script::Unknown), _) |
+            (_, ScriptExtension::Single(Script::Unknown)) => false,
             (a, b) if a == b => true,
             (ScriptExtension::Single(Script::Common), _) |
             (ScriptExtension::Single(Script::Inherited), _) |
diff --git a/src/lib.rs b/src/lib.rs
@@ -37,8 +37,10 @@ impl ScriptExtension {
     /// Check if this ScriptExtension has any intersection with another
     /// ScriptExtension
     ///
-    /// "Common" (`Zyyy`) and "Inherited" (Zinh`) are considered as intersecting
+    /// "Common" (`Zyyy`) and "Inherited" (`Zinh`) are considered as intersecting
     /// everything.
+    ///
+    /// "Unknown" intersects nothing
     pub fn intersects(self, other: Self) -> bool {
         self.inner_intersects(other)
     }
@@ -47,17 +49,17 @@ impl ScriptExtension {
 /// Extension trait on `char` for calculating script properties
 pub trait UnicodeScript {
     /// Get the script for a given character
-    fn script(&self) -> Option<Script>;
+    fn script(&self) -> Script;
     /// Get the Script_Extension for a given character
-    fn script_extension(&self) -> Option<ScriptExtension>;
+    fn script_extension(&self) -> ScriptExtension;
 }
 
 impl UnicodeScript for char {
-    fn script(&self) -> Option<Script> {
-        get_script(*self)
+    fn script(&self) -> Script {
+        get_script(*self).unwrap_or(Script::Unknown)
     }
 
-    fn script_extension(&self) -> Option<ScriptExtension> {
-        get_script_extension(*self).or_else(|| self.script().map(ScriptExtension::Single))
+    fn script_extension(&self) -> ScriptExtension {
+        get_script_extension(*self).unwrap_or_else(|| ScriptExtension::Single(self.script()))
     }
 }
diff --git a/src/tables.rs b/src/tables.rs
@@ -22,6 +22,8 @@ use core::convert::TryFrom;
 #[allow(non_camel_case_types)]
 /// A value of the Script property
 pub enum Script {
+    /// Unknown script
+    Unknown,
     /// Tang
     Tangut,
     /// Thaa
@@ -454,6 +456,7 @@ impl TryFrom<ScriptExtension> for Script {
 impl Script {
     pub(crate) fn inner_full_name(self) -> &'static str {
         match self {
+            Script::Unknown => "Unknown",
             Script::Tangut => "Tangut",
             Script::Thaana => "Thaana",
             Script::Adlam => "Adlam",
@@ -611,6 +614,7 @@ impl Script {
 
     pub(crate) fn inner_short_name(self) -> &'static str {
         match self {
+            Script::Unknown => "",
             Script::Tangut => "Tang",
             Script::Thaana => "Thaa",
             Script::Adlam => "Adlm",
@@ -883,6 +887,8 @@ impl ScriptExtension {
     #[inline]
     pub(crate) fn inner_intersects(self, other: Self) -> bool {
         match (self, other) {
+            (ScriptExtension::Single(Script::Unknown), _) |
+            (_, ScriptExtension::Single(Script::Unknown)) => false,
             (a, b) if a == b => true,
             (ScriptExtension::Single(Script::Common), _) |
             (ScriptExtension::Single(Script::Inherited), _) |
