From e676ab53ddbab367179ee2ab214bb41ff2ee0c11 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 1 Oct 2020 15:13:04 +0200 Subject: [PATCH] =?UTF-8?q?Rename=20compute=20to=20eval=20=E2=9C=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{compute => eval}/dict.rs | 0 src/{compute => eval}/mod.rs | 2 +- src/{compute => eval}/scope.rs | 0 src/{compute => eval}/value.rs | 0 src/layout/mod.rs | 2 +- src/lib.rs | 4 ++-- src/library/mod.rs | 2 +- src/parse/mod.rs | 2 +- src/parse/tests.rs | 2 +- src/prelude.rs | 2 +- src/syntax/expr.rs | 2 +- src/syntax/lit.rs | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename src/{compute => eval}/dict.rs (100%) rename src/{compute => eval}/mod.rs (64%) rename src/{compute => eval}/scope.rs (100%) rename src/{compute => eval}/value.rs (100%) diff --git a/src/compute/dict.rs b/src/eval/dict.rs similarity index 100% rename from src/compute/dict.rs rename to src/eval/dict.rs diff --git a/src/compute/mod.rs b/src/eval/mod.rs similarity index 64% rename from src/compute/mod.rs rename to src/eval/mod.rs index 8f2226b1e..65fc71c42 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 similarity index 100% rename from src/compute/scope.rs rename to src/eval/scope.rs diff --git a/src/compute/value.rs b/src/eval/value.rs similarity index 100% rename from src/compute/value.rs rename to src/eval/value.rs diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 5f32167a6..0843e80ac 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 6d52fd37a..431525426 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 0e99a5c52..a5fdfc4c1 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 ea030ce1f..cc0b63781 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 7ffbeedab..9d6b673ff 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 2938efd04..8f3584303 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 8705b6bba..7f4d03d50 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 9684e5d3a..3cd945839 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};