From bff9b3c57226a0d0e3449efa7b46229c6ebf2314 Mon Sep 17 00:00:00 2001 From: grammarware Date: Sun, 12 Dec 2010 15:15:27 +0000 Subject: [PATCH] enforcing naming convention; deleting obsolete directories ; adding a test case to the set git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@906 ab42f6e0-554d-0410-b580-99e487e6eeb2 --- shared/tools/java2bgf | 4 +- topics/extraction/Makefile | 27 +-- .../extraction/{java2bgf => java}/.classpath | 0 topics/extraction/{java2bgf => java}/.project | 0 topics/extraction/java/Makefile | 9 + .../extraction/{java2bgf => java}/README.txt | 0 .../slps/java2bgf/Tool.java | 0 topics/extraction/java/testperform | 6 + topics/extraction/java/tests/java1.baseline | 223 +++++++++++++++++ topics/extraction/java/tests/java3.baseline | 229 ++++++++++++++++++ topics/extraction/java2bgf/Makefile | 22 -- topics/extraction/java2bgf/tests/fl.baseline | 44 ---- 12 files changed, 481 insertions(+), 83 deletions(-) rename topics/extraction/{java2bgf => java}/.classpath (100%) rename topics/extraction/{java2bgf => java}/.project (100%) create mode 100644 topics/extraction/java/Makefile rename topics/extraction/{java2bgf => java}/README.txt (100%) rename topics/extraction/{java2bgf => java}/slps/java2bgf/Tool.java (100%) create mode 100755 topics/extraction/java/testperform create mode 100644 topics/extraction/java/tests/java1.baseline create mode 100644 topics/extraction/java/tests/java3.baseline delete mode 100644 topics/extraction/java2bgf/Makefile delete mode 100644 topics/extraction/java2bgf/tests/fl.baseline diff --git a/shared/tools/java2bgf b/shared/tools/java2bgf index 20c83d9b..fb90025c 100755 --- a/shared/tools/java2bgf +++ b/shared/tools/java2bgf @@ -18,9 +18,9 @@ else cd $1 LOCAL3=${PWD} # Build extractor if needed - cd ${LOCAL2}/../topics/extraction/java2bgf/slps/java2bgf + cd ${LOCAL2}/../topics/extraction/java/slps/java2bgf javac *.java cd ${LOCAL1} rm -f $3 - java -cp ${CLASSPATH}:${LOCAL2}/../topics/extraction/java2bgf:${LOCAL3} slps.java2bgf.Tool $* + java -cp ${CLASSPATH}:${LOCAL2}/../topics/extraction/java:${LOCAL3} slps.java2bgf.Tool $* fi diff --git a/topics/extraction/Makefile b/topics/extraction/Makefile index bc4014e2..0d60af34 100644 --- a/topics/extraction/Makefile +++ b/topics/extraction/Makefile @@ -1,35 +1,32 @@ build: - cd antlr2bgf; make build - cd asfix2btf; make build - cd dcg2bgf; make build + cd antlr; make build + cd asfix; make build + cd dcg; make build cd java2bgf; make build cd ldf2bgf; make build cd ldf2pdf; make build cd sdf2bgf; make build cd xml2btf; make build - cd xsd2bgf; make build - cd xsd2ldf; make build + cd xsd; make build test: - cd antlr2bgf; make test - cd asfix2btf; make test - cd dcg2bgf; make test + cd antlr; make test + cd asfix; make test + cd dcg; make test cd java2bgf; make test cd ldf2bgf; make test cd ldf2pdf; make test cd sdf2bgf; make test cd xml2btf; make test - cd xsd2bgf; make test - cd xsd2ldf; make test + cd xsd; make test clean: - cd antlr2bgf; make clean - cd asfix2btf; make clean - cd dcg2bgf; make clean + cd antlr; make clean + cd asfix; make clean + cd dcg; make clean cd java2bgf; make clean cd ldf2bgf; make clean cd ldf2pdf; make clean cd sdf2bgf; make clean cd xml2btf; make clean - cd xsd2bgf; make clean - cd xsd2ldf; make clean + cd xsd; make clean diff --git a/topics/extraction/java2bgf/.classpath b/topics/extraction/java/.classpath similarity index 100% rename from topics/extraction/java2bgf/.classpath rename to topics/extraction/java/.classpath diff --git a/topics/extraction/java2bgf/.project b/topics/extraction/java/.project similarity index 100% rename from topics/extraction/java2bgf/.project rename to topics/extraction/java/.project diff --git a/topics/extraction/java/Makefile b/topics/extraction/java/Makefile new file mode 100644 index 00000000..12a72fde --- /dev/null +++ b/topics/extraction/java/Makefile @@ -0,0 +1,9 @@ +build: + cd slps/java2bgf; javac *.java + +test: + ./testperform ../../fl/java1 types + ./testperform ../../fl/java3 fl + +clean: + rm -f *~ tests/*.bgf slps/java2bgf/*.class diff --git a/topics/extraction/java2bgf/README.txt b/topics/extraction/java/README.txt similarity index 100% rename from topics/extraction/java2bgf/README.txt rename to topics/extraction/java/README.txt diff --git a/topics/extraction/java2bgf/slps/java2bgf/Tool.java b/topics/extraction/java/slps/java2bgf/Tool.java similarity index 100% rename from topics/extraction/java2bgf/slps/java2bgf/Tool.java rename to topics/extraction/java/slps/java2bgf/Tool.java diff --git a/topics/extraction/java/testperform b/topics/extraction/java/testperform new file mode 100755 index 00000000..1d293b2a --- /dev/null +++ b/topics/extraction/java/testperform @@ -0,0 +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 diff --git a/topics/extraction/java/tests/java1.baseline b/topics/extraction/java/tests/java1.baseline new file mode 100644 index 00000000..21fc0642 --- /dev/null +++ b/topics/extraction/java/tests/java1.baseline @@ -0,0 +1,223 @@ + + + + Apply + + + + + name + + string + + + + + + args + + + + + + + + + + + + + + Argument + + + name + + string + + + + + + Binary + + + + + ops + + Ops + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + Expr + + + + Apply + + + Argument + + + Binary + + + IfThenElse + + + Literal + + + + + + Function + + + + + name + + string + + + + + + args + + + + + + + + + + + + rhs + + Expr + + + + + + + + IfThenElse + + + + + ifExpr + + Expr + + + + + + thenExpr + + Expr + + + + + + elseExpr + + Expr + + + + + + + + Literal + + + info + + int + + + + + + Ops + + + + + Equal + + + + + + + + Plus + + + + + + + + Minus + + + + + + + + + + Program + + + functions + + + + + + + + + + + + Visitor + + + + + \ No newline at end of file diff --git a/topics/extraction/java/tests/java3.baseline b/topics/extraction/java/tests/java3.baseline new file mode 100644 index 00000000..047257d6 --- /dev/null +++ b/topics/extraction/java/tests/java3.baseline @@ -0,0 +1,229 @@ + + + + Apply + + + + + Name + + string + + + + + + Arg + + + + + + + + + + + + + + Argument + + + Name + + string + + + + + + Binary + + + + + Ops + + Ops + + + + + + Left + + Expr + + + + + + Right + + Expr + + + + + + + + Expr + + + + Apply + + + Argument + + + Binary + + + IfThenElse + + + Literal + + + + + + Function + + + + + Name + + string + + + + + + Arg + + + + + + + + + + + + Rhs + + Expr + + + + + + + + IfThenElse + + + + + IfExpr + + Expr + + + + + + ThenExpr + + Expr + + + + + + ElseExpr + + Expr + + + + + + + + Literal + + + Info + + int + + + + + + ObjectFactory + + + + + + Ops + + + + + EQUAL + + + + + + + + PLUS + + + + + + + + MINUS + + + + + + + + + + package-info + + + + + + Program + + + Function + + + + + + + + + + + \ No newline at end of file diff --git a/topics/extraction/java2bgf/Makefile b/topics/extraction/java2bgf/Makefile deleted file mode 100644 index 0c8e78f5..00000000 --- a/topics/extraction/java2bgf/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -basedir = ../../fl/java1 -package = types -target = tests/fl - -build: - cd slps/java2bgf; javac *.java - -test: - make clean-tests - ../../../shared/tools/java2bgf ${basedir} ${package} ${target}.bgf - ../../../shared/tools/validate bgf ${target}.bgf - ../../../shared/tools/showbgf ${target}.bgf > ${target}.out - diff ${target}.out ${target}.baseline - -clean: - make clean-tests - rm -f *~ - rm -f slps/java2bgf/*.class - -clean-tests: - rm -f tests/*.bgf - rm -f tests/*.out diff --git a/topics/extraction/java2bgf/tests/fl.baseline b/topics/extraction/java2bgf/tests/fl.baseline deleted file mode 100644 index e4438b7c..00000000 --- a/topics/extraction/java2bgf/tests/fl.baseline +++ /dev/null @@ -1,44 +0,0 @@ -Loading XSD file '/Users/laemmel/projects/slps/shared/xsd/bgf.xsd'. -Loading XML file '/Users/laemmel/projects/slps/topics/transformation/xbgf/apps/bgf/append.xbgf'. -Loading XML file 'tests/fl.bgf'. -Applying verticalN transformation. -Applying rassoc transformation. -Applying rassoc transformation. -Applying verticalN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameN transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying renameL transformation. -Applying stripSs transformation. -Applying designate transformation. -Applying designate transformation. -Applying reroot transformation. -g( [], [ - p([], 'Apply', (s(name, v(string)), s(args, *(a)))), - p([], 'Argument', s(name, v(string))), - p([], 'Binary', (s(ops, n('Ops')), s(left, n('Expr')), s(right, n('Expr')))), - p([], 'Expr', (n('Apply');n('Argument');n('Binary');n('IfThenElse');n('Literal'))), - p([], 'Function', (s(name, v(string)), s(args, *(a)), s(rhs, n('Expr')))), - p([], 'IfThenElse', (s(ifExpr, n('Expr')), s(thenExpr, n('Expr')), s(elseExpr, n('Expr')))), - p([], 'Literal', s(info, v(int))), - p([], 'Ops', (s('Equal', true);s('Plus', true);s('Minus', true))), - p([], 'Program', s(functions, *(a))), - p([], 'Visitor', fail) -]) -