Update Model

Added Any List. Hopefully it's the right move.

src/v2/lu_dog/types.rs

@@ -3,6 +3,7 @@
 pub mod a_wait;
 pub mod addition;
 pub mod and;
+pub mod any_list;
 pub mod argument;
 pub mod assignment;
 pub mod binary;
@@ -117,6 +118,8 @@ pub use crate::v2::lu_dog::addition::Addition;
 pub use crate::v2::lu_dog::addition::ADDITION;
 pub use crate::v2::lu_dog::and::And;
 pub use crate::v2::lu_dog::and::AND;
+pub use crate::v2::lu_dog::any_list::AnyList;
+pub use crate::v2::lu_dog::any_list::ANY_LIST;
 pub use crate::v2::lu_dog::argument::Argument;
 pub use crate::v2::lu_dog::assignment::Assignment;
 pub use crate::v2::lu_dog::assignment::ASSIGNMENT;

src/v2/lu_dog/types/any_list.rs

@@ -0,0 +1,33 @@
+// {"magic":"","directive":{"Start":{"directive":"allow-editing","tag":"any_list-struct-definition-file"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-use-statements"}}}
+use serde::{Deserialize, Serialize};
+use uuid::{uuid, Uuid};
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-documentation"}}}
+/// A list that does not enforce that it’s elements all share a type.
+///
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-definition"}}}
+pub const ANY_LIST: Uuid = uuid!["356fe736-c2f0-5d4e-baa6-8725754ed1d3"];
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct AnyList;
+
+impl AnyList {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    pub fn id(&self) -> Uuid {
+        ANY_LIST
+    }
+}
+
+impl Default for AnyList {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"End":{"directive":"allow-editing"}}}

src/v2/lu_dog/types/value_type.rs

@@ -4,6 +4,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use uuid::Uuid;
 
+use crate::v2::lu_dog::types::any_list::ANY_LIST;
 use crate::v2::lu_dog::types::char::CHAR;
 use crate::v2::lu_dog::types::empty::EMPTY;
 use crate::v2::lu_dog::types::enum_generic::EnumGeneric;
