Add support for \N.

progval · progval · commit 51d26e72d434 · 2018-06-17T02:34:32.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ nom = "^4.0"
 #nom_locate = { path = "../nom_locate/" }
 nom_locate = { git = "https://github.com/fflorent/nom_locate" }
 unicode-xid = "^0.1"
-#unicode_names = "^0.1.7"
+unicode_names2 = "^0.2.1"
 num-traits = { version="^0.2.4", optional=true }
 num-bigint = { version="^0.2.0", optional=true }
 wtf8 = { version="^0.0.3", optional=true }
diff --git a/src/expressions.rs b/src/expressions.rs
@@ -631,6 +631,10 @@ mod tests {
         assert_parse_eq(atom(make_strspan(r#"'\x8a'"#)), Ok((make_strspan(""),
             Box::new(Expression::String(vec![new_pystring("", "\u{8a}")])))
         ));
+
+        assert_parse_eq(atom(make_strspan(r#"'\N{snowman}'"#)), Ok((make_strspan(""),
+            Box::new(Expression::String(vec![new_pystring("", "☃")])))
+        ));
     }
 
     #[test]
diff --git a/src/lib.rs b/src/lib.rs
@@ -9,7 +9,7 @@ extern crate nom_locate;
 extern crate pretty_assertions;
 
 extern crate unicode_xid;
-//extern crate unicode_names;
+extern crate unicode_names2;
 
 #[cfg(feature="bigint")]
 extern crate num_traits;
diff --git a/src/strings.rs b/src/strings.rs
@@ -1,5 +1,7 @@
 use nom::anychar;
 
+use unicode_names2;
+
 #[cfg(feature="wtf8")]
 use wtf8;
 
@@ -51,10 +53,9 @@ named!(escapedchar<StrSpan, Option<PyStringCodePoint>>,
             _ => unreachable!(),
         }
       }
-    //| preceded!(char!('N'), delimited!(char!('{'), none_of!("}"), char!('}'))) => { |name|
-    //    unicode_names::character(name)
-    //  }
-    | char!('N') => { |_| unimplemented!() }
+    | preceded!(char!('N'), delimited!(char!('{'), many1!(none_of!("}")), char!('}'))) => { |name: Vec<char>|
+        unicode_names2::character(&name.iter().collect::<String>()).map(cp_from_char)
+      }
     | preceded!(char!('u'), count!(one_of!("0123456789abcdefABCDEF"), 4)) => { |v: Vec<char>| {
         let it: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
         if let [d1, d2, d3, d4] = &it[..] {
