Skip to content

Commit

Permalink
down to 28 defines, 32 redefines, 19 replaces
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@485 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Feb 20, 2009
1 parent a0f422e commit 7bbf895
Show file tree
Hide file tree
Showing 6 changed files with 409 additions and 392 deletions.
3 changes: 0 additions & 3 deletions topics/java/lci/xbgf/correct-app2.xbgf
View file
Expand Up @@ -43,7 +43,6 @@

<!-- ISSUE CORRECT SPECERROR
let's complete some of the statements with a trailing semicolon-->
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<nonterminal>Statement</nonterminal>
Expand Down Expand Up @@ -73,7 +72,6 @@

<!-- ISSUE CORRECT SPECERROR
Same for BreakStatement -->
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<nonterminal>Statement</nonterminal>
Expand Down Expand Up @@ -216,7 +214,6 @@
vs.
- [], ;([*(,([n(InfixOp), n(Expression3)])), ,([n(Expression3), t(instanceof), n(Type)])])
-->
<!-- REVISE -->
<xbgf:project>
<bgf:production>
<nonterminal>Expression2Rest</nonterminal>
Expand Down
6 changes: 0 additions & 6 deletions topics/java/lci/xbgf/correct-app3.xbgf
View file
Expand Up @@ -25,7 +25,6 @@ Annotation:
vs.
- [], ;([*(,([n(InfixOp), n(Expression3)])), ,([n(Expression3), t(instanceof), n(Type)])])
-->
<!-- REVISE -->
<xbgf:project>
<bgf:production>
<nonterminal>Expression2Rest</nonterminal>
Expand Down Expand Up @@ -80,7 +79,6 @@ Annotation:
- [], ;([n(Block),
,([t(break), ?(n(Identifier)), t((;))]),
-->
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<nonterminal>Statement</nonterminal>
Expand Down Expand Up @@ -110,7 +108,6 @@ Annotation:

<!-- ISSUE CORRECT SPECERROR
same with continue -->
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<nonterminal>Statement</nonterminal>
Expand Down Expand Up @@ -146,7 +143,6 @@ Annotation:
ElementValues:
ElementValue [ "," ElementValues ]
-->
<!-- REVISE -->
<xbgf:concretize>
<bgf:production>
<nonterminal>ElementValues</nonterminal>
Expand Down Expand Up @@ -196,7 +192,6 @@ AnnotationMethodRest:
AnnotationConstantRest:
VariableDeclarators
-->
<!-- REVISE -->
<xbgf:project>
<bgf:production>
<nonterminal>AnnotationTypeElementRest</nonterminal>
Expand All @@ -222,7 +217,6 @@ AnnotationConstantRest:
</bgf:expression>
</bgf:production>
</xbgf:project>
<!-- REVISE -->
<xbgf:inject>
<bgf:production>
<nonterminal>AnnotationMethodOrConstantRest</nonterminal>
Expand Down
1 change: 0 additions & 1 deletion topics/java/lci/xbgf/editDeclarations.xbgf
View file
Expand Up @@ -1942,7 +1942,6 @@ Block:
</bgf:expression>
</bgf:production>
</xbgf:disappear>
<!-- REVISE -->
<xbgf:project>
<bgf:production>
<nonterminal>ClassBodyDeclaration</nonterminal>
Expand Down
170 changes: 67 additions & 103 deletions topics/java/lci/xbgf/editExpressions-doc3.xbgf
View file
Expand Up @@ -490,7 +490,7 @@
</vertical>
</xbgf:add>
<xbgf:add>
<vertical>
<horizontal>
<bgf:production>
<nonterminal>IdentifierSuffix</nonterminal>
<bgf:expression>
Expand All @@ -499,15 +499,26 @@
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>class</terminal>
<choice>
<bgf:expression>
<marked>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</horizontal>
</xbgf:add>
<xbgf:add>
<vertical>
<horizontal>
<bgf:production>
<nonterminal>IdentifierSuffix</nonterminal>
<bgf:expression>
Expand All @@ -516,15 +527,33 @@
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>super</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
<choice>
<bgf:expression>
<marked>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>super</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
</choice>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</horizontal>
</xbgf:add>
<xbgf:introduce>
<bgf:production>
Expand All @@ -542,7 +571,7 @@
</bgf:production>
</xbgf:introduce>
<xbgf:add>
<vertical>
<horizontal>
<bgf:production>
<nonterminal>IdentifierSuffix</nonterminal>
<bgf:expression>
Expand All @@ -551,109 +580,44 @@
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>InnerCreator</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</vertical>
</xbgf:add>
<xbgf:horizontal>IdentifierSuffix</xbgf:horizontal>
<xbgf:factor>
<bgf:expression>
<choice>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>this</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>class</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>super</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>.</terminal>
</bgf:expression>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>InnerCreator</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</choice>
</bgf:expression>
<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>
<choice>
<bgf:expression>
<terminal>super</terminal>
<marked>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>new</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>InnerCreator</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
<sequence>
<bgf:expression>
<terminal>super</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Arguments</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</sequence>
</bgf:expression>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>new</terminal>
<terminal>class</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>InnerCreator</nonterminal>
<terminal>this</terminal>
</bgf:expression>
</sequence>
</choice>
</bgf:expression>
</choice>
</sequence>
</bgf:expression>
</sequence>
</bgf:expression>
</xbgf:factor>
<xbgf:vertical>
<nonterminal>IdentifierSuffix</nonterminal>
</xbgf:vertical>
</bgf:production>
</horizontal>
</xbgf:add>

<!-- ISSUE PERMISSIVENESS
- Fail: Primary.
Expand Down

0 comments on commit 7bbf895

Please sign in to comment.