Revise parse_json
.
This commit is contained in:
parent
5e4f27ae25
commit
4f2764d233
@ -14,6 +14,7 @@ Enhancements
|
|||||||
|
|
||||||
* `Module::eval_ast_as_new_raw` is made public as a low-level API.
|
* `Module::eval_ast_as_new_raw` is made public as a low-level API.
|
||||||
* Improper `switch` case condition syntax is now caught at parse time.
|
* Improper `switch` case condition syntax is now caught at parse time.
|
||||||
|
* `Engine::parse_json` now natively handles nested JSON inputs (using a token remap filter) without needing to replace `{` with `#{`.
|
||||||
|
|
||||||
|
|
||||||
Version 1.6.1
|
Version 1.6.1
|
||||||
|
@ -314,19 +314,12 @@ impl Engine {
|
|||||||
///
|
///
|
||||||
/// Not available under `no_object`.
|
/// Not available under `no_object`.
|
||||||
///
|
///
|
||||||
/// The JSON string must be an object hash. It cannot be a simple scalar value.
|
/// The JSON string must be an object hash. It cannot be a simple primitive value.
|
||||||
///
|
///
|
||||||
/// Set `has_null` to `true` in order to map `null` values to `()`.
|
/// Set `has_null` to `true` in order to map `null` values to `()`.
|
||||||
/// Setting it to `false` will cause an [`ErrorVariableNotFound`][crate::EvalAltResult::ErrorVariableNotFound] error during parsing.
|
/// Setting it to `false` causes a syntax error for any `null` value.
|
||||||
///
|
///
|
||||||
/// # JSON With Sub-Objects
|
/// JSON sub-objects are handled transparently.
|
||||||
///
|
|
||||||
/// This method assumes no sub-objects in the JSON string. That is because the syntax
|
|
||||||
/// of a JSON sub-object (or object hash), `{ .. }`, is different from Rhai's syntax, `#{ .. }`.
|
|
||||||
/// Parsing a JSON string with sub-objects will cause a syntax error.
|
|
||||||
///
|
|
||||||
/// If it is certain that the character `{` never appears in any text string within the JSON object,
|
|
||||||
/// which is a valid assumption for many use cases, then globally replace `{` with `#{` before calling this method.
|
|
||||||
///
|
///
|
||||||
/// # Example
|
/// # Example
|
||||||
///
|
///
|
||||||
@ -336,18 +329,27 @@ impl Engine {
|
|||||||
///
|
///
|
||||||
/// let engine = Engine::new();
|
/// let engine = Engine::new();
|
||||||
///
|
///
|
||||||
/// let map = engine.parse_json(
|
/// let map = engine.parse_json(r#"
|
||||||
/// r#"{"a":123, "b":42, "c":{"x":false, "y":true}, "d":null}"#
|
/// {
|
||||||
/// .replace("{", "#{").as_str(),
|
/// "a": 123,
|
||||||
/// true)?;
|
/// "b": 42,
|
||||||
|
/// "c": {
|
||||||
|
/// "x": false,
|
||||||
|
/// "y": true,
|
||||||
|
/// "z": '$'
|
||||||
|
/// },
|
||||||
|
/// "d": null
|
||||||
|
/// }"#, true)?;
|
||||||
///
|
///
|
||||||
/// assert_eq!(map.len(), 4);
|
/// assert_eq!(map.len(), 4);
|
||||||
/// assert_eq!(map["a"].as_int().expect("a should exist"), 123);
|
/// assert_eq!(map["a"].as_int().expect("a should exist"), 123);
|
||||||
/// assert_eq!(map["b"].as_int().expect("b should exist"), 42);
|
/// assert_eq!(map["b"].as_int().expect("b should exist"), 42);
|
||||||
/// assert!(map["d"].is::<()>());
|
/// assert_eq!(map["d"].as_unit().expect("d should exist"), ());
|
||||||
///
|
///
|
||||||
/// let c = map["c"].read_lock::<Map>().expect("c should exist");
|
/// let c = map["c"].read_lock::<Map>().expect("c should exist");
|
||||||
/// assert_eq!(c["x"].as_bool().expect("x should be bool"), false);
|
/// assert_eq!(c["x"].as_bool().expect("x should be bool"), false);
|
||||||
|
/// assert_eq!(c["y"].as_bool().expect("y should be bool"), true);
|
||||||
|
/// assert_eq!(c["z"].as_char().expect("z should be char"), '$');
|
||||||
/// # Ok(())
|
/// # Ok(())
|
||||||
/// # }
|
/// # }
|
||||||
/// ```
|
/// ```
|
||||||
@ -358,60 +360,80 @@ impl Engine {
|
|||||||
json: impl AsRef<str>,
|
json: impl AsRef<str>,
|
||||||
has_null: bool,
|
has_null: bool,
|
||||||
) -> crate::RhaiResultOf<crate::Map> {
|
) -> crate::RhaiResultOf<crate::Map> {
|
||||||
use crate::tokenizer::Token;
|
use crate::{tokenizer::Token, LexError};
|
||||||
|
|
||||||
fn parse_json_inner(
|
let scripts = [json.as_ref()];
|
||||||
engine: &Engine,
|
|
||||||
json: &str,
|
let (stream, tokenizer_control) = self.lex_raw(
|
||||||
has_null: bool,
|
&scripts,
|
||||||
) -> crate::RhaiResultOf<crate::Map> {
|
|
||||||
let mut scope = Scope::new();
|
|
||||||
let json_text = json.trim_start();
|
|
||||||
let scripts = if json_text.starts_with(Token::MapStart.literal_syntax()) {
|
|
||||||
[json_text, ""]
|
|
||||||
} else if json_text.starts_with(Token::LeftBrace.literal_syntax()) {
|
|
||||||
["#", json_text]
|
|
||||||
} else {
|
|
||||||
return Err(crate::PERR::MissingToken(
|
|
||||||
Token::LeftBrace.syntax().into(),
|
|
||||||
"to start a JSON object hash".into(),
|
|
||||||
)
|
|
||||||
.into_err(crate::Position::new(
|
|
||||||
1,
|
|
||||||
(json.len() - json_text.len() + 1) as u16,
|
|
||||||
))
|
|
||||||
.into());
|
|
||||||
};
|
|
||||||
let (stream, tokenizer_control) = engine.lex_raw(
|
|
||||||
&scripts,
|
|
||||||
if has_null {
|
|
||||||
Some(&|token, _, _| {
|
|
||||||
match token {
|
|
||||||
// If `null` is present, make sure `null` is treated as a variable
|
|
||||||
Token::Reserved(s) if &*s == "null" => Token::Identifier(s),
|
|
||||||
_ => token,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut state = ParseState::new(engine, tokenizer_control);
|
|
||||||
let ast = engine.parse_global_expr(
|
|
||||||
&mut stream.peekable(),
|
|
||||||
&mut state,
|
|
||||||
&scope,
|
|
||||||
#[cfg(not(feature = "no_optimize"))]
|
|
||||||
OptimizationLevel::None,
|
|
||||||
#[cfg(feature = "no_optimize")]
|
|
||||||
OptimizationLevel::default(),
|
|
||||||
)?;
|
|
||||||
if has_null {
|
if has_null {
|
||||||
scope.push_constant("null", ());
|
Some(&|token, _, _| {
|
||||||
}
|
match token {
|
||||||
engine.eval_ast_with_scope(&mut scope, &ast)
|
// `null` => `()`
|
||||||
}
|
Token::Reserved(s) if &*s == "null" => Token::Unit,
|
||||||
|
// `{` => `#{`
|
||||||
|
Token::LeftBrace => Token::MapStart,
|
||||||
|
// Disallowed syntax
|
||||||
|
t @ (Token::Unit | Token::MapStart) => Token::LexError(
|
||||||
|
LexError::ImproperSymbol(
|
||||||
|
t.literal_syntax().to_string(),
|
||||||
|
"".to_string(),
|
||||||
|
)
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
Token::InterpolatedString(..) => Token::LexError(
|
||||||
|
LexError::ImproperSymbol(
|
||||||
|
"interpolated string".to_string(),
|
||||||
|
"".to_string(),
|
||||||
|
)
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
// All others
|
||||||
|
_ => token,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
Some(&|token, _, _| {
|
||||||
|
match token {
|
||||||
|
Token::Reserved(s) if &*s == "null" => Token::LexError(
|
||||||
|
LexError::ImproperSymbol("null".to_string(), "".to_string()).into(),
|
||||||
|
),
|
||||||
|
// `{` => `#{`
|
||||||
|
Token::LeftBrace => Token::MapStart,
|
||||||
|
// Disallowed syntax
|
||||||
|
t @ (Token::Unit | Token::MapStart) => Token::LexError(
|
||||||
|
LexError::ImproperSymbol(
|
||||||
|
t.literal_syntax().to_string(),
|
||||||
|
"".to_string(),
|
||||||
|
)
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
Token::InterpolatedString(..) => Token::LexError(
|
||||||
|
LexError::ImproperSymbol(
|
||||||
|
"interpolated string".to_string(),
|
||||||
|
"".to_string(),
|
||||||
|
)
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
// All others
|
||||||
|
_ => token,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
parse_json_inner(self, json.as_ref(), has_null)
|
let mut state = ParseState::new(self, tokenizer_control);
|
||||||
|
|
||||||
|
let ast = self.parse_global_expr(
|
||||||
|
&mut stream.peekable(),
|
||||||
|
&mut state,
|
||||||
|
&Scope::new(),
|
||||||
|
#[cfg(not(feature = "no_optimize"))]
|
||||||
|
OptimizationLevel::None,
|
||||||
|
#[cfg(feature = "no_optimize")]
|
||||||
|
OptimizationLevel::default(),
|
||||||
|
)?;
|
||||||
|
|
||||||
|
self.eval_ast(&ast)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,8 +130,8 @@ fn test_map_assign() -> Result<(), Box<EvalAltResult>> {
|
|||||||
|
|
||||||
let x = engine.eval::<Map>(r#"let x = #{a: 1, b: true, "c$": "hello"}; x"#)?;
|
let x = engine.eval::<Map>(r#"let x = #{a: 1, b: true, "c$": "hello"}; x"#)?;
|
||||||
|
|
||||||
assert_eq!(x["a"].clone_cast::<INT>(), 1);
|
assert_eq!(x["a"].as_int().unwrap(), 1);
|
||||||
assert_eq!(x["b"].clone_cast::<bool>(), true);
|
assert_eq!(x["b"].as_bool().unwrap(), true);
|
||||||
assert_eq!(x["c$"].clone_cast::<String>(), "hello");
|
assert_eq!(x["c$"].clone_cast::<String>(), "hello");
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -143,8 +143,8 @@ fn test_map_return() -> Result<(), Box<EvalAltResult>> {
|
|||||||
|
|
||||||
let x = engine.eval::<Map>(r#"#{a: 1, b: true, "c$": "hello"}"#)?;
|
let x = engine.eval::<Map>(r#"#{a: 1, b: true, "c$": "hello"}"#)?;
|
||||||
|
|
||||||
assert_eq!(x["a"].clone_cast::<INT>(), 1);
|
assert_eq!(x["a"].as_int().unwrap(), 1);
|
||||||
assert_eq!(x["b"].clone_cast::<bool>(), true);
|
assert_eq!(x["b"].as_bool().unwrap(), true);
|
||||||
assert_eq!(x["c$"].clone_cast::<String>(), "hello");
|
assert_eq!(x["c$"].clone_cast::<String>(), "hello");
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -182,17 +182,17 @@ fn test_map_for() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fn test_map_json() -> Result<(), Box<EvalAltResult>> {
|
fn test_map_json() -> Result<(), Box<EvalAltResult>> {
|
||||||
let engine = Engine::new();
|
let engine = Engine::new();
|
||||||
|
|
||||||
let json = r#"{"a":1, "b":true, "c":42, "$d e f!":"hello", "z":null}"#;
|
let json = r#"{"a":1, "b":true, "c":41+1, "$d e f!":"hello", "z":null}"#;
|
||||||
|
|
||||||
let map = engine.parse_json(json, true)?;
|
let map = engine.parse_json(json, true)?;
|
||||||
|
|
||||||
assert!(!map.contains_key("x"));
|
assert!(!map.contains_key("x"));
|
||||||
|
|
||||||
assert_eq!(map["a"].clone_cast::<INT>(), 1);
|
assert_eq!(map["a"].as_int().unwrap(), 1);
|
||||||
assert_eq!(map["b"].clone_cast::<bool>(), true);
|
assert_eq!(map["b"].as_bool().unwrap(), true);
|
||||||
assert_eq!(map["c"].clone_cast::<INT>(), 42);
|
assert_eq!(map["c"].as_int().unwrap(), 42);
|
||||||
assert_eq!(map["$d e f!"].clone_cast::<String>(), "hello");
|
assert_eq!(map["$d e f!"].clone_cast::<String>(), "hello");
|
||||||
assert_eq!(map["z"].clone_cast::<()>(), ());
|
assert_eq!(map["z"].as_unit().unwrap(), ());
|
||||||
|
|
||||||
#[cfg(not(feature = "no_index"))]
|
#[cfg(not(feature = "no_index"))]
|
||||||
{
|
{
|
||||||
@ -218,12 +218,37 @@ fn test_map_json() -> Result<(), Box<EvalAltResult>> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
engine.parse_json(&format!("#{}", json), true)?;
|
engine.parse_json(json, true)?;
|
||||||
|
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
*engine.parse_json(" 123", true).expect_err("should error"),
|
*engine.parse_json("123", true).expect_err("should error"),
|
||||||
EvalAltResult::ErrorParsing(ParseErrorType::MissingToken(token, ..), ..)
|
EvalAltResult::ErrorMismatchOutputType(..)
|
||||||
if token == "{"
|
));
|
||||||
|
|
||||||
|
assert!(matches!(
|
||||||
|
*engine
|
||||||
|
.parse_json("#{a:123}", true)
|
||||||
|
.expect_err("should error"),
|
||||||
|
EvalAltResult::ErrorParsing(..)
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(matches!(
|
||||||
|
*engine.parse_json("{a:()}", true).expect_err("should error"),
|
||||||
|
EvalAltResult::ErrorParsing(..)
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(matches!(
|
||||||
|
*engine
|
||||||
|
.parse_json("#{a:123+456}", true)
|
||||||
|
.expect_err("should error"),
|
||||||
|
EvalAltResult::ErrorParsing(..)
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(matches!(
|
||||||
|
*engine
|
||||||
|
.parse_json("{a:`hello${world}`}", true)
|
||||||
|
.expect_err("should error"),
|
||||||
|
EvalAltResult::ErrorParsing(..)
|
||||||
));
|
));
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
Loading…
Reference in New Issue
Block a user