Skip to content

Commit

Permalink
moving some of the refactorings to the other branch
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@613 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Apr 28, 2009
1 parent 08e98db commit b38adb0
Show file tree
Hide file tree
Showing 5 changed files with 218 additions and 100 deletions.
2 changes: 1 addition & 1 deletion topics/java/lci/Makefile
View file
Expand Up @@ -3,7 +3,7 @@ validator = ../../../shared/tools/checkxml
build:

test:
../../../shared/tools/lci java3.lcf architecture
../../../shared/tools/lci java.lcf architecture

check:
${validator} lcf java.lcf
Expand Down
10 changes: 8 additions & 2 deletions topics/java/lci/java.lcf
View file
Expand Up @@ -147,8 +147,11 @@
<perform>refactorClasses-doc2</perform>
<perform>refactorInterfaces-doc2</perform>
<perform>refactorDeclarations-doc2</perform>
<perform>edit-doc2</perform>
<perform>refactorMinorMismatches</perform>
</refactoring>
<relaxation>
<perform>edit-doc2</perform>
</relaxation>
</branch>
</target>

Expand Down Expand Up @@ -208,8 +211,11 @@
<perform>refactorTypes-jls1</perform>
<perform>editDeclarations</perform>
<perform>refactorExpressions</perform>
<perform>editExpressions-jls1</perform>
<perform>refactorMinorMismatches</perform>
</refactoring>
<relaxation>
<perform>editExpressions-jls1</perform>
</relaxation>
<extension>
<perform>extend-jls1</perform>
</extension>
Expand Down
95 changes: 0 additions & 95 deletions topics/java/lci/xbgf/extendStatements.xbgf
View file
Expand Up @@ -35,12 +35,9 @@
<!--
- Fail: Statement.
- [], ,([t(for), t((), ?(n(ForInit)), t((;)), ?(n(Expression)), t((;)), ?(n(ForUpdate)), t()), n(Statement)])
- [], ,([t(try), n(Block), ?(n(Catches)), t(finally), n(Block)])
- [], ,([t(try), n(Block), n(Catches)])
- [], n(ExpressionStatement)
vs.
- [], ,([n(StatementExpression), t((;))])
- [], ,([t(try), n(Block), ;([n(Catches), ,([?(n(Catches)), t(finally), n(Block)])])])
- [], ,([t(for), t((), n(ForControl), t()), n(Statement)])
- [], ,([t(assert), n(Expression), ?(,([t(:), n(Expression)])), t((;))])
-->
Expand Down Expand Up @@ -228,98 +225,6 @@
</vertical>
</xbgf:add>

<!-- ISSUE EXTEND
- Fail: Statement.
- [], ,([t(try), n(Block), ?(n(Catches)), t(finally), n(Block)])
- [], ,([t(try), n(Block), n(Catches)])
vs.
- [], ,([t(try), n(Block), ;([n(Catches), ,([?(n(Catches)), t(finally), n(Block)])])])
-->
<xbgf:horizontal>Statement</xbgf:horizontal>
<xbgf:factor>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>finally</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>finally</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</xbgf:factor>
<xbgf:vertical>
<nonterminal>Statement</nonterminal>
</xbgf:vertical>

<!-- ISSUE EXTEND
- Fail: Statement.
vs.
Expand Down
6 changes: 4 additions & 2 deletions topics/java/lci/xbgf/refactor-app2.xbgf
View file
Expand Up @@ -80,6 +80,7 @@
</bgf:production>
</xbgf:extract>
</xbgf:atomic>

<xbgf:massage>
<bgf:expression>
<optional>
Expand All @@ -103,7 +104,7 @@

<xbgf:horizontal>MemberDecl</xbgf:horizontal>
<xbgf:inline>MemberDecl</xbgf:inline>
<xbgf:distribute>
<!-- <xbgf:distribute>
<nonterminal>ClassBodyDeclaration</nonterminal>
</xbgf:distribute>
<xbgf:vertical>
Expand All @@ -112,9 +113,10 @@
<xbgf:distribute>
<nonterminal>Statement</nonterminal>
</xbgf:distribute>

<xbgf:vertical>
<nonterminal>Statement</nonterminal>
</xbgf:vertical>
</xbgf:vertical>-->

<xbgf:fold>
<nonterminal>ParExpression</nonterminal>
Expand Down
205 changes: 205 additions & 0 deletions topics/java/lci/xbgf/refactorMinorMismatches.xbgf
View file
@@ -0,0 +1,205 @@
<xbgf:sequence
xmlns:bgf="http://planet-sl.org/bgf"
xmlns:xbgf="http://planet-sl.org/xbgf">

<!--
- Fail (1/2): Statement.
- [], ,([t(try), n(Block), ;([n(Catches), ,([?(n(Catches)), t(finally), n(Block)])])])
vs.
- [], ,([t(try), n(Block), ?(n(Catches)), t(finally), n(Block)])
- [], ,([t(try), n(Block), n(Catches)])
-->
<xbgf:atomic>
<xbgf:horizontal>Statement</xbgf:horizontal>
<xbgf:factor>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>finally</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>try</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>finally</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Block</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<nonterminal>Catches</nonterminal>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</xbgf:factor>
<xbgf:vertical>
<nonterminal>Statement</nonterminal>
</xbgf:vertical>
</xbgf:atomic>

<!--
- Fail (1/4): ClassBodyDeclaration.
- [], ,([n(ModifiersOpt), ;([n(MethodOrFieldDecl), ,([t(void), n(Identifier), n(MethodDeclaratorRest)]), ,([n(Identifier), n(ConstructorDeclaratorRest)]), n(ClassOrInterfaceDeclaration)])])
vs.
- [], ,([n(ModifiersOpt), n(Identifier), n(ConstructorDeclaratorRest)])
- [], ,([n(ModifiersOpt), n(ClassOrInterfaceDeclaration)])
- [], ,([n(ModifiersOpt), t(void), n(Identifier), n(MethodDeclaratorRest)])
- [], ,([n(ModifiersOpt), n(MethodOrFieldDecl)])
-->
<xbgf:atomic>
<xbgf:horizontal>ClassBodyDeclaration</xbgf:horizontal>
<xbgf:factor>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ConstructorDeclaratorRest</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>void</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>MethodDeclaratorRest</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>MethodOrFieldDecl</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ConstructorDeclaratorRest</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>void</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>MethodDeclaratorRest</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<nonterminal>MethodOrFieldDecl</nonterminal>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</xbgf:factor>
<xbgf:vertical>
<nonterminal>ClassBodyDeclaration</nonterminal>
</xbgf:vertical>
</xbgf:atomic>
</xbgf:sequence>

0 comments on commit b38adb0

Please sign in to comment.