Merge remote-tracking branch 'Mathieu_Fery/1447-java-wildcard-parsing'

1 files changed, 7 insertions, 1 deletions

diff --git a/src/antlr/com/jogamp/gluegen/jgram/JavaParser.g b/src/antlr/com/jogamp/gluegen/jgram/JavaParser.g
index a4d8c72..85f24d3 100644
--- a/src/antlr/com/jogamp/gluegen/jgram/JavaParser.g
+++ b/src/antlr/com/jogamp/gluegen/jgram/JavaParser.g
@@ -266,7 +266,13 @@ typeSpec[boolean addImagNode]
 // A class type specification is a class type with possible brackets afterwards
 //   (which would make it an array type).
 classTypeSpec[boolean addImagNode]
-    :    identifier (LT gen:classTypeSpec[false] GT)? (lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK!)*
+    :    identifier (LT
+            (
+                classTypeSpec[false]
+            |
+                QUESTION ("extends" classTypeSpec[false] (BAND classTypeSpec[false])*)?
+            ) GT
+        )? (lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK!)*
         {
             if ( addImagNode ) {
                 #classTypeSpec = #(#[TYPE,"TYPE"], #classTypeSpec);