Skip to content

Commit

Permalink
get tests passing again
Browse files Browse the repository at this point in the history
  • Loading branch information
@zkat
zkat committed Dec 9, 2024
1 parent 4ebde4d commit e549f73
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 27 deletions.
3 changes: 1 addition & 2 deletions src/document.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,6 @@ foo 1 bar=0xdeadbeef {
}
if let Some(KdlEntryFormat { value_repr, .. }) = entry.format() {
if entry.name().is_none() && entry.ty().is_none() {
dbg!(&entry);
check_span(value_repr, entry.span(), source);
}
}
Expand Down Expand Up @@ -824,7 +823,7 @@ inline { time; to; live "our" "dreams"; "y;all" }
check_span("time", inline_nodes[0].span(), &input);
check_span("to", inline_nodes[1].span(), &input);
check_span(r#"live "our" "dreams""#, inline_nodes[2].span(), &input);
check_span(r#""y;all""#, inline_nodes[3].span(), &input);
check_span(r#""y;all" "#, inline_nodes[3].span(), &input);

Ok(())
}
Expand Down
105 changes: 80 additions & 25 deletions src/v2_parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub(crate) fn failure_from_errs(errs: Vec<KdlParseError>, input: &str) -> KdlPar
message: e
.message
.or_else(|| e.label.clone().map(|l| format!("Expected {l}"))),
label: e.label.map(|l| format!("invalid {l}")),
label: e.label.map(|l| format!("not {l}")),
help: e.help,
severity: Severity::Error,
})
Expand All @@ -69,17 +69,17 @@ struct KdlParseContext {

impl KdlParseContext {
fn msg(mut self, txt: impl AsRef<str>) -> Self {
self.message = Some(format!("{}", txt.as_ref()));
self.message = Some(txt.as_ref().to_string());
self
}

fn lbl(mut self, txt: impl AsRef<str>) -> Self {
self.label = Some(format!("{}", txt.as_ref()));
self.label = Some(txt.as_ref().to_string());
self
}

fn hlp(mut self, txt: impl AsRef<str>) -> Self {
self.help = Some(format!("{}", txt.as_ref()));
self.help = Some(txt.as_ref().to_string());
self
}

Expand Down Expand Up @@ -200,7 +200,7 @@ fn span_from_checkpoint<I: Stream + Location>(
input: &I,
start: &<I as Stream>::Checkpoint,
) -> SourceSpan {
let offset = input.offset_from(&start);
let offset = input.offset_from(start);
((input.location() - offset)..input.location()).into()
}

Expand Down Expand Up @@ -278,7 +278,7 @@ fn nodes(input: &mut Input<'_>) -> PResult<KdlDocument> {
repeat(0.., alt((line_space.void(), (slashdash, base_node).void())))
.map(|()| ())
.take(),
separated(0.., node.context(cx().lbl("node")), node_terminator).with_span(),
trace("nodes", separated(0.., node, node_terminator)).with_span(),
opt(node_terminator),
repeat(0.., alt((line_space.void(), (slashdash, base_node).void())))
.map(|()| ())
Expand Down Expand Up @@ -317,7 +317,28 @@ fn node(input: &mut Input<'_>) -> PResult<KdlNode> {
}

fn base_node(input: &mut Input<'_>) -> PResult<KdlNode> {
not(alt(("}".void(), eof.void()))).parse_next(input)?;
let _start = input.checkpoint();
let open_curly = resume_after_cut(
cut_err(not("{").context(
cx().msg("Found child block instead of node name")
.lbl("node name")
.hlp("Did you forget to add the node name itself? Or perhaps terminated the node before its child block?"))),
"{".void(),
)
.parse_next(input)?;
if open_curly.is_none() {
// If we got a weird misplaces `{`, we consume the "child block" here,
// because otherwise the error message is going to include the entire
// child block as its span, but we only want to point to the offending
// curly.
input.reset(&_start);
node_children.parse_next(input)?;
opt(slashdashed_children).parse_next(input)?;
peek(opt(node_terminator)).parse_next(input)?;
// We also return a fake node here, for good measure.
return Ok(KdlNode::new("<<BAD_NODE>>"));
}
let ty = opt(ty).parse_next(input)?;
let after_ty = node_space0.take().parse_next(input)?;
let _before_ident = input.checkpoint();
Expand Down Expand Up @@ -502,7 +523,11 @@ fn node_entry(input: &mut Input<'_>) -> PResult<Option<KdlEntry>> {
None
};
let entry = if let Some(after_key) = after_key {
let (after_eq, value) = (node_space0.take(), cut_err(value)).parse_next(input)?;
let (after_eq, value) = (
node_space0.take(),
cut_err(value.context(cx().lbl("property value"))),
)
.parse_next(input)?;
value.map(|mut value| {
value.name = maybe_ident;
if let Some(fmt) = value.format_mut() {
Expand Down Expand Up @@ -687,7 +712,15 @@ fn around_children_test() {

/// `node-children := '{' nodes final-node? '}'`
fn node_children(input: &mut Input<'_>) -> PResult<KdlDocument> {
delimited("{", nodes, cut_err("}")).parse_next(input)
trace(
"node children",
delimited(
"{",
nodes,
cut_err("}").context(cx().msg("No closing '}' for child block").lbl("'}'")),
),
)
.parse_next(input)
}

/// `node-terminator := single-line-comment | newline | ';' | eof`
Expand Down Expand Up @@ -1885,7 +1918,27 @@ mod failure_tests {

#[test]
fn bad_node_name_test() -> miette::Result<()> {
let input = Arc::new("no/de 1 {\n 1 2 foo\n bad#}".to_string());
let input = Arc::new("foo { bar; { baz; }; }".to_string());
let res: Result<KdlDocument, KdlParseFailure> = input.parse();
// super::_print_diagnostic(res);
// return Ok(());
assert_eq!(
res,
Err(mkfail(
input.clone(),
vec![
KdlDiagnostic {
input: input.clone(),
span: (11..12).into(),
message: Some("Found child block instead of node name".into()),
label: Some("not node name".into()),
help: Some("Did you forget to add the node name itself? Or perhaps terminated the node before its child block?".into()),
severity: Severity::Error
}
]
))
);
let input = Arc::new("no/de 1 {\n 1 2 foo\n bad#\n}".to_string());
let res: Result<KdlDocument, KdlParseFailure> = input.parse();
// super::_print_diagnostic(res);
// return Ok(());
Expand All @@ -1898,39 +1951,39 @@ mod failure_tests {
input: input.clone(),
span: (0..5).into(),
message: Some("Expected identifier string".into()),
label: Some("invalid identifier string".into()),
label: Some("not identifier string".into()),
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
severity: Severity::Error
},
KdlDiagnostic {
input: input.clone(),
span: (0..5).into(),
message: Some("Found invalid node name".into()),
label: Some("invalid node name".into()),
label: Some("not node name".into()),
help: Some("This can be any string type, including a quoted, raw, or multiline string, as well as a plain identifier string.".into()),
severity: Severity::Error
},
KdlDiagnostic {
input: input.clone(),
span: (14..15).into(),
message: Some("Found invalid node name".into()),
label: Some("invalid node name".into()),
label: Some("not node name".into()),
help: Some("This can be any string type, including a quoted, raw, or multiline string, as well as a plain identifier string.".into()),
severity: Severity::Error
},
KdlDiagnostic {
input: input.clone(),
span: (26..30).into(),
message: Some("Expected identifier string".into()),
label: Some("invalid identifier string".into()),
label: Some("not identifier string".into()),
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
severity: Severity::Error
},
KdlDiagnostic {
input: input.clone(),
span: (26..30).into(),
message: Some("Found invalid node name".into()),
label: Some("invalid node name".into()),
label: Some("not node name".into()),
help: Some("This can be any string type, including a quoted, raw, or multiline string, as well as a plain identifier string.".into()),
severity: Severity::Error
}
Expand All @@ -1944,6 +1997,8 @@ mod failure_tests {
fn bad_entry_number_test() -> miette::Result<()> {
let input = Arc::new("node 1asdf 2".to_string());
let res: Result<KdlDocument, KdlParseFailure> = input.parse();
// super::_print_diagnostic(res);
// return Ok(());
assert_eq!(
res,
Err(mkfail(
Expand All @@ -1952,7 +2007,7 @@ mod failure_tests {
input: input.clone(),
span: (5..10).into(),
message: Some("Expected integer".into()),
label: Some("invalid integer".into()),
label: Some("not integer".into()),
severity: miette::Severity::Error,
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
Expand All @@ -1969,7 +2024,7 @@ mod failure_tests {
input: input.clone(),
span: (5..12).into(),
message: Some("Expected hexadecimal number".into()),
label: Some("invalid hexadecimal number".into()),
label: Some("not hexadecimal number".into()),
severity: miette::Severity::Error,
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
Expand All @@ -1986,7 +2041,7 @@ mod failure_tests {
input: input.clone(),
span: (5..12).into(),
message: Some("Expected octal number".into()),
label: Some("invalid octal number".into()),
label: Some("not octal number".into()),
severity: miette::Severity::Error,
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
Expand All @@ -2003,7 +2058,7 @@ mod failure_tests {
input: input.clone(),
span: (5..12).into(),
message: Some("Expected binary number".into()),
label: Some("invalid binary number".into()),
label: Some("not binary number".into()),
severity: miette::Severity::Error,
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
Expand All @@ -2020,7 +2075,7 @@ mod failure_tests {
input: input.clone(),
span: (5..12).into(),
message: Some("Expected float".into()),
label: Some("invalid float".into()),
label: Some("not float".into()),
severity: miette::Severity::Error,
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
Expand All @@ -2037,7 +2092,7 @@ mod failure_tests {
input: input.clone(),
span: (5..11).into(),
message: Some("Non-digit character found after the '.' of a float".into()),
label: Some("invalid float".into()),
label: Some("not float".into()),
severity: miette::Severity::Error,
help: None,
}]
Expand All @@ -2056,7 +2111,7 @@ mod failure_tests {
message: Some(
"Non-digit character found in the exponent part of a float".into()
),
label: Some("invalid float".into()),
label: Some("not float".into()),
severity: miette::Severity::Error,
help: Some(
"Floats with exponent parts should look like '2.0e123', or '43.3E-4'."
Expand All @@ -2081,7 +2136,7 @@ mod failure_tests {
span: (5..8).into(),
severity: miette::Severity::Error,
message: Some("Expected quoted string".into()),
label: Some("invalid quoted string".into()),
label: Some("not quoted string".into()),
help: None,
}]
))
Expand All @@ -2101,7 +2156,7 @@ mod failure_tests {
span: (5..11).into(),
severity: miette::Severity::Error,
message: Some("Expected quoted string".into()),
label: Some("invalid quoted string".into()),
label: Some("not quoted string".into()),
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
}]
))
Expand All @@ -2121,15 +2176,15 @@ mod failure_tests {
input: input.clone(),
span: (5..6).into(),
message: Some("Unexpected newline in single-line quoted string".into()),
label: Some("invalid quoted string".into()),
label: Some("not quoted string".into()),
help: Some("You can make a string multi-line by wrapping it in '\"\"\"', with a newline immediately after the opening quotes.".into()),
severity: Severity::Error
},
KdlDiagnostic {
input: input.clone(),
span: (16..27).into(),
message: Some("Expected identifier string".into()),
label: Some("invalid identifier string".into()),
label: Some("not identifier string".into()),
help: Some("A valid value was partially parsed, but was not followed by a value terminator. Did you want a space here?".into()),
severity: Severity::Error
}
Expand Down

0 comments on commit e549f73

Please sign in to comment.