summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-10-01 15:13:04 +0200
committerLaurenz <laurmaedje@gmail.com>2020-10-01 15:13:04 +0200
commite676ab53ddbab367179ee2ab214bb41ff2ee0c11 (patch)
treef003f6eb6698494310da5771249bbb61a8da27a0
parent7c12f0c07f9d4ed473027dbd00cbbc00e4a3050c (diff)
Rename compute to eval ✏
-rw-r--r--src/eval/dict.rs (renamed from src/compute/dict.rs)0
-rw-r--r--src/eval/mod.rs (renamed from src/compute/mod.rs)2
-rw-r--r--src/eval/scope.rs (renamed from src/compute/scope.rs)0
-rw-r--r--src/eval/value.rs (renamed from src/compute/value.rs)0
-rw-r--r--src/layout/mod.rs2
-rw-r--r--src/lib.rs4
-rw-r--r--src/library/mod.rs2
-rw-r--r--src/parse/mod.rs2
-rw-r--r--src/parse/tests.rs2
-rw-r--r--src/prelude.rs2
-rw-r--r--src/syntax/expr.rs2
-rw-r--r--src/syntax/lit.rs2
12 files changed, 10 insertions, 10 deletions
diff --git a/src/compute/dict.rs b/src/eval/dict.rs
index e6216572..e6216572 100644
--- a/src/compute/dict.rs
+++ b/src/eval/dict.rs
diff --git a/src/compute/mod.rs b/src/eval/mod.rs
index 8f2226b1..65fc71c4 100644
--- a/src/compute/mod.rs
+++ b/src/eval/mod.rs
@@ -1,4 +1,4 @@
-//! Building blocks for the computational part.
+//! Evaluation of syntax trees.
mod dict;
mod scope;
diff --git a/src/compute/scope.rs b/src/eval/scope.rs
index 8e6576d1..8e6576d1 100644
--- a/src/compute/scope.rs
+++ b/src/eval/scope.rs
diff --git a/src/compute/value.rs b/src/eval/value.rs
index cfbc302c..cfbc302c 100644
--- a/src/compute/value.rs
+++ b/src/eval/value.rs
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 5f32167a..0843e80a 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -21,7 +21,7 @@ pub mod prelude {
pub use primitive::*;
pub use tree::layout_tree as layout;
-use crate::compute::Scope;
+use crate::eval::Scope;
use crate::font::SharedFontLoader;
use crate::geom::{Margins, Size};
use crate::style::{LayoutStyle, PageStyle, TextStyle};
diff --git a/src/lib.rs b/src/lib.rs
index 6d52fd37..43152542 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,7 @@ mod macros;
pub mod diagnostic;
pub mod color;
-pub mod compute;
+pub mod eval;
pub mod export;
pub mod font;
pub mod geom;
@@ -44,8 +44,8 @@ use std::fmt::Debug;
use std::future::Future;
use std::pin::Pin;
-use crate::compute::{Scope, Value};
use crate::diagnostic::Diagnostic;
+use crate::eval::{Scope, Value};
use crate::font::SharedFontLoader;
use crate::layout::{Commands, MultiLayout};
use crate::style::{LayoutStyle, PageStyle, TextStyle};
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 0e99a5c5..a5fdfc4c 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -16,7 +16,7 @@ pub use spacing::*;
use std::rc::Rc;
-use crate::compute::Scope;
+use crate::eval::Scope;
use crate::prelude::*;
macro_rules! std {
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index ea030ce1..cc0b6378 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -13,7 +13,7 @@ pub use tokens::*;
use std::str::FromStr;
use crate::color::RgbaColor;
-use crate::compute::DictKey;
+use crate::eval::DictKey;
use crate::syntax::*;
use crate::{Feedback, Pass};
diff --git a/src/parse/tests.rs b/src/parse/tests.rs
index 7ffbeeda..9d6b673f 100644
--- a/src/parse/tests.rs
+++ b/src/parse/tests.rs
@@ -6,7 +6,7 @@ use std::fmt::Debug;
use super::parse;
use crate::color::RgbaColor;
-use crate::compute::DictKey;
+use crate::eval::DictKey;
use crate::length::Length;
use crate::syntax::*;
diff --git a/src/prelude.rs b/src/prelude.rs
index 2938efd0..8f358430 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,7 +1,7 @@
//! A prelude for building custom functions.
pub use super::*;
-pub use crate::compute::*;
+pub use crate::eval::*;
pub use crate::layout::prelude::*;
pub use crate::layout::Command::{self, *};
pub use crate::layout::Commands;
diff --git a/src/syntax/expr.rs b/src/syntax/expr.rs
index 8705b6bb..7f4d03d5 100644
--- a/src/syntax/expr.rs
+++ b/src/syntax/expr.rs
@@ -2,7 +2,7 @@
use super::span::{SpanWith, Spanned};
use super::{Decoration, Ident, Lit, LitDict};
-use crate::compute::Value;
+use crate::eval::Value;
use crate::layout::LayoutContext;
use crate::Feedback;
diff --git a/src/syntax/lit.rs b/src/syntax/lit.rs
index 9684e5d3..3cd94583 100644
--- a/src/syntax/lit.rs
+++ b/src/syntax/lit.rs
@@ -2,7 +2,7 @@
use super::{Expr, Ident, SpanWith, Spanned, SynTree};
use crate::color::RgbaColor;
-use crate::compute::{DictKey, DictValue, SpannedEntry, Value};
+use crate::eval::{DictKey, DictValue, SpannedEntry, Value};
use crate::layout::LayoutContext;
use crate::length::Length;
use crate::{DynFuture, Feedback};