extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-19 14:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

[parser] Improve type errors for boolean literals (#16408)

Browse Source 
Currently, strings `true` and `false` are intercepted early in parsing.
Previously, if they didn't match the expected shape, the parse error
said "expected non-boolean value". This PR changes the message to say
"expected <shape>".

Because the parsing error requires a `&'static str` I had to add a
`to_str(&self) -> &'static str` method on `SyntaxShape`. It's a bit
crude for more complex shapes: it simply says `keyword`, `list`,
`table`, and so on for them, without exposing the underlying structure.

Fixes #16406
This commit is contained in:
Andrej Kolčin
2025-08-11 16:59:27 +00:00
committed by GitHub
parent 038f8f85ed
commit 751ef6e8da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-parser/src/parser.rs
View File

@@ -5204,7 +5204,7 @@ pub fn parse_value(
if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) { if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) {
return Expression::new(working_set, Expr::Bool(true), span, Type::Bool); return Expression::new(working_set, Expr::Bool(true), span, Type::Bool);
} else { } else {
working_set.error(ParseError::Expected("non-boolean value", span)); working_set.error(ParseError::ExpectedWithStringMsg(shape.to_string(), span));
return Expression::garbage(working_set, span); return Expression::garbage(working_set, span);
} }
} }
@@ -5212,7 +5212,7 @@ pub fn parse_value(
if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) { if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) {
return Expression::new(working_set, Expr::Bool(false), span, Type::Bool); return Expression::new(working_set, Expr::Bool(false), span, Type::Bool);
} else { } else {
working_set.error(ParseError::Expected("non-boolean value", span)); working_set.error(ParseError::ExpectedWithStringMsg(shape.to_string(), span));
return Expression::garbage(working_set, span); return Expression::garbage(working_set, span);
} }
} }