summaryrefslogtreecommitdiff
path: root/src/syntax/ast/expr.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/syntax/ast/expr.rs')
-rw-r--r--src/syntax/ast/expr.rs199
1 files changed, 0 insertions, 199 deletions
diff --git a/src/syntax/ast/expr.rs b/src/syntax/ast/expr.rs
index 718b0568..4f440d33 100644
--- a/src/syntax/ast/expr.rs
+++ b/src/syntax/ast/expr.rs
@@ -1,9 +1,6 @@
//! Expressions.
use super::*;
-use crate::eval::Value;
-use crate::layout::LayoutContext;
-use crate::DynFuture;
/// An expression.
#[derive(Debug, Clone, PartialEq)]
@@ -18,20 +15,6 @@ pub enum Expr {
Binary(ExprBinary),
}
-impl Expr {
- /// Evaluate the expression to a value.
- pub fn eval<'a>(&'a self, ctx: &'a mut LayoutContext) -> DynFuture<'a, Value> {
- Box::pin(async move {
- match self {
- Self::Lit(lit) => lit.eval(ctx).await,
- Self::Call(call) => call.eval(ctx).await,
- Self::Unary(unary) => unary.eval(ctx).await,
- Self::Binary(binary) => binary.eval(ctx).await,
- }
- })
- }
-}
-
/// An invocation of a function: `[foo: ...]`, `foo(...)`.
#[derive(Debug, Clone, PartialEq)]
pub struct ExprCall {
@@ -41,26 +24,6 @@ pub struct ExprCall {
pub args: LitDict,
}
-impl ExprCall {
- /// Evaluate the call expression to a value.
- pub async fn eval(&self, ctx: &mut LayoutContext) -> Value {
- let name = &self.name.v;
- let span = self.name.span;
- let args = self.args.eval(ctx).await;
-
- if let Some(func) = ctx.state.scope.func(name) {
- ctx.f.decorations.push(Decoration::Resolved.span_with(span));
- (func.clone())(args, ctx).await
- } else {
- if !name.is_empty() {
- error!(@ctx.f, span, "unknown function");
- ctx.f.decorations.push(Decoration::Unresolved.span_with(span));
- }
- Value::Dict(args)
- }
- }
-}
-
/// A unary operation: `-x`.
#[derive(Debug, Clone, PartialEq)]
pub struct ExprUnary {
@@ -70,33 +33,6 @@ pub struct ExprUnary {
pub expr: Spanned<Box<Expr>>,
}
-impl ExprUnary {
- /// Evaluate the expression to a value.
- pub async fn eval(&self, ctx: &mut LayoutContext) -> Value {
- use Value::*;
-
- let value = self.expr.v.eval(ctx).await;
- if value == Error {
- return Error;
- }
-
- let span = self.op.span.join(self.expr.span);
- match self.op.v {
- UnOp::Neg => match value {
- Int(v) => Int(-v),
- Float(v) => Float(-v),
- Length(v) => Length(-v),
- Relative(v) => Relative(-v),
- Linear(v) => Linear(-v),
- v => {
- error!(@ctx.f, span, "cannot negate {}", v.ty());
- Value::Error
- }
- },
- }
- }
-}
-
/// A unary operator.
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub enum UnOp {
@@ -115,141 +51,6 @@ pub struct ExprBinary {
pub rhs: Spanned<Box<Expr>>,
}
-impl ExprBinary {
- /// Evaluate the expression to a value.
- pub async fn eval(&self, ctx: &mut LayoutContext) -> Value {
- use crate::geom::Linear as Lin;
- use Value::*;
-
- let lhs = self.lhs.v.eval(ctx).await;
- let rhs = self.rhs.v.eval(ctx).await;
-
- if lhs == Error || rhs == Error {
- return Error;
- }
-
- let span = self.lhs.span.join(self.rhs.span);
- match self.op.v {
- BinOp::Add => match (lhs, rhs) {
- // Numbers to themselves.
- (Int(a), Int(b)) => Int(a + b),
- (Int(a), Float(b)) => Float(a as f64 + b),
- (Float(a), Int(b)) => Float(a + b as f64),
- (Float(a), Float(b)) => Float(a + b),
-
- // Lengths, relatives and linears to themselves.
- (Length(a), Length(b)) => Length(a + b),
- (Length(a), Relative(b)) => Linear(Lin::abs(a) + Lin::rel(b)),
- (Length(a), Linear(b)) => Linear(Lin::abs(a) + b),
-
- (Relative(a), Length(b)) => Linear(Lin::rel(a) + Lin::abs(b)),
- (Relative(a), Relative(b)) => Relative(a + b),
- (Relative(a), Linear(b)) => Linear(Lin::rel(a) + b),
-
- (Linear(a), Length(b)) => Linear(a + Lin::abs(b)),
- (Linear(a), Relative(b)) => Linear(a + Lin::rel(b)),
- (Linear(a), Linear(b)) => Linear(a + b),
-
- // Complex data types to themselves.
- (Str(a), Str(b)) => Str(a + &b),
- (Dict(a), Dict(b)) => Dict(concat(a, b)),
- (Content(a), Content(b)) => Content(concat(a, b)),
- (Commands(a), Commands(b)) => Commands(concat(a, b)),
-
- (a, b) => {
- error!(@ctx.f, span, "cannot add {} and {}", a.ty(), b.ty());
- Value::Error
- }
- },
-
- BinOp::Sub => match (lhs, rhs) {
- // Numbers from themselves.
- (Int(a), Int(b)) => Int(a - b),
- (Int(a), Float(b)) => Float(a as f64 - b),
- (Float(a), Int(b)) => Float(a - b as f64),
- (Float(a), Float(b)) => Float(a - b),
-
- // Lengths, relatives and linears from themselves.
- (Length(a), Length(b)) => Length(a - b),
- (Length(a), Relative(b)) => Linear(Lin::abs(a) - Lin::rel(b)),
- (Length(a), Linear(b)) => Linear(Lin::abs(a) - b),
- (Relative(a), Length(b)) => Linear(Lin::rel(a) - Lin::abs(b)),
- (Relative(a), Relative(b)) => Relative(a - b),
- (Relative(a), Linear(b)) => Linear(Lin::rel(a) - b),
- (Linear(a), Length(b)) => Linear(a - Lin::abs(b)),
- (Linear(a), Relative(b)) => Linear(a - Lin::rel(b)),
- (Linear(a), Linear(b)) => Linear(a - b),
-
- (a, b) => {
- error!(@ctx.f, span, "cannot subtract {1} from {0}", a.ty(), b.ty());
- Value::Error
- }
- },
-
- BinOp::Mul => match (lhs, rhs) {
- // Numbers with themselves.
- (Int(a), Int(b)) => Int(a * b),
- (Int(a), Float(b)) => Float(a as f64 * b),
- (Float(a), Int(b)) => Float(a * b as f64),
- (Float(a), Float(b)) => Float(a * b),
-
- // Lengths, relatives and linears with numbers.
- (Length(a), Int(b)) => Length(a * b as f64),
- (Length(a), Float(b)) => Length(a * b),
- (Int(a), Length(b)) => Length(a as f64 * b),
- (Float(a), Length(b)) => Length(a * b),
- (Relative(a), Int(b)) => Relative(a * b as f64),
- (Relative(a), Float(b)) => Relative(a * b),
- (Int(a), Relative(b)) => Relative(a as f64 * b),
- (Float(a), Relative(b)) => Relative(a * b),
- (Linear(a), Int(b)) => Linear(a * b as f64),
- (Linear(a), Float(b)) => Linear(a * b),
- (Int(a), Linear(b)) => Linear(a as f64 * b),
- (Float(a), Linear(b)) => Linear(a * b),
-
- // Integers with strings.
- (Int(a), Str(b)) => Str(b.repeat(a.max(0) as usize)),
- (Str(a), Int(b)) => Str(a.repeat(b.max(0) as usize)),
-
- (a, b) => {
- error!(@ctx.f, span, "cannot multiply {} with {}", a.ty(), b.ty());
- Value::Error
- }
- },
-
- BinOp::Div => match (lhs, rhs) {
- // Numbers by themselves.
- (Int(a), Int(b)) => Float(a as f64 / b as f64),
- (Int(a), Float(b)) => Float(a as f64 / b),
- (Float(a), Int(b)) => Float(a / b as f64),
- (Float(a), Float(b)) => Float(a / b),
-
- // Lengths by numbers.
- (Length(a), Int(b)) => Length(a / b as f64),
- (Length(a), Float(b)) => Length(a / b),
- (Relative(a), Int(b)) => Relative(a / b as f64),
- (Relative(a), Float(b)) => Relative(a / b),
- (Linear(a), Int(b)) => Linear(a / b as f64),
- (Linear(a), Float(b)) => Linear(a / b),
-
- (a, b) => {
- error!(@ctx.f, span, "cannot divide {} by {}", a.ty(), b.ty());
- Value::Error
- }
- },
- }
- }
-}
-
-/// Concatenate two collections.
-fn concat<T, A>(mut a: T, b: T) -> T
-where
- T: Extend<A> + IntoIterator<Item = A>,
-{
- a.extend(b);
- a
-}
-
/// A binary operator.
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub enum BinOp {
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-16 00:45:33 +0000