Commit 8658f69ba4e5ef29f063011f8bf1414a0a234b90
2024-09-29T22:01:59
Facts.add_tags(db, 1, 2, 3)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/lib/kc3/0.1/facts.kc3 b/lib/kc3/0.1/facts.kc3
index d7b563b..67f64e9 100644
--- a/lib/kc3/0.1/facts.kc3
+++ b/lib/kc3/0.1/facts.kc3
@@ -12,7 +12,7 @@ defmodule Facts do
rwlock_thread: (Ptr) 0,
transaction: (Ptr) 0]
- def add_tags = cfn Fact "facts_add_tags" (Facts, Tag, Tag, Tag, Result)
+ def add_tags = cfn FactW "kc3_facts_add_tags" (Facts, Tag, Tag, Tag, Result)
def cast = cfn Tag "tag_init_cast_struct" (Result, Sym, Tag)
diff --git a/libkc3/kc3.c b/libkc3/kc3.c
index 4ade011..784db72 100644
--- a/libkc3/kc3.c
+++ b/libkc3/kc3.c
@@ -27,6 +27,8 @@
#include "buf_parse.h"
#include "call.h"
#include "env.h"
+#include "fact.h"
+#include "facts.h"
#include "facts_cursor.h"
#include "fd.h"
#include "kc3_main.h"
@@ -207,6 +209,17 @@ s_tag * kc3_fact_from_ptr (s_tag *tag, u_ptr_w *ptr)
return tag_init_struct_with_data(tag, &g_sym_Fact, ptr->p, false);
}
+s_fact_w * kc3_facts_add_tags (s_facts *facts, const s_tag *subject,
+ const s_tag *predicate,
+ const s_tag *object,
+ s_fact_w *dest)
+{
+ const s_fact *fact;
+ if (! (fact = facts_add_tags(facts, subject, predicate, object)))
+ return NULL;
+ return fact_w_init_fact(dest, fact);
+}
+
s_tag * kc3_facts_collect_with_tags (s_facts *facts,
s_tag *subject,
s_tag *predicate,
diff --git a/test/ikc3/facts.kc3 b/test/ikc3/facts.kc3
index f38d239..096383a 100644
--- a/test/ikc3/facts.kc3
+++ b/test/ikc3/facts.kc3
@@ -1,8 +1,10 @@
quote %Fact{}
%Fact{}
-quote %Set.Tag{}
-%Set.Tag{}
-quote %Set.Fact{}
-%Set.Fact{}
-quote %Facts{}
-%Facts{}
+quote db = Facts.database() ; void
+db = Facts.database() ; void
+quote Facts.add_tags(db, 1, 2, 3)
+Facts.add_tags(db, 1, 2, 3)
+quote Facts.add_tags(db, 4, 5, 6)
+Facts.add_tags(db, 4, 5, 6)
+quote Facts.with_tags(db, s = ?, p = ?, o = ?, fn (fact) { puts(fact); :ok })
+Facts.with_tags(db, s = ?, p = ?, o = ?, fn (fact) { puts(fact); :ok })
diff --git a/test/ikc3/facts.out.expected b/test/ikc3/facts.out.expected
index c4000f2..cac7d62 100644
--- a/test/ikc3/facts.out.expected
+++ b/test/ikc3/facts.out.expected
@@ -3,31 +3,25 @@
predicate: (Ptr) 0x0,
object: (Ptr) 0x0,
id: (Uw) 0}
-%Set.Tag{}
-%Set.Tag{collisions: (Uw) 0,
- count: (Uw) 0,
- items: (Ptr) 0x0,
- max: (Uw) 0}
-%Set.Fact{}
-%Set.Fact{collisions: (Uw) 0,
- count: (Uw) 0,
- items: (Ptr) 0x0,
- max: (Uw) 0}
-%Facts{}
-%Facts{tags: %Set.Tag{collisions: (Uw) 0,
- count: (Uw) 0,
- items: (Ptr) 0x0,
- max: (Uw) 0},
- facts: %Set.Fact{collisions: (Uw) 0,
- count: (Uw) 0,
- items: (Ptr) 0x0,
- max: (Uw) 0},
- index_spo: (Ptr) 0x0,
- index_pos: (Ptr) 0x0,
- index_osp: (Ptr) 0x0,
- log: (Ptr) 0x0,
- next_id: (Uw) 0,
- rwlock: (Ptr) 0x0,
- rwlock_count: (Sw) 0,
- rwlock_thread: (Ptr) 0x0,
- transaction: (Ptr) 0x0}
+db = Facts.database() ; void
+void
+Facts.add_tags(db, 1, 2, 3)
+%FactW{subject: 1,
+ predicate: 2,
+ object: 3,
+ id: (Uw) 0}
+Facts.add_tags(db, 4, 5, 6)
+%FactW{subject: 4,
+ predicate: 5,
+ object: 6,
+ id: (Uw) 0}
+Facts.with_tags(db, s = ?, p = ?, o = ?, fn (fact) { puts(fact) ; :ok })
+%FactW{subject: 1,
+ predicate: 2,
+ object: 3,
+ id: (Uw) 0}
+%FactW{subject: 4,
+ predicate: 5,
+ object: 6,
+ id: (Uw) 0}
+:ok