fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2025-06-21 02:31:32 +00:00
Code Issues Projects Releases Wiki Activity

feat(testing-framework): testing parser improvements (#375)

Browse Source 
* Introduce multiline call annotations

Call annotations have same format as `;`-annotations, but can allow
multiline JSON literals.  They look like `#| ...  |#` (that's Common Lisp syntax for multiline comments).

For example:

```
(call "peer_id" ("serv" "func") [a b] var)  #|
      map = {
        "0": null,
        "default": 42,
      }
   |#
```

* A JSON in the assertion parser doesn't have be last

We have been using nom's `rest` for JSON values.  Now we have a simple JSON parser
that recognizes JSON to be parsed with `serde_json`, and may have multiple JSON objects
within same assertion.

* Allow annotation after a compound form

It is attached to a rightmost nested element that has to be a `call` special form.
This commit is contained in:
Ivan Boldyrev
2022-11-25 13:56:23 +03:00
committed by GitHub
parent becdedc364
commit 843d2a1d7b
5 changed files with 514 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
crates/testing-framework/src/asserts/parser.rs
View File

@ -40,28 +40,38 @@ impl FromStr for ServiceDefinition {
pub fn parse_kw(inp: &str) -> IResult<&str, ServiceDefinition, ParseError> {
use nom::branch::alt;
use nom::bytes::complete::tag;
use nom::combinator::{cut, map_res, rest};
use nom::character::complete::alphanumeric1;
use nom::combinator::{cut, map_res, recognize};
use nom::error::context;
use nom::sequence::separated_pair;
let equal = || delim_ws(tag("="));
let json_value = || {
cut(context(
"result value has to be a valid JSON",
recognize(super::json::json_value),
))
};
let json_map = || {
cut(context(
"result value has to be a valid JSON hash",
recognize(super::json::hash),
))
};
delim_ws(map_res(
separated_pair(
alt((
tag(ServiceTagName::Ok.as_ref()),
tag(ServiceTagName::Error.as_ref()),
tag(ServiceTagName::SeqOk.as_ref()),
tag(ServiceTagName::SeqError.as_ref()),
alt((
separated_pair(tag(ServiceTagName::Ok.as_ref()), equal(), json_value()),
separated_pair(tag(ServiceTagName::Error.as_ref()), equal(), json_map()),
separated_pair(tag(ServiceTagName::SeqOk.as_ref()), equal(), json_map()),
separated_pair(tag(ServiceTagName::SeqError.as_ref()), equal(), json_map()),
separated_pair(
tag(ServiceTagName::Behaviour.as_ref()),
tag(ServiceTagName::Map.as_ref()),
)),
equal(),
cut(context(
"result value is consumed to end and has to be a valid JSON",
rest,
)),
),
equal(),
cut(alphanumeric1),
),
separated_pair(tag(ServiceTagName::Map.as_ref()), equal(), json_map()),
)),
|(tag, value): (&str, &str)| {
let value = value.trim();
match ServiceTagName::from_str(tag) {
@ -221,4 +231,22 @@ mod tests {
}))
);
}
#[test]
fn test_composable() {
use nom::bytes::complete::tag;
use nom::multi::separated_list1;
let res = separated_list1(tag(";"), parse_kw)(r#"ok={"ret_code": 0};map={"default": 42}"#);
assert_eq!(
res,
Ok((
"",
vec![
ServiceDefinition::Ok(json!({"ret_code":0,})),
ServiceDefinition::Map(maplit::hashmap! {"default".to_owned()=>json!(42),})
]
))
)
}
}