Skip to content

Commit

Permalink
fixing some errors known from bugs.sun.com
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@528 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Apr 2, 2009
1 parent fc81622 commit 38ac42c
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 2 deletions.
Binary file modified topics/java/lci/snapshot/architecture_large.pdf
View file
Binary file not shown.
Binary file modified topics/java/lci/snapshot/architecture_small.pdf
View file
Binary file not shown.
60 changes: 58 additions & 2 deletions topics/java/lci/xbgf/correct-app3.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ Annotation:
should be
ElementValues:
ElementValue [ "," ElementValues ]

The XBGF command could've been concretize!
-->
<xbgf:concretize>
<xbgf:inject>
<bgf:production>
<nonterminal>ElementValues</nonterminal>
<bgf:expression>
Expand Down Expand Up @@ -172,7 +174,7 @@ Annotation:
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:concretize>
</xbgf:inject>

<!-- undefine lexical term -->
<!-- GENERALITY -->
Expand Down Expand Up @@ -261,4 +263,58 @@ AnnotationConstantRest:
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE CORRECT
as in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442525
* 18.1 does not permit the obsolescent array syntax in a method declaration of an annotation type:
AnnotationMethodRest:
() {[]} [DefaultValue]
where {[]} means 0 or more []'s. [DefaultValue] means 0 or 1 DefaultValue.
-->
<xbgf:appear>
<bgf:production>
<nonterminal>AnnotationMethodRest</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</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>
<optional>
<bgf:expression>
<nonterminal>DefaultValue</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:appear>

<!-- ISSUE CORRECT
as in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442525
* 18.1 defines TypeArgument incorrectly, e.g. '? extends int' is legal.
Correct are ActualTypeArgument and Wildcard from 4.5.1. They use ReferenceType, which is in 4.3 but not 18.1.
-->
</xbgf:sequence>
56 changes: 56 additions & 0 deletions topics/java/lci/xbgf/correct-doc3.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,60 @@
</vertical>
</xbgf:remove>

<!-- ISSUE CORRECT
as in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442525
9.6 should permit the old syntax too:
AnnotationTypeElementDeclaration:
AbstractMethodModifiersopt Type Identifier ( ) Dimsopt DefaultValueopt ;
-->
<xbgf:appear>
<bgf:production>
<nonterminal>AnnotationTypeElementDeclaration</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>AbstractMethodModifiers</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<nonterminal>Type</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>Identifier</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>(</terminal>
</bgf:expression>
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<marked>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Dims</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</marked>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>DefaultValue</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>;</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:appear>

</xbgf:sequence>
7 changes: 7 additions & 0 deletions topics/java/lci/xbgf/extend-doc12.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,13 @@
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>Dims</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down
3 changes: 3 additions & 0 deletions topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down
12 changes: 12 additions & 0 deletions topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,9 @@ AnnotationTypeElementRest:
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down Expand Up @@ -1060,6 +1063,9 @@ AnnotationTypeElementRest:
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down Expand Up @@ -1121,6 +1127,9 @@ AnnotationTypeElementRest:
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down Expand Up @@ -1180,6 +1189,9 @@ AnnotationTypeElementRest:
<bgf:expression>
<terminal>)</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BracketsOpt</nonterminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
Expand Down

0 comments on commit 38ac42c

Please sign in to comment.