contrib/jwrapper grammar: fix generic types parameters with bounds

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/jwrapper/grammar/javap.sablecc b/contrib/jwrapper/grammar/javap.sablecc
index 6a16747..34785d5 100644 (file)
--- a/contrib/jwrapper/grammar/javap.sablecc
+++ b/contrib/jwrapper/grammar/javap.sablecc
@@ -32,8 +32,11 @@ primitive_type
 
 type_ref
        = full_class_name
-       | generic_identifier 'extends' full_class_name
-       | question_mark;
+       | generic_identifier 'extends' type_bound
+       | wildcard;
+type_bound
+       = {tail:} type_bound '&' full_class_name
+       | {head:} full_class_name;
 
 generic_param = '<' generic_parameter_list '>';
 generic_parameter_list