diff --git a/topics/convergence/ebnf/.gitignore b/topics/convergence/exbgf/java/.gitignore similarity index 100% rename from topics/convergence/ebnf/.gitignore rename to topics/convergence/exbgf/java/.gitignore diff --git a/topics/convergence/java/Makefile b/topics/convergence/exbgf/java/Makefile similarity index 56% rename from topics/convergence/java/Makefile rename to topics/convergence/exbgf/java/Makefile index 677fef61..37574f5f 100644 --- a/topics/convergence/java/Makefile +++ b/topics/convergence/exbgf/java/Makefile @@ -1,20 +1,11 @@ -tools = ../../../shared/tools +tools = ../../../../shared/tools validator = ${tools}/validate build: test: - # make xbgfs ${tools}/lci java.lcf architecture -# xbgfs: -# exbgf2xbgf exbgf/unite-read1.exbgf xbgf/unite-read1.xbgf -# exbgf2xbgf exbgf/unite-read2.exbgf xbgf/unite-read2.xbgf -# exbgf2xbgf exbgf/unite-read3.exbgf xbgf/unite-read3.xbgf -# exbgf2xbgf exbgf/deyaccify-read2.exbgf xbgf/deyaccify-read2.xbgf -# exbgf2xbgf exbgf/deyaccify-read3.exbgf xbgf/deyaccify-read3.xbgf -# exbgf2xbgf exbgf/inlineStatements.exbgf xbgf/inlineStatements.xbgf -# check: ${validator} lcf java.lcf ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf diff --git a/topics/convergence/java/README.txt b/topics/convergence/exbgf/java/README.txt similarity index 100% rename from topics/convergence/java/README.txt rename to topics/convergence/exbgf/java/README.txt diff --git a/topics/convergence/ebnf/bgf/.gitignore b/topics/convergence/exbgf/java/bgf/.gitignore similarity index 100% rename from topics/convergence/ebnf/bgf/.gitignore rename to topics/convergence/exbgf/java/bgf/.gitignore diff --git a/topics/convergence/java/exbgf/.gitignore b/topics/convergence/exbgf/java/exbgf/.gitignore similarity index 100% rename from topics/convergence/java/exbgf/.gitignore rename to topics/convergence/exbgf/java/exbgf/.gitignore diff --git a/topics/convergence/java/exbgf/correct-impl1.exbgf b/topics/convergence/exbgf/java/exbgf/correct-impl1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-impl1.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-impl1.exbgf diff --git a/topics/convergence/java/exbgf/correct-impl2.exbgf b/topics/convergence/exbgf/java/exbgf/correct-impl2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-impl2.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-impl2.exbgf diff --git a/topics/convergence/java/exbgf/correct-impl3.exbgf b/topics/convergence/exbgf/java/exbgf/correct-impl3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-impl3.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-impl3.exbgf diff --git a/topics/convergence/java/exbgf/correct-read1.exbgf b/topics/convergence/exbgf/java/exbgf/correct-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-read1.exbgf diff --git a/topics/convergence/java/exbgf/correct-read2.exbgf b/topics/convergence/exbgf/java/exbgf/correct-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-read2.exbgf diff --git a/topics/convergence/java/exbgf/correct-read3.exbgf b/topics/convergence/exbgf/java/exbgf/correct-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/correct-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/correct-read3.exbgf diff --git a/topics/convergence/java/exbgf/deyaccify-read2.exbgf b/topics/convergence/exbgf/java/exbgf/deyaccify-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/deyaccify-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/deyaccify-read2.exbgf diff --git a/topics/convergence/java/exbgf/deyaccify-read3.exbgf b/topics/convergence/exbgf/java/exbgf/deyaccify-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/deyaccify-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/deyaccify-read3.exbgf diff --git a/topics/convergence/java/exbgf/edit-read1.exbgf b/topics/convergence/exbgf/java/exbgf/edit-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/edit-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/edit-read1.exbgf diff --git a/topics/convergence/java/exbgf/edit-read2.exbgf b/topics/convergence/exbgf/java/exbgf/edit-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/edit-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/edit-read2.exbgf diff --git a/topics/convergence/java/exbgf/edit-read3.exbgf b/topics/convergence/exbgf/java/exbgf/edit-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/edit-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/edit-read3.exbgf diff --git a/topics/convergence/java/exbgf/editDeclarations.exbgf b/topics/convergence/exbgf/java/exbgf/editDeclarations.exbgf similarity index 100% rename from topics/convergence/java/exbgf/editDeclarations.exbgf rename to topics/convergence/exbgf/java/exbgf/editDeclarations.exbgf diff --git a/topics/convergence/java/exbgf/editExpressions-jls1.exbgf b/topics/convergence/exbgf/java/exbgf/editExpressions-jls1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/editExpressions-jls1.exbgf rename to topics/convergence/exbgf/java/exbgf/editExpressions-jls1.exbgf diff --git a/topics/convergence/java/exbgf/editExpressions-read2.exbgf b/topics/convergence/exbgf/java/exbgf/editExpressions-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/editExpressions-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/editExpressions-read2.exbgf diff --git a/topics/convergence/java/exbgf/editExpressions-read3.exbgf b/topics/convergence/exbgf/java/exbgf/editExpressions-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/editExpressions-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/editExpressions-read3.exbgf diff --git a/topics/convergence/java/exbgf/eliminate-read2.exbgf b/topics/convergence/exbgf/java/exbgf/eliminate-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/eliminate-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/eliminate-read2.exbgf diff --git a/topics/convergence/java/exbgf/extend-jls1.exbgf b/topics/convergence/exbgf/java/exbgf/extend-jls1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extend-jls1.exbgf rename to topics/convergence/exbgf/java/exbgf/extend-jls1.exbgf diff --git a/topics/convergence/java/exbgf/extend-read1.exbgf b/topics/convergence/exbgf/java/exbgf/extend-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extend-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/extend-read1.exbgf diff --git a/topics/convergence/java/exbgf/extend-read12.exbgf b/topics/convergence/exbgf/java/exbgf/extend-read12.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extend-read12.exbgf rename to topics/convergence/exbgf/java/exbgf/extend-read12.exbgf diff --git a/topics/convergence/java/exbgf/extendClassDeclarations.exbgf b/topics/convergence/exbgf/java/exbgf/extendClassDeclarations.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendClassDeclarations.exbgf rename to topics/convergence/exbgf/java/exbgf/extendClassDeclarations.exbgf diff --git a/topics/convergence/java/exbgf/extendDeclarations.exbgf b/topics/convergence/exbgf/java/exbgf/extendDeclarations.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendDeclarations.exbgf rename to topics/convergence/exbgf/java/exbgf/extendDeclarations.exbgf diff --git a/topics/convergence/java/exbgf/extendExpressions.exbgf b/topics/convergence/exbgf/java/exbgf/extendExpressions.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendExpressions.exbgf rename to topics/convergence/exbgf/java/exbgf/extendExpressions.exbgf diff --git a/topics/convergence/java/exbgf/extendInterfaceDeclarations.exbgf b/topics/convergence/exbgf/java/exbgf/extendInterfaceDeclarations.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendInterfaceDeclarations.exbgf rename to topics/convergence/exbgf/java/exbgf/extendInterfaceDeclarations.exbgf diff --git a/topics/convergence/java/exbgf/extendModifiers.exbgf b/topics/convergence/exbgf/java/exbgf/extendModifiers.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendModifiers.exbgf rename to topics/convergence/exbgf/java/exbgf/extendModifiers.exbgf diff --git a/topics/convergence/java/exbgf/extendStatements.exbgf b/topics/convergence/exbgf/java/exbgf/extendStatements.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendStatements.exbgf rename to topics/convergence/exbgf/java/exbgf/extendStatements.exbgf diff --git a/topics/convergence/java/exbgf/extendWithAnnotations.exbgf b/topics/convergence/exbgf/java/exbgf/extendWithAnnotations.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendWithAnnotations.exbgf rename to topics/convergence/exbgf/java/exbgf/extendWithAnnotations.exbgf diff --git a/topics/convergence/java/exbgf/extendWithTypeArguments.exbgf b/topics/convergence/exbgf/java/exbgf/extendWithTypeArguments.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extendWithTypeArguments.exbgf rename to topics/convergence/exbgf/java/exbgf/extendWithTypeArguments.exbgf diff --git a/topics/convergence/java/exbgf/extract-impl3.exbgf b/topics/convergence/exbgf/java/exbgf/extract-impl3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/extract-impl3.exbgf rename to topics/convergence/exbgf/java/exbgf/extract-impl3.exbgf diff --git a/topics/convergence/java/exbgf/generalize-impl3.exbgf b/topics/convergence/exbgf/java/exbgf/generalize-impl3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/generalize-impl3.exbgf rename to topics/convergence/exbgf/java/exbgf/generalize-impl3.exbgf diff --git a/topics/convergence/java/exbgf/generalizeBlock.exbgf b/topics/convergence/exbgf/java/exbgf/generalizeBlock.exbgf similarity index 100% rename from topics/convergence/java/exbgf/generalizeBlock.exbgf rename to topics/convergence/exbgf/java/exbgf/generalizeBlock.exbgf diff --git a/topics/convergence/java/exbgf/generalizeLabels.exbgf b/topics/convergence/exbgf/java/exbgf/generalizeLabels.exbgf similarity index 100% rename from topics/convergence/java/exbgf/generalizeLabels.exbgf rename to topics/convergence/exbgf/java/exbgf/generalizeLabels.exbgf diff --git a/topics/convergence/java/exbgf/generalizeStatements.exbgf b/topics/convergence/exbgf/java/exbgf/generalizeStatements.exbgf similarity index 100% rename from topics/convergence/java/exbgf/generalizeStatements.exbgf rename to topics/convergence/exbgf/java/exbgf/generalizeStatements.exbgf diff --git a/topics/convergence/java/exbgf/inlineStatements.exbgf b/topics/convergence/exbgf/java/exbgf/inlineStatements.exbgf similarity index 100% rename from topics/convergence/java/exbgf/inlineStatements.exbgf rename to topics/convergence/exbgf/java/exbgf/inlineStatements.exbgf diff --git a/topics/convergence/java/exbgf/recover-impl3.exbgf b/topics/convergence/exbgf/java/exbgf/recover-impl3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/recover-impl3.exbgf rename to topics/convergence/exbgf/java/exbgf/recover-impl3.exbgf diff --git a/topics/convergence/java/exbgf/recover-read2.exbgf b/topics/convergence/exbgf/java/exbgf/recover-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/recover-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/recover-read2.exbgf diff --git a/topics/convergence/java/exbgf/recover-read3.exbgf b/topics/convergence/exbgf/java/exbgf/recover-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/recover-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/recover-read3.exbgf diff --git a/topics/convergence/java/exbgf/refactor-impl1.exbgf b/topics/convergence/exbgf/java/exbgf/refactor-impl1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactor-impl1.exbgf rename to topics/convergence/exbgf/java/exbgf/refactor-impl1.exbgf diff --git a/topics/convergence/java/exbgf/refactor-impl2.exbgf b/topics/convergence/exbgf/java/exbgf/refactor-impl2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactor-impl2.exbgf rename to topics/convergence/exbgf/java/exbgf/refactor-impl2.exbgf diff --git a/topics/convergence/java/exbgf/refactor-impl3.exbgf b/topics/convergence/exbgf/java/exbgf/refactor-impl3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactor-impl3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactor-impl3.exbgf diff --git a/topics/convergence/java/exbgf/refactor-read1.exbgf b/topics/convergence/exbgf/java/exbgf/refactor-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactor-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/refactor-read1.exbgf diff --git a/topics/convergence/java/exbgf/refactorClasses-read2.exbgf b/topics/convergence/exbgf/java/exbgf/refactorClasses-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorClasses-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorClasses-read2.exbgf diff --git a/topics/convergence/java/exbgf/refactorClasses-read3.exbgf b/topics/convergence/exbgf/java/exbgf/refactorClasses-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorClasses-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorClasses-read3.exbgf diff --git a/topics/convergence/java/exbgf/refactorDeclarations-read2.exbgf b/topics/convergence/exbgf/java/exbgf/refactorDeclarations-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorDeclarations-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorDeclarations-read2.exbgf diff --git a/topics/convergence/java/exbgf/refactorDeclarations-read3.exbgf b/topics/convergence/exbgf/java/exbgf/refactorDeclarations-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorDeclarations-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorDeclarations-read3.exbgf diff --git a/topics/convergence/java/exbgf/refactorEnums.exbgf b/topics/convergence/exbgf/java/exbgf/refactorEnums.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorEnums.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorEnums.exbgf diff --git a/topics/convergence/java/exbgf/refactorExpressions.exbgf b/topics/convergence/exbgf/java/exbgf/refactorExpressions.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorExpressions.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorExpressions.exbgf diff --git a/topics/convergence/java/exbgf/refactorInterfaces-read2.exbgf b/topics/convergence/exbgf/java/exbgf/refactorInterfaces-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorInterfaces-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorInterfaces-read2.exbgf diff --git a/topics/convergence/java/exbgf/refactorInterfaces-read3.exbgf b/topics/convergence/exbgf/java/exbgf/refactorInterfaces-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorInterfaces-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorInterfaces-read3.exbgf diff --git a/topics/convergence/java/exbgf/refactorMinorMismatches.exbgf b/topics/convergence/exbgf/java/exbgf/refactorMinorMismatches.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorMinorMismatches.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorMinorMismatches.exbgf diff --git a/topics/convergence/java/exbgf/refactorPackageNames.exbgf b/topics/convergence/exbgf/java/exbgf/refactorPackageNames.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorPackageNames.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorPackageNames.exbgf diff --git a/topics/convergence/java/exbgf/refactorStatements-jls1.exbgf b/topics/convergence/exbgf/java/exbgf/refactorStatements-jls1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorStatements-jls1.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorStatements-jls1.exbgf diff --git a/topics/convergence/java/exbgf/refactorStatements-read3.exbgf b/topics/convergence/exbgf/java/exbgf/refactorStatements-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorStatements-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorStatements-read3.exbgf diff --git a/topics/convergence/java/exbgf/refactorTypes-jls1.exbgf b/topics/convergence/exbgf/java/exbgf/refactorTypes-jls1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorTypes-jls1.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorTypes-jls1.exbgf diff --git a/topics/convergence/java/exbgf/refactorTypes-read2.exbgf b/topics/convergence/exbgf/java/exbgf/refactorTypes-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorTypes-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorTypes-read2.exbgf diff --git a/topics/convergence/java/exbgf/refactorTypes-read3.exbgf b/topics/convergence/exbgf/java/exbgf/refactorTypes-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/refactorTypes-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/refactorTypes-read3.exbgf diff --git a/topics/convergence/java/exbgf/relaxClasses-read3.exbgf b/topics/convergence/exbgf/java/exbgf/relaxClasses-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/relaxClasses-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/relaxClasses-read3.exbgf diff --git a/topics/convergence/java/exbgf/relaxExpressions-read3.exbgf b/topics/convergence/exbgf/java/exbgf/relaxExpressions-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/relaxExpressions-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/relaxExpressions-read3.exbgf diff --git a/topics/convergence/java/exbgf/rename-impl1.exbgf b/topics/convergence/exbgf/java/exbgf/rename-impl1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-impl1.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-impl1.exbgf diff --git a/topics/convergence/java/exbgf/rename-jls1.exbgf b/topics/convergence/exbgf/java/exbgf/rename-jls1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-jls1.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-jls1.exbgf diff --git a/topics/convergence/java/exbgf/rename-jls12.exbgf b/topics/convergence/exbgf/java/exbgf/rename-jls12.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-jls12.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-jls12.exbgf diff --git a/topics/convergence/java/exbgf/rename-read1.exbgf b/topics/convergence/exbgf/java/exbgf/rename-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-read1.exbgf diff --git a/topics/convergence/java/exbgf/rename-read12.exbgf b/topics/convergence/exbgf/java/exbgf/rename-read12.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-read12.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-read12.exbgf diff --git a/topics/convergence/java/exbgf/rename-read2.exbgf b/topics/convergence/exbgf/java/exbgf/rename-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-read2.exbgf diff --git a/topics/convergence/java/exbgf/rename-read3.exbgf b/topics/convergence/exbgf/java/exbgf/rename-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/rename-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/rename-read3.exbgf diff --git a/topics/convergence/java/exbgf/unite-read1.exbgf b/topics/convergence/exbgf/java/exbgf/unite-read1.exbgf similarity index 100% rename from topics/convergence/java/exbgf/unite-read1.exbgf rename to topics/convergence/exbgf/java/exbgf/unite-read1.exbgf diff --git a/topics/convergence/java/exbgf/unite-read2.exbgf b/topics/convergence/exbgf/java/exbgf/unite-read2.exbgf similarity index 100% rename from topics/convergence/java/exbgf/unite-read2.exbgf rename to topics/convergence/exbgf/java/exbgf/unite-read2.exbgf diff --git a/topics/convergence/java/exbgf/unite-read3.exbgf b/topics/convergence/exbgf/java/exbgf/unite-read3.exbgf similarity index 100% rename from topics/convergence/java/exbgf/unite-read3.exbgf rename to topics/convergence/exbgf/java/exbgf/unite-read3.exbgf diff --git a/topics/convergence/java/java.lcf b/topics/convergence/exbgf/java/java.lcf similarity index 95% rename from topics/convergence/java/java.lcf rename to topics/convergence/exbgf/java/java.lcf index c7862828..6d2a4069 100644 --- a/topics/convergence/java/java.lcf +++ b/topics/convergence/exbgf/java/java.lcf @@ -2,11 +2,11 @@ slps - ../../.. + ../../../.. grammars - ../../grammars + ../../../grammars tools diff --git a/topics/convergence/ebnf/snapshot/.gitignore b/topics/convergence/exbgf/java/snapshot/.gitignore similarity index 100% rename from topics/convergence/ebnf/snapshot/.gitignore rename to topics/convergence/exbgf/java/snapshot/.gitignore diff --git a/topics/convergence/java/snapshot/architecture_large.pdf b/topics/convergence/exbgf/java/snapshot/architecture_large.pdf similarity index 100% rename from topics/convergence/java/snapshot/architecture_large.pdf rename to topics/convergence/exbgf/java/snapshot/architecture_large.pdf diff --git a/topics/convergence/java/snapshot/architecture_small.pdf b/topics/convergence/exbgf/java/snapshot/architecture_small.pdf similarity index 100% rename from topics/convergence/java/snapshot/architecture_small.pdf rename to topics/convergence/exbgf/java/snapshot/architecture_small.pdf diff --git a/topics/convergence/declarative/Makefile b/topics/convergence/mbgf/Makefile similarity index 100% rename from topics/convergence/declarative/Makefile rename to topics/convergence/mbgf/Makefile diff --git a/topics/convergence/mbgf/fl/.gitignore b/topics/convergence/mbgf/fl/.gitignore new file mode 100644 index 00000000..4bac1892 --- /dev/null +++ b/topics/convergence/mbgf/fl/.gitignore @@ -0,0 +1,2 @@ +*.xbgf +*.bgf diff --git a/topics/convergence/tri/Makefile b/topics/convergence/mbgf/fl/Makefile similarity index 58% rename from topics/convergence/tri/Makefile rename to topics/convergence/mbgf/fl/Makefile index e6b1c74a..1e77cbb2 100644 --- a/topics/convergence/tri/Makefile +++ b/topics/convergence/mbgf/fl/Makefile @@ -1,37 +1,36 @@ -tools = ../../../shared/tools +tools = ../../../../shared/tools validator = ${tools}/validate d: - ./mbgf2xbgf.py test.mbgf sdf dcg test.2to1.xbgf + ../mbgf2xbgf.py fl.mbgf sdf dcg test.2to1.xbgf xbgf test.2to1.xbgf bgf/sdf.bgf bgf/sdf.2.bgf gdts bgf/sdf.2.bgf bgf/dcg.bgf -tst: - ./m2 test.mbgf sdf rsc +test: + ./m2 fl.mbgf sdf rsc go: - ./mbgf2xbgf.py test.mbgf 3 2 test.3to2.xbgf + ../mbgf2xbgf.py fl.mbgf 3 2 test.3to2.xbgf xbgf test.3to2.xbgf bgf/rascal.bgf bgf/rascal.2.bgf gdts bgf/rascal.2.bgf bgf/sdf.bgf - ./mbgf2xbgf.py test.mbgf 1 2 test.1to2.xbgf + ../mbgf2xbgf.py fl.mbgf 1 2 test.1to2.xbgf xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf gdts bgf/dcg.2.bgf bgf/sdf.bgf t: - ./mbgf2xbgf.py test.mbgf 1 3 test.res.xbgf + ../mbgf2xbgf.py fl.mbgf 1 3 test.res.xbgf xbgf2xbnf test.res.xbgf try: - xsltproc --stringparam in 1 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt test.mbgf > test.1to2.xbgf + xsltproc --stringparam in 1 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt fl.mbgf > test.1to2.xbgf xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf gdts bgf/dcg.2.bgf bgf/rascal.bgf - xsltproc --stringparam in 3 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt test.mbgf > test.1to2.xbgf + xsltproc --stringparam in 3 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt fl.mbgf > test.1to2.xbgf xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf build: - -test: - ${tools}/lci fl.lcf architecture + cp ../../xbgf/fl/snapshot/*.bgf snapshot/ + cp ../../xbgf/fl/snapshot/*.bgf bgf/ check: ${validator} lcf fl.lcf @@ -41,9 +40,6 @@ check: clean: rm -f *~ rm -f codesamples/* xmlsamples/* bgf/* - rm -f xbgf/stripTerminals.xbgf xbgf/stripSelectors.xbgf - rm -f xbgf/rename-om.xbgf xbgf/rename-sdf.xbgf xbgf/rename-jaxb.xbgf xbgf/rename-xsd.xbgf xbgf/rename-model.xbgf - rm -f xbgf/reroot-lower.xbgf xbgf/reroot-upper.xbgf rm -rf bin obj rm -f *.user *.suo rm -f architecture* diff --git a/topics/convergence/java/bgf/.gitignore b/topics/convergence/mbgf/fl/bgf/.gitignore similarity index 100% rename from topics/convergence/java/bgf/.gitignore rename to topics/convergence/mbgf/fl/bgf/.gitignore diff --git a/topics/convergence/tri/test.mbgf b/topics/convergence/mbgf/fl/fl.mbgf similarity index 100% rename from topics/convergence/tri/test.mbgf rename to topics/convergence/mbgf/fl/fl.mbgf diff --git a/topics/convergence/tri/m1 b/topics/convergence/mbgf/fl/m1 similarity index 88% rename from topics/convergence/tri/m1 rename to topics/convergence/mbgf/fl/m1 index fd7c7d00..0b342aec 100755 --- a/topics/convergence/tri/m1 +++ b/topics/convergence/mbgf/fl/m1 @@ -2,7 +2,7 @@ # m1 file.mbgf one two # $0 $1 $2 $3 -./mbgf2xbgf.py $1 $2 $3 tmp.xbgf +../mbgf2xbgf.py $1 $2 $3 tmp.xbgf xbgf tmp.xbgf `xpath $1 'mbgf:sequence/sources/src[@name="'$2'"]/text()' 2> /dev/null` tmp1.bgf gdt tmp1.bgf `xpath $1 'mbgf:sequence/sources/src[@name="'$3'"]/text()' 2> /dev/null` || exit -1 rm tmp.xbgf tmp1.bgf diff --git a/topics/convergence/tri/m2 b/topics/convergence/mbgf/fl/m2 similarity index 100% rename from topics/convergence/tri/m2 rename to topics/convergence/mbgf/fl/m2 diff --git a/topics/convergence/tri/m3 b/topics/convergence/mbgf/fl/m3 similarity index 100% rename from topics/convergence/tri/m3 rename to topics/convergence/mbgf/fl/m3 diff --git a/topics/convergence/java/snapshot/.gitignore b/topics/convergence/mbgf/fl/snapshot/.gitignore similarity index 100% rename from topics/convergence/java/snapshot/.gitignore rename to topics/convergence/mbgf/fl/snapshot/.gitignore diff --git a/topics/convergence/tri/mbgf2xbgf.py b/topics/convergence/mbgf/mbgf2xbgf.py similarity index 100% rename from topics/convergence/tri/mbgf2xbgf.py rename to topics/convergence/mbgf/mbgf2xbgf.py diff --git a/topics/convergence/declarative/tests/.gitignore b/topics/convergence/mbgf/tests/.gitignore similarity index 100% rename from topics/convergence/declarative/tests/.gitignore rename to topics/convergence/mbgf/tests/.gitignore diff --git a/topics/convergence/declarative/tests/Makefile b/topics/convergence/mbgf/tests/Makefile similarity index 100% rename from topics/convergence/declarative/tests/Makefile rename to topics/convergence/mbgf/tests/Makefile diff --git a/topics/convergence/declarative/tests/fold-labels-fl-1.bgf b/topics/convergence/mbgf/tests/fold-labels-fl-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-fl-1.bgf rename to topics/convergence/mbgf/tests/fold-labels-fl-1.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-fl-2.bgf b/topics/convergence/mbgf/tests/fold-labels-fl-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-fl-2.bgf rename to topics/convergence/mbgf/tests/fold-labels-fl-2.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-fl-3.bgf b/topics/convergence/mbgf/tests/fold-labels-fl-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-fl-3.bgf rename to topics/convergence/mbgf/tests/fold-labels-fl-3.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-fl.mbgf b/topics/convergence/mbgf/tests/fold-labels-fl.mbgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-fl.mbgf rename to topics/convergence/mbgf/tests/fold-labels-fl.mbgf diff --git a/topics/convergence/declarative/tests/fold-labels-lf-1.bgf b/topics/convergence/mbgf/tests/fold-labels-lf-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-lf-1.bgf rename to topics/convergence/mbgf/tests/fold-labels-lf-1.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-lf-2.bgf b/topics/convergence/mbgf/tests/fold-labels-lf-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-lf-2.bgf rename to topics/convergence/mbgf/tests/fold-labels-lf-2.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-lf-3.bgf b/topics/convergence/mbgf/tests/fold-labels-lf-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-lf-3.bgf rename to topics/convergence/mbgf/tests/fold-labels-lf-3.bgf diff --git a/topics/convergence/declarative/tests/fold-labels-lf.mbgf b/topics/convergence/mbgf/tests/fold-labels-lf.mbgf similarity index 100% rename from topics/convergence/declarative/tests/fold-labels-lf.mbgf rename to topics/convergence/mbgf/tests/fold-labels-lf.mbgf diff --git a/topics/convergence/declarative/tests/fold-names-any-1.bgf b/topics/convergence/mbgf/tests/fold-names-any-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-any-1.bgf rename to topics/convergence/mbgf/tests/fold-names-any-1.bgf diff --git a/topics/convergence/declarative/tests/fold-names-any-2.bgf b/topics/convergence/mbgf/tests/fold-names-any-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-any-2.bgf rename to topics/convergence/mbgf/tests/fold-names-any-2.bgf diff --git a/topics/convergence/declarative/tests/fold-names-any-3.bgf b/topics/convergence/mbgf/tests/fold-names-any-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-any-3.bgf rename to topics/convergence/mbgf/tests/fold-names-any-3.bgf diff --git a/topics/convergence/declarative/tests/fold-names-any.mbgf b/topics/convergence/mbgf/tests/fold-names-any.mbgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-any.mbgf rename to topics/convergence/mbgf/tests/fold-names-any.mbgf diff --git a/topics/convergence/declarative/tests/fold-names-ordered-1.bgf b/topics/convergence/mbgf/tests/fold-names-ordered-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-ordered-1.bgf rename to topics/convergence/mbgf/tests/fold-names-ordered-1.bgf diff --git a/topics/convergence/declarative/tests/fold-names-ordered-2.bgf b/topics/convergence/mbgf/tests/fold-names-ordered-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-ordered-2.bgf rename to topics/convergence/mbgf/tests/fold-names-ordered-2.bgf diff --git a/topics/convergence/declarative/tests/fold-names-ordered-3.bgf b/topics/convergence/mbgf/tests/fold-names-ordered-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-ordered-3.bgf rename to topics/convergence/mbgf/tests/fold-names-ordered-3.bgf diff --git a/topics/convergence/declarative/tests/fold-names-ordered.mbgf b/topics/convergence/mbgf/tests/fold-names-ordered.mbgf similarity index 100% rename from topics/convergence/declarative/tests/fold-names-ordered.mbgf rename to topics/convergence/mbgf/tests/fold-names-ordered.mbgf diff --git a/topics/convergence/declarative/tests/folding-easy-1.bgf b/topics/convergence/mbgf/tests/folding-easy-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/folding-easy-1.bgf rename to topics/convergence/mbgf/tests/folding-easy-1.bgf diff --git a/topics/convergence/declarative/tests/folding-easy-2.bgf b/topics/convergence/mbgf/tests/folding-easy-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/folding-easy-2.bgf rename to topics/convergence/mbgf/tests/folding-easy-2.bgf diff --git a/topics/convergence/declarative/tests/folding-easy-3.bgf b/topics/convergence/mbgf/tests/folding-easy-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/folding-easy-3.bgf rename to topics/convergence/mbgf/tests/folding-easy-3.bgf diff --git a/topics/convergence/declarative/tests/folding-easy.mbgf b/topics/convergence/mbgf/tests/folding-easy.mbgf similarity index 100% rename from topics/convergence/declarative/tests/folding-easy.mbgf rename to topics/convergence/mbgf/tests/folding-easy.mbgf diff --git a/topics/convergence/declarative/tests/iteration-irl-1.bgf b/topics/convergence/mbgf/tests/iteration-irl-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-irl-1.bgf rename to topics/convergence/mbgf/tests/iteration-irl-1.bgf diff --git a/topics/convergence/declarative/tests/iteration-irl-2.bgf b/topics/convergence/mbgf/tests/iteration-irl-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-irl-2.bgf rename to topics/convergence/mbgf/tests/iteration-irl-2.bgf diff --git a/topics/convergence/declarative/tests/iteration-irl-3.bgf b/topics/convergence/mbgf/tests/iteration-irl-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-irl-3.bgf rename to topics/convergence/mbgf/tests/iteration-irl-3.bgf diff --git a/topics/convergence/declarative/tests/iteration-irl.mbgf b/topics/convergence/mbgf/tests/iteration-irl.mbgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-irl.mbgf rename to topics/convergence/mbgf/tests/iteration-irl.mbgf diff --git a/topics/convergence/declarative/tests/iteration-nosep-1.bgf b/topics/convergence/mbgf/tests/iteration-nosep-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-nosep-1.bgf rename to topics/convergence/mbgf/tests/iteration-nosep-1.bgf diff --git a/topics/convergence/declarative/tests/iteration-nosep-2.bgf b/topics/convergence/mbgf/tests/iteration-nosep-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-nosep-2.bgf rename to topics/convergence/mbgf/tests/iteration-nosep-2.bgf diff --git a/topics/convergence/declarative/tests/iteration-nosep-3.bgf b/topics/convergence/mbgf/tests/iteration-nosep-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-nosep-3.bgf rename to topics/convergence/mbgf/tests/iteration-nosep-3.bgf diff --git a/topics/convergence/declarative/tests/iteration-nosep.mbgf b/topics/convergence/mbgf/tests/iteration-nosep.mbgf similarity index 100% rename from topics/convergence/declarative/tests/iteration-nosep.mbgf rename to topics/convergence/mbgf/tests/iteration-nosep.mbgf diff --git a/topics/convergence/declarative/tests/labels-many-1.bgf b/topics/convergence/mbgf/tests/labels-many-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-many-1.bgf rename to topics/convergence/mbgf/tests/labels-many-1.bgf diff --git a/topics/convergence/declarative/tests/labels-many-2.bgf b/topics/convergence/mbgf/tests/labels-many-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-many-2.bgf rename to topics/convergence/mbgf/tests/labels-many-2.bgf diff --git a/topics/convergence/declarative/tests/labels-many-3.bgf b/topics/convergence/mbgf/tests/labels-many-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-many-3.bgf rename to topics/convergence/mbgf/tests/labels-many-3.bgf diff --git a/topics/convergence/declarative/tests/labels-many.mbgf b/topics/convergence/mbgf/tests/labels-many.mbgf similarity index 100% rename from topics/convergence/declarative/tests/labels-many.mbgf rename to topics/convergence/mbgf/tests/labels-many.mbgf diff --git a/topics/convergence/declarative/tests/labels-same-1.bgf b/topics/convergence/mbgf/tests/labels-same-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-same-1.bgf rename to topics/convergence/mbgf/tests/labels-same-1.bgf diff --git a/topics/convergence/declarative/tests/labels-same-2.bgf b/topics/convergence/mbgf/tests/labels-same-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-same-2.bgf rename to topics/convergence/mbgf/tests/labels-same-2.bgf diff --git a/topics/convergence/declarative/tests/labels-same-3.bgf b/topics/convergence/mbgf/tests/labels-same-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/labels-same-3.bgf rename to topics/convergence/mbgf/tests/labels-same-3.bgf diff --git a/topics/convergence/declarative/tests/labels-same.mbgf b/topics/convergence/mbgf/tests/labels-same.mbgf similarity index 100% rename from topics/convergence/declarative/tests/labels-same.mbgf rename to topics/convergence/mbgf/tests/labels-same.mbgf diff --git a/topics/convergence/declarative/tests/list.numbers b/topics/convergence/mbgf/tests/list.numbers similarity index 100% rename from topics/convergence/declarative/tests/list.numbers rename to topics/convergence/mbgf/tests/list.numbers diff --git a/topics/convergence/declarative/tests/m1 b/topics/convergence/mbgf/tests/m1 similarity index 100% rename from topics/convergence/declarative/tests/m1 rename to topics/convergence/mbgf/tests/m1 diff --git a/topics/convergence/declarative/tests/naming-abc-1.bgf b/topics/convergence/mbgf/tests/naming-abc-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-abc-1.bgf rename to topics/convergence/mbgf/tests/naming-abc-1.bgf diff --git a/topics/convergence/declarative/tests/naming-abc-2.bgf b/topics/convergence/mbgf/tests/naming-abc-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-abc-2.bgf rename to topics/convergence/mbgf/tests/naming-abc-2.bgf diff --git a/topics/convergence/declarative/tests/naming-abc-3.bgf b/topics/convergence/mbgf/tests/naming-abc-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-abc-3.bgf rename to topics/convergence/mbgf/tests/naming-abc-3.bgf diff --git a/topics/convergence/declarative/tests/naming-abc.mbgf b/topics/convergence/mbgf/tests/naming-abc.mbgf similarity index 100% rename from topics/convergence/declarative/tests/naming-abc.mbgf rename to topics/convergence/mbgf/tests/naming-abc.mbgf diff --git a/topics/convergence/declarative/tests/naming-dde-1.bgf b/topics/convergence/mbgf/tests/naming-dde-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-dde-1.bgf rename to topics/convergence/mbgf/tests/naming-dde-1.bgf diff --git a/topics/convergence/declarative/tests/naming-dde-2.bgf b/topics/convergence/mbgf/tests/naming-dde-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-dde-2.bgf rename to topics/convergence/mbgf/tests/naming-dde-2.bgf diff --git a/topics/convergence/declarative/tests/naming-dde-3.bgf b/topics/convergence/mbgf/tests/naming-dde-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/naming-dde-3.bgf rename to topics/convergence/mbgf/tests/naming-dde-3.bgf diff --git a/topics/convergence/declarative/tests/naming-dde.mbgf b/topics/convergence/mbgf/tests/naming-dde.mbgf similarity index 100% rename from topics/convergence/declarative/tests/naming-dde.mbgf rename to topics/convergence/mbgf/tests/naming-dde.mbgf diff --git a/topics/convergence/declarative/tests/quiettest b/topics/convergence/mbgf/tests/quiettest similarity index 100% rename from topics/convergence/declarative/tests/quiettest rename to topics/convergence/mbgf/tests/quiettest diff --git a/topics/convergence/declarative/tests/selectables-many-1.bgf b/topics/convergence/mbgf/tests/selectables-many-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-many-1.bgf rename to topics/convergence/mbgf/tests/selectables-many-1.bgf diff --git a/topics/convergence/declarative/tests/selectables-many-2.bgf b/topics/convergence/mbgf/tests/selectables-many-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-many-2.bgf rename to topics/convergence/mbgf/tests/selectables-many-2.bgf diff --git a/topics/convergence/declarative/tests/selectables-many-3.bgf b/topics/convergence/mbgf/tests/selectables-many-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-many-3.bgf rename to topics/convergence/mbgf/tests/selectables-many-3.bgf diff --git a/topics/convergence/declarative/tests/selectables-many.mbgf b/topics/convergence/mbgf/tests/selectables-many.mbgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-many.mbgf rename to topics/convergence/mbgf/tests/selectables-many.mbgf diff --git a/topics/convergence/declarative/tests/selectables-multi-1.bgf b/topics/convergence/mbgf/tests/selectables-multi-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-multi-1.bgf rename to topics/convergence/mbgf/tests/selectables-multi-1.bgf diff --git a/topics/convergence/declarative/tests/selectables-multi-2.bgf b/topics/convergence/mbgf/tests/selectables-multi-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-multi-2.bgf rename to topics/convergence/mbgf/tests/selectables-multi-2.bgf diff --git a/topics/convergence/declarative/tests/selectables-multi-3.bgf b/topics/convergence/mbgf/tests/selectables-multi-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-multi-3.bgf rename to topics/convergence/mbgf/tests/selectables-multi-3.bgf diff --git a/topics/convergence/declarative/tests/selectables-multi.mbgf b/topics/convergence/mbgf/tests/selectables-multi.mbgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-multi.mbgf rename to topics/convergence/mbgf/tests/selectables-multi.mbgf diff --git a/topics/convergence/declarative/tests/selectables-one-1.bgf b/topics/convergence/mbgf/tests/selectables-one-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-one-1.bgf rename to topics/convergence/mbgf/tests/selectables-one-1.bgf diff --git a/topics/convergence/declarative/tests/selectables-one-2.bgf b/topics/convergence/mbgf/tests/selectables-one-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-one-2.bgf rename to topics/convergence/mbgf/tests/selectables-one-2.bgf diff --git a/topics/convergence/declarative/tests/selectables-one-3.bgf b/topics/convergence/mbgf/tests/selectables-one-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-one-3.bgf rename to topics/convergence/mbgf/tests/selectables-one-3.bgf diff --git a/topics/convergence/declarative/tests/selectables-one.mbgf b/topics/convergence/mbgf/tests/selectables-one.mbgf similarity index 100% rename from topics/convergence/declarative/tests/selectables-one.mbgf rename to topics/convergence/mbgf/tests/selectables-one.mbgf diff --git a/topics/convergence/declarative/tests/testcopy b/topics/convergence/mbgf/tests/testcopy similarity index 100% rename from topics/convergence/declarative/tests/testcopy rename to topics/convergence/mbgf/tests/testcopy diff --git a/topics/convergence/declarative/tests/testperform b/topics/convergence/mbgf/tests/testperform similarity index 100% rename from topics/convergence/declarative/tests/testperform rename to topics/convergence/mbgf/tests/testperform diff --git a/topics/convergence/declarative/tests/topchoice-hhv-1.bgf b/topics/convergence/mbgf/tests/topchoice-hhv-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/topchoice-hhv-1.bgf rename to topics/convergence/mbgf/tests/topchoice-hhv-1.bgf diff --git a/topics/convergence/declarative/tests/topchoice-hhv-2.bgf b/topics/convergence/mbgf/tests/topchoice-hhv-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/topchoice-hhv-2.bgf rename to topics/convergence/mbgf/tests/topchoice-hhv-2.bgf diff --git a/topics/convergence/declarative/tests/topchoice-hhv-3.bgf b/topics/convergence/mbgf/tests/topchoice-hhv-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/topchoice-hhv-3.bgf rename to topics/convergence/mbgf/tests/topchoice-hhv-3.bgf diff --git a/topics/convergence/declarative/tests/topchoice-hhv.mbgf b/topics/convergence/mbgf/tests/topchoice-hhv.mbgf similarity index 100% rename from topics/convergence/declarative/tests/topchoice-hhv.mbgf rename to topics/convergence/mbgf/tests/topchoice-hhv.mbgf diff --git a/topics/convergence/declarative/tests/unification-easy-1.bgf b/topics/convergence/mbgf/tests/unification-easy-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-easy-1.bgf rename to topics/convergence/mbgf/tests/unification-easy-1.bgf diff --git a/topics/convergence/declarative/tests/unification-easy-2.bgf b/topics/convergence/mbgf/tests/unification-easy-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-easy-2.bgf rename to topics/convergence/mbgf/tests/unification-easy-2.bgf diff --git a/topics/convergence/declarative/tests/unification-easy-3.bgf b/topics/convergence/mbgf/tests/unification-easy-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-easy-3.bgf rename to topics/convergence/mbgf/tests/unification-easy-3.bgf diff --git a/topics/convergence/declarative/tests/unification-easy.mbgf b/topics/convergence/mbgf/tests/unification-easy.mbgf similarity index 100% rename from topics/convergence/declarative/tests/unification-easy.mbgf rename to topics/convergence/mbgf/tests/unification-easy.mbgf diff --git a/topics/convergence/declarative/tests/unification-hard-1.bgf b/topics/convergence/mbgf/tests/unification-hard-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-hard-1.bgf rename to topics/convergence/mbgf/tests/unification-hard-1.bgf diff --git a/topics/convergence/declarative/tests/unification-hard-2.bgf b/topics/convergence/mbgf/tests/unification-hard-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-hard-2.bgf rename to topics/convergence/mbgf/tests/unification-hard-2.bgf diff --git a/topics/convergence/declarative/tests/unification-hard-3.bgf b/topics/convergence/mbgf/tests/unification-hard-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-hard-3.bgf rename to topics/convergence/mbgf/tests/unification-hard-3.bgf diff --git a/topics/convergence/declarative/tests/unification-hard.mbgf b/topics/convergence/mbgf/tests/unification-hard.mbgf similarity index 100% rename from topics/convergence/declarative/tests/unification-hard.mbgf rename to topics/convergence/mbgf/tests/unification-hard.mbgf diff --git a/topics/convergence/declarative/tests/unification-semi-1.bgf b/topics/convergence/mbgf/tests/unification-semi-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-semi-1.bgf rename to topics/convergence/mbgf/tests/unification-semi-1.bgf diff --git a/topics/convergence/declarative/tests/unification-semi-2.bgf b/topics/convergence/mbgf/tests/unification-semi-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-semi-2.bgf rename to topics/convergence/mbgf/tests/unification-semi-2.bgf diff --git a/topics/convergence/declarative/tests/unification-semi-3.bgf b/topics/convergence/mbgf/tests/unification-semi-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/unification-semi-3.bgf rename to topics/convergence/mbgf/tests/unification-semi-3.bgf diff --git a/topics/convergence/declarative/tests/unification-semi.mbgf b/topics/convergence/mbgf/tests/unification-semi.mbgf similarity index 100% rename from topics/convergence/declarative/tests/unification-semi.mbgf rename to topics/convergence/mbgf/tests/unification-semi.mbgf diff --git a/topics/convergence/declarative/tests/width-esp-1.bgf b/topics/convergence/mbgf/tests/width-esp-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-esp-1.bgf rename to topics/convergence/mbgf/tests/width-esp-1.bgf diff --git a/topics/convergence/declarative/tests/width-esp-2.bgf b/topics/convergence/mbgf/tests/width-esp-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-esp-2.bgf rename to topics/convergence/mbgf/tests/width-esp-2.bgf diff --git a/topics/convergence/declarative/tests/width-esp-3.bgf b/topics/convergence/mbgf/tests/width-esp-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-esp-3.bgf rename to topics/convergence/mbgf/tests/width-esp-3.bgf diff --git a/topics/convergence/declarative/tests/width-esp.mbgf b/topics/convergence/mbgf/tests/width-esp.mbgf similarity index 100% rename from topics/convergence/declarative/tests/width-esp.mbgf rename to topics/convergence/mbgf/tests/width-esp.mbgf diff --git a/topics/convergence/declarative/tests/width-qse-1.bgf b/topics/convergence/mbgf/tests/width-qse-1.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-qse-1.bgf rename to topics/convergence/mbgf/tests/width-qse-1.bgf diff --git a/topics/convergence/declarative/tests/width-qse-2.bgf b/topics/convergence/mbgf/tests/width-qse-2.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-qse-2.bgf rename to topics/convergence/mbgf/tests/width-qse-2.bgf diff --git a/topics/convergence/declarative/tests/width-qse-3.bgf b/topics/convergence/mbgf/tests/width-qse-3.bgf similarity index 100% rename from topics/convergence/declarative/tests/width-qse-3.bgf rename to topics/convergence/mbgf/tests/width-qse-3.bgf diff --git a/topics/convergence/declarative/tests/width-qse.mbgf b/topics/convergence/mbgf/tests/width-qse.mbgf similarity index 100% rename from topics/convergence/declarative/tests/width-qse.mbgf rename to topics/convergence/mbgf/tests/width-qse.mbgf diff --git a/topics/convergence/tri/.gitignore b/topics/convergence/tri/.gitignore deleted file mode 100644 index bdbd9eb6..00000000 --- a/topics/convergence/tri/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -architecture_* -*.log diff --git a/topics/convergence/java/.gitignore b/topics/convergence/xbgf/ebnf/.gitignore similarity index 100% rename from topics/convergence/java/.gitignore rename to topics/convergence/xbgf/ebnf/.gitignore diff --git a/topics/convergence/ebnf/Makefile b/topics/convergence/xbgf/ebnf/Makefile similarity index 71% rename from topics/convergence/ebnf/Makefile rename to topics/convergence/xbgf/ebnf/Makefile index c2a84ffd..5ddaeab6 100644 --- a/topics/convergence/ebnf/Makefile +++ b/topics/convergence/xbgf/ebnf/Makefile @@ -1,4 +1,4 @@ -validator = ../../../shared/tools/validate +validator = ../../../../shared/tools/validate all: make clean @@ -6,7 +6,7 @@ all: make check test: - ../../../shared/tools/lci bnf.lcf architecture + ../../lci/lci.py bnf.lcf architecture check: ${validator} lcf bnf.lcf diff --git a/topics/convergence/ebnf/README.txt b/topics/convergence/xbgf/ebnf/README.txt similarity index 100% rename from topics/convergence/ebnf/README.txt rename to topics/convergence/xbgf/ebnf/README.txt diff --git a/topics/convergence/xbgf/ebnf/bgf/.gitignore b/topics/convergence/xbgf/ebnf/bgf/.gitignore new file mode 100644 index 00000000..7f8e342c --- /dev/null +++ b/topics/convergence/xbgf/ebnf/bgf/.gitignore @@ -0,0 +1 @@ +*.bgf diff --git a/topics/convergence/ebnf/bnf.bgf b/topics/convergence/xbgf/ebnf/bnf.bgf similarity index 100% rename from topics/convergence/ebnf/bnf.bgf rename to topics/convergence/xbgf/ebnf/bnf.bgf diff --git a/topics/convergence/ebnf/bnf.lcf b/topics/convergence/xbgf/ebnf/bnf.lcf similarity index 93% rename from topics/convergence/ebnf/bnf.lcf rename to topics/convergence/xbgf/ebnf/bnf.lcf index 1513236e..a87bbc2d 100644 --- a/topics/convergence/ebnf/bnf.lcf +++ b/topics/convergence/xbgf/ebnf/bnf.lcf @@ -2,7 +2,7 @@ slps - ../../.. + ../../../.. schemata @@ -42,7 +42,7 @@ ebnf-bgf - cp ../../grammars/metasyntax/ebnf-bgf/grammar.bgf + cp ../../../grammars/metasyntax/ebnf-bgf/grammar.bgf