From 4d826603710650777c5e475a4cf0c8ceebdc8849 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 20 Jul 2015 07:12:09 -0400 Subject: [PATCH] contrib/jwrapper grammar: fix generic types parameters with bounds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/jwrapper/grammar/javap.sablecc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/jwrapper/grammar/javap.sablecc b/contrib/jwrapper/grammar/javap.sablecc index 6a16747..34785d5 100644 --- 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 -- 1.7.9.5