Skip to content

Commit

Permalink
label hunt finished
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@461 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Feb 16, 2009
1 parent 2527345 commit e34b3f5
Show file tree
Hide file tree
Showing 14 changed files with 157 additions and 651 deletions.
10 changes: 6 additions & 4 deletions topics/java/lci/java-lci.csproj
View file
Expand Up @@ -58,19 +58,22 @@
<None Include="xbgf\correct-doc1.xbgf" />
<None Include="xbgf\correct-doc2.xbgf" />
<None Include="xbgf\correct-doc3.xbgf" />
<None Include="xbgf\deyaccify-doc2.xbgf" />
<None Include="xbgf\deyaccifyStatements.xbgf" />
<None Include="xbgf\edit-doc1.xbgf" />
<None Include="xbgf\edit-doc2.xbgf" />
<None Include="xbgf\edit-doc3.xbgf" />
<None Include="xbgf\editDeclarations.xbgf" />
<None Include="xbgf\editExpressions-doc2.xbgf" />
<None Include="xbgf\editExpressions-doc3.xbgf" />
<None Include="xbgf\editExpressions-jls1.xbgf" />
<None Include="xbgf\editExpressions.xbgf" />
<None Include="xbgf\eliminate-doc2.xbgf" />
<None Include="xbgf\extend-doc1.xbgf" />
<None Include="xbgf\extend-doc12.xbgf" />
<None Include="xbgf\extend-jls1.xbgf" />
<None Include="xbgf\extend-jls2.xbgf" />
<None Include="xbgf\extendDeclarations.xbgf" />
<None Include="xbgf\extendExpressions.xbgf" />
<None Include="xbgf\extendModifiers.xbgf" />
<None Include="xbgf\extendStatements.xbgf" />
<None Include="xbgf\generalize-app3.xbgf" />
<None Include="xbgf\generalizeBlock.xbgf" />
<None Include="xbgf\generalizeLabels.xbgf" />
Expand All @@ -79,7 +82,6 @@
<None Include="xbgf\generalizeNames-doc1.xbgf" />
<None Include="xbgf\generalizeNames.xbgf" />
<None Include="xbgf\generalizeStatements.xbgf" />
<None Include="xbgf\inline-jls2.xbgf" />
<None Include="xbgf\inlineStatements.xbgf" />
<None Include="xbgf\recover-app3.xbgf" />
<None Include="xbgf\recover-doc2.xbgf" />
Expand Down
2 changes: 1 addition & 1 deletion topics/java/lci/java.lcf
View file
Expand Up @@ -122,7 +122,7 @@
<perform>refactorExpressions</perform>
<perform>inlineStatements</perform>
<perform>generalizeStatements</perform>
<perform>editExpressions</perform>
<perform>editExpressions-doc2</perform>
<perform>eliminate-doc2</perform>
<perform>refactorClasses-doc2</perform>
<perform>refactorInterfaces-doc2</perform>
Expand Down
47 changes: 0 additions & 47 deletions topics/java/lci/xbgf/correct-app2.xbgf
View file
Expand Up @@ -43,29 +43,9 @@

<!-- ISSUE CORRECT SPECERROR
let's complete some of the statements with a trailing semicolon-->
<xbgf:designate>
<bgf:production>
<label>ContinueStatement</label>
<nonterminal>Statement</nonterminal> <bgf:expression>
<sequence>
<bgf:expression>
<terminal>continue</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<label>ContinueStatement</label>
<nonterminal>Statement</nonterminal>
<bgf:expression>
<sequence>
Expand All @@ -90,36 +70,12 @@
</bgf:expression>
</bgf:production>
</xbgf:inject>
<xbgf:unlabel>
<label>ContinueStatement</label>
</xbgf:unlabel>

<!-- ISSUE CORRECT SPECERROR
Same for BreakStatement -->
<xbgf:designate>
<bgf:production>
<label>BreakStatement</label>
<nonterminal>Statement</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>break</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<label>BreakStatement</label>
<nonterminal>Statement</nonterminal>
<bgf:expression>
<sequence>
Expand All @@ -144,9 +100,6 @@
</bgf:expression>
</bgf:production>
</xbgf:inject>
<xbgf:unlabel>
<label>BreakStatement</label>
</xbgf:unlabel>

<!-- ISSUE CORRECT SPECERROR
Expression is referenced as Expr:
Expand Down
47 changes: 0 additions & 47 deletions topics/java/lci/xbgf/editDeclarations.xbgf
View file
Expand Up @@ -1596,51 +1596,8 @@
<nonterminal>ClassBodyDeclaration</nonterminal>
</in>
</xbgf:unfold>
<xbgf:designate>
<bgf:production>
<label>target</label>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Type</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>VariableDeclaratorRest</nonterminal>
</bgf:expression>
<bgf:expression>
<star>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>,</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>VariableDeclaratorRest</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</star>
</bgf:expression>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:disappear>
<bgf:production>
<label>target</label>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<sequence>
Expand Down Expand Up @@ -1687,7 +1644,6 @@
<!-- REVISE -->
<xbgf:project>
<bgf:production>
<label>target</label>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<sequence>
Expand All @@ -1714,9 +1670,6 @@
</bgf:expression>
</bgf:production>
</xbgf:project>
<xbgf:unlabel>
<label>target</label>
</xbgf:unlabel>

<!--
- [], ,([n(ModifiersOpt), n(Type), n(Identifier), n(MethodDeclaratorRest)])
Expand Down
90 changes: 53 additions & 37 deletions topics/java/lci/xbgf/editExpressions.xbgf → ...s/java/lci/xbgf/editExpressions-doc2.xbgf
View file
Expand Up @@ -46,24 +46,14 @@
<nonterminal>Primary</nonterminal>
</xbgf:vertical>

<!--
<!-- ISSUE EXTEND
- Fail: Primary.
- [], ,([t(this), ?(n(Arguments))])
vs.
- [], t(this)
-->
<xbgf:designate>
<bgf:production>
<label>target</label>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:appear>
<bgf:production>
<label>target</label>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<sequence>
Expand All @@ -85,24 +75,24 @@
</bgf:expression>
</bgf:production>
</xbgf:appear>
<xbgf:unlabel>
<label>target</label>
</xbgf:unlabel>

<!-- ISSUE PERMISSIVENESS
- Fail: Primary.
- [], ,([n(BasicType), n(BracketsOpt), t(.), t(class)])
vs.
- [], ,([n(Type), t(.), t(class)])
-->
<xbgf:designate>
<xbgf:downgrade>
<bgf:production>
<label>target</label>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>Type</nonterminal>
<marked>
<bgf:expression>
<nonterminal>Type</nonterminal>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
Expand All @@ -113,29 +103,55 @@
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<!-- GENERALITY -->
<xbgf:replace>
<bgf:expression>
<bgf:production>
<nonterminal>Type</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>BasicType</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<nonterminal>BasicType</nonterminal>
</bgf:expression>
</bgf:production>
</xbgf:downgrade>
<xbgf:appear>
<bgf:production>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>BasicType</nonterminal>
</bgf:expression>
<bgf:expression>
<marked>
<bgf:expression>
<star>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>[</terminal>
</bgf:expression>
<bgf:expression>
<terminal>]</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</star>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:appear>
<xbgf:fold>
<nonterminal>BracketsOpt</nonterminal>
<in>
<label>target</label>
<nonterminal>Primary</nonterminal>
</in>
</xbgf:replace>
<xbgf:unlabel>
<label>target</label>
</xbgf:unlabel>
</xbgf:fold>

<!--
- Fail: Primary.
Expand Down

0 comments on commit e34b3f5

Please sign in to comment.