Merge pull request #4 from crlf0710/various_changes

Manishearth · web-flow · commit 5b65d2fe2d78 · 2020-06-10T08:02:08.000-07:00
Various changes
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -11,11 +11,9 @@
 # except according to those terms.
 
 # This script uses the following Unicode tables:
-# - DerivedCoreProperties.txt
-# - auxiliary/GraphemeBreakProperty.txt
-# - auxiliary/WordBreakProperty.txt
-# - ReadMe.txt
-# - UnicodeData.txt
+# - PropertyValueAliases.txt
+# - ScriptExtensions.txt
+# - Scripts.txt
 #
 # Since this should not require frequent updates, we just store this
 # out-of-line and check the unicode.rs file into git.
@@ -39,7 +37,7 @@
 use super::ScriptExtension;
 '''
 
-UNICODE_VERSION = (12, 0, 0)
+UNICODE_VERSION = (13, 0, 0)
 
 UNICODE_VERSION_NUMBER = "%s.%s.%s" %UNICODE_VERSION
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -193,6 +193,15 @@ impl ScriptExtension {
         (self.first == 0) & (self.second == 0) & (self.third == 0)
     }
 
+    /// Returns the number of scripts in the script extension
+    pub fn len(self) -> usize {
+        if self.is_common_or_inherited() {
+            1
+        } else {
+            (self.first.count_ones() + self.second.count_ones() + self.third.count_ones()) as usize
+        }
+    }
+
     /// Intersect this `ScriptExtension` with another `ScriptExtension`. Produces `Unknown` if things
     /// do not intersect. This is equivalent to [`ScriptExtension::intersection`] but it stores the result
     /// in `self`
@@ -257,9 +266,9 @@ impl ScriptExtension {
         ext
     }
 
-    /// Iterate over the scripts in this string
+    /// Iterate over the scripts in this script extension
     ///
-    /// Will never yeild Script::Unknown
+    /// Will never yield Script::Unknown
     pub fn iter(self) -> ScriptIterator {
         ScriptIterator { ext: self }
     }
diff --git a/src/tables.rs b/src/tables.rs
