Merge pull request #81 from maciejhirsz/0.10.0

0.10.0 - closes #80, closes #79, closes #77, closes #76, closes #69.

Author: maciejhirsz

Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "json"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Maciej Hirsz <[email protected]>"]
 description = "JSON implementation in Rust"
 repository = "https://github.com/maciejhirsz/json-rust"
 documentation = "http://terhix.com/doc/json/"
 license = "MIT/Apache-2.0"
-
-[dependencies]
-itoa = "0.1"
-ftoa = "0.1"

README.md

@@ -125,9 +125,8 @@ can even outperform parsing to structs.
 This crate implements the standard according to the [
 RFC 7159](https://tools.ietf.org/html/rfc7159) and
 [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf)
-documents. It makes some compromises when it comes to number precision, but they are
-both within the specification and advised practices for best interoperability,
-specifically those discussed in the RFC.
+documents. For the best interoperability numbers are treated stored as 64bit precision
+mantissa with 16 bit decimal exponent for floating point representation.
 
 ## License
 

src/codegen.rs

@@ -1,10 +1,9 @@
 use std::ptr;
 use std::io::Write;
-use std::num::FpCategory;
 use JsonValue;
+use number::Number;
 
-extern crate itoa;
-extern crate ftoa;
+use util::print_dec;
 
 const QU: u8 = b'"';
 const BS: u8 = b'\\';
@@ -54,10 +53,13 @@ pub trait Generator {
 
     fn write_min(&mut self, slice: &[u8], min: u8);
 
+    #[inline(always)]
     fn new_line(&mut self) {}
 
+    #[inline(always)]
     fn indent(&mut self) {}
 
+    #[inline(always)]
     fn dedent(&mut self) {}
 
     #[inline(never)]
@@ -95,27 +97,19 @@ pub trait Generator {
     }
 
     #[inline(always)]
-    fn write_number(&mut self, num: f64) {
-        match num.classify() {
-            FpCategory::Normal    |
-            FpCategory::Subnormal => {
-                if num.fract() == 0.0 && num.abs() < 1e19 {
-                    itoa::write(self.get_writer(), num as i64).unwrap();
-                } else {
-                    ftoa::write(self.get_writer(), num).unwrap();
-                }
-            },
-            FpCategory::Zero => {
-                if num.is_sign_negative() {
-                    self.write(b"-0");
-                } else {
-                    self.write_char(b'0');
-                }
-            },
-            FpCategory::Nan      |
-            FpCategory::Infinite => {
-                self.write(b"null");
-            }
+    fn write_number(&mut self, num: &Number) {
+        if num.is_nan() {
+            self.write(b"null");
+            return;
+        }
+        let (positive, mantissa, exponent) = num.as_parts();
+        unsafe {
+            print_dec::write(
+                self.get_writer(),
+                positive,
+                mantissa,
+                exponent
+            ).unwrap();
         }
     }
 
@@ -124,7 +118,7 @@ pub trait Generator {
             JsonValue::Null               => self.write(b"null"),
             JsonValue::Short(ref short)   => self.write_string(short.as_str()),
             JsonValue::String(ref string) => self.write_string(string),
-            JsonValue::Number(ref number) => self.write_number(*number),
+            JsonValue::Number(ref number) => self.write_number(number),
             JsonValue::Boolean(true)      => self.write(b"true"),
             JsonValue::Boolean(false)     => self.write(b"false"),
             JsonValue::Array(ref array)   => {

src/error.rs

@@ -15,7 +15,6 @@ pub enum Error {
     UnexpectedEndOfJson,
     FailedUtf8Parsing,
     WrongType(String),
-    UndefinedField(String),
 }
 
 impl Error {
@@ -38,7 +37,6 @@ impl fmt::Display for Error {
             UnexpectedEndOfJson   => write!(f, "Unexpected end of JSON"),
             FailedUtf8Parsing     => write!(f, "Failed to parse UTF-8 bytes"),
             WrongType(ref s)      => write!(f, "Wrong type, expected: {}", s),
-            UndefinedField(ref s) => write!(f, "Undefined field: {}", s)
         }
     }
 }
@@ -51,7 +49,6 @@ impl error::Error for Error {
             UnexpectedEndOfJson        => "Unexpected end of JSON",
             FailedUtf8Parsing          => "Failed to read bytes as UTF-8 from JSON",
             WrongType(_)               => "Wrong type",
-            UndefinedField(_)          => "Undefined field",
         }
     }
 }