From bf3c9b257faf0c2e70dd5151967853cddc7b7578 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Tue, 6 Jan 2015 08:25:58 -0500 Subject: [PATCH] contrib/jwrapper: rename field to property 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 | 6 +++--- contrib/jwrapper/src/javap_visitor.nit | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/jwrapper/grammar/javap.sablecc b/contrib/jwrapper/grammar/javap.sablecc index 4e9165a..87dfa12 100644 --- a/contrib/jwrapper/grammar/javap.sablecc +++ b/contrib/jwrapper/grammar/javap.sablecc @@ -13,12 +13,12 @@ multi_files = class_or_interface*; class_or_interface = class_declaration | interface_declaration; -class_declaration = class_header '{' field_declaration* '}'; +class_declaration = class_header '{' property_declaration* '}'; class_header = modifier* 'class' full_class_name extends_declaration? implements_declaration? throws_declaration?; interface_declaration = modifier* 'interface' full_class_name extends_interface_declaration? - '{' field_declaration* '}'; + '{' property_declaration* '}'; modifier = 'public'|'private'|'protected'|'static'|'final'|'native'|'synchronized'|'abstract'|'threadsafe'|'transient'|'volatile'; type = type_specifier '[]'*; @@ -50,7 +50,7 @@ statement_block = '{' statement* '}'; variable_id = identifier '[]'*; method_id = identifier; -field_declaration = method_declaration | constructor_declaration | variable_declaration | static_declaration | ';'; +property_declaration = method_declaration | constructor_declaration | variable_declaration | static_declaration | ';'; variable_declaration = modifier* type variable_id throws_declaration? ';'; method_declaration = modifier* generic_param? type method_id '(' parameter_list? ')' throws_declaration? ';'; constructor_declaration = modifier* full_class_name '(' parameter_list? ')' throws_declaration? ';'; diff --git a/contrib/jwrapper/src/javap_visitor.nit b/contrib/jwrapper/src/javap_visitor.nit index 1ede6f0..7b8f2b2 100644 --- a/contrib/jwrapper/src/javap_visitor.nit +++ b/contrib/jwrapper/src/javap_visitor.nit @@ -336,11 +336,11 @@ redef class Nimplements_declaration end end -# # -# F I E L D D E C L A R A T I O N S # -# # +# # +# P R O P E R T Y D E C L A R A T I O N S # +# # -# Method declaration in the field declarations +# Method declaration redef class Nmethod_declaration redef fun accept_visitor(v) do @@ -357,7 +357,7 @@ redef class Nmethod_declaration end end -# Constructor declaration in the field declarations +# Constructor declaration redef class Nconstructor_declaration redef fun accept_visitor(v) do @@ -367,7 +367,7 @@ redef class Nconstructor_declaration end end -# Variable declaration in the field declarations +# Variable property declaration redef class Nvariable_declaration redef fun accept_visitor(v) do @@ -382,7 +382,7 @@ redef class Nvariable_declaration end end -# Static declaration in the field declarations +# Static property declaration redef class Nstatic_declaration redef fun accept_visitor(v) do @@ -392,7 +392,7 @@ redef class Nstatic_declaration end end -# Identifier of the field +# Identifier of a variable redef class Nvariable_id redef fun accept_visitor(v) do -- 1.7.9.5