Merge pull request #95 from maciejhirsz/state_machine

0.11.0 closes #93 #96

Author: maciejhirsz

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "json"
-version = "0.10.3"
+version = "0.11.0"
 authors = ["Maciej Hirsz <maciej.hirsz@gmail.com>"]
 description = "JSON implementation in Rust"
 repository = "https://github.com/maciejhirsz/json-rust"

src/error.rs

@@ -13,6 +13,7 @@ pub enum Error {
         column: usize,
     },
     UnexpectedEndOfJson,
+    ExceededDepthLimit,
     FailedUtf8Parsing,
     WrongType(String),
 }
@@ -35,6 +36,7 @@ impl fmt::Display for Error {
             } => write!(f, "Unexpected character: {} at ({}:{})", ch, line, column),
 
             UnexpectedEndOfJson   => write!(f, "Unexpected end of JSON"),
+            ExceededDepthLimit    => write!(f, "Exceeded depth limit"),
             FailedUtf8Parsing     => write!(f, "Failed to parse UTF-8 bytes"),
             WrongType(ref s)      => write!(f, "Wrong type, expected: {}", s),
         }
@@ -44,9 +46,11 @@ impl fmt::Display for Error {
 impl error::Error for Error {
     fn description(&self) -> &str {
         use Error::*;
+
         match *self {
             UnexpectedCharacter { .. } => "Unexpected character",
             UnexpectedEndOfJson        => "Unexpected end of JSON",
+            ExceededDepthLimit         => "Exceeded depth limit",
             FailedUtf8Parsing          => "Failed to read bytes as UTF-8 from JSON",
             WrongType(_)               => "Wrong type",
         }

src/object.rs

@@ -339,6 +339,13 @@ impl Object {
         }
     }
 
+    #[inline]
+    pub fn override_last(&mut self, value: JsonValue) {
+        if let Some(node) = self.store.last_mut() {
+            node.value = value;
+        }
+    }
+
     pub fn get(&self, key: &str) -> Option<&JsonValue> {
         if self.store.len() == 0 {
             return None;