From 58362a1a5a5d9549af2aa5712547b239ffc56943 Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Sun, 12 Dec 2010 15:50:12 +0000
Subject: [PATCH] combining different LDF extractors to one place

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@907 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 shared/tools/ldf2bgf                           |  4 ++--
 shared/tools/ldf2set                           |  2 +-
 topics/extraction/Makefile                     |  6 +++---
 topics/extraction/java/testperform             |  6 +++---
 topics/extraction/ldf/Makefile                 | 18 ++++++++++++++++++
 .../xsl => topics/extraction/ldf}/ldf2bgf.xslt |  0
 .../extraction/ldf}/ldf2set.py                 |  0
 topics/extraction/ldf/testperform              |  6 ++++++
 topics/extraction/ldf2bgf/Makefile             | 12 ------------
 topics/extraction/ldf2set/Makefile             |  7 -------
 10 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 topics/extraction/ldf/Makefile
 rename {shared/xsl => topics/extraction/ldf}/ldf2bgf.xslt (100%)
 rename {shared/python => topics/extraction/ldf}/ldf2set.py (100%)
 create mode 100755 topics/extraction/ldf/testperform
 delete mode 100644 topics/extraction/ldf2bgf/Makefile
 delete mode 100755 topics/extraction/ldf2set/Makefile

diff --git a/shared/tools/ldf2bgf b/shared/tools/ldf2bgf
index 8d60e859..a8d69572 100755
--- a/shared/tools/ldf2bgf
+++ b/shared/tools/ldf2bgf
@@ -12,10 +12,10 @@ if [ ! -r $1 ]; then
 elif [ $# -eq 2 ]
 then
     rm -f $2
-    xsltproc ${SLPS}/shared/xsl/ldf2bgf.xslt $1 > $2
+    xsltproc ${SLPS}/topics/extraction/ldf/ldf2bgf.xslt $1 > $2
 elif [ $# -eq 1 ]
 then
-    xsltproc ${SLPS}/shared/xsl/ldf2bgf.xslt $1 > ${LOCAL}/`basename $1 .ldf`.bgf
+    xsltproc ${SLPS}/topics/extraction/ldf/ldf2bgf.xslt $1 > ${LOCAL}/`basename $1 .ldf`.bgf
 else
     echo "This tool transforms Language Document Format to BNF-like Grammar Format"
     echo "Usage: ldf2bgf <input-language-document> [<output-grammar>]"
diff --git a/shared/tools/ldf2set b/shared/tools/ldf2set
index d0582845..ba469bef 100755
--- a/shared/tools/ldf2set
+++ b/shared/tools/ldf2set
@@ -15,5 +15,5 @@ elif [ ! -r $1 ]; then
     echo "Oops: $1 not found or not readable."
     exit 1
 else
-    python ${SLPS}/shared/python/ldf2set.py $1 $2
+    python ${SLPS}/topics/extraction/ldf/ldf2set.py $1 $2
 fi
diff --git a/topics/extraction/Makefile b/topics/extraction/Makefile
index 0d60af34..83763e5f 100644
--- a/topics/extraction/Makefile
+++ b/topics/extraction/Makefile
@@ -2,7 +2,7 @@ build:
 	cd antlr; make build
 	cd asfix; make build
 	cd dcg; make build
-	cd java2bgf; make build
+	cd java; make build
 	cd ldf2bgf; make build
 	cd ldf2pdf; make build
 	cd sdf2bgf; make build
@@ -13,7 +13,7 @@ test:
 	cd antlr; make test
 	cd asfix; make test
 	cd dcg; make test
-	cd java2bgf; make test
+	cd java; make test
 	cd ldf2bgf; make test
 	cd ldf2pdf; make test
 	cd sdf2bgf; make test
@@ -24,7 +24,7 @@ clean:
 	cd antlr; make clean
 	cd asfix; make clean
 	cd dcg; make clean
-	cd java2bgf; make clean
+	cd java; make clean
 	cd ldf2bgf; make clean
 	cd ldf2pdf; make clean
 	cd sdf2bgf; make clean
diff --git a/topics/extraction/java/testperform b/topics/extraction/java/testperform
index 1d293b2a..fbefd6db 100755
--- a/topics/extraction/java/testperform
+++ b/topics/extraction/java/testperform
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 echo [Test Case] $1 $2
-../../../shared/tools/java2bgf $1 $2 `basename $1`.bgf || exit -1
-../../../shared/tools/validate bgf `basename $1`.bgf || exit -1
-../../../shared/tools/gdt `basename $1`.bgf tests/`basename $1`.baseline || exit -1
+../../../shared/tools/java2bgf $1 $2 tests/`basename $1`.bgf || exit -1
+../../../shared/tools/validate bgf tests/`basename $1`.bgf || exit -1
+../../../shared/tools/gdt tests/`basename $1`.bgf tests/`basename $1`.baseline || exit -1
diff --git a/topics/extraction/ldf/Makefile b/topics/extraction/ldf/Makefile
new file mode 100644
index 00000000..e04da7c5
--- /dev/null
+++ b/topics/extraction/ldf/Makefile
@@ -0,0 +1,18 @@
+all:
+	make clean
+	make test
+
+build:
+
+test:
+	make test-ldf2bgf
+	make test-ldf2set
+
+test-ldf2bgf:
+	find ../../.. -name "*.ldf" | xargs -n1 ./testperform
+
+test-ldf2set:
+	../../../shared/tools/ldf2set ../../fl/ldf/fl.ldf samples
+
+clean:
+	rm -rf *.bgf tests/*.bgf samples/* samples.xml *.pyc
diff --git a/shared/xsl/ldf2bgf.xslt b/topics/extraction/ldf/ldf2bgf.xslt
similarity index 100%
rename from shared/xsl/ldf2bgf.xslt
rename to topics/extraction/ldf/ldf2bgf.xslt
diff --git a/shared/python/ldf2set.py b/topics/extraction/ldf/ldf2set.py
similarity index 100%
rename from shared/python/ldf2set.py
rename to topics/extraction/ldf/ldf2set.py
diff --git a/topics/extraction/ldf/testperform b/topics/extraction/ldf/testperform
new file mode 100755
index 00000000..3baf9656
--- /dev/null
+++ b/topics/extraction/ldf/testperform
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo [Test Case] $1
+../../../shared/tools/ldf2bgf $1 tests/`basename $1 .ldf`.bgf || exit -1
+../../../shared/tools/validate bgf tests/`basename $1 .ldf`.bgf || exit -1
+#../../../shared/tools/gdt tests/`basename $1 .ldf`.bgf tests/`basename $1 .ldf`.baseline || exit -1
diff --git a/topics/extraction/ldf2bgf/Makefile b/topics/extraction/ldf2bgf/Makefile
deleted file mode 100644
index 1164eeb0..00000000
--- a/topics/extraction/ldf2bgf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-all:
-	make clean
-	make test
-
-build:
-
-test:
-	find ../../.. -name "*.ldf" | xargs -n1 ../../../shared/tools/ldf2bgf
-	ls -1 *.bgf | xargs -n1 ../../../shared/tools/validate bgf
-
-clean:
-	rm -f *.bgf
diff --git a/topics/extraction/ldf2set/Makefile b/topics/extraction/ldf2set/Makefile
deleted file mode 100755
index ab5ef497..00000000
--- a/topics/extraction/ldf2set/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-build:
-
-test:
-	../../../shared/tools/ldf2set ../../fl/ldf/fl.ldf samples
-
-clean:
-	rm -rf samples/* samples.xml *.pyc