update tangle and semantic-db for latest changes to factor

diff --git a/extra/semantic-db/authors.txt b/extra/semantic-db/authors.txt
new file mode 100644 (file)
index 0000000..e9c193b
--- /dev/null
+++ b/extra/semantic-db/authors.txt
@@ -0,0 +1 @@
+Alex Chapman

diff --git a/extra/semantic-db/semantic-db.factor b/extra/semantic-db/semantic-db.factor
index 51bd94d61cef2d8ce2bf7bd114a90d9fa924c900..2451d73acb08684d0abc7252460a619c31831f13 100755 (executable)
--- a/extra/semantic-db/semantic-db.factor
+++ b/extra/semantic-db/semantic-db.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators combinators.cleave combinators.lib
-continuations db db.tuples db.types db.sqlite hashtables kernel math
-math.parser namespaces parser sequences sequences.deep
+continuations db db.tuples db.types db.sqlite kernel math
+math.parser namespaces parser sets sequences sequences.deep
 sequences.lib strings words ;
 IN: semantic-db
 
@@ -28,7 +28,7 @@ node "node"
 TUPLE: arc id subject object relation ;
 
 : <arc> ( subject object relation -- arc )
-    arc construct-empty swap >>relation swap >>object swap >>subject ;
+    arc new swap >>relation swap >>object swap >>subject ;
 
 : <id-arc> ( id -- arc )
     arc new swap >>id ;

diff --git a/extra/tangle/authors.txt b/extra/tangle/authors.txt
new file mode 100644 (file)
index 0000000..e9c193b
--- /dev/null
+++ b/extra/tangle/authors.txt
@@ -0,0 +1 @@
+Alex Chapman

diff --git a/extra/tangle/html/html.factor b/extra/tangle/html/html.factor
index 9c55b66528fabe458d4acdef402b89d987b2c7cc..fc604f4d468d911556e0919eb6e90d510410e9c4 100644 (file)
--- a/extra/tangle/html/html.factor
+++ b/extra/tangle/html/html.factor
@@ -7,11 +7,11 @@ TUPLE: element attributes ;
 
 TUPLE: ulist < element items ;
 : <ulist> ( items -- element )
-    H{ } clone swap ulist construct-boa ;
+    H{ } clone swap ulist boa ;
 
 TUPLE: link < element href text ;
 : <link> ( href text -- element )
-    H{ } clone -rot link construct-boa ;
+    H{ } clone -rot link boa ;
 
 GENERIC: >html ( element -- str )
 

diff --git a/extra/tangle/tangle.factor b/extra/tangle/tangle.factor
index cbd3b94058fcfa4f12b2061664f53ea9f54258d8..c6a1faa27b7a7ed452ef22505a29b7e23ceb6720 100644 (file)
--- a/extra/tangle/tangle.factor
+++ b/extra/tangle/tangle.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs db db.sqlite db.postgresql http.server io kernel namespaces semantic-db sequences strings ;
+USING: accessors assocs db db.sqlite db.postgresql http.server http.server.actions io kernel namespaces semantic-db sequences strings ;
 IN: tangle
 
 GENERIC: render* ( content templater -- output )
@@ -20,7 +20,7 @@ TUPLE: sqlite-tangle ;
 TUPLE: postgres-tangle ;
 
 : make-tangle ( db templater type -- tangle )
-    construct-empty [ <tangle> ] dip tuck set-delegate ;
+    new [ <tangle> ] dip tuck set-delegate ;
 
 : <sqlite-tangle> ( db templater -- tangle ) sqlite-tangle make-tangle ;
 : <postgres-tangle> ( db templater -- tangle ) postgres-tangle make-tangle ;
@@ -40,8 +40,8 @@ M: postgres-tangle new-db ( tangle args -- tangle )
 TUPLE: node-responder tangle ;
 C: <node-responder> node-responder
 
-M: node-responder call-responder ( path responder -- response )
-    "text/plain" <content> nip request-params
+M: node-responder call-responder* ( path responder -- response )
+    "text/plain" <content> nip params get
     [ "node-id" swap at* [ >>body ] [ drop ] if ] when* nip ;
 
 : test-tangle ( -- )