eval: rename ObjectNodes -> ModelNodes

Author: fightling

lang/eval/expression.rs

@@ -162,7 +162,7 @@ impl Eval for Nested {
             node_stack.push(nodes);
         }
 
-        Ok(Value::Nodes(ObjectNodes::from_node_stack(&node_stack)))
+        Ok(Value::Nodes(ModelNodes::from_node_stack(&node_stack)))
     }
 }
 

lang/eval/part.rs

@@ -76,7 +76,7 @@ impl CallTrait for PartDefinition {
     /// Consider the `part a(b: Scalar) { }`.
     /// Calling the part `a([1.0, 2.0])` results in two nodes with `b = 1.0` and `b = 2.0`, respectively.
     fn call(&self, args: &CallArgumentValueList, context: &mut Context) -> EvalResult<Value> {
-        let mut nodes = ObjectNodes::default();
+        let mut nodes = ModelNodes::default();
 
         match self.find_matching_initializer(args, context) {
             Some((init, multi_args)) => {

lang/model_tree/mod.rs

@@ -247,7 +247,7 @@ impl ModelNode {
     /// Append a multiple nodes as children.
     ///
     /// Return self.
-    pub fn append_children(&self, nodes: ObjectNodes) -> Self {
+    pub fn append_children(&self, nodes: ModelNodes) -> Self {
         for node in nodes.iter() {
             self.append(node.clone())
         }
@@ -327,9 +327,9 @@ impl std::fmt::Display for ModelNode {
 
 /// Object node multiplicities.
 #[derive(Debug, Default, Clone, PartialEq)]
-pub struct ObjectNodes(Vec<ModelNode>);
+pub struct ModelNodes(Vec<ModelNode>);
 
-impl ObjectNodes {
+impl ModelNodes {
     /// Returns the first node if there is exactly one node in the list.
     pub fn single_node(&self) -> Option<ModelNode> {
         match self.0.len() {
@@ -371,7 +371,7 @@ impl ObjectNodes {
     ///       d0
     ///     c2
     ///       d0
-    pub fn from_node_stack(node_stack: &[ObjectNodes]) -> Self {
+    pub fn from_node_stack(node_stack: &[ModelNodes]) -> Self {
         match node_stack.len() {
             0 => panic!("Node stack must not be empty"),
             1 => {}
@@ -421,7 +421,7 @@ impl ObjectNodes {
     }
 
     /// Merge two lists of [`ObjectNode`] into one by concatenation.
-    pub fn merge(lhs: ObjectNodes, rhs: ObjectNodes) -> Self {
+    pub fn merge(lhs: ModelNodes, rhs: ModelNodes) -> Self {
         lhs.iter()
             .chain(rhs.iter())
             .cloned()
@@ -438,27 +438,27 @@ impl ObjectNodes {
     }
 }
 
-impl std::ops::Deref for ObjectNodes {
+impl std::ops::Deref for ModelNodes {
     type Target = Vec<ModelNode>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
 
-impl std::ops::DerefMut for ObjectNodes {
+impl std::ops::DerefMut for ModelNodes {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.0
     }
 }
 
-impl From<Vec<ModelNode>> for ObjectNodes {
+impl From<Vec<ModelNode>> for ModelNodes {
     fn from(value: Vec<ModelNode>) -> Self {
         Self(value)
     }
 }
 
-impl std::fmt::Display for ObjectNodes {
+impl std::fmt::Display for ModelNodes {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         for node in self.iter() {
             node.fmt(f)?;
@@ -497,7 +497,7 @@ fn node_nest() {
     //       d0
     //     c2
     //       d0
-    let nodes = ObjectNodes::from_node_stack(&nodes);
+    let nodes = ModelNodes::from_node_stack(&nodes);
     assert_eq!(nodes.len(), 2); // Contains a0 and a1 as root
 
     for node in nodes.iter() {

lang/model_tree/object/object_builder.rs

@@ -12,7 +12,7 @@ pub struct ObjectBuilder {
     object: Object,
 
     /// Children to be placed in the node.
-    children: ObjectNodes,
+    children: ModelNodes,
 
     /// Metadata for the object node.
     metadata: Metadata,
@@ -59,7 +59,7 @@ impl ObjectBuilder {
     }
 
     /// Append child nodes to this object node.
-    pub fn append_children(&mut self, nodes: &mut ObjectNodes) -> &mut Self {
+    pub fn append_children(&mut self, nodes: &mut ModelNodes) -> &mut Self {
         (*self.children).append(nodes);
         self
     }

lang/syntax/statement/assignment_statement.rs

@@ -64,7 +64,7 @@ impl Eval for AssignmentStatement {
 
 impl AssignmentStatement {
     /// Try to evaluate the assignment into nodes.
-    pub fn try_eval_to_nodes(&self, context: &mut Context) -> EvalResult<ObjectNodes> {
+    pub fn try_eval_to_nodes(&self, context: &mut Context) -> EvalResult<ModelNodes> {
         let value = self
             .assignment
             .expression

lang/value/mod.rs

@@ -68,7 +68,7 @@ pub enum Value {
     /// A tuple of unnamed items.
     UnnamedTuple(UnnamedTuple),
     /// A node in the render tree.
-    Nodes(ObjectNodes),
+    Nodes(ModelNodes),
 }
 
 impl Value {
@@ -90,10 +90,10 @@ impl Value {
     }
 
     /// Fetch nodes from this value.
-    pub fn fetch_nodes(self) -> ObjectNodes {
+    pub fn fetch_nodes(self) -> ModelNodes {
         match self {
             Self::Nodes(n) => n,
-            _ => ObjectNodes::default(),
+            _ => ModelNodes::default(),
         }
     }
 
@@ -386,9 +386,9 @@ impl std::ops::BitOr for Value {
 
     fn bitor(self, rhs: Self) -> Self::Output {
         match (self, rhs) {
-            (Value::Nodes(lhs), Value::Nodes(rhs)) => Ok(Value::from_single_node(
-                ObjectNodes::merge(lhs, rhs).union(),
-            )),
+            (Value::Nodes(lhs), Value::Nodes(rhs)) => {
+                Ok(Value::from_single_node(ModelNodes::merge(lhs, rhs).union()))
+            }
             (lhs, rhs) => Err(ValueError::InvalidOperator(format!("{lhs} | {rhs}"))),
         }
     }
@@ -488,8 +488,8 @@ impl_try_from!(Bool => bool);
 impl_try_from!(String => String);
 impl_try_from!(Color => Color);
 
-impl From<ObjectNodes> for Value {
-    fn from(nodes: ObjectNodes) -> Self {
+impl From<ModelNodes> for Value {
+    fn from(nodes: ModelNodes) -> Self {
         match nodes.len() {
             0 => Value::None,
             _ => Value::Nodes(nodes),