holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't throw err on typename as parameter name (#2926)

Browse Source 
Before this was an error:
`def e [path:path] {echo $path}`
Now its not.
This commit is contained in:
Leonhard Kipp 2021-01-13 02:44:55 +01:00 committed by GitHub
parent a636f161a4
commit 4f2ae34df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crates/nu-parser/src/parse/def/param_flag_list.rs
View File

@ -200,35 +200,17 @@ fn parse_type_token(type_: &Token) -> (SyntaxShape, Option<ParseError>) {
}
fn parse_param_name(token: &Token) -> (Spanned<String>, Option<ParseError>) {
match &token.contents {
TokenContents::Baseline(name) => {
//Make sure user didn't enter type
//REVIEW Should type names be allowed to be parameter names:
//Example case:
//def f [ string ] { echo $string }
//Currently an error is thrown
let name = name.clone().spanned(token.span);
let (_, err) = parse_type(&name);
if err.is_some() {
//Okay not a type. Just return name
(name, None)
} else {
(
name,
Some(ParseError::mismatch(
"parameter name",
token_to_spanned_string(token),
)),
)
}
}
_ => (
"Internal Error".to_string().spanned(token.span),
if let TokenContents::Baseline(name) = &token.contents {
let name = name.clone().spanned(token.span);
(name, None)
} else {
(
"InternalError".to_string().spanned(token.span),
Some(ParseError::mismatch(
"parameter name",
token_to_spanned_string(token),
)),
),
)
}
}