Merge pull request #144 from togglebyte/feature/expr_id

Dedupe expressions

Author: togglebyte

Cargo.toml

@@ -31,7 +31,12 @@ anathema-testutils = { path = "anathema-testutils" }
 
 [features]
 default = []
-profile = ["anathema-runtime/profile", "anathema-widgets/profile", "anathema-backend/profile", "anathema-value-resolver/profile"]
+profile = [
+    "anathema-runtime/profile", 
+    "anathema-widgets/profile", 
+    "anathema-backend/profile",
+    "anathema-value-resolver/profile",
+]
 serde = ["anathema-state/serde", "anathema-store/serde"]
 # filelog = ["anathema-debug/filelog", "anathema-widgets/filelog", "anathema-runtime/filelog"]
 

anathema-default-widgets/src/border.rs

@@ -428,7 +428,7 @@ impl Widget for Border {
         id: WidgetId,
         ctx: &mut LayoutCtx<'_, 'bp>,
     ) -> Result<Size> {
-        let attributes = ctx.attribute_storage.get_mut(id);
+        let attributes = ctx.attribute_storage.get(id);
 
         self.sides = attributes.get_as::<Sides>("sides").unwrap_or_default();
 

anathema-default-widgets/src/testing.rs

@@ -134,6 +134,7 @@ pub struct TestRunner {
     variables: Variables,
     components: Components,
     function_table: FunctionTable,
+    doc: Document,
 }
 
 impl TestRunner {
@@ -171,6 +172,7 @@ impl TestRunner {
             variables,
             components: Components::new(),
             function_table: FunctionTable::new(),
+            doc,
         }
     }
 
@@ -184,6 +186,7 @@ impl TestRunner {
             &mut self.component_registry,
             &mut self.components,
             &self.function_table,
+            &self.doc,
         )
     }
 }
@@ -202,6 +205,7 @@ pub struct TestInstance<'bp> {
     changes: Changes,
     glyph_map: GlyphMap,
     function_table: &'bp FunctionTable,
