summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpukkamustard <pukkamustard@posteo.net>2020-09-27 14:44:37 +0200
committerpukkamustard <pukkamustard@posteo.net>2020-09-27 14:55:42 +0200
commit04096e8418259ea212172453aa79a79d6f546295 (patch)
treeea5e8ae16c546db3260c8e183ae37f2c10a53538
parenta7c30b2235bf3cf345b7daaaaa38e8b7b3190e04 (diff)
(schemantic datalog) -> (datalog): move Datalog modules
-rw-r--r--Makefile.am38
-rw-r--r--datalog.scm (renamed from schemantic/datalog.scm)6
-rw-r--r--datalog/relational-algebra.scm (renamed from schemantic/datalog/relational-algebra.scm)4
-rw-r--r--datalog/vhash-set.scm (renamed from schemantic/datalog/vhash-set.scm)2
-rw-r--r--hall.scm101
-rw-r--r--schemantic/rdf/datalog.scm (renamed from schemantic/datalog/rdf.scm)4
-rw-r--r--tests/datalog.scm (renamed from tests/schemantic/datalog.scm)6
-rw-r--r--tests/datalog/relational-algebra.scm (renamed from tests/schemantic/datalog/relational-algebra.scm)6
-rw-r--r--tests/schemantic/rdf.scm1
-rw-r--r--tests/schemantic/rdf/datalog.scm (renamed from tests/schemantic/datalog/rdf.scm)8
10 files changed, 101 insertions, 75 deletions
diff --git a/Makefile.am b/Makefile.am
index 24dbe41..5089f99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,32 +38,33 @@ SOURCES = schemantic.scm \
schemantic/serialization/turtle.scm \
schemantic/graph/vhash/index.scm \
schemantic/graph/vhash.scm \
+ schemantic/fragment-graph/radix-sort.scm \
+ schemantic/fragment-graph/csexp.scm \
schemantic/interop/guile-rdf.scm \
schemantic/rdf/lang-string.scm \
- schemantic/iri.scm \
- schemantic/literal.scm \
+ schemantic/rdf/datalog.scm \
schemantic/lvar.scm \
- schemantic/blank-node.scm \
+ schemantic/iri.scm \
+ schemantic/fragment-graph.scm \
schemantic/xsd.scm \
schemantic/rdf.scm \
- schemantic/fragment-graph.scm \
- schemantic/fragment-graph/csexp.scm \
- schemantic/fragment-graph/radix-sort.scm \
+ schemantic/literal.scm \
+ schemantic/blank-node.scm \
schemantic/ns.scm \
- schemantic/datalog.scm \
- schemantic/datalog/vhash-set.scm \
- schemantic/datalog/relational-algebra.scm \
- schemantic/datalog/rdf.scm
+ datalog.scm \
+ datalog/relational-algebra.scm \
+ datalog/vhash-set.scm
TESTS = tests/schemantic/graph/vhash.scm \
+ tests/schemantic/rdf/datalog.scm \
tests/schemantic/serializaton/turtle.scm \
- tests/schemantic/iri.scm \
- tests/schemantic/literal.scm \
tests/schemantic/lvar.scm \
+ tests/schemantic/iri.scm \
tests/schemantic/fragment-graph.scm \
- tests/schemantic/datalog.scm \
- tests/schemantic/datalog/relational-algebra.scm \
- tests/schemantic/datalog/rdf.scm
+ tests/schemantic/rdf.scm \
+ tests/schemantic/literal.scm \
+ tests/datalog.scm \
+ tests/datalog/relational-algebra.scm
TEST_EXTENSIONS = .scm
SCM_LOG_DRIVER = \
@@ -86,9 +87,16 @@ EXTRA_DIST += README.org \
README \
HACKING \
COPYING \
+ NEWS \
+ AUTHORS \
+ ChangeLog \
guix.scm \
hall.scm \
build-aux/test-driver.scm \
+ configure.ac \
+ Makefile.am \
+ pre-inst-env.in \
+ build-aux/test-driver.scm \
$(TESTS)
ACLOCAL_AMFLAGS = -I m4
diff --git a/schemantic/datalog.scm b/datalog.scm
index 57ee711..2441ed7 100644
--- a/schemantic/datalog.scm
+++ b/datalog.scm
@@ -2,11 +2,11 @@
;
; SPDX-License-Identifier: GPL-3.0-or-later
-(define-module (schemantic datalog)
+(define-module (datalog)
#:use-module (schemantic lvar)
- #:use-module ((schemantic datalog relational-algebra) #:prefix ra:)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module ((datalog relational-algebra) #:prefix ra:)
+ #:use-module (datalog vhash-set)
#:use-module (oop goops)
#:use-module (ice-9 format)
diff --git a/schemantic/datalog/relational-algebra.scm b/datalog/relational-algebra.scm
index 3a30e4b..c3680c7 100644
--- a/schemantic/datalog/relational-algebra.scm
+++ b/datalog/relational-algebra.scm
@@ -2,9 +2,9 @@
;
; SPDX-License-Identifier: GPL-3.0-or-later
-(define-module (schemantic datalog relational-algebra)
+(define-module (datalog relational-algebra)
#:use-module (schemantic lvar)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module (datalog vhash-set)
#:use-module (oop goops)
diff --git a/schemantic/datalog/vhash-set.scm b/datalog/vhash-set.scm
index 831535e..e9d3b45 100644
--- a/schemantic/datalog/vhash-set.scm
+++ b/datalog/vhash-set.scm
@@ -2,7 +2,7 @@
;
; SPDX-License-Identifier: GPL-3.0-or-later
-(define-module (schemantic datalog vhash-set)
+(define-module (datalog vhash-set)
#:use-module (ice-9 vlist)
#:use-module (srfi srfi-1)
diff --git a/hall.scm b/hall.scm
index 4b4469c..a7908f4 100644
--- a/hall.scm
+++ b/hall.scm
@@ -14,53 +14,70 @@
(files (libraries
((scheme-file "schemantic")
(directory
- "schemantic"
- ((directory
- "serialization"
- ((scheme-file "turtle")))
- (directory
- "graph"
- ((directory "vhash" ((scheme-file "index")))
- (scheme-file "vhash")))
- (directory "interop" ((scheme-file "guile-rdf")))
- (directory "rdf" ((scheme-file "lang-string")))
- (scheme-file "iri")
- (scheme-file "literal")
- (scheme-file "lvar")
- (scheme-file "blank-node")
- (scheme-file "xsd")
- (scheme-file "rdf")
- (scheme-file "fragment-graph")
- (directory "fragment-graph" ((scheme-file "csexp")
- (scheme-file "radix-sort")))
- (scheme-file "ns")
- (scheme-file "datalog")
- (directory "datalog" ((scheme-file "vhash-set")
- (scheme-file "relational-algebra")
- (scheme-file "rdf")))))))
+ "schemantic"
+ ((directory
+ "serialization"
+ ((scheme-file "turtle")))
+ (directory
+ "graph"
+ ((directory "vhash" ((scheme-file "index")))
+ (scheme-file "vhash")))
+ (directory
+ "fragment-graph"
+ ((scheme-file "radix-sort")
+ (scheme-file "csexp")))
+ (directory "interop" ((scheme-file "guile-rdf")))
+ (directory
+ "rdf"
+ ((scheme-file "lang-string")
+ (scheme-file "datalog")))
+ (scheme-file "lvar")
+ (scheme-file "iri")
+ (scheme-file "fragment-graph")
+ (scheme-file "xsd")
+ (scheme-file "rdf")
+ (scheme-file "literal")
+ (scheme-file "blank-node")
+ (scheme-file "ns")))
+ (scheme-file "datalog")
+ (directory "datalog"
+ ((scheme-file "relational-algebra")
+ (scheme-file "vhash-set")))))
(tests ((directory
- "tests"
- ((directory "data" ())
- (directory
- "schemantic"
- ((directory "graph" ((scheme-file "vhash")))
- (directory
- "serializaton"
- ((scheme-file "turtle")))
- (scheme-file "iri")
- (scheme-file "literal")
- (scheme-file "lvar")
- (scheme-file "fragment-graph")
- (scheme-file "datalog")
- (directory "datalog"
- ((scheme-file "relational-algebra")
- (scheme-file "rdf")))))))))
+ "tests"
+ ((directory "data" ())
+ (directory
+ "schemantic"
+ ((directory "graph" ((scheme-file "vhash")))
+ (directory "rdf" ((scheme-file "datalog")))
+ (directory
+ "serializaton"
+ ((scheme-file "turtle")))
+ (scheme-file "lvar")
+ (scheme-file "iri")
+ (scheme-file "fragment-graph")
+ (scheme-file "rdf")
+ (scheme-file "literal")))
+ (scheme-file "datalog")
+ (directory
+ "datalog"
+ ((scheme-file "relational-algebra")))))))
(programs ((directory "scripts" ())))
(documentation
((org-file "README")
(symlink "README" "README.org")
(text-file "HACKING")
(text-file "COPYING")
- (directory "doc" ((texi-file "schemantic")))))
+ (directory "doc" ((texi-file "schemantic")))
+ (text-file "NEWS")
+ (text-file "AUTHORS")
+ (text-file "ChangeLog")))
(infrastructure
- ((scheme-file "guix") (scheme-file "hall")))))
+ ((scheme-file "guix")
+ (scheme-file "hall")
+ (directory
+ "build-aux"
+ ((scheme-file "test-driver")))
+ (autoconf-file "configure")
+ (automake-file "Makefile")
+ (in-file "pre-inst-env")))))
diff --git a/schemantic/datalog/rdf.scm b/schemantic/rdf/datalog.scm
index 23a399e..e34a272 100644
--- a/schemantic/datalog/rdf.scm
+++ b/schemantic/rdf/datalog.scm
@@ -1,7 +1,7 @@
-(define-module (schemantic datalog rdf)
+(define-module (schemantic rdf datalog)
#:use-module (schemantic rdf)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module (datalog vhash-set)
#:use-module (ice-9 vlist)
diff --git a/tests/schemantic/datalog.scm b/tests/datalog.scm
index 617c5a0..178c555 100644
--- a/tests/schemantic/datalog.scm
+++ b/tests/datalog.scm
@@ -2,10 +2,10 @@
;
; SPDX-License-Identifier: GPL-3.0-or-later
-(define-module (tests schemantic datalog)
+(define-module (tests datalog)
#:use-module (schemantic lvar)
- #:use-module (schemantic datalog)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module (datalog)
+ #:use-module (datalog vhash-set)
#:use-module (ice-9 vlist)
diff --git a/tests/schemantic/datalog/relational-algebra.scm b/tests/datalog/relational-algebra.scm
index 4daa0e5..79cc602 100644
--- a/tests/schemantic/datalog/relational-algebra.scm
+++ b/tests/datalog/relational-algebra.scm
@@ -2,10 +2,10 @@
;
; SPDX-License-Identifier: GPL-3.0-or-later
-(define-module (tests schemantic datalog relational-algebra)
+(define-module (tests datalog relational-algebra)
#:use-module (schemantic lvar)
- #:use-module (schemantic datalog relational-algebra)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module (datalog relational-algebra)
+ #:use-module (datalog vhash-set)
#:use-module (ice-9 vlist)
diff --git a/tests/schemantic/rdf.scm b/tests/schemantic/rdf.scm
index 3cba3fb..b2fa93c 100644
--- a/tests/schemantic/rdf.scm
+++ b/tests/schemantic/rdf.scm
@@ -8,6 +8,7 @@
#:use-module (schemantic graph vhash)
#:use-module (schemantic serialization turtle)
+ #:use-module (srfi srfi-64)
#:use-module (srfi srfi-171)
#:use-module (ice-9 textual-ports))
diff --git a/tests/schemantic/datalog/rdf.scm b/tests/schemantic/rdf/datalog.scm
index c811662..5526b8f 100644
--- a/tests/schemantic/datalog/rdf.scm
+++ b/tests/schemantic/rdf/datalog.scm
@@ -1,12 +1,12 @@
-(define-module (tests schemantic datalog rdf)
+(define-module (tests schemantic rdf datalog)
#:use-module (schemantic rdf)
#:use-module ((schemantic ns) #:select (rdf))
#:use-module (schemantic serialization turtle)
#:use-module (schemantic graph vhash)
+ #:use-module (schemantic rdf datalog)
- #:use-module (schemantic datalog)
- #:use-module (schemantic datalog rdf)
- #:use-module (schemantic datalog vhash-set)
+ #:use-module (datalog)
+ #:use-module (datalog vhash-set)
#:use-module (ice-9 vlist)
#:use-module (ice-9 textual-ports) ; for reading ttl file