tools.test: Make the flag public. Finish porting tester changes to fuzzer.

[factor.git] / unmaintained / semantic-db / semantic-db.factor

diff --git a/unmaintained/semantic-db/semantic-db.factor b/unmaintained/semantic-db/semantic-db.factor
index e3d13108ade2e963c6b610da79f0115b785c55ae..f2bf9ad4b55a8dd0477a293a97c55e1d1493fb2a 100644 (file)
--- a/unmaintained/semantic-db/semantic-db.factor
+++ b/unmaintained/semantic-db/semantic-db.factor
@@ -20,9 +20,9 @@ node "node"
 : load-node ( id -- node ) f <node> select-tuple ;
 
 : node-content ( node -- content )
-    dup content>> [ nip ] [ select-tuple content>> ] if* ;
+    dup content>> [ ] [ select-tuple content>> ] ?if ;
 
-: node= ( node node -- ? ) [ id>> ] bi@ = ;
+: node= ( node node -- ? ) [ id>> ] same? ;
 
 ! TODO: get rid of arc id and write our own sql
 TUPLE: arc id subject object relation ;
@@ -207,7 +207,7 @@ C: <relation-definition> relation-definition
     ] if ;
 
 : (define-relation-word) ( id-word name>> definition -- id-word )
-    >r create-in over [ execute ] curry r> compose define ;
+    >r create-word-in over [ execute ] curry r> compose define ;
 
 : define-relation-word ( relation-definition id-word given-word-name word-type definition -- relation-definition id-word )
     >r >r [
@@ -229,7 +229,7 @@ C: <relation-definition> relation-definition
     [ ensure-context ensure-relation ] 2curry define ;
 
 : create-id-word ( relation-definition -- id-word )
-    dup id-word>> "id-word" choose-word-name create-in ;
+    dup id-word>> "id-word" choose-word-name create-word-in ;
 
 PRIVATE>
 
@@ -259,7 +259,7 @@ C: <node-tree> node-tree
 
 : (get-node-chain) ( node next-selector seq -- seq )
     pick [
-        over push >r [ call ] keep r> (get-node-chain)
+        suffix! >r [ call ] keep r> (get-node-chain)
     ] [
         2nip
     ] if* ;