Merge pull request #47 from maciejhirsz/0.8.0

0.8.0 closes #34, fixes #36, fixes #40, fixes #41, fixes #42, fixes #44, fixes #45, fixes #46.

Author: maciejhirsz

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "json"
-version = "0.7.4"
+version = "0.8.0"
 authors = ["Maciej Hirsz <[email protected]>"]
 description = "JSON implementation in Rust"
 repository = "https://github.com/maciejhirsz/json-rust"

src/codegen.rs

@@ -1,15 +1,27 @@
+use std::io::Write;
+use std::num::FpCategory;
 use JsonValue;
 
 pub trait Generator {
-    fn current_index(&self) -> usize;
+    fn get_buffer(&mut self) -> &mut Vec<u8>;
 
-    fn new_line(&mut self) {}
+    fn current_index(&mut self) -> usize {
+        self.get_buffer().len()
+    }
+
+    #[inline(always)]
+    fn write(&mut self, slice: &[u8]) {
+        self.get_buffer().extend_from_slice(slice)
+    }
 
-    fn write(&mut self, slice: &[u8]);
+    #[inline(always)]
+    fn write_char(&mut self, ch: u8) {
+        self.get_buffer().push(ch)
+    }
 
     fn write_min(&mut self, slice: &[u8], minslice: &[u8]);
 
-    fn write_char(&mut self, ch: u8);
+    fn new_line(&mut self) {}
 
     fn indent(&mut self) {}
 
@@ -46,41 +58,41 @@ pub trait Generator {
     }
 
     fn write_number(&mut self, mut num: f64) {
-        if num < 0.0 {
-            num = -num;
-            self.write_char(b'-');
+        match num.classify() {
+            FpCategory::Nan      |
+            FpCategory::Infinite => {
+                self.write(b"null");
+                return;
+            },
+            FpCategory::Zero => {
+                self.write(if num.is_sign_negative() { b"-0" } else { b"0" });
+                return;
+            },
+            _ => {},
         }
 
-        if num > 1e19 || num < 1e-15 {
-            self.write(format!("{:e}", num).as_bytes());
-            return;
+        if num.is_sign_negative() {
+            num = num.abs();
+            self.write_char(b'-');
         }
 
-        let start = self.current_index();
-
-        self.write_digits_from_u64(num as u64);
-
-        let mut fract = num.fract();
+        let fract = num.fract();
 
-        if fract < 1e-16 {
+        if fract > 0.0 {
+            if num < 1e-15 {
+                write!(self.get_buffer(), "{:e}", num).unwrap();
+            } else {
+                write!(self.get_buffer(), "{}", num).unwrap();
+            }
             return;
         }
 
-        let mut length = self.current_index() - start;
-
-        fract *= 10.0;
-
-        self.write_char(b'.');
-        self.write_char((fract as u8) + b'0');
-        fract = fract.fract();
-        length += 2;
-
-        while length < 17 && fract > 1e-15 {
-            fract *= 10.0;
-            self.write_char((fract as u8) + b'0');
-            fract = fract.fract();
-            length += 1;
+        if num > 1e19 || num < 1e-15 {
+            write!(self.get_buffer(), "{:e}", num).unwrap();
+            return;
         }
+
+        self.write_digits_from_u64(num as u64);
     }
 
     fn write_json(&mut self, json: &JsonValue) {
@@ -147,22 +159,16 @@ impl DumpGenerator {
 }
 
 impl Generator for DumpGenerator {
-    fn current_index(&self) -> usize {
-        self.code.len()
-    }
-
-    fn write(&mut self, slice: &[u8]) {
-        self.code.extend_from_slice(slice);
+    #[inline(always)]
+    fn get_buffer(&mut self) -> &mut Vec<u8> {
+        &mut self.code
     }
 
+    #[inline(always)]
     fn write_min(&mut self, _: &[u8], minslice: &[u8]) {
         self.code.extend_from_slice(minslice);
     }
 
-    fn write_char(&mut self, ch: u8) {
-        self.code.push(ch);
-    }
-
     fn consume(self) -> String {
         String::from_utf8(self.code).unwrap()
     }
@@ -185,8 +191,14 @@ impl PrettyGenerator {
 }
 
 impl Generator for PrettyGenerator {
-    fn current_index(&self) -> usize {
-        self.code.len()
+    #[inline(always)]
+    fn get_buffer(&mut self) -> &mut Vec<u8> {
+        &mut self.code
+    }
+
+    #[inline(always)]
+    fn write_min(&mut self, slice: &[u8], _: &[u8]) {
+        self.code.extend_from_slice(slice);
     }
 
     fn new_line(&mut self) {
@@ -196,18 +208,6 @@ impl Generator for PrettyGenerator {
         }
     }
 
-    fn write(&mut self, slice: &[u8]) {
-        self.code.extend_from_slice(slice);
-    }
-
-    fn write_min(&mut self, slice: &[u8], _: &[u8]) {
-        self.code.extend_from_slice(slice);
-    }
-
-    fn write_char(&mut self, ch: u8) {
-        self.code.push(ch);
-    }
-
     fn indent(&mut self) {
         self.dent += 1;
     }

src/error.rs

@@ -1,15 +1,9 @@
-use parser::Token;
 use std::error::Error;
 use std::fmt;
 use std::char;
 
 #[derive(Debug, PartialEq)]
 pub enum JsonError {
-    UnexpectedToken {
-        token: String,
-        line: usize,
-        column: usize,
-    },
     UnexpectedCharacter {
         ch: char,
         line: usize,
@@ -23,14 +17,6 @@ pub enum JsonError {
 }
 
 impl JsonError {
-    pub fn unexpected_token(token: Token,) -> Self {
-        JsonError::UnexpectedToken {
-            token: token.to_string(),
-            line: 0,
-            column: 0,
-        }
-    }
-
     pub fn wrong_type(expected: &str) -> Self {
         JsonError::WrongType(expected.into())
     }
@@ -45,12 +31,6 @@ impl fmt::Display for JsonError {
         use JsonError::*;
 
         match *self {
-            UnexpectedToken {
-                ref token,
-                ref line,
-                ref column,
-            } => write!(f, "Unexpected token: {} at ({}:{})", token, line, column),
-
             UnexpectedCharacter {
                 ref ch,
                 ref line,
@@ -70,7 +50,6 @@ impl Error for JsonError {
     fn description(&self) -> &str {
         use JsonError::*;
         match *self {
-            UnexpectedToken { .. }     => "Unexpected token",
             UnexpectedCharacter { .. } => "Unexpected character",
             UnexpectedEndOfJson        => "Unexpected end of JSON",
             FailedUtf8Parsing          => "Failed to read bytes as UTF-8 from JSON",

src/lib.rs

@@ -264,11 +264,6 @@ pub fn from<T>(value: T) -> JsonValue where T: Into<JsonValue> {
     value.into()
 }
 
-#[deprecated(since="0.5.0", note="Use `value.dump(0)` instead")]
-pub fn stringify_ref(root: &JsonValue) -> String {
-    root.dump()
-}
-
 /// Pretty prints out the value as JSON string.
 pub fn stringify<T>(root: T) -> String where T: Into<JsonValue> {
     let root: JsonValue = root.into();