mirror of
https://github.com/perstarkse/minne.git
synced 2026-03-23 18:01:26 +01:00
fix: working stream parser
This commit is contained in:
Per Stark
695
common/src/utils/stream_parser.rs
Normal file
695
common/src/utils/stream_parser.rs
Normal file
@@ -0,0 +1,695 @@
|
||||
use serde_json::{json, Value};
|
||||
|
||||
// Modified ObjectStatus enum to track escape character state
|
||||
#[derive(Clone, Debug)]
|
||||
enum ObjectStatus {
|
||||
// We are ready to start a new object.
|
||||
Ready,
|
||||
// We are in the beginning of a string, likely because we just received an opening quote.
|
||||
StringQuoteOpen {
|
||||
is_escaped: bool, // New field to track if the next character is escaped
|
||||
},
|
||||
// We just finished a string, likely because we just received a closing quote.
|
||||
StringQuoteClose,
|
||||
// We are in the middle of a scalar value, likely because we just received a digit.
|
||||
Scalar {
|
||||
value_so_far: Vec<char>,
|
||||
},
|
||||
ScalarNumber {
|
||||
value_so_far: Vec<char>,
|
||||
},
|
||||
// We just started a property, likely because we just received an opening brace or a comma in case of an existing object.
|
||||
StartProperty,
|
||||
// We are in the beginning of a key, likely because we just received a quote. We need to store the key_so_far because
|
||||
// unlike the value, we cannot add the key to the object until it is complete.
|
||||
KeyQuoteOpen {
|
||||
key_so_far: Vec<char>,
|
||||
is_escaped: bool, // New field to track if the next character is escaped
|
||||
},
|
||||
// We just finished a key, likely because we just received a closing quote.
|
||||
KeyQuoteClose {
|
||||
key: Vec<char>,
|
||||
},
|
||||
// We just finished a key, likely because we just received a colon.
|
||||
Colon {
|
||||
key: Vec<char>,
|
||||
},
|
||||
// We are in the beginning of a value, likely because we just received a quote.
|
||||
ValueQuoteOpen {
|
||||
key: Vec<char>,
|
||||
is_escaped: bool, // New field to track if the next character is escaped
|
||||
// We don't need to store the valueSoFar because we can add the value to the object immediately.
|
||||
},
|
||||
ValueQuoteClose,
|
||||
// We are taking any value that is not a string. For these case we just store
|
||||
// each character until we reach a comma or a closing brace and then we pare
|
||||
// and add the value to the object.
|
||||
ValueScalar {
|
||||
key: Vec<char>,
|
||||
value_so_far: Vec<char>,
|
||||
},
|
||||
// We just finished the object, likely because we just received a closing brace.
|
||||
Closed,
|
||||
}
|
||||
|
||||
// Modified add_char_into_object function to handle escaped quotes
|
||||
fn add_char_into_object(
|
||||
object: &mut Value,
|
||||
current_status: &mut ObjectStatus,
|
||||
current_char: char,
|
||||
) -> Result<(), String> {
|
||||
// First, match on the current status and character to determine what to do
|
||||
match (current_status.clone(), current_char) {
|
||||
// ------ String handling with escaping ------
|
||||
(ObjectStatus::StringQuoteOpen { is_escaped: true }, '"') => {
|
||||
// Handle escaped quote in string
|
||||
if let Value::String(str) = object {
|
||||
str.push('"');
|
||||
}
|
||||
*current_status = ObjectStatus::StringQuoteOpen { is_escaped: false };
|
||||
return Ok(());
|
||||
}
|
||||
(ObjectStatus::StringQuoteOpen { is_escaped: false }, '"') => {
|
||||
// End of string
|
||||
*current_status = ObjectStatus::StringQuoteClose;
|
||||
return Ok(());
|
||||
}
|
||||
(ObjectStatus::StringQuoteOpen { is_escaped: true }, char) => {
|
||||
// Handle other escaped characters
|
||||
if let Value::String(str) = object {
|
||||
str.push('\\');
|
||||
str.push(char);
|
||||
}
|
||||
*current_status = ObjectStatus::StringQuoteOpen { is_escaped: false };
|
||||
return Ok(());
|
||||
}
|
||||
(ObjectStatus::StringQuoteOpen { is_escaped: false }, '\\') => {
|
||||
// Set escape flag for next character
|
||||
*current_status = ObjectStatus::StringQuoteOpen { is_escaped: true };
|
||||
return Ok(());
|
||||
}
|
||||
(ObjectStatus::StringQuoteOpen { is_escaped: false }, char) => {
|
||||
// Regular character in string
|
||||
if let Value::String(str) = object {
|
||||
str.push(char);
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// ------ Key handling with escaping ------
|
||||
(
|
||||
ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: true,
|
||||
},
|
||||
'"',
|
||||
) => {
|
||||
// Handle escaped quote in key
|
||||
let mut new_key = key_so_far;
|
||||
new_key.push('"');
|
||||
*current_status = ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far: new_key,
|
||||
is_escaped: false,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: false,
|
||||
},
|
||||
'"',
|
||||
) => {
|
||||
// End of key
|
||||
if let Value::Object(obj) = object {
|
||||
obj.insert(key_so_far.iter().collect::<String>(), Value::Null);
|
||||
}
|
||||
*current_status = ObjectStatus::KeyQuoteClose { key: key_so_far };
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: true,
|
||||
},
|
||||
char,
|
||||
) => {
|
||||
// Handle other escaped characters in key
|
||||
let mut new_key = key_so_far;
|
||||
new_key.push('\\');
|
||||
new_key.push(char);
|
||||
*current_status = ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far: new_key,
|
||||
is_escaped: false,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: false,
|
||||
},
|
||||
'\\',
|
||||
) => {
|
||||
// Set escape flag for next character in key
|
||||
*current_status = ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: true,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::KeyQuoteOpen {
|
||||
mut key_so_far,
|
||||
is_escaped: false,
|
||||
},
|
||||
char,
|
||||
) => {
|
||||
// Regular character in key
|
||||
key_so_far.push(char);
|
||||
*current_status = ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far,
|
||||
is_escaped: false,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// ------ Value quote handling with escaping ------
|
||||
(
|
||||
ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: true,
|
||||
},
|
||||
'"',
|
||||
) => {
|
||||
// Handle escaped quote in value
|
||||
if let Value::Object(obj) = object {
|
||||
let key_string = key.iter().collect::<String>();
|
||||
if let Some(Value::String(value)) = obj.get_mut(&key_string) {
|
||||
value.push('"');
|
||||
}
|
||||
}
|
||||
*current_status = ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: false,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::ValueQuoteOpen {
|
||||
is_escaped: false, ..
|
||||
},
|
||||
'"',
|
||||
) => {
|
||||
// End of value
|
||||
*current_status = ObjectStatus::ValueQuoteClose;
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: true,
|
||||
},
|
||||
char,
|
||||
) => {
|
||||
// Handle other escaped characters in value
|
||||
if let Value::Object(obj) = object {
|
||||
let key_string = key.iter().collect::<String>();
|
||||
if let Some(Value::String(value)) = obj.get_mut(&key_string) {
|
||||
value.push('\\');
|
||||
value.push(char);
|
||||
}
|
||||
}
|
||||
*current_status = ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: false,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: false,
|
||||
},
|
||||
'\\',
|
||||
) => {
|
||||
// Set escape flag for next character in value
|
||||
*current_status = ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: true,
|
||||
};
|
||||
return Ok(());
|
||||
}
|
||||
(
|
||||
ObjectStatus::ValueQuoteOpen {
|
||||
key,
|
||||
is_escaped: false,
|
||||
},
|
||||
char,
|
||||
) => {
|
||||
// Regular character in value
|
||||
if let Value::Object(obj) = object {
|
||||
let key_string = key.iter().collect::<String>();
|
||||
if let Some(Value::String(value)) = obj.get_mut(&key_string) {
|
||||
value.push(char);
|
||||
} else {
|
||||
return Err(format!("Invalid value type for key {}", key_string));
|
||||
}
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Now let's handle the rest of the cases using the original pattern
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// If we reach here, it means we didn't handle the character in the specific escape handling above,
|
||||
// so we fall back to the original logic
|
||||
match (object, current_status, current_char) {
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, '"') => {
|
||||
*val = json!("");
|
||||
*sts = ObjectStatus::StringQuoteOpen { is_escaped: false };
|
||||
}
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, '{') => {
|
||||
*val = json!({});
|
||||
*sts = ObjectStatus::StartProperty;
|
||||
}
|
||||
// ------ true ------
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, 't') => {
|
||||
*val = json!(true);
|
||||
*sts = ObjectStatus::Scalar {
|
||||
value_so_far: vec!['t'],
|
||||
};
|
||||
}
|
||||
(
|
||||
Value::Bool(true),
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'r',
|
||||
) if *value_so_far == vec!['t'] => {
|
||||
value_so_far.push('r');
|
||||
}
|
||||
(
|
||||
Value::Bool(true),
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'u',
|
||||
) if *value_so_far == vec!['t', 'r'] => {
|
||||
value_so_far.push('u');
|
||||
}
|
||||
(Value::Bool(true), sts @ ObjectStatus::Scalar { .. }, 'e') => {
|
||||
*sts = ObjectStatus::Closed;
|
||||
}
|
||||
// ------ false ------
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, 'f') => {
|
||||
*val = json!(false);
|
||||
*sts = ObjectStatus::Scalar {
|
||||
value_so_far: vec!['f'],
|
||||
};
|
||||
}
|
||||
(
|
||||
Value::Bool(false),
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'a',
|
||||
) if *value_so_far == vec!['f'] => {
|
||||
value_so_far.push('a');
|
||||
}
|
||||
(
|
||||
Value::Bool(false),
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'l',
|
||||
) if *value_so_far == vec!['f', 'a'] => {
|
||||
value_so_far.push('l');
|
||||
}
|
||||
(
|
||||
Value::Bool(false),
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
's',
|
||||
) if *value_so_far == vec!['f', 'a', 'l'] => {
|
||||
value_so_far.push('s');
|
||||
}
|
||||
(Value::Bool(false), sts @ ObjectStatus::Scalar { .. }, 'e') => {
|
||||
*sts = ObjectStatus::Closed;
|
||||
}
|
||||
// ------ null ------
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, 'n') => {
|
||||
*val = json!(null);
|
||||
*sts = ObjectStatus::Scalar {
|
||||
value_so_far: vec!['n'],
|
||||
};
|
||||
}
|
||||
(
|
||||
Value::Null,
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'u',
|
||||
) if *value_so_far == vec!['n'] => {
|
||||
value_so_far.push('u');
|
||||
}
|
||||
(
|
||||
Value::Null,
|
||||
ObjectStatus::Scalar {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'l',
|
||||
) if *value_so_far == vec!['n', 'u'] => {
|
||||
value_so_far.push('l');
|
||||
}
|
||||
(Value::Null, sts @ ObjectStatus::Scalar { .. }, 'l') => {
|
||||
*sts = ObjectStatus::Closed;
|
||||
}
|
||||
// ------ number ------
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, c @ '0'..='9') => {
|
||||
*val = Value::Number(c.to_digit(10).unwrap().into());
|
||||
*sts = ObjectStatus::ScalarNumber {
|
||||
value_so_far: vec![c],
|
||||
};
|
||||
}
|
||||
(val @ Value::Null, sts @ ObjectStatus::Ready, '-') => {
|
||||
*val = Value::Number(0.into());
|
||||
*sts = ObjectStatus::ScalarNumber {
|
||||
value_so_far: vec!['-'],
|
||||
};
|
||||
}
|
||||
(
|
||||
Value::Number(ref mut num),
|
||||
ObjectStatus::ScalarNumber {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
c @ '0'..='9',
|
||||
) => {
|
||||
value_so_far.push(c);
|
||||
// if there are any . in the value so far, then we need to parse the number as a float
|
||||
if value_so_far.contains(&'.') {
|
||||
let parsed_number = value_so_far
|
||||
.iter()
|
||||
.collect::<String>()
|
||||
.parse::<f64>()
|
||||
.unwrap();
|
||||
if let Some(json_number) = serde_json::Number::from_f64(parsed_number) {
|
||||
*num = json_number;
|
||||
}
|
||||
} else {
|
||||
let parsed_number = value_so_far
|
||||
.iter()
|
||||
.collect::<String>()
|
||||
.parse::<i64>()
|
||||
.unwrap();
|
||||
*num = parsed_number.into();
|
||||
}
|
||||
}
|
||||
(
|
||||
Value::Number(_),
|
||||
ObjectStatus::ScalarNumber {
|
||||
ref mut value_so_far,
|
||||
},
|
||||
'.',
|
||||
) => {
|
||||
value_so_far.push('.');
|
||||
}
|
||||
(Value::Object(_obj), sts @ ObjectStatus::StartProperty, '"') => {
|
||||
*sts = ObjectStatus::KeyQuoteOpen {
|
||||
key_so_far: vec![],
|
||||
is_escaped: false,
|
||||
};
|
||||
}
|
||||
(Value::Object(_obj), sts @ ObjectStatus::KeyQuoteClose { .. }, ':') => {
|
||||
if let ObjectStatus::KeyQuoteClose { key } = sts.clone() {
|
||||
*sts = ObjectStatus::Colon { key: key.clone() };
|
||||
}
|
||||
}
|
||||
(Value::Object(_obj), ObjectStatus::Colon { .. }, ' ' | '\n') => {}
|
||||
(Value::Object(ref mut obj), sts @ ObjectStatus::Colon { .. }, '"') => {
|
||||
if let ObjectStatus::Colon { key } = sts.clone() {
|
||||
*sts = ObjectStatus::ValueQuoteOpen {
|
||||
key: key.clone(),
|
||||
is_escaped: false,
|
||||
};
|
||||
// create an empty string for the value
|
||||
obj.insert(key.iter().collect::<String>().clone(), json!(""));
|
||||
}
|
||||
}
|
||||
// ------ Add Scalar Value ------
|
||||
(Value::Object(_obj), sts @ ObjectStatus::Colon { .. }, char) => {
|
||||
if let ObjectStatus::Colon { key } = sts.clone() {
|
||||
*sts = ObjectStatus::ValueScalar {
|
||||
key: key.clone(),
|
||||
value_so_far: vec![char],
|
||||
};
|
||||
}
|
||||
}
|
||||
(Value::Object(ref mut obj), sts @ ObjectStatus::ValueScalar { .. }, ',') => {
|
||||
if let ObjectStatus::ValueScalar { key, value_so_far } = sts.clone() {
|
||||
let key_string = key.iter().collect::<String>();
|
||||
let value_string = value_so_far.iter().collect::<String>();
|
||||
let value = match value_string.parse::<Value>() {
|
||||
Ok(value) => value,
|
||||
Err(e) => {
|
||||
return Err(format!("Invalid value for key {}: {}", key_string, e));
|
||||
}
|
||||
};
|
||||
obj.insert(key_string, value);
|
||||
*sts = ObjectStatus::StartProperty;
|
||||
}
|
||||
}
|
||||
(Value::Object(ref mut obj), sts @ ObjectStatus::ValueScalar { .. }, '}') => {
|
||||
if let ObjectStatus::ValueScalar { key, value_so_far } = sts.clone() {
|
||||
let key_string = key.iter().collect::<String>();
|
||||
let value_string = value_so_far.iter().collect::<String>();
|
||||
let value = match value_string.parse::<Value>() {
|
||||
Ok(value) => value,
|
||||
Err(e) => {
|
||||
return Err(format!("Invalid value for key {}: {}", key_string, e));
|
||||
}
|
||||
};
|
||||
obj.insert(key_string, value);
|
||||
*sts = ObjectStatus::Closed;
|
||||
}
|
||||
}
|
||||
(
|
||||
Value::Object(_obj),
|
||||
ObjectStatus::ValueScalar {
|
||||
key: _key,
|
||||
ref mut value_so_far,
|
||||
},
|
||||
char,
|
||||
) => {
|
||||
// push the character into the value so far
|
||||
value_so_far.push(char);
|
||||
}
|
||||
// ------ Finished taking value ------
|
||||
(Value::Object(_obj), sts @ ObjectStatus::ValueQuoteClose, ',') => {
|
||||
*sts = ObjectStatus::StartProperty;
|
||||
}
|
||||
(Value::Object(_obj), sts @ ObjectStatus::ValueQuoteClose, '}') => {
|
||||
*sts = ObjectStatus::Closed;
|
||||
}
|
||||
// ------ white spaces ------
|
||||
(_, _, ' ' | '\n') => {}
|
||||
(_val, st, c) => {
|
||||
return Err(format!("Invalid character {} status: {:?}", c, st));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
#[cfg(debug_assertions)]
|
||||
pub fn parse_stream(json_string: &str) -> Result<Value, String> {
|
||||
let mut out: Value = Value::Null;
|
||||
let mut current_status = ObjectStatus::Ready;
|
||||
for current_char in json_string.chars() {
|
||||
println!(
|
||||
"variables: {:?} {:?} {:?}",
|
||||
out,
|
||||
current_status.clone(),
|
||||
current_char.to_string()
|
||||
);
|
||||
if let Err(e) = add_char_into_object(&mut out, &mut current_status, current_char) {
|
||||
return Err(e);
|
||||
}
|
||||
}
|
||||
return Ok(out);
|
||||
}
|
||||
|
||||
#[cfg(not(debug_assertions))]
|
||||
pub fn parse_stream(json_string: &str) -> Result<Value, String> {
|
||||
let mut out: Value = Value::Null;
|
||||
let mut current_status = ObjectStatus::Ready;
|
||||
for current_char in json_string.chars() {
|
||||
if let Err(e) = add_char_into_object(&mut out, &mut current_status, current_char) {
|
||||
return Err(e);
|
||||
}
|
||||
}
|
||||
return Ok(out);
|
||||
}
|
||||
|
||||
pub struct JsonStreamParser {
|
||||
object: Value,
|
||||
current_status: ObjectStatus,
|
||||
}
|
||||
|
||||
impl JsonStreamParser {
|
||||
pub fn new() -> JsonStreamParser {
|
||||
JsonStreamParser {
|
||||
object: Value::Null,
|
||||
current_status: ObjectStatus::Ready,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_char(&mut self, current_char: char) -> Result<(), String> {
|
||||
add_char_into_object(&mut self.object, &mut self.current_status, current_char)
|
||||
}
|
||||
|
||||
pub fn get_result(&self) -> &Value {
|
||||
&self.object
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! param_test {
|
||||
($($name:ident: $string:expr, $value:expr)*) => {
|
||||
$(
|
||||
mod $name {
|
||||
use super::{parse_stream, JsonStreamParser};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
#[test]
|
||||
fn simple() {
|
||||
let string: &str = $string;
|
||||
let value: Value = $value;
|
||||
let result = parse_stream(&string);
|
||||
assert_eq!(result.unwrap(), value);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in string.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &value);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn object_single_key_value() {
|
||||
let string = $string;
|
||||
let value = $value;
|
||||
let raw_json = format!("{{\"key\": {}}}", string);
|
||||
let expected = json!({"key": value});
|
||||
let result = parse_stream(&raw_json);
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn object_multiple_key_value() {
|
||||
let string = $string;
|
||||
let value = $value;
|
||||
let raw_json = format!("{{\"key1\": {}, \"key2\": {}}}", string, string);
|
||||
let expected = json!({"key1": value, "key2": value});
|
||||
let result = parse_stream(&raw_json);
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn object_multiple_key_value_with_blank_1() {
|
||||
let string = $string;
|
||||
let value = $value;
|
||||
let raw_json = format!("{{ \"key1\": {}, \"key2\": {}}}", string, string);
|
||||
let expected = json!({"key1": value, "key2": value});
|
||||
let result = parse_stream(&raw_json);
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn object_multiple_key_value_with_blank_2() {
|
||||
let string = $string;
|
||||
let value = $value;
|
||||
let raw_json = format!("{{\"key1\": {}, \"key2\": {} }}", string, string);
|
||||
let expected = json!({"key1": value, "key2": value});
|
||||
let result = parse_stream(&raw_json);
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn object_multiple_key_value_with_blank_3() {
|
||||
let string = $string;
|
||||
let value = $value;
|
||||
let raw_json = format!("{{
|
||||
\"key1\": {} ,
|
||||
\"key2\": {}
|
||||
}}", string, string);
|
||||
let expected = json!({"key1": value, "key2": value});
|
||||
let result = parse_stream(&raw_json);
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
parser.add_char(c).unwrap();
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_escaped_quotes_in_objects() {
|
||||
let raw_json = r#"{"key with \"quotes\"": "value with \"quotes\""}"#;
|
||||
let expected = json!({"key with \"quotes\"": "value with \"quotes\""});
|
||||
|
||||
let result = parse_stream(raw_json);
|
||||
assert!(result.is_ok(), "Parse error: {:?}", result.err());
|
||||
assert_eq!(result.unwrap(), expected);
|
||||
|
||||
let mut parser = JsonStreamParser::new();
|
||||
for c in raw_json.chars() {
|
||||
assert!(parser.add_char(c).is_ok(), "Add char error");
|
||||
}
|
||||
assert_eq!(parser.get_result(), &expected);
|
||||
}
|
||||
}
|
||||
)*
|
||||
}
|
||||
}
|
||||
|
||||
param_test! {
|
||||
null: r#"null"#, Value::Null
|
||||
true_value: r#"true"#, Value::Bool(true)
|
||||
false_value: r#"false"#, Value::Bool(false)
|
||||
empty_string: r#""""#, Value::String("".to_string())
|
||||
single_character_string: r#""a""#, Value::String("a".to_string())
|
||||
string_with_spaces: r#""a b c""#, Value::String("a b c".to_string())
|
||||
string_with_space_at_end: r#""a b c ""#, Value::String("a b c ".to_string())
|
||||
string_with_space_at_start: r#"" a b c""#, Value::String(" a b c".to_string())
|
||||
string_with_space_at_start_and_end: r#"" a b c ""#, Value::String(" a b c ".to_string())
|
||||
number: r#"1234567890"#, Value::Number(1234567890.into())
|
||||
single_digit_number: r#"1"#, Value::Number(1.into())
|
||||
number_with_spaces_at_start: r#" 1234567890"#, Value::Number(1234567890.into())
|
||||
number_with_spaces_at_end: r#"1234567890 "#, Value::Number(1234567890.into())
|
||||
number_with_spaces_at_start_and_end: r#" 1234567890 "#, Value::Number(1234567890.into())
|
||||
negative_number: r#"-1234567890"#, Value::Number((-1234567890).into())
|
||||
negative_single_digit_number: r#"-1"#, Value::Number((-1).into())
|
||||
zero: r#"0"#, Value::Number(0.into())
|
||||
float: r#"123.456"#, Value::Number(serde_json::Number::from_f64(123.456).unwrap())
|
||||
negative_float: r#"-123.456"#, Value::Number(serde_json::Number::from_f64(-123.456).unwrap())
|
||||
escaped_quotes: r#""he said \"hello\"""#, Value::String(r#"he said "hello""#.to_string())
|
||||
}
|
||||
Reference in New Issue
Block a user