contrib/jwrapper: big rewrite of the AST visitor

[nit.git] / contrib / jwrapper / grammar / javap.sablecc

diff --git a/contrib/jwrapper/grammar/javap.sablecc b/contrib/jwrapper/grammar/javap.sablecc
index 3f9318b..dc46557 100644 (file)
--- a/contrib/jwrapper/grammar/javap.sablecc
+++ b/contrib/jwrapper/grammar/javap.sablecc
@@ -3,18 +3,18 @@ Grammar javap;
 // ---
 Lexer
 
-identifier = ('a'..'z'|'A'..'Z'|'_'|'$') ('a'..'z'|'A'..'Z'|'_'|'$'|'0'..'9')*;
+identifier = ('a'..'z'|'A'..'Z'|'_'|'$') ('a'..'z'|'A'..'Z'|'_'|'-'|'$'|'0'..'9')*;
 blank = (' '|'\n'|'\t'|'\r')+;
 separator = ('.'|'/');
 brackets = '[]';
 wildcard = '?';
+compiled_from = 'Compiled from "' (Any-'"')* '"';
+dots = '...';
 
 // ---
 Parser
 Ignored blank;
 
-
-compiled_from = 'Compiled from "' identifier+ '.java"';
 files = file+;
 file = compiled_from? class_declaration;
 
@@ -25,21 +25,24 @@ class_declaration = modifier* class_or_interface full_class_name
 class_or_interface = 'class'|'interface';
 
 modifier
-       = 'public'|'private'|'protected'|'static'|'final'|'native'|'synchronized'|'abstract'|'threadsafe'|'transient'|'volatile';
-type = primitive_type brackets*;
-primitive_type
-       = 'boolean'|'byte'|'char'|'short'|'int'|'float'|'long'|'double'
-       | type_ref;
+       = 'public'|'private'|'protected'|'static'|'final'|'native'|'synchronized'|'abstract'|'threadsafe'|'transient'|'volatile'|'strictfp';
 
-type_ref
-       = full_class_name
-       | generic_identifier 'extends' full_class_name
-       | question_mark;
+type = base_type brackets*;
+
+base_type
+       = {primitive:} primitive_base_type
+       | {class:} full_class_name
+       | {extends:} generic_identifier 'extends' type_bound
+       | {super:} generic_identifier 'super' type_bound
+       | {wildcard:} wildcard
+       | {void:} 'void';
+
+primitive_base_type = 'boolean'|'byte'|'char'|'short'|'int'|'float'|'long'|'double';
+
+type_bound
+       = {tail:} type_bound '&' full_class_name
+       | {head:} full_class_name;
 
-generic_param = '<' generic_parameter_list '>';
-generic_parameter_list
-       = {tail:} generic_parameter_list ',' parameter
-       | {head:} parameter;
 generic_identifier
        = full_class_name
        | wildcard;
@@ -47,22 +50,19 @@ generic_identifier
 full_class_name
        = {tail:} full_class_name separator class_name
        | {head:} class_name;
-class_name = identifier generic_param?;
+class_name = identifier generic_parameters?;
 
-parameter
-       = type '...'?
-       | {wildcard:} wildcard 'super' full_class_name ;
-parameter_list
-       = {tail:} parameter_list ',' parameter
-       | {head:} parameter;
+generic_parameters = '<' parameters '>';
 
-attribute_id = identifier brackets*;
-method_id = identifier;
+parameter = type dots?;
+parameters
+       = {tail:} parameters ',' parameter
+       | {head:} parameter;
 
 property_declaration
-       = {method:} modifier* generic_param? type method_id '(' parameter_list? ')' throws_declaration? ';'
-       | {constructor:} modifier* full_class_name '(' parameter_list? ')' throws_declaration? ';'
-       | {attribute:} modifier* type attribute_id throws_declaration? ';'
+       = {method:} modifier* generic_parameters? type identifier '(' parameters? ')' throws_declaration? ';'
+       | {constructor:} modifier* generic_parameters? full_class_name '(' parameters? ')' throws_declaration? ';'
+       | {attribute:} modifier* type identifier brackets* throws_declaration? ';'
        | {static:} modifier* '{' '}' ';'
        | ';';