Skip to content

Commit

Permalink
onetwo converged
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@334 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Oct 10, 2008
1 parent 5c515c4 commit 9ae55d1
Show file tree
Hide file tree
Showing 5 changed files with 1,154 additions and 79 deletions.
123 changes: 123 additions & 0 deletions topics/java/lci/xbgf/addFeatures1to2.xbgf
View file
Expand Up @@ -17,4 +17,127 @@
</xbgf:add>
<xbgf:horizontal>Modifier</xbgf:horizontal>

<!--
- Fail: SuperSuffix.
- [], ,([t(.), n(Identifier), ?(n(Arguments))])
vs.
- [], ;([n(Arguments), ,([t(.), n(Identifier), ?(n(Arguments))])])
-->
<xbgf:add>
<bgf:production>
<nonterminal>SuperSuffix</nonterminal>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</bgf:production>
</xbgf:add>
<xbgf:horizontal>SuperSuffix</xbgf:horizontal>

<!-- can we do this with widen? -->
<xbgf:replace>
<bgf:expression>
<nonterminal>MethodBody</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<nonterminal>MethodBody</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</choice>
</bgf:expression>
<in>
<nonterminal>MethodDeclaratorRest</nonterminal>
</in>
</xbgf:replace>

<!-- more features in Primary -->
<xbgf:add>
<bgf:production>
<nonterminal>IdentifierSuffix</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>[</terminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>]</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>Expression</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>]</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:add>
<xbgf:add>
<bgf:production>
<nonterminal>IdentifierSuffix</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>super</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>InnerCreator</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:add>
<xbgf:horizontal>IdentifierSuffix</xbgf:horizontal>

</xbgf:sequence>
60 changes: 3 additions & 57 deletions topics/java/lci/xbgf/deyaccifyExpressions.xbgf
View file
Expand Up @@ -121,10 +121,8 @@ vs
p([], 'CastExpression', ','([t('('), ;([n('Expression'), n('Type')]), t(')'), n('UnaryExpression')])),

-->
<xbgf:vertical>
<nonterminal>CastExpression</nonterminal>
</xbgf:vertical>
<xbgf:add>
<xbgf:undefine>CastExpression</xbgf:undefine>
<xbgf:define>
<bgf:production>
<nonterminal>CastExpression</nonterminal>
<bgf:expression>
Expand All @@ -151,59 +149,7 @@ vs
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:add>
<xbgf:remove>
<bgf:production>
<nonterminal>CastExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BasicType</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Dims</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>UnaryExpression</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:remove>
<xbgf:remove>
<bgf:production>
<nonterminal>CastExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>QualifiedIdentifier</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>UnaryExpressionNotPlusMinus</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:remove>
</xbgf:define>
<xbgf:inline>CastExpression</xbgf:inline>

<!-- Defining PrefixOp; smart extract needed -->
Expand Down
27 changes: 17 additions & 10 deletions topics/java/lci/xbgf/refactorStatements.xbgf
View file
Expand Up @@ -26,7 +26,7 @@
</bgf:expression>
</bgf:production>
</xbgf:extract>

<!--
- Fail: SwitchBlockStatementGroups.
- [], ;([n(SwitchBlockStatementGroup), ,([n(SwitchBlockStatementGroups), n(SwitchBlockStatementGroup)])])
Expand Down Expand Up @@ -67,7 +67,7 @@
</bgf:expression>
</bgf:production>
</xbgf:extract>

<!--
- Fail: Statement.
- [], ,([t(switch), n(ParExpression), t({), n(SwitchBlockStatementGroups), ?(n(SwitchLabels)), t(})])
Expand Down Expand Up @@ -131,7 +131,7 @@
<xbgf:distribute>
<nonterminal>Statement</nonterminal>
</xbgf:distribute>

<!--
- Fail: Statement.
- [], ,([t(if), n(ParExpression), n(StatementNoShortIf), t(else), n(Statement)])
Expand Down Expand Up @@ -252,6 +252,13 @@
</bgf:expression>
</xbgf:massage>

<!-- Getting rid of all of them -->
<xbgf:undefine>StatementNoShortIf</xbgf:undefine>
<xbgf:eliminate>ForStatementNoShortIf</xbgf:eliminate>
<xbgf:eliminate>WhileStatementNoShortIf</xbgf:eliminate>
<xbgf:eliminate>LabeledStatementNoShortIf</xbgf:eliminate>
<xbgf:eliminate>IfThenElseStatementNoShortIf</xbgf:eliminate>

<!--
- Fail: BlockStatements.
- [], ;([n(BlockStatement), ,([n(BlockStatements), n(BlockStatement)])])
Expand Down Expand Up @@ -301,7 +308,7 @@
</bgf:expression>
</bgf:production>
</xbgf:extract>

<!--
- Fail: BlockStatement.
- [], ;([n(LocalVariableDeclarationStatement), n(Statement)])
Expand Down Expand Up @@ -359,7 +366,7 @@
<label>target</label>
</xbgf:strip>
<xbgf:horizontal>BlockStatement</xbgf:horizontal>

<!--
- Fail: ForUpdate.
- [], n(StatementExpressionList)
Expand Down Expand Up @@ -396,7 +403,7 @@
</bgf:production>
</xbgf:extract>
<xbgf:inline>StatementExpressionList</xbgf:inline>

<!--
- Fail: ForInit.
- [], ;([,([n(StatementExpression), n(MoreStatementExpressions)]), n(LocalVariableDeclaration)])
Expand Down Expand Up @@ -426,23 +433,23 @@
</bgf:production>
</xbgf:inject>
<xbgf:inline>LocalVariableDeclaration</xbgf:inline>

<!--
- Fail: Catches.
- [], ;([n(CatchClause), ,([n(Catches), n(CatchClause)])])
vs.
- [], +n(CatchClause)
-->
<xbgf:deyaccify>Catches</xbgf:deyaccify>

<!--
- Fail: VariableDeclarators.
- [], ;([n(VariableDeclarator), ,([n(VariableDeclarators), t((,)), n(VariableDeclarator)])])
vs.
- [], ,([n(VariableDeclarator), *(,([t((,)), n(VariableDeclarator)]))])
-->
<xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>

<!--
- Fail: VariableDeclaratorId.
- [], ;([n(Identifier), ,([n(VariableDeclaratorId), t([), t(])])])
Expand Down Expand Up @@ -591,4 +598,4 @@
</bgf:production>
</xbgf:extract>

</xbgf:sequence>
</xbgf:sequence>

0 comments on commit 9ae55d1

Please sign in to comment.