+    doc: &'bp Document,
 }
 
 impl<'bp> TestInstance<'bp> {
@@ -214,6 +218,7 @@ impl<'bp> TestInstance<'bp> {
         component_registry: &'bp mut ComponentRegistry,
         components: &'bp mut Components,
         function_table: &'bp FunctionTable,
+        doc: &'bp Document,
     ) -> Self {
         let mut tree = WidgetTree::empty();
         let mut attribute_storage = AttributeStorage::empty();
@@ -233,6 +238,7 @@ impl<'bp> TestInstance<'bp> {
             &mut glyph_map,
             &mut viewport,
             function_table,
+            &doc.expressions,
         );
 
         let mut ctx = ctx.eval_ctx(None, None);
@@ -254,6 +260,7 @@ impl<'bp> TestInstance<'bp> {
             changes: Changes::empty(),
             glyph_map,
             function_table,
+            doc,
         }
     }
 
@@ -285,6 +292,7 @@ impl<'bp> TestInstance<'bp> {
             &mut self.glyph_map,
             &mut self.viewport,
             self.function_table,
+            &self.doc.expressions,
         );
 
         self.changes.iter().for_each(|(sub, change)| {
@@ -331,6 +339,7 @@ impl<'bp> TestInstance<'bp> {
             &mut self.glyph_map,
             &mut self.viewport,
             self.function_table,
+            &self.doc.expressions,
         );
 
         let mut cycle = WidgetCycle::new(self.backend, self.tree.view(), constraints);

anathema-runtime/src/builder.rs

@@ -171,7 +171,8 @@ impl<G: GlobalEventHandler> Builder<G> {
     }
 
     pub fn register_global(&mut self, key: impl Into<String>, value: impl Into<Expression>) -> Result<()> {
-        self.variables.define_global(key, value).map_err(|e| e.to_error(None))?;
+        let id = self.document.expressions.insert_at_root(value.into());
+        self.variables.define_global(key, id).map_err(|e| e.to_error(None))?;
         Ok(())
     }
 

anathema-runtime/src/runtime/mod.rs

@@ -66,7 +66,8 @@ impl Runtime<()> {
     }
 
     pub fn register_global(&mut self, key: impl Into<String>, value: impl Into<Expression>) -> Result<()> {
-        self.variables.define_global(key, value).map_err(|e| e.to_error(None))?;
+        let id = self.document.expressions.insert_at_root(value.into());
+        self.variables.define_global(key, id).map_err(|e| e.to_error(None))?;
         Ok(())
     }
 
@@ -239,6 +240,7 @@ impl<G: GlobalEventHandler> Runtime<G> {
             &mut self.glyph_map,
             &mut self.viewport,
             &self.function_table,
+            &self.document.expressions,
         );
 
         let inst = Frame {

anathema-store/src/slab/generational.rs

@@ -460,6 +460,20 @@ where
     }
 }
 
+// -----------------------------------------------------------------------------
+//   - Index -
+// -----------------------------------------------------------------------------
+impl<T> std::ops::Index<Key> for GenSlab<T> {
+    type Output = T;
+
+    fn index(&self, index: Key) -> &Self::Output {
+        match self.get(index) {
+            Some(val) => val,
+            None => panic!("invalid index or generation"),
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

anathema-templates/src/blueprints.rs

@@ -1,28 +1,29 @@
 use anathema_store::smallmap::SmallMap;
 use anathema_store::storage::strings::StringId;
 
+use crate::ComponentBlueprintId;
 use crate::components::AssocEventMapping;
-use crate::{ComponentBlueprintId, Expression};
+use crate::expressions::ExpressionId;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Single {
     pub ident: String,
     pub children: Vec<Blueprint>,
-    pub attributes: SmallMap<String, Expression>,
-    pub value: Option<Expression>,
+    pub attributes: SmallMap<String, ExpressionId>,
+    pub value: Option<ExpressionId>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct For {
     pub binding: String,
-    pub data: Expression,
+    pub data: ExpressionId,
     pub body: Vec<Blueprint>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct With {
     pub binding: String,
-    pub data: Expression,
+    pub data: ExpressionId,
     pub body: Vec<Blueprint>,
 }
 
@@ -34,7 +35,7 @@ pub struct ControlFlow {
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Else {
-    pub cond: Option<Expression>,
+    pub cond: Option<ExpressionId>,
     pub body: Vec<Blueprint>,
 }
 
@@ -44,7 +45,7 @@ pub struct Component {
     pub name_id: StringId,
     pub id: ComponentBlueprintId,
     pub body: Vec<Blueprint>,
-    pub attributes: SmallMap<String, Expression>,
+    pub attributes: SmallMap<String, ExpressionId>,
     pub assoc_functions: Vec<AssocEventMapping>,
     /// The parent component in the blueprint
     pub parent: Option<ComponentBlueprintId>,

anathema-templates/src/components.rs

@@ -10,6 +10,7 @@ use anathema_store::storage::Storage;
 use crate::Lexer;
 use crate::blueprints::Blueprint;
 use crate::error::{Error, ErrorKind, Result};
+use crate::expressions::Expressions;
 use crate::statements::eval::Scope;
 use crate::statements::parser::Parser;
 use crate::statements::{Context, Statements};
@@ -223,6 +224,7 @@ impl ComponentTemplates {
         variables: &mut Variables,
         slots: SmallMap<StringId, Vec<Blueprint>>,
         strings: &mut Strings,
+        expressions: &mut Expressions,
     ) -> Result<Vec<Blueprint>> {
         let ticket = self.components.checkout(component_id);
         let (_, component_src) = &*ticket;
@@ -238,7 +240,7 @@ impl ComponentTemplates {
         // NOTE
         // The ticket has to be restored to the component store,
         // this is why the error is returned rather than using `?` on `self.compile`.
-        let ret = self.compile(component_src, variables, slots, strings, component_id);
+        let ret = self.compile(component_src, variables, slots, strings, expressions, component_id);
         self.components.restore(ticket);
         self.dependencies.pop();
         ret
@@ -250,6 +252,7 @@ impl ComponentTemplates {
         variables: &mut Variables,
         slots: SmallMap<StringId, Vec<Blueprint>>,
         strings: &mut Strings,
+        expressions: &mut Expressions,
         parent: ComponentBlueprintId,
     ) -> Result<Vec<Blueprint>> {
         let tokens = Lexer::new(template, strings).collect::<Result<Vec<_>>>()?;
@@ -258,7 +261,7 @@ impl ComponentTemplates {
 
         let statements = parser.collect::<Result<Statements>>()?;
 
-        let mut context = Context::new(template, variables, self, strings, slots, Some(parent));
+        let mut context = Context::new(template, variables, self, strings, expressions, slots, Some(parent));
 
         Scope::new(statements).eval(&mut context)
     }

anathema-templates/src/document.rs

@@ -6,6 +6,7 @@ use anathema_store::smallmap::SmallMap;
 use crate::blueprints::Blueprint;
 use crate::components::{ComponentTemplates, SourceKind, TemplateSource};
 use crate::error::{Error, ErrorKind, Result};
+use crate::expressions::Expressions;
 use crate::statements::eval::Scope;
 use crate::statements::parser::Parser;
 use crate::statements::{Context, Statements};
@@ -21,6 +22,7 @@ use crate::{ComponentBlueprintId, Lexer, Variables};
 pub struct Document {
     template: TemplateSource,
     pub strings: Strings,
+    pub expressions: Expressions,
     components: ComponentTemplates,
     pub hot_reload: bool,
 }
@@ -31,6 +33,7 @@ impl Document {
         Self {
             template,
             strings: Strings::new(),
+            expressions: Expressions::empty(),
             components: ComponentTemplates::new(),
             hot_reload: true,
         }
@@ -58,6 +61,8 @@ impl Document {
 
     pub fn compile(&mut self, globals: &mut Variables) -> Result<Blueprint> {
         globals.reset_globals();
+        self.expressions.clear();
+
         let tokens = Lexer::new(&self.template, &mut self.strings).collect::<Result<Vec<_>>>()?;
         let tokens = Tokens::new(tokens, self.template.len());
         let parser = Parser::new(tokens, &mut self.strings, &self.template, &mut self.components);
@@ -68,6 +73,7 @@ impl Document {
             template: &self.template,
             variables: globals,
             strings: &mut self.strings,
+            expressions: &mut self.expressions,
             components: &mut self.components,
             slots: SmallMap::empty(),
             current_component_parent: None,

anathema-templates/src/expressions/mod.rs

@@ -2,13 +2,80 @@ use std::collections::HashMap;
 use std::fmt::Display;
 
 use anathema_state::Hex;
+use anathema_store::slab::Index;
 
 use crate::primitives::Primitive;
-use crate::variables::VarId;
+use crate::variables::{ScopeId, VarId};
 
 pub(crate) mod eval;
 pub(crate) mod parser;
 
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub struct ExpressionId(u32);
+
+impl From<ExpressionId> for Index {
+    fn from(value: ExpressionId) -> Self {
+        value.0.into()
+    }
+}
+
+#[derive(Debug)]
+pub struct Expressions {
+    inner: Vec<(Expression, ScopeId)>,
+}
+
+impl Expressions {
+    pub fn empty() -> Self {
+        Self { inner: vec![] }
+    }
+
+    /// Get a reference to an expression
+    ///
+    /// # Panics
+    ///
+    /// Panics if the expression id is greater than the length of expressions.
+    /// This should never happen as the ids are assigned to blueprints using them.
+    ///
+    /// Only time this could happen is if the expression id is created outside of the tempalte
+    /// generation.
+    pub fn get(&self, id: ExpressionId) -> &Expression {
+        &self.inner[id.0 as usize].0
+    }
+
+    /// Insert an expression in the root scope
+    pub fn insert_at_root(&mut self, expression: impl Into<Expression>) -> ExpressionId {
+        self.insert(expression.into(), ScopeId::root().clone())
+    }
+
+    /// Insert an expression and return the id to the newly inserted expression
+    pub fn insert(&mut self, expression: Expression, boundary: ScopeId) -> ExpressionId {
+        let id = ExpressionId(self.inner.len() as u32);
+        match self
+            .inner
+            .iter()
+            .position(|(e, scope)| expression.eq(e) && boundary.eq(scope))
+        {
+            Some(id) => ExpressionId(id as u32),
+            None => {
+                self.inner.push((expression, boundary));
+                id
+            }
+        }
+    }
+
+    pub(crate) fn clear(&mut self) {
+        self.inner.clear()
+    }
+}
+
+impl std::ops::Index<ExpressionId> for Expressions {
+    type Output = Expression;
+
+    fn index(&self, index: ExpressionId) -> &Self::Output {
+        &self.inner[index.0 as usize].0
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum Op {
     Add,