From 7e6bdb1b2ddfd0718b1b4c90ae18e7bd7e75cded Mon Sep 17 00:00:00 2001 From: grammarware Date: Fri, 12 Sep 2008 00:01:44 +0000 Subject: [PATCH] more convergence git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@260 ab42f6e0-554d-0410-b580-99e487e6eeb2 --- topics/java/lci/Makefile | 2 +- topics/java/lci/java-lci.csproj | 5 + topics/java/lci/java.lcf | 6 +- topics/java/lci/xbgf/cropFeatures1.xbgf | 13 +++ topics/java/lci/xbgf/preferLALR.xbgf | 69 ++++++++++++++ topics/java/lci/xbgf/prepare2.xbgf | 3 + topics/java/lci/xbgf/refactorStatements.xbgf | 45 +++++++-- topics/java/lci/xbgf/refactorTypes.xbgf | 98 ++++++++++++++++++++ 8 files changed, 229 insertions(+), 12 deletions(-) create mode 100644 topics/java/lci/xbgf/cropFeatures1.xbgf create mode 100644 topics/java/lci/xbgf/preferLALR.xbgf create mode 100644 topics/java/lci/xbgf/refactorTypes.xbgf diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile index 98074937..cc8b2bc8 100644 --- a/topics/java/lci/Makefile +++ b/topics/java/lci/Makefile @@ -3,7 +3,7 @@ validator = ../../../shared/tools/checkxml build: diff: test - gdt bgf/jls1.prepare1.refactorStatements.structure1.addFeatures1to2.bgf bgf/jls2.prepare2.bgf + gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf test: python ../../convergence/lci/lci.py java.lcf architecture diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj index 0473d38d..4e9d6743 100644 --- a/topics/java/lci/java-lci.csproj +++ b/topics/java/lci/java-lci.csproj @@ -58,10 +58,15 @@ xbgf.xsd + + + + + \ No newline at end of file diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf index 9bbbc5d6..e990a7c2 100644 --- a/topics/java/lci/java.lcf +++ b/topics/java/lci/java.lcf @@ -102,14 +102,16 @@ preferLALR - + onetwo one refactorStatements + refactorTypes structure1 addFeatures1to2 + cropFeatures1 jls2 @@ -132,4 +134,4 @@ - + \ No newline at end of file diff --git a/topics/java/lci/xbgf/cropFeatures1.xbgf b/topics/java/lci/xbgf/cropFeatures1.xbgf new file mode 100644 index 00000000..64473e1d --- /dev/null +++ b/topics/java/lci/xbgf/cropFeatures1.xbgf @@ -0,0 +1,13 @@ + + + MethodBody + + + + MethodBody + ; + + + diff --git a/topics/java/lci/xbgf/preferLALR.xbgf b/topics/java/lci/xbgf/preferLALR.xbgf new file mode 100644 index 00000000..23634389 --- /dev/null +++ b/topics/java/lci/xbgf/preferLALR.xbgf @@ -0,0 +1,69 @@ + + + CompilationUnit + + + Type + + + Primary + + + Statement + + + + AmbiguousName + Name + + + + + MethodName + Name + + + TypeName + Name + + + PackageName + Name + + + ExpressionName + Name + + + + diff --git a/topics/java/lci/xbgf/prepare2.xbgf b/topics/java/lci/xbgf/prepare2.xbgf index 58a6e861..6d1b4ab0 100644 --- a/topics/java/lci/xbgf/prepare2.xbgf +++ b/topics/java/lci/xbgf/prepare2.xbgf @@ -32,6 +32,9 @@ InterfaceMemberDecl + + BasicType + diff --git a/topics/java/lci/xbgf/refactorStatements.xbgf b/topics/java/lci/xbgf/refactorStatements.xbgf index 51c9b5ce..af813b89 100644 --- a/topics/java/lci/xbgf/refactorStatements.xbgf +++ b/topics/java/lci/xbgf/refactorStatements.xbgf @@ -54,7 +54,14 @@ - IfThenStatement + + + Statement + + IfThenStatement + + + IfThenElseStatement ForStatement @@ -63,10 +70,18 @@ StatementWithoutTrailingSubstatement - + StatementWithoutTrailingSubstatement Statement + + + Statement + + Statement + + + TryStatement @@ -74,6 +89,14 @@ TryStatement Statement + + + Statement + + Statement + + + Finally - + + StatementExpressionList \ No newline at end of file diff --git a/topics/java/lci/xbgf/refactorTypes.xbgf b/topics/java/lci/xbgf/refactorTypes.xbgf new file mode 100644 index 00000000..eb085271 --- /dev/null +++ b/topics/java/lci/xbgf/refactorTypes.xbgf @@ -0,0 +1,98 @@ + + + + PrimitiveType + + + + PrimitiveType + + NumericType + + + + NumericType + + IntegralType + + + IntegralType + PrimitiveType + + + FloatingPointType + + + FloatingPointType + PrimitiveType + + + + PrimitiveType + BasicType + + + + ReferenceType + + ReferenceType + Type + + ClassType + + ClassType + Type + ArrayType + + + Type + + Type + + + + + + Type + + + + Identifier + + + + + + + . + + + Identifier + + + + + + + BracketsOpt + + + + + + + + + ClassTypeList + TypeList + + + InterfaceTypeList + + InterfaceTypeList + TypeList + + + \ No newline at end of file