Skip to content

Commit

Permalink
JSL is updated with the new add (vertical&horizontal)
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@470 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Feb 16, 2009
1 parent 52a9748 commit 2a2f2d0
Show file tree
Hide file tree
Showing 28 changed files with 2,266 additions and 1,990 deletions.
28 changes: 15 additions & 13 deletions topics/java/lci/xbgf/correct-doc1.xbgf
View file
Expand Up @@ -28,19 +28,21 @@
<nonterminal>ConstantModifier</nonterminal>
</xbgf:vertical>
<xbgf:add>
<bgf:production>
<nonterminal>ConstantModifiers</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ConstantModifiers</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ConstantModifier</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>ConstantModifiers</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ConstantModifiers</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ConstantModifier</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!-- ISSUE CORRECT SPECERROR
Expand Down
34 changes: 18 additions & 16 deletions topics/java/lci/xbgf/correct-doc3.xbgf
View file
Expand Up @@ -281,22 +281,24 @@
,([n(PackageOrTypeName), t(.), n(Identifier)])])
-->
<xbgf:remove>
<bgf:production>
<nonterminal>TypeName</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>TypeName</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>TypeName</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>TypeName</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:remove>

</xbgf:sequence>
140 changes: 72 additions & 68 deletions topics/java/lci/xbgf/edit-doc1.xbgf
View file
Expand Up @@ -90,76 +90,80 @@
</in>
</xbgf:replace>
<xbgf:add>
<bgf:production>
<nonterminal>ClassInstanceCreationExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceType</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ArgumentList</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassBody</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>ClassInstanceCreationExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceType</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ArgumentList</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassBody</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>
<xbgf:add>
<bgf:production>
<nonterminal>ClassInstanceCreationExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>Primary</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ArgumentList</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ClassBody</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>ClassInstanceCreationExpression</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>Primary</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ArgumentList</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ClassBody</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>
<xbgf:horizontal>ClassInstanceCreationExpression</xbgf:horizontal>
<xbgf:factor>
Expand Down
56 changes: 29 additions & 27 deletions topics/java/lci/xbgf/edit-doc3.xbgf
View file
Expand Up @@ -8,33 +8,35 @@
vs.
-->
<xbgf:add>
<bgf:production>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>NonWildcardTypeArguments</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>Primary</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>NonWildcardTypeArguments</nonterminal>
</bgf:expression>
<bgf:expression>
<choice>
<bgf:expression>
<nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!-- finishing touches -->
Expand Down
70 changes: 39 additions & 31 deletions topics/java/lci/xbgf/editDeclarations.xbgf
View file
Expand Up @@ -766,12 +766,14 @@
</xbgf:extract>
<!-- ISSUE EXTEND -->
<xbgf:add>
<bgf:production>
<nonterminal>InterfaceBodyDeclaration</nonterminal>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>InterfaceBodyDeclaration</nonterminal>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!--
Expand Down Expand Up @@ -1134,12 +1136,14 @@
<nonterminal>InterfaceMemberDecl</nonterminal>
</xbgf:vertical>
<xbgf:add>
<bgf:production>
<nonterminal>InterfaceMemberDecl</nonterminal>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>InterfaceMemberDecl</nonterminal>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!--
Expand Down Expand Up @@ -1550,30 +1554,34 @@
<!-- ISSUE EXTEND
Empty class body declaration -->
<xbgf:add>
<bgf:production>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!-- ISSUE EXTEND
Inner class declaration -->
<xbgf:add>
<bgf:production>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
<vertical>
<bgf:production>
<nonterminal>ClassBodyDeclaration</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>ModifiersOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassOrInterfaceDeclaration</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>

<!--
Expand Down

0 comments on commit 2a2f2d0

Please sign in to comment.