@@ -67,6 +68,7 @@ pub struct ValueType {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-hybrid-enum-definition"}}}
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum ValueTypeEnum {
+    AnyList(Uuid),
     Char(Uuid),
     Empty(Uuid),
     EnumGeneric(Uuid),
@@ -90,6 +92,19 @@ pub enum ValueTypeEnum {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-implementation"}}}
 impl ValueType {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-new-impl"}}}
+    // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_any_list"}}}
+    /// Inter a new ValueType in the store, and return it's `id`.
+    pub fn new_any_list(bogus: bool, store: &mut LuDogStore) -> Rc<RefCell<ValueType>> {
+        let id = Uuid::new_v4();
+        let new = Rc::new(RefCell::new(ValueType {
+            bogus: bogus,
+            subtype: ValueTypeEnum::AnyList(ANY_LIST),
+            id,
+        }));
+        store.inter_value_type(new.clone());
+        new
+    }
+    // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_char"}}}
     /// Inter a new ValueType in the store, and return it's `id`.
     pub fn new_char(bogus: bool, store: &mut LuDogStore) -> Rc<RefCell<ValueType>> {

src/v2/lu_dog_ndrwlock_vec/store.rs

@@ -108,10 +108,10 @@ use crate::v2::lu_dog_ndrwlock_vec::types::{
     StringBit, StringLiteral, StructExpression, StructField, StructGeneric, TupleField, TypeCast,
     Unary, Unit, UnnamedFieldExpression, ValueType, Variable, VariableExpression, WoogStruct,
     XFuture, XIf, XMacro, XMatch, XPath, XPlugin, XPrint, XReturn, XValue, ZObjectStore, ADDITION,
-    AND, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM, FULL,
-    GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN, LESS_THAN_OR_EQUAL,
-    MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE, SUBTRACTION, TASK, TO,
-    TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
+    AND, ANY_LIST, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM,
+    FULL, GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN,
+    LESS_THAN_OR_EQUAL, MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE,
+    SUBTRACTION, TASK, TO, TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
 };
 
 #[derive(Debug)]

src/v2/lu_dog_ndrwlock_vec/types.rs

@@ -3,6 +3,7 @@
 pub mod a_wait;
 pub mod addition;
 pub mod and;
+pub mod any_list;
 pub mod argument;
 pub mod assignment;
 pub mod binary;
@@ -117,6 +118,8 @@ pub use crate::v2::lu_dog_ndrwlock_vec::addition::Addition;
 pub use crate::v2::lu_dog_ndrwlock_vec::addition::ADDITION;
 pub use crate::v2::lu_dog_ndrwlock_vec::and::And;
 pub use crate::v2::lu_dog_ndrwlock_vec::and::AND;
+pub use crate::v2::lu_dog_ndrwlock_vec::any_list::AnyList;
+pub use crate::v2::lu_dog_ndrwlock_vec::any_list::ANY_LIST;
 pub use crate::v2::lu_dog_ndrwlock_vec::argument::Argument;
 pub use crate::v2::lu_dog_ndrwlock_vec::assignment::Assignment;
 pub use crate::v2::lu_dog_ndrwlock_vec::assignment::ASSIGNMENT;

src/v2/lu_dog_ndrwlock_vec/types/any_list.rs

@@ -0,0 +1,33 @@
+// {"magic":"","directive":{"Start":{"directive":"allow-editing","tag":"any_list-struct-definition-file"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-use-statements"}}}
+use serde::{Deserialize, Serialize};
+use uuid::{uuid, Uuid};
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-documentation"}}}
+/// A list that does not enforce that it’s elements all share a type.
+///
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-definition"}}}
+pub const ANY_LIST: Uuid = uuid!["356fe736-c2f0-5d4e-baa6-8725754ed1d3"];
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AnyList;
+
+impl AnyList {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    pub fn id(&self) -> Uuid {
+        ANY_LIST
+    }
+}
+
+impl Default for AnyList {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"End":{"directive":"allow-editing"}}}

src/v2/lu_dog_ndrwlock_vec/types/value_type.rs

@@ -4,6 +4,7 @@ use no_deadlocks::RwLock;
 use std::sync::Arc;
 use uuid::Uuid;
 
+use crate::v2::lu_dog_ndrwlock_vec::types::any_list::ANY_LIST;
 use crate::v2::lu_dog_ndrwlock_vec::types::char::CHAR;
 use crate::v2::lu_dog_ndrwlock_vec::types::empty::EMPTY;
 use crate::v2::lu_dog_ndrwlock_vec::types::enum_generic::EnumGeneric;
@@ -65,6 +66,7 @@ pub struct ValueType {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-hybrid-enum-definition"}}}
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub enum ValueTypeEnum {
+    AnyList(Uuid),
     Char(Uuid),
     Empty(Uuid),
     EnumGeneric(usize),
@@ -87,6 +89,18 @@ pub enum ValueTypeEnum {
 // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-implementation"}}}
 impl ValueType {
+    // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_any_list"}}}
+    /// Inter a new ValueType in the store, and return it's `id`.
+    pub fn new_any_list(bogus: bool, store: &mut LuDogNdrwlockVecStore) -> Arc<RwLock<ValueType>> {
+        store.inter_value_type(|id| {
+            Arc::new(RwLock::new(ValueType {
+                bogus: bogus,
+                subtype: ValueTypeEnum::AnyList(ANY_LIST),
+                id,
+            }))
+        })
+    }
+    // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_char"}}}
     /// Inter a new ValueType in the store, and return it's `id`.
     pub fn new_char(bogus: bool, store: &mut LuDogNdrwlockVecStore) -> Arc<RwLock<ValueType>> {

src/v2/lu_dog_pl_vec/store.rs

@@ -113,10 +113,10 @@ use crate::v2::lu_dog_pl_vec::types::{
     StringBit, StringLiteral, StructExpression, StructField, StructGeneric, TupleField, TypeCast,
     Unary, Unit, UnnamedFieldExpression, ValueType, Variable, VariableExpression, WoogStruct,
     XFuture, XIf, XMacro, XMatch, XPath, XPlugin, XPrint, XReturn, XValue, ZObjectStore, ADDITION,
-    AND, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM, FULL,
-    GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN, LESS_THAN_OR_EQUAL,
-    MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE, SUBTRACTION, TASK, TO,
-    TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
+    AND, ANY_LIST, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM,
+    FULL, GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN,
+    LESS_THAN_OR_EQUAL, MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE,
+    SUBTRACTION, TASK, TO, TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
 };
 
 #[derive(Debug, Deserialize, Serialize)]

src/v2/lu_dog_pl_vec/types.rs

@@ -3,6 +3,7 @@
 pub mod a_wait;
 pub mod addition;
 pub mod and;
+pub mod any_list;
 pub mod argument;
 pub mod assignment;
 pub mod binary;
@@ -117,6 +118,8 @@ pub use crate::v2::lu_dog_pl_vec::addition::Addition;
 pub use crate::v2::lu_dog_pl_vec::addition::ADDITION;
 pub use crate::v2::lu_dog_pl_vec::and::And;
 pub use crate::v2::lu_dog_pl_vec::and::AND;
+pub use crate::v2::lu_dog_pl_vec::any_list::AnyList;
+pub use crate::v2::lu_dog_pl_vec::any_list::ANY_LIST;
 pub use crate::v2::lu_dog_pl_vec::argument::Argument;
 pub use crate::v2::lu_dog_pl_vec::assignment::Assignment;
 pub use crate::v2::lu_dog_pl_vec::assignment::ASSIGNMENT;

src/v2/lu_dog_pl_vec/types/any_list.rs

@@ -0,0 +1,33 @@
+// {"magic":"","directive":{"Start":{"directive":"allow-editing","tag":"any_list-struct-definition-file"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-use-statements"}}}
+use serde::{Deserialize, Serialize};
+use uuid::{uuid, Uuid};
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-documentation"}}}
+/// A list that does not enforce that it’s elements all share a type.
+///
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-definition"}}}
+pub const ANY_LIST: Uuid = uuid!["356fe736-c2f0-5d4e-baa6-8725754ed1d3"];
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AnyList;
+
+impl AnyList {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    pub fn id(&self) -> Uuid {
+        ANY_LIST
+    }
+}
+
+impl Default for AnyList {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"End":{"directive":"allow-editing"}}}

src/v2/lu_dog_pl_vec/types/value_type.rs

@@ -4,6 +4,7 @@ use parking_lot::RwLock;
 use std::sync::Arc;
 use uuid::Uuid;
 
+use crate::v2::lu_dog_pl_vec::types::any_list::ANY_LIST;
 use crate::v2::lu_dog_pl_vec::types::char::CHAR;
 use crate::v2::lu_dog_pl_vec::types::empty::EMPTY;
 use crate::v2::lu_dog_pl_vec::types::enum_generic::EnumGeneric;
@@ -65,6 +66,7 @@ pub struct ValueType {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-hybrid-enum-definition"}}}
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub enum ValueTypeEnum {
+    AnyList(Uuid),
     Char(Uuid),
     Empty(Uuid),
     EnumGeneric(usize),
@@ -87,6 +89,18 @@ pub enum ValueTypeEnum {
 // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-implementation"}}}
 impl ValueType {
+    // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_any_list"}}}
+    /// Inter a new ValueType in the store, and return it's `id`.
+    pub fn new_any_list(bogus: bool, store: &mut LuDogPlVecStore) -> Arc<RwLock<ValueType>> {
+        store.inter_value_type(|id| {
+            Arc::new(RwLock::new(ValueType {
+                bogus: bogus,
+                subtype: ValueTypeEnum::AnyList(ANY_LIST),
+                id,
+            }))
+        })
+    }
+    // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_char"}}}
     /// Inter a new ValueType in the store, and return it's `id`.
     pub fn new_char(bogus: bool, store: &mut LuDogPlVecStore) -> Arc<RwLock<ValueType>> {

src/v2/lu_dog_rwlock/types.rs

@@ -3,6 +3,7 @@
 pub mod a_wait;
 pub mod addition;
 pub mod and;
+pub mod any_list;
 pub mod argument;
 pub mod assignment;
 pub mod binary;
@@ -117,6 +118,8 @@ pub use crate::v2::lu_dog_rwlock::addition::Addition;
 pub use crate::v2::lu_dog_rwlock::addition::ADDITION;
 pub use crate::v2::lu_dog_rwlock::and::And;
 pub use crate::v2::lu_dog_rwlock::and::AND;
+pub use crate::v2::lu_dog_rwlock::any_list::AnyList;
+pub use crate::v2::lu_dog_rwlock::any_list::ANY_LIST;
 pub use crate::v2::lu_dog_rwlock::argument::Argument;
 pub use crate::v2::lu_dog_rwlock::assignment::Assignment;
 pub use crate::v2::lu_dog_rwlock::assignment::ASSIGNMENT;

src/v2/lu_dog_rwlock/types/any_list.rs

@@ -0,0 +1,33 @@
+// {"magic":"","directive":{"Start":{"directive":"allow-editing","tag":"any_list-struct-definition-file"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-use-statements"}}}
+use serde::{Deserialize, Serialize};
+use uuid::{uuid, Uuid};
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-documentation"}}}
+/// A list that does not enforce that it’s elements all share a type.
+///
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"any_list-const-definition"}}}
+pub const ANY_LIST: Uuid = uuid!["356fe736-c2f0-5d4e-baa6-8725754ed1d3"];
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct AnyList;
+
+impl AnyList {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    pub fn id(&self) -> Uuid {
+        ANY_LIST
+    }
+}
+
+impl Default for AnyList {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+// {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
+// {"magic":"","directive":{"End":{"directive":"allow-editing"}}}

src/v2/lu_dog_rwlock/types/value_type.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use uuid::Uuid;
 
+use crate::v2::lu_dog_rwlock::types::any_list::ANY_LIST;
 use crate::v2::lu_dog_rwlock::types::char::CHAR;
 use crate::v2::lu_dog_rwlock::types::empty::EMPTY;
 use crate::v2::lu_dog_rwlock::types::enum_generic::EnumGeneric;
@@ -67,6 +68,7 @@ pub struct ValueType {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-hybrid-enum-definition"}}}
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum ValueTypeEnum {
+    AnyList(Uuid),
     Char(Uuid),
     Empty(Uuid),
     EnumGeneric(Uuid),
@@ -90,6 +92,19 @@ pub enum ValueTypeEnum {
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-implementation"}}}
 impl ValueType {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-new-impl"}}}
+    // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_any_list"}}}
+    /// Inter a new ValueType in the store, and return it's `id`.
+    pub fn new_any_list(bogus: bool, store: &mut LuDogRwlockStore) -> Arc<RwLock<ValueType>> {
+        let id = Uuid::new_v4();
+        let new = Arc::new(RwLock::new(ValueType {
+            bogus: bogus,
+            subtype: ValueTypeEnum::AnyList(ANY_LIST),
+            id,
+        }));
+        store.inter_value_type(new.clone());
+        new
+    }
+    // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"value_type-struct-impl-new_char"}}}
     /// Inter a new ValueType in the store, and return it's `id`.
     pub fn new_char(bogus: bool, store: &mut LuDogRwlockStore) -> Arc<RwLock<ValueType>> {

src/v2/lu_dog_rwlock_vec/store.rs

@@ -113,10 +113,10 @@ use crate::v2::lu_dog_rwlock_vec::types::{
     StringBit, StringLiteral, StructExpression, StructField, StructGeneric, TupleField, TypeCast,
     Unary, Unit, UnnamedFieldExpression, ValueType, Variable, VariableExpression, WoogStruct,
     XFuture, XIf, XMacro, XMatch, XPath, XPlugin, XPrint, XReturn, XValue, ZObjectStore, ADDITION,
-    AND, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM, FULL,
-    GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN, LESS_THAN_OR_EQUAL,
-    MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE, SUBTRACTION, TASK, TO,
-    TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
+    AND, ANY_LIST, ASSIGNMENT, CHAR, DIVISION, EMPTY, EMPTY_EXPRESSION, EQUAL, FALSE_LITERAL, FROM,
+    FULL, GREATER_THAN, GREATER_THAN_OR_EQUAL, INCLUSIVE, ITEM_STATEMENT, LESS_THAN,
+    LESS_THAN_OR_EQUAL, MACRO_CALL, MULTIPLICATION, NEGATION, NOT, NOT_EQUAL, OR, RANGE,
+    SUBTRACTION, TASK, TO, TO_INCLUSIVE, TRUE_LITERAL, UNKNOWN, X_DEBUGGER,
 };
 
 #[derive(Debug, Deserialize, Serialize)]