[annotation-tools] 4 new revisions pushed by michael.ernst on 2009-09-05 00:02 GMT
codesite...@google.com
Revision: 8b5a4e7768
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 15:57:21 2009
Log: Add a cross-reference
http://code.google.com/p/annotation-tools/source/detail?r=8b5a4e7768
Revision: deba611a73
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 15:59:07 2009
Log: Put content in file body as well as in its name.
http://code.google.com/p/annotation-tools/source/detail?r=deba611a73
Revision: d67f9518e7
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 16:00:16 2009
Log: Test generic types with multiple levels of generics
http://code.google.com/p/annotation-tools/source/detail?r=d67f9518e7
Revision: e6bf6cffaf
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 16:01:00 2009
Log: Tests for multi-dimensional arrays (currently failing).
http://code.google.com/p/annotation-tools/source/detail?r=e6bf6cffaf
==============================================================================
Revision: 8b5a4e7768
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 15:57:21 2009
Log: Add a cross-reference
http://code.google.com/p/annotation-tools/source/detail?r=8b5a4e7768
Modified:
/annotation-file-utilities/annotation-file-format.tex
=======================================
--- /annotation-file-utilities/annotation-file-format.tex Wed Sep 2
10:29:13 2009
+++ /annotation-file-utilities/annotation-file-format.tex Fri Sep 4
15:57:21 2009
@@ -3,6 +3,7 @@
\usepackage{fullpage}
\usepackage{relsize}
\usepackage{url}
+\usepackage{hevea}
% \usepackage{verbdef}
\def\topfraction{.9}
@@ -310,7 +311,7 @@
\qquad \bnfnt{new-definition}* \\
\\
\bnfnt{type-argument-or-array-definition} ::= \\
-\qquad \bnfcmt The integer list here contains the values of the
``location'' array~\cite{JSR308}. \\ % Section 4.3.12
+\qquad \bnfcmt The integer list here contains the values of the
``\ahref{http://types.cs.washington.edu/jsr308/specification/java-annotation-design.html#class-file:ext:ri:typearg}{location}''
array~\cite{JSR308}. \\ % Section 4.3.12
\qquad \bnflit{inner-type} \bnfnt{integer} [ \bnflit{,} \bnfnt{integer}
]+ \bnflit{:} \bnfnt{annotation}* \lineend \\
\\
\bnfnt{bound-definition} ::= \\
==============================================================================
Revision: deba611a73
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 15:59:07 2009
Log: Put content in file body as well as in its name.
http://code.google.com/p/annotation-tools/source/detail?r=deba611a73
Modified:
/annotation-file-utilities/tests/-SEE-THE-MAKEFILE-
=======================================
--- /annotation-file-utilities/tests/-SEE-THE-MAKEFILE- Mon Jul 6 12:18:44
2009
+++ /annotation-file-utilities/tests/-SEE-THE-MAKEFILE- Fri Sep 4 15:59:07
2009
@@ -0,0 +1,1 @@
+See the Makefile.
==============================================================================
Revision: d67f9518e7
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 16:00:16 2009
Log: Test generic types with multiple levels of generics
http://code.google.com/p/annotation-tools/source/detail?r=d67f9518e7
Added:
/annotation-file-utilities/tests/MultiLevelGeneric.goal
/annotation-file-utilities/tests/MultiLevelGeneric.jaif
/annotation-file-utilities/tests/MultiLevelGeneric.java
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiLevelGeneric.goal Fri Sep 4
16:00:16 2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class MultiLevelGeneric {
+ @java.lang.A Map<@java.lang.B Comparable<@java.lang.C Object>,
@java.lang.G List<@java.lang.H Date>> field;
+}
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiLevelGeneric.jaif Fri Sep 4
16:00:16 2009
@@ -0,0 +1,19 @@
+package java.lang:
+annotation visible @A:
+annotation visible @B:
+annotation visible @C:
+annotation visible @D:
+annotation visible @E:
+annotation visible @F:
+annotation visible @G:
+annotation visible @H:
+
+package annotator.tests:
+class MultiLevelGeneric:
+
+ field field: @java.lang.A
+ inner-type 0: @B
+ inner-type 0, 0: @C
+ inner-type 1: @G
+ inner-type 1, 0: @H
+
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiLevelGeneric.java Fri Sep 4
16:00:16 2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class MultiLevelGeneric {
+ Map<Comparable<Object>, List<Date>> field;
+}
==============================================================================
Revision: e6bf6cffaf
Author: Michael Ernst <mer...@cs.washington.edu>
Date: Fri Sep 4 16:01:00 2009
Log: Tests for multi-dimensional arrays (currently failing).
http://code.google.com/p/annotation-tools/source/detail?r=e6bf6cffaf
Added:
/annotation-file-utilities/tests/ComplexLocationTwo.goal
/annotation-file-utilities/tests/ComplexLocationTwo.jaif
/annotation-file-utilities/tests/ComplexLocationTwo.java
/annotation-file-utilities/tests/MultiDimArray.goal
/annotation-file-utilities/tests/MultiDimArray.jaif
/annotation-file-utilities/tests/MultiDimArray.java
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/ComplexLocationTwo.goal Fri Sep 4
16:01:00 2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class ComplexLocationTwo {
+ @java.lang.A Map<@java.lang.B Comparable<@java.lang.C Object
@java.lang.D [] @java.lang.E [] @java.lang.F []>, @java.lang.G
List<@java.lang.H Date>>
+}
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/ComplexLocationTwo.jaif Fri Sep 4
16:01:00 2009
@@ -0,0 +1,22 @@
+package java.lang:
+annotation visible @A:
+annotation visible @B:
+annotation visible @C:
+annotation visible @D:
+annotation visible @E:
+annotation visible @F:
+annotation visible @G:
+annotation visible @H:
+
+package annotator.tests:
+class ComplexLocationTwo:
+
+ field field: @java.lang.A
+ inner-type 0: @B
+ inner-type 0, 0: @D
+ inner-type 0, 0, 0: @E
+ inner-type 0, 0, 1: @F
+ inner-type 0, 0, 2: @C
+ inner-type 1: @G
+ inner-type 1, 0: @H
+
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/ComplexLocationTwo.java Fri Sep 4
16:01:00 2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class ComplexLocationTwo {
+ Map<Comparable<Object[][][]>, List<Date>> field;
+}
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiDimArray.goal Fri Sep 4 16:01:00
2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class MultiDimArray {
+ @java.lang.C Object @java.lang.D [] @java.lang.E [] @java.lang.F []
field;
+}
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiDimArray.jaif Fri Sep 4 16:01:00
2009
@@ -0,0 +1,18 @@
+package java.lang:
+annotation visible @A:
+annotation visible @B:
+annotation visible @C:
+annotation visible @D:
+annotation visible @E:
+annotation visible @F:
+annotation visible @G:
+annotation visible @H:
+
+package annotator.tests:
+class MultiDimArray:
+
+ field field: @D
+ inner-type 0: @E
+ inner-type 1: @F
+ inner-type 2: @C
+
=======================================
--- /dev/null
+++ /annotation-file-utilities/tests/MultiDimArray.java Fri Sep 4 16:01:00
2009
@@ -0,0 +1,7 @@
+package annotator.tests;
+
+import java.util.*;
+
+public class MultiDimArray {
+ Object[][][] field;
+}