mirror of
https://github.com/nushell/nushell
synced 2025-01-26 03:45:19 +00:00
Allow parse-time evaluation of if
(#10326)
This commit is contained in:
parent
451a9c64d3
commit
0a3bfe7f73
3 changed files with 76 additions and 7 deletions
|
@ -1,6 +1,7 @@
|
||||||
use nu_engine::{eval_block, eval_expression, eval_expression_with_input, CallExt};
|
use nu_engine::{eval_block, eval_expression, eval_expression_with_input, CallExt};
|
||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Block, Command, EngineState, Stack};
|
use nu_protocol::engine::{Block, Command, EngineState, Stack, StateWorkingSet};
|
||||||
|
use nu_protocol::eval_const::{eval_const_subexpression, eval_constant, eval_constant_with_input};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
};
|
};
|
||||||
|
@ -40,6 +41,60 @@ impl Command for If {
|
||||||
.category(Category::Core)
|
.category(Category::Core)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_const(&self) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_const(
|
||||||
|
&self,
|
||||||
|
working_set: &StateWorkingSet,
|
||||||
|
call: &Call,
|
||||||
|
input: PipelineData,
|
||||||
|
) -> Result<PipelineData, ShellError> {
|
||||||
|
let cond = call.positional_nth(0).expect("checked through parser");
|
||||||
|
let then_block: Block = call.req_const(working_set, 1)?;
|
||||||
|
let else_case = call.positional_nth(2);
|
||||||
|
|
||||||
|
let result = eval_constant(working_set, cond)?;
|
||||||
|
match &result {
|
||||||
|
Value::Bool { val, .. } => {
|
||||||
|
if *val {
|
||||||
|
let block = working_set.get_block(then_block.block_id);
|
||||||
|
eval_const_subexpression(
|
||||||
|
working_set,
|
||||||
|
block,
|
||||||
|
input,
|
||||||
|
block.span.unwrap_or(call.head),
|
||||||
|
)
|
||||||
|
} else if let Some(else_case) = else_case {
|
||||||
|
if let Some(else_expr) = else_case.as_keyword() {
|
||||||
|
if let Some(block_id) = else_expr.as_block() {
|
||||||
|
let block = working_set.get_block(block_id);
|
||||||
|
eval_const_subexpression(
|
||||||
|
working_set,
|
||||||
|
block,
|
||||||
|
input,
|
||||||
|
block.span.unwrap_or(call.head),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
eval_constant_with_input(working_set, else_expr, input)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
eval_constant_with_input(working_set, else_case, input)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Ok(PipelineData::empty())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x => Err(ShellError::CantConvert {
|
||||||
|
to_type: "bool".into(),
|
||||||
|
from_type: x.get_type().to_string(),
|
||||||
|
span: result.span(),
|
||||||
|
help: None,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
|
|
|
@ -207,16 +207,16 @@ fn eval_const_call(
|
||||||
decl.run_const(working_set, call, input)
|
decl.run_const(working_set, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn eval_const_subexpression(
|
pub fn eval_const_subexpression(
|
||||||
working_set: &StateWorkingSet,
|
working_set: &StateWorkingSet,
|
||||||
expr: &Expression,
|
|
||||||
block: &Block,
|
block: &Block,
|
||||||
mut input: PipelineData,
|
mut input: PipelineData,
|
||||||
|
span: Span,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
for pipeline in block.pipelines.iter() {
|
for pipeline in block.pipelines.iter() {
|
||||||
for element in pipeline.elements.iter() {
|
for element in pipeline.elements.iter() {
|
||||||
let PipelineElement::Expression(_, expr) = element else {
|
let PipelineElement::Expression(_, expr) = element else {
|
||||||
return Err(ShellError::NotAConstant(expr.span));
|
return Err(ShellError::NotAConstant(span));
|
||||||
};
|
};
|
||||||
|
|
||||||
input = eval_constant_with_input(working_set, expr, input)?
|
input = eval_constant_with_input(working_set, expr, input)?
|
||||||
|
@ -226,7 +226,7 @@ fn eval_const_subexpression(
|
||||||
Ok(input)
|
Ok(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn eval_constant_with_input(
|
pub fn eval_constant_with_input(
|
||||||
working_set: &StateWorkingSet,
|
working_set: &StateWorkingSet,
|
||||||
expr: &Expression,
|
expr: &Expression,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
|
@ -235,7 +235,7 @@ fn eval_constant_with_input(
|
||||||
Expr::Call(call) => eval_const_call(working_set, call, input),
|
Expr::Call(call) => eval_const_call(working_set, call, input),
|
||||||
Expr::Subexpression(block_id) => {
|
Expr::Subexpression(block_id) => {
|
||||||
let block = working_set.get_block(*block_id);
|
let block = working_set.get_block(*block_id);
|
||||||
eval_const_subexpression(working_set, expr, block, input)
|
eval_const_subexpression(working_set, block, input, expr.span)
|
||||||
}
|
}
|
||||||
_ => eval_constant(working_set, expr).map(|v| PipelineData::Value(v, None)),
|
_ => eval_constant(working_set, expr).map(|v| PipelineData::Value(v, None)),
|
||||||
}
|
}
|
||||||
|
@ -341,7 +341,7 @@ pub fn eval_constant(
|
||||||
Expr::Subexpression(block_id) => {
|
Expr::Subexpression(block_id) => {
|
||||||
let block = working_set.get_block(*block_id);
|
let block = working_set.get_block(*block_id);
|
||||||
Ok(
|
Ok(
|
||||||
eval_const_subexpression(working_set, expr, block, PipelineData::empty())?
|
eval_const_subexpression(working_set, block, PipelineData::empty(), expr.span)?
|
||||||
.into_value(expr.span),
|
.into_value(expr.span),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -471,6 +471,7 @@ pub fn eval_constant(
|
||||||
Operator::Assignment(_) => Err(ShellError::NotAConstant(expr.span)),
|
Operator::Assignment(_) => Err(ShellError::NotAConstant(expr.span)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Expr::Block(block_id) => Ok(Value::block(*block_id, expr.span)),
|
||||||
_ => Err(ShellError::NotAConstant(expr.span)),
|
_ => Err(ShellError::NotAConstant(expr.span)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -342,3 +342,16 @@ fn version_const() {
|
||||||
let actual = nu!("const x = (version); $x");
|
let actual = nu!("const x = (version); $x");
|
||||||
assert!(actual.err.is_empty());
|
assert!(actual.err.is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn if_const() {
|
||||||
|
let actual = nu!("const x = (if 2 < 3 { 'yes!' }); $x");
|
||||||
|
assert_eq!(actual.out, "yes!");
|
||||||
|
|
||||||
|
let actual = nu!("const x = (if 5 < 3 { 'yes!' } else { 'no!' }); $x");
|
||||||
|
assert_eq!(actual.out, "no!");
|
||||||
|
|
||||||
|
let actual =
|
||||||
|
nu!("const x = (if 5 < 3 { 'yes!' } else if 4 < 5 { 'no!' } else { 'okay!' }); $x");
|
||||||
|
assert_eq!(actual.out, "no!");
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue