Update Trieste and fix API breakage

.github/workflows/pr_gate.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Run clang-format style check
         uses: jidicula/clang-format-action@v4.8.0
         with:
-          clang-format-version: '13'
+          clang-format-version: '18'
           check-path: ${{matrix.path['check']}}
           exclude-regex: ${{matrix.path['exclude']}}
 

CMakeLists.txt

@@ -93,7 +93,7 @@ FetchContent_Declare(
 FetchContent_Declare(
   trieste
   GIT_REPOSITORY https://github.com/microsoft/trieste
-  GIT_TAG        7cd90387ac2de6423ed1dc43496273b0a20a03d4
+  GIT_TAG        7ddc75733bc74ee43b98d4999fe15045f4115f69
 )
 
 FetchContent_MakeAvailable(cmake_utils)

src/internal.cc

@@ -88,7 +88,7 @@ namespace rego
       return false;
     }
 
-    return is_in(node->parent()->shared_from_this(), types);
+    return is_in(node->parent(), types);
   }
 
   bool is_constant(const Node& term)

src/reader.cc

@@ -665,17 +665,17 @@ namespace
       }};
 
     pass.pre(Comma, [comma_groups](Node node) {
-      comma_groups->insert(node->parent());
+      comma_groups->insert(node->parent_unsafe());
       return 0;
     });
 
     pass.pre(Colon, [colon_groups](Node node) {
-      colon_groups->insert(node->parent());
+      colon_groups->insert(node->parent_unsafe());
       return 0;
     });
 
     pass.pre(Or, [or_groups](Node node) {
-      auto group = node->parent();
+      auto group = node->parent_unsafe();
       auto pos = group->find(node);
       for (auto it = group->begin(); it != pos; ++it)
       {

src/rego_c.cc

@@ -552,7 +552,7 @@ extern "C"
     logging::Debug() << "regoNodeJSONSize";
     auto node_ptr = reinterpret_cast<trieste::NodeDef*>(node);
     trieste::WFContext context(rego::wf_result);
-    std::string json = rego::to_key(node_ptr->shared_from_this(), true);
+    std::string json = rego::to_key(node_ptr->intrusive_ptr_from_this(), true);
     return static_cast<regoSize>(json.size() + 1);
   }
 
@@ -562,7 +562,7 @@ extern "C"
 
     auto node_ptr = reinterpret_cast<trieste::NodeDef*>(node);
     trieste::WFContext context(rego::wf_result);
-    std::string json = rego::to_key(node_ptr->shared_from_this(), true);
+    std::string json = rego::to_key(node_ptr->intrusive_ptr_from_this(), true);
     if (size < json.size() + 1)
     {
       return REGO_ERROR_BUFFER_TOO_SMALL;

src/unifier.cc

@@ -411,8 +411,7 @@ namespace rego
         "Recursion detected in rule body: " + std::string(m_rule.view()));
     }
 
-    logging::Debug() << "=====Unification====="
-                     << "exprs: " << m_statements;
+    logging::Debug() << "=====Unification=====" << "exprs: " << m_statements;
 
     {
       logging::LocalIndent indent;

src/unify.cc

@@ -67,7 +67,7 @@ namespace rego
       return name.find("query$") != std::string::npos;
     }
 
-    return in_query(node->parent()->shared_from_this());
+    return in_query(node->parent());
   }
 
   bool contains_local(const Node& node)

src/unify/absolute_refs.cc

@@ -21,7 +21,7 @@ namespace
       return Ref << (RefHead << (Var ^ "data")) << refargseq;
     }
 
-    Node ref = build_ref(leaf->parent()->shared_from_this());
+    Node ref = build_ref(leaf->parent());
 
     if (leaf->type() == Policy || leaf->type() == DataModule)
     {

src/unify/enumerate.cc

@@ -31,7 +31,7 @@ namespace
     find_all_refs_in(local->scope(), (local / Var)->location(), refs);
     for (auto& ref : refs)
     {
-      if (ref->parent() == local.get())
+      if (ref->parent() == local)
       {
         continue;
       }
@@ -61,7 +61,7 @@ namespace
 
   Node next_enum(Node local)
   {
-    Node unifybody = local->parent()->shared_from_this();
+    Node unifybody = local->parent();
     auto it = unifybody->find(local) + 1;
     return find_enum(unifybody, it);
   }
@@ -302,21 +302,21 @@ namespace rego
       if (is_in(local, {LiteralEnum}))
       {
         // should this local be defined here?
-        Node unifybody = local->parent()->shared_from_this();
+        Node unifybody = local->parent();
         bool requires_move = false;
         while (!should_be_defined_in(local, unifybody))
         {
           // we need to keep popping out of nested enums until we find the
           // correct scope
           requires_move = true;
-          NodeDef* literalenum = unifybody->parent();
+          Node literalenum = unifybody->parent();
           if (literalenum->type() != LiteralEnum)
           {
             // we've popped out of the nested enums
             break;
           }
 
-          unifybody = literalenum->parent()->shared_from_this();
+          unifybody = literalenum->parent();
         }
 
         if (requires_move)

src/unify/lift_refheads.cc

@@ -215,7 +215,7 @@ namespace
         return;
       }
 
-      Node module = node->parent()->parent()->shared_from_this();
+      Node module = node->parent()->parent();
       Node prefix_ref = concat_refs(Var ^ "data", (module / Package)->front());
       if (prefix_ref->type() == Error)
       {
@@ -316,7 +316,7 @@ namespace rego
         }) >>
           [refheads](Match& _) {
             ACTION();
-            Node module = _(Rule)->parent()->parent()->shared_from_this();
+            Node module = _(Rule)->parent()->parent();
             Node imports = (module / ImportSeq)->clone();
             Node package_ref = (module / Package)->front();
             Node version = (module / Version)->clone();
@@ -374,7 +374,7 @@ namespace rego
     });
 
     lift_refheads.post(Rule, [refheads](Node node) {
-      Node module = node->parent()->parent()->shared_from_this();
+      Node module = node->parent()->parent();
       Node rulehead = node / RuleHead;
       Node package_ref = (module / Package)->front();
       Node prefix_ref = concat_refs(Var ^ "data", package_ref);

src/unify/lift_to_rule.cc

@@ -136,7 +136,7 @@ namespace
     }
   }
 
-  Node get_version(NodeDef* node)
+  Node get_version(Node node)
   {
     if (node == Top)
     {
@@ -151,7 +151,7 @@ namespace
         return (*it)->clone();
       }
 
-      return err(node->shared_from_this(), "Missing version");
+      return err(node, "Missing version");
     }
 
     return get_version(node->parent());

src/unify/symbols.cc

@@ -39,7 +39,7 @@ namespace
     auto it = module->find_first(Version, module->begin());
     if (it == module->end())
     {
-      return err(module->shared_from_this(), "No version found in module");
+      return err(module, "No version found in module");
     }
     return (*it)->clone();
   }