Make the dependency on unicode_names2 optional.

Author: progval

.travis.yml

@@ -9,5 +9,5 @@ script:
     - cargo test --no-default-features --features "$FEATURES"
 env:
     matrix:
-        - FEATURES="bigint wtf8"
+        - FEATURES="bigint wtf8 unicode-names"
         - FEATURES=""

Cargo.toml

@@ -8,19 +8,19 @@ documentation = "https://docs.rs/python-parser"
 repository = "https://github.com/ProgVal/rust-python-parser"
 
 [features]
-default = ["bigint", "wtf8"]
+default = ["bigint", "wtf8", "unicode-names"]
 bigint = ["num-traits", "num-bigint"]
+unicode-names = ["unicode_names2"]
 
 [[bin]]
 name = "prettyprint"
 path = "src/main.rs"
 
 [dependencies]
 nom = "^4.0"
-#nom_locate = { path = "../nom_locate/" }
 nom_locate = "^0.3.0"
 unicode-xid = "^0.1"
-unicode_names2 = "^0.2.1"
+unicode_names2 = { version="^0.2.1", optional=true }
 num-traits = { version="^0.2.4", optional=true }
 num-bigint = { version="^0.2.0", optional=true }
 wtf8 = { version="^0.0.3", optional=true }

src/errors.rs

@@ -3,6 +3,7 @@
 pub enum PyParseError {
     UnexpectedIndent,
     ExpectedIndent,
+    DisabledFeature,
 }
 impl From<PyParseError> for u32 {
     fn from(e: PyParseError) -> u32 {

src/expressions.rs

@@ -628,6 +628,12 @@ mod tests {
             Box::new(Expression::String(vec![new_pystring("", "\u{8a}")])))
         ));
 
+    }
+
+    #[test]
+    #[cfg_attr(not(feature="unicode-names"), ignore)]
+    fn test_unicode_name() {
+        let atom = ExpressionParser::<NewlinesAreNotSpaces>::atom;
         assert_parse_eq(atom(make_strspan(r#"'\N{snowman}'"#)), Ok((make_strspan(""),
             Box::new(Expression::String(vec![new_pystring("", "☃")])))
         ));

src/lib.rs

@@ -68,6 +68,8 @@ extern crate nom_locate;
 extern crate pretty_assertions;
 
 extern crate unicode_xid;
+
+#[cfg(feature="unicode-names")]
 extern crate unicode_names2;
 
 #[cfg(feature="bigint")]

src/strings.rs

@@ -1,11 +1,13 @@
 use nom::anychar;
 
+#[cfg(feature="unicode-names")]
 use unicode_names2;
 
 #[cfg(feature="wtf8")]
 use wtf8;
 
 use helpers::StrSpan;
+use errors::PyParseError;
 use ast::*;
 
 #[cfg(feature="wtf8")]
@@ -25,6 +27,19 @@ fn cp_from_u32(n: u32) -> Option<char> {
     ::std::char::from_u32(n)
 }
 
+#[cfg(feature="unicode-names")]
+named!(unicode_escaped_name<StrSpan, Option<PyStringCodePoint>>,
+  map!(
+    preceded!(char!('N'), delimited!(char!('{'), many1!(none_of!("}")), char!('}'))),
+    |name: Vec<char>| unicode_names2::character(&name.iter().collect::<String>()).map(cp_from_char)
+  )
+);
+
+#[cfg(not(feature="unicode-names"))]
+pub fn unicode_escaped_name(i: StrSpan) -> Result<(StrSpan, Option<PyStringCodePoint>), ::nom::Err<StrSpan>> {
+    Err(::nom::Err::Error(::nom::Context::Code(i, ::nom::ErrorKind::Custom(PyParseError::DisabledFeature.into()))))
+}
+
 named!(escapedchar<StrSpan, Option<PyStringCodePoint>>,
   preceded!(char!('\\'),
     alt!(
@@ -53,9 +68,7 @@ named!(escapedchar<StrSpan, Option<PyStringCodePoint>>,
             _ => unreachable!(),
         }
       }
-    | preceded!(char!('N'), delimited!(char!('{'), many1!(none_of!("}")), char!('}'))) => { |name: Vec<char>|
-        unicode_names2::character(&name.iter().collect::<String>()).map(cp_from_char)
-      }
+    | unicode_escaped_name
     | preceded!(char!('u'), count!(one_of!("0123456789abcdefABCDEF"), 4)) => { |v: Vec<char>| {
         let v: Vec<u32> = v.iter().map(|c| c.to_digit(16).unwrap()).collect();
         cp_from_u32((v[0] << 12) + (v[1] << 8) + (v[2] << 4) + v[3])