From d618b60d9e250e1830c655dfada8c8d807e9d2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= Date: Mon, 11 Sep 2023 21:30:38 +0300 Subject: [PATCH] Remove leftover const eval file (#10324) --- crates/nu-parser/src/eval.rs | 115 ----------------------------------- 1 file changed, 115 deletions(-) delete mode 100644 crates/nu-parser/src/eval.rs diff --git a/crates/nu-parser/src/eval.rs b/crates/nu-parser/src/eval.rs deleted file mode 100644 index d9de4a289..000000000 --- a/crates/nu-parser/src/eval.rs +++ /dev/null @@ -1,115 +0,0 @@ -use nu_protocol::{ - ast::{Expr, Expression}, - engine::StateWorkingSet, - ParseError, Record, Span, Value, -}; - -/// Evaluate a constant value at parse time -/// -/// Based off eval_expression() in the engine -pub fn eval_constant( - working_set: &StateWorkingSet, - expr: &Expression, -) -> Result { - match &expr.expr { - Expr::Bool(b) => Ok(Value::bool(*b, expr.span)), - Expr::Int(i) => Ok(Value::int(*i, expr.span)), - Expr::Float(f) => Ok(Value::float(*f, expr.span)), - Expr::Binary(b) => Ok(Value::binary(b.clone(), expr.span)), - Expr::Filepath(path) => Ok(Value::string(path, expr.span)), - Expr::Var(var_id) => match working_set.get_variable(*var_id).const_val.as_ref() { - Some(val) => Ok(val.clone()), - None => Err(ParseError::NotAConstant(expr.span)), - }, - Expr::CellPath(cell_path) => Ok(Value::cell_path(cell_path.clone(), expr.span)), - Expr::FullCellPath(cell_path) => { - let value = eval_constant(working_set, &cell_path.head)?; - - match value.follow_cell_path(&cell_path.tail, false) { - Ok(val) => Ok(val), - // TODO: Better error conversion - Err(shell_error) => Err(ParseError::LabeledError( - "Error when following cell path".to_string(), - format!("{shell_error:?}"), - expr.span, - )), - } - } - Expr::DateTime(dt) => Ok(Value::date(*dt, expr.span)), - Expr::List(x) => { - let mut output = vec![]; - for expr in x { - output.push(eval_constant(working_set, expr)?); - } - Ok(Value::list(output, expr.span)) - } - Expr::Record(fields) => { - let mut record = Record::new(); - for (col, val) in fields { - // avoid duplicate cols. - let col_name = value_as_string(eval_constant(working_set, col)?, expr.span)?; - let pos = record.cols.iter().position(|c| c == &col_name); - match pos { - Some(index) => { - record.vals[index] = eval_constant(working_set, val)?; - } - None => { - record.push(col_name, eval_constant(working_set, val)?); - } - } - } - - Ok(Value::record(record, expr.span)) - } - Expr::Table(headers, vals) => { - let mut output_headers = vec![]; - for expr in headers { - output_headers.push(value_as_string( - eval_constant(working_set, expr)?, - expr.span, - )?); - } - - let mut output_rows = vec![]; - for val in vals { - let mut row = vec![]; - for expr in val { - row.push(eval_constant(working_set, expr)?); - } - output_rows.push(Value::record( - Record { - cols: output_headers.clone(), - vals: row, - }, - expr.span, - )); - } - Ok(Value::list(output_rows, expr.span)) - } - Expr::Keyword(_, _, expr) => eval_constant(working_set, expr), - Expr::String(s) => Ok(Value::string(s, expr.span)), - Expr::Nothing => Ok(Value::nothing(expr.span)), - Expr::ValueWithUnit(expr, unit) => { - if let Ok(Value::Int { val, .. }) = eval_constant(working_set, expr) { - unit.item.to_value(val, unit.span).map_err(|_| { - ParseError::InvalidLiteral( - "literal can not fit in unit".into(), - "literal can not fit in unit".into(), - unit.span, - ) - }) - } else { - Err(ParseError::NotAConstant(expr.span)) - } - } - _ => Err(ParseError::NotAConstant(expr.span)), - } -} - -/// Get the value as a string -pub fn value_as_string(value: Value, span: Span) -> Result { - match value { - Value::String { val, .. } => Ok(val), - _ => Err(ParseError::NotAConstant(span)), - } -}