east asian width test success

Author: takev

build/ucd_generator/column.rs

@@ -27,7 +27,7 @@ fn test_chunk(column: &Vec<usize>, a: usize, b: usize, chunk_size: usize) -> boo
     let b_offset = b * chunk_size;
 
     for i in 0..chunk_size {
-        if column[a_offset + i] != column[b_offset + 1] {
+        if column[a_offset + i] != column[b_offset + i] {
             return false;
         }
     }

build/ucd_generator/generators.rs

@@ -28,9 +28,11 @@ pub fn generate_enum_table(code_dir : &std::path::Path, name : &str, enum_values
     let code_path = code_dir.join(format!("{}.rs", &name));
     let mut fd = std::fs::File::create(&code_path)?;
 
+    write!(fd, "// This file was generated by the cargo-build script.\n\n")?;
+
     write!(fd, "const {}_CHUNK_SIZE : usize = {};\n", upper_name, chunk_size)?;
     write!(fd, "const {}_COLUMN_BITS : usize = {};\n", upper_name, column_bits)?;
-    write!(fd, "const {}_INDEX_LEN : usize = {};\n\n", upper_name, index.len())?;
+    write!(fd, "const {}_INDEX_LEN : usize = {};\n", upper_name, index.len())?;
     write!(fd, "const {}_INDEX_BITS : usize = {};\n\n", upper_name, index_bits)?;
 
     write!(fd, "const {}_COLUMN: [u8; {}] = [", upper_name, column_bytes.len())?;
@@ -51,21 +53,28 @@ pub fn generate_enum_table(code_dir : &std::path::Path, name : &str, enum_values
     }
     write!(fd, "\n];\n\n")?;
 
+    write!(fd, "/// The {} attribute for Unicode code-points.\n", camel_name)?;
     write!(fd, "#[derive(Debug,Clone,Copy,PartialEq)]\n")?;
-
     write!(fd, "pub enum {} {{\n", camel_name)?;
     for (i, v) in enum_values.iter().enumerate() {
         write!(fd, "    {} = {},\n", v, i)?;
     }
     write!(fd, "}}\n\n")?;
 
+    write!(fd, "/// Get the {} attribute for a Unicode code-point.\n", camel_name)?;
+    write!(fd, "///\n")?;
+    write!(fd, "/// # Arguments\n")?;
+    write!(fd, "///  - `code_point` A code-point in the form of a rust `char`.\n")?;
+    write!(fd, "///\n")?;
+    write!(fd, "/// # Returns\n")?;
+    write!(fd, "/// A {} attribute of the Unicode code-point.\n", camel_name)?;
     write!(fd, "pub const fn get_{}(code_point: char) -> {}\n", name, camel_name)?;
     write!(fd, "{{\n")?;
     write!(fd, "    const INDEX_MASK : usize = (1 << {}_INDEX_BITS) - 1;\n", upper_name)?;
-    write!(fd, "    const COLUMN_MASK : usize = (1 << {}_COLUMN_BITS) - 1;\n", upper_name)?;
+    write!(fd, "    const COLUMN_MASK : usize = (1 << {}_COLUMN_BITS) - 1;\n\n", upper_name)?;
 
     write!(fd, "    let code_point_value = code_point as usize;\n")?;
-    write!(fd, "    let code_point_lo = code_point_value & {}_CHUNK_SIZE;\n", upper_name)?;
+    write!(fd, "    let code_point_lo = code_point_value % {}_CHUNK_SIZE;\n", upper_name)?;
     write!(fd, "    let mut code_point_hi = code_point_value / {}_CHUNK_SIZE;\n", upper_name)?;
     write!(fd, "    if code_point_hi > {}_INDEX_LEN - 1 {{\n", upper_name)?;
     write!(fd, "        code_point_hi = {}_INDEX_LEN - 1;\n", upper_name)?;

src/lib.rs

@@ -1,14 +1,16 @@
 
 pub mod east_asian_width;
 
+pub use east_asian_width::EastAsianWidth;
+pub use east_asian_width::get_east_asian_width;
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[test]
     fn east_asian_width() {
-        assert_eq!(east_asian_width::get_east_asian_width('a'), east_asian_width::EastAsianWidth::Na);
-        assert_eq!(east_asian_width::get_east_asian_width('あ'), east_asian_width::EastAsianWidth::W);
+        assert_eq!(get_east_asian_width('a'), EastAsianWidth::Na);
+        assert_eq!(get_east_asian_width('あ'), EastAsianWidth::W);
     }
 }