diff --git a/extra/tokyo/cabinet/abstract/abstract.factor b/extra/tokyo/abstractdb/abstractdb.factor similarity index 84% rename from extra/tokyo/cabinet/abstract/abstract.factor rename to extra/tokyo/abstractdb/abstractdb.factor index 245267f488..1433c275e1 100644 --- a/extra/tokyo/cabinet/abstract/abstract.factor +++ b/extra/tokyo/abstractdb/abstractdb.factor @@ -1,20 +1,12 @@ ! Copyright (C) 2009 Bruno Deferrari ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.c-types arrays assocs destructors -io io.streams.memory kernel libc locals -sequences serialize tokyo.alien.tcadb tokyo.alien.tcutil vectors ; -IN: tokyo.cabinet.abstract +kernel locals sequences serialize vectors +tokyo.alien.tcadb tokyo.alien.tcutil tokyo.utils ; +IN: tokyo.abstractdb TUPLE: tokyo-abstractdb handle disposed ; - ] dip with-input-stream* ; inline - -: memory>object ( memory -- object ) - [ deserialize ] with-memory-reader ; -PRIVATE> - INSTANCE: tokyo-abstractdb assoc : ( name -- tokyo-abstractdb ) diff --git a/extra/tokyo/cabinet/abstract/authors.txt b/extra/tokyo/abstractdb/authors.txt similarity index 100% rename from extra/tokyo/cabinet/abstract/authors.txt rename to extra/tokyo/abstractdb/authors.txt diff --git a/extra/tokyo/cabinet/abstract/summary.txt b/extra/tokyo/abstractdb/summary.txt similarity index 100% rename from extra/tokyo/cabinet/abstract/summary.txt rename to extra/tokyo/abstractdb/summary.txt diff --git a/extra/tokyo/utils/authors.txt b/extra/tokyo/utils/authors.txt new file mode 100644 index 0000000000..f4a8cb1dc2 --- /dev/null +++ b/extra/tokyo/utils/authors.txt @@ -0,0 +1 @@ +Bruno Deferrari diff --git a/extra/tokyo/utils/summary.txt b/extra/tokyo/utils/summary.txt new file mode 100644 index 0000000000..5e3ec0e86b --- /dev/null +++ b/extra/tokyo/utils/summary.txt @@ -0,0 +1 @@ +Some utility words used by the tokyo vocabs diff --git a/extra/tokyo/utils/utils.factor b/extra/tokyo/utils/utils.factor new file mode 100644 index 0000000000..2b589e4a4b --- /dev/null +++ b/extra/tokyo/utils/utils.factor @@ -0,0 +1,10 @@ +! Copyright (C) 2009 Bruno Deferrari +! See http://factorcode.org/license.txt for BSD license. +USING: io io.streams.memory serialize kernel ; +IN: tokyo.utils + +: with-memory-reader ( memory quot -- ) + [ ] dip with-input-stream* ; inline + +: memory>object ( memory -- object ) + [ deserialize ] with-memory-reader ;