Added Tag support in hierarchy interface

Langulus · Feb 19, 2024 · d0ed509 · d0ed509
1 parent 2008f05
commit d0ed509
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 22 deletions.
diff --git a/source/Hierarchy-Seek.inl b/source/Hierarchy-Seek.inl
@@ -9,8 +9,8 @@
 #pragma once
 #include "Hierarchy.hpp"
 
-#define TEMPLATE() template<class THIS>
-#define TME() SeekInterface<THIS>
+#define TEMPLATE()   template<class THIS>
+#define TME()        SeekInterface<THIS>
 
 
 namespace Langulus::Entity
@@ -164,17 +164,35 @@ namespace Langulus::Entity
 
 
    TEMPLATE() template<CT::Trait T, Seek SEEK> LANGULUS(INLINED)
-   bool TME()::SeekValue(CT::Data auto& output, Index offset) const {
+   bool TME()::SeekValue(CT::NotTagged auto& output, Index offset) const {
       return static_cast<const THIS*>(this)
          ->template SeekValue<SEEK>(MetaTraitOf<T>(), output, offset);
    }
 
    TEMPLATE() template<CT::Trait T, Seek SEEK> LANGULUS(INLINED)
-   bool TME()::SeekValueAux(const Neat& aux, CT::Data auto& output, Index offset) const {
+   bool TME()::SeekValueAux(const Neat& aux, CT::NotTagged auto& output, Index offset) const {
       return static_cast<const THIS*>(this)
          ->template SeekValueAux<SEEK>(MetaTraitOf<T>(), aux, output, offset);
    }
 
+
+
+   TEMPLATE() template<Seek SEEK> LANGULUS(INLINED)
+   bool TME()::SeekValue(CT::Tagged auto& output, Index offset) const {
+      using T = Deref<decltype(output)>;
+      return static_cast<const THIS*>(this)->template
+         SeekValue<SEEK>(MetaTraitOf<typename T::TagType>(), output.mData, offset);
+   }
+
+   TEMPLATE() template<Seek SEEK> LANGULUS(INLINED)
+   bool TME()::SeekValueAux(const Neat& aux, CT::Tagged auto& output, Index offset) const {
+      using T = Deref<decltype(output)>;
+      return static_cast<const THIS*>(this)->template
+         SeekValueAux<SEEK>(MetaTraitOf<typename T::TagType>(), aux, output.mData, offset);
+   }
+
+
+
    #if LANGULUS_FEATURE(MANAGED_REFLECTION)
       ///                                                                     
       /// Token based interface                                               
@@ -240,6 +258,7 @@ namespace Langulus::Entity
 #undef TEMPLATE
 #undef TME
 
+
 namespace Langulus::Entity
 {
 
@@ -371,7 +390,7 @@ namespace Langulus::Entity
       // Scan descriptor                                                
       Trait result;
       aux.ForEachDeep([&](const Trait& trait) {
-         if (trait.TraitIs(meta)) {
+         if (trait.IsTrait(meta)) {
             if (offset == 0) {
                // Match found                                           
                result = trait;
@@ -446,7 +465,7 @@ namespace Langulus::Entity
       bool done = false;
       if (meta) {
          aux.ForEachDeep([&](const Trait& trait) -> LoopControl {
-            if (trait.TraitIs(meta)) {
+            if (trait.IsTrait(meta)) {
                // Found match                                           
                try {
                   if constexpr (CT::DescriptorMakable<D>)
@@ -483,7 +502,7 @@ namespace Langulus::Entity
                --offset;
                return not done;
             }
-            catch(...) { }
+            catch (...) { }
 
             return Loop::Continue;
          });

diff --git a/source/Hierarchy.hpp b/source/Hierarchy.hpp
@@ -131,10 +131,16 @@ namespace Langulus::Entity
       template<CT::Trait = Trait, Seek = Seek::HereAndAbove>
       NOD() Trait SeekTraitAux(const Neat&, Index = 0) const;
 
+
       template<CT::Trait = Trait, Seek = Seek::HereAndAbove>
-      bool SeekValue(CT::Data auto&, Index = IndexFirst) const;
+      bool SeekValue(CT::NotTagged auto&, Index = IndexFirst) const;
       template<CT::Trait = Trait, Seek = Seek::HereAndAbove>
-      bool SeekValueAux(const Neat&, CT::Data auto&, Index = 0) const;
+      bool SeekValueAux(const Neat&, CT::NotTagged auto&, Index = 0) const;
+
+      template<Seek = Seek::HereAndAbove>
+      bool SeekValue(CT::Tagged auto&, Index = IndexFirst) const;
+      template<Seek = Seek::HereAndAbove>
+      bool SeekValueAux(const Neat&, CT::Tagged auto&, Index = 0) const;
 
 
       template<Seek = Seek::HereAndAbove>

diff --git a/source/Module.hpp b/source/Module.hpp
@@ -36,7 +36,7 @@ namespace Langulus
    ///                 with the currently set RTTI boundary. These types will 
    ///                 be unloaded when shared library is unloaded. Unload    
    ///                 will be forbidden, if they're still in use.            
-   template<class... T>
+   template<class...T>
    void RegisterTypeList(Entity::MetaList& list) {
       // Merge to avoid duplications                                    
       (list << ... << MetaOf<T>());

diff --git a/source/Pin.hpp b/source/Pin.hpp
@@ -34,6 +34,7 @@ namespace Langulus
       concept NotPinnable = ((not Pinnable<T>) and ...);
 
    } // namespace Langulus::CT
+
 } // namespace Langulus
 
 
@@ -59,16 +60,13 @@ namespace Langulus::Entity
       T mValue;
 
       // Is the pinnable value pinned?                                  
-      bool mLocked = false;
+      Traits::State::Tag<bool> mLocked = false;
 
    public:
       LANGULUS(ABSTRACT) false;
       LANGULUS(TYPED) T;
       LANGULUS_BASES(A::Pinnable);
-
-      LANGULUS_PROPERTIES_START(Pin)
-         LANGULUS_PROPERTY_TRAIT(mLocked, State),
-      LANGULUS_PROPERTIES_END();
+      LANGULUS_MEMBERS(&Pin::mValue, &Pin::mLocked);
 
       ///                                                                     
       ///   Construction                                                      

diff --git a/source/Runtime.hpp b/source/Runtime.hpp
@@ -99,7 +99,7 @@ namespace Langulus::Entity
       NOD() bool UnloadSharedLibrary(const SharedLibrary&);
 
    public:
-      LANGULUS_CONVERSIONS(Text);
+      LANGULUS_CONVERTS_TO(Text);
 
       Runtime() = delete;
       Runtime(Runtime&&) noexcept = default;

diff --git a/source/Thing-Seek.inl b/source/Thing-Seek.inl
@@ -218,7 +218,7 @@ namespace Langulus::Entity
       // Scan descriptor                                                
       Trait result;
       aux.ForEachDeep([&](const Trait& trait) {
-         if (trait.TraitIs(meta)) {
+         if (trait.IsTrait(meta)) {
             // Found match                                              
             result = trait;
             return Loop::Break;
@@ -312,7 +312,7 @@ namespace Langulus::Entity
       bool done = false;
       if (meta) {
          aux.ForEachDeep([&](const Trait& trait) {
-            if (trait.TraitIs(meta)) {
+            if (trait.IsTrait(meta)) {
                // Found match                                           
                try {
                   if constexpr (CT::Pinnable<D>)

diff --git a/source/Thing-Traits.cpp b/source/Thing-Traits.cpp
@@ -86,25 +86,25 @@ namespace Langulus::Entity
    Trait Thing::GetTrait(const Trait& id, Index index) {
       if (id.GetTrait()) {
          // Handle some predefined traits here                          
-         if (id.template TraitIs<Traits::Unit>()) {
+         if (id.template IsTrait<Traits::Unit>()) {
             // Get a component                                          
             auto unit = GetUnitMeta(DMeta {}, index);
             if (unit)
                return Traits::Unit {unit};
             return {};
          }
-         else if (id.template TraitIs<Traits::Child>()) {
+         else if (id.template IsTrait<Traits::Child>()) {
             // Get a child entity                                       
             auto child = GetChild(index);
             if (child)
                return Traits::Child {child};
             return {};
          }
-         else if (id.template TraitIs<Traits::Runtime>()) {
+         else if (id.template IsTrait<Traits::Runtime>()) {
             // Get the nearest runtime                                  
             return Traits::Runtime {mRuntime->Get()};
          }
-         else if (id.template TraitIs<Traits::Parent>()) {
+         else if (id.template IsTrait<Traits::Parent>()) {
             // Get the parent                                           
             return Traits::Parent {mOwner.Get()};
          }

diff --git a/source/Thing.hpp b/source/Thing.hpp
@@ -35,6 +35,10 @@ namespace Langulus::Entity
    /// It is a placeholder type, that can be extended by external modules     
    struct Lingua : Text {
       LANGULUS(ABSTRACT) true;
+      LANGULUS_CONVERTS_FROM();
+
+   private:
+      using Text::SerializationRules;
    };