Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make const also use a subexpression

Browse Source
This commit is contained in:
Devyn Cairns 2024-07-15 18:10:21 -07:00
parent af2af1bb23
commit c12af98ac2
No known key found for this signature in database
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/nu-parser/src/parse_keywords.rs
View File

@ -35,8 +35,8 @@ use crate::{
lite_parser::{lite_parse, LiteCommand}, lite_parser::{lite_parse, LiteCommand},
parser::{ parser::{
check_call, garbage, garbage_pipeline, parse, parse_call, parse_expression, check_call, garbage, garbage_pipeline, parse, parse_call, parse_expression,
parse_full_signature, parse_import_pattern, parse_internal_call, parse_multispan_value, parse_full_signature, parse_import_pattern, parse_internal_call, parse_string, parse_value,
parse_string, parse_value, parse_var_with_opt_type, trim_quotes, ParsedInternalCall, parse_var_with_opt_type, trim_quotes, ParsedInternalCall,
}, },
unescape_unquote_string, Token, TokenContents, unescape_unquote_string, Token, TokenContents,
}; };
@ -3161,9 +3161,6 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
// } // }
if let Some(decl_id) = working_set.find_decl(b"const") { if let Some(decl_id) = working_set.find_decl(b"const") {
let cmd = working_set.get_decl(decl_id);
let call_signature = cmd.signature().call_signature();
if spans.len() >= 4 { if spans.len() >= 4 {
// This is a bit of by-hand parsing to get around the issue where we want to parse in the reverse order // This is a bit of by-hand parsing to get around the issue where we want to parse in the reverse order
// so that the var-id created by the variable isn't visible in the expression that init it // so that the var-id created by the variable isn't visible in the expression that init it
@ -3171,18 +3168,29 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
let item = working_set.get_span_contents(*span.1); let item = working_set.get_span_contents(*span.1);
// const x = 'f', = at least start from index 2 // const x = 'f', = at least start from index 2
if item == b"=" && spans.len() > (span.0 + 1) && span.0 > 1 { if item == b"=" && spans.len() > (span.0 + 1) && span.0 > 1 {
let mut idx = span.0; // Parse the rvalue as a subexpression
let rvalue_span = Span::concat(&spans[(span.0 + 1)..]);
let rvalue = parse_multispan_value( let (rvalue_tokens, rvalue_error) = lex(
working_set, working_set.get_span_contents(rvalue_span),
spans, rvalue_span.start,
&mut idx, &[],
&SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)), &[],
false,
);
working_set.parse_errors.extend(rvalue_error);
trace!("parsing: const right-hand side subexpression");
let rvalue_block =
parse_block(working_set, &rvalue_tokens, rvalue_span, false, true);
let rvalue_ty = rvalue_block.output_type();
let rvalue_block_id = working_set.add_block(Arc::new(rvalue_block));
let rvalue = Expression::new(
working_set,
Expr::Subexpression(rvalue_block_id),
rvalue_span,
rvalue_ty,
); );
if idx < (spans.len() - 1) {
working_set
.error(ParseError::ExtraPositional(call_signature, spans[idx + 1]));
}
let mut idx = 0; let mut idx = 0;