Handle escapes

examples/encode.rs

@@ -33,7 +33,7 @@ fn main() {
         float: 2.18,
         map: HashMap::from_iter(vec![(0, '1'), (1, '2'), (3, '5'), (8, '1')]),
         nested: Nested {
-            a: "Hello from RON".to_string(),
+            a: "Hello from \"RON\"".to_string(),
             b: 'b',
         },
     }).expect("Serialization failed");

src/de.rs

@@ -31,11 +31,13 @@ pub enum Error {
     ExpectedMapEnd,
     ExpectedStruct,
     ExpectedStructEnd,
-    ExpectetUnit,
+    ExpectedUnit,
     ExpectedStructName,
     ExpectedString,
     ExpectedIdentifier,
 
+    InvalidEscape,
+
     /// A custom error emitted by the deserializer.
     Message(String),
     TrailingCharacters,
@@ -228,9 +230,24 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
     fn deserialize_char<V>(self, visitor: V) -> Result<V::Value>
         where V: Visitor<'de>
     {
-        let parser = sym(b'\'') * take(1) - sym(b'\'');
+        let parser = sym(b'\'') * take(1);
         match parser.parse(&mut self.input) {
-            Ok(c) => visitor.visit_char(c[0] as char),
+            Ok(c) => {
+                let rv = if c[0] == b'\\' {
+                    match take(1).parse(&mut self.input) {
+                        Ok(ref c) if c[0] == b'\'' => visitor.visit_char('\''),
+                        Ok(ref c) if c[0] == b'\\' => visitor.visit_char('\\'),
+                        Ok(_) => Err(Error::InvalidEscape),
+                        Err(_) => Err(Error::InvalidEscape),
+                    }
+                } else {
+                    visitor.visit_char(c[0] as char)
+                };
+
+                sym(b'\'').parse(&mut self.input).map_err(|_| Error::ExpectedChar)?;
+
+                rv
+            },
             Err(_) => Err(Error::ExpectedChar)
         }
     }
@@ -296,7 +313,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
     {
         match self.consume("()") {
             Ok(_) => visitor.visit_unit(),
-            Err(_) => Err(Error::ExpectetUnit),
+            Err(_) => Err(Error::ExpectedUnit),
         }
     }
 
@@ -692,4 +709,14 @@ mod tests {
     fn test_char() {
         assert_eq!(Ok('c'), from_str("'c'"));
     }
+
+    #[test]
+    fn test_escape_char() {
+        assert_eq!('\'', from_str::<char>("'\\''").unwrap());
+    }
+
+    #[test]
+    fn test_escape() {
+        assert_eq!("\"Quoted\"", from_str::<String>(r#""\"Quoted\"""#).unwrap());
+    }
 }

src/ser.rs

@@ -114,14 +114,22 @@ impl<'a> ser::Serializer for &'a mut Serializer {
 
     fn serialize_char(self, v: char) -> Result<()> {
         self.output += "'";
+        if v == '\\' || v == '\'' {
+            self.output.push('\\');
+        }
         self.output.push(v);
         self.output += "'";
         Ok(())
     }
 
     fn serialize_str(self, v: &str) -> Result<()> {
         self.output += "\"";
-        self.output += v;
+        for char in v.chars() {
+            if char == '\\' || char == '"' {
+                self.output.push('\\');
+            }
+            self.output.push(char);
+        }
         self.output += "\"";
         Ok(())
     }
@@ -512,4 +520,9 @@ mod tests {
     fn test_char() {
         assert_eq!(to_string(&'c').unwrap(), "'c'");
     }
+
+    #[test]
+    fn test_escape() {
+        assert_eq!(to_string(&r#""Quoted""#).unwrap(), r#""\"Quoted\"""#);
+    }
 }