diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g index 5680d68..158614b 100644 --- a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g +++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g @@ -286,7 +286,6 @@ class_member_declaration returns [List preComments]: -> method(modifiers={$modifiers.st}, type={$type.st}, name={ $member_name.st }, typeparams = { $type_parameter_list.st }, params={ $formal_parameter_list.st }, exceptions = { $exception.st }, bodyIsSemi = { $method_body.isSemi }, body={ $method_body.st }) | ^(INTERFACE attributes? modifiers? interface_declaration[$modifiers.st]) -> { $interface_declaration.st } | ^(CLASS attributes? modifiers? class_declaration[$modifiers.st]) -> { $class_declaration.st } - | ^(INDEXER attributes? modifiers? type type_name? { $preComments = CollectedComments; } indexer_declaration) | ^(FIELD attributes? modifiers? type { $preComments = CollectedComments; } field_declaration) -> field(modifiers={$modifiers.st}, type={$type.st}, field={$field_declaration.st}) | ^(OPERATOR attributes? modifiers? type { $preComments = CollectedComments; } operator_declaration) | ^(ENUM attributes? modifiers? { $preComments = CollectedComments; } enum_declaration[$modifiers.st]) @@ -936,21 +935,6 @@ member_name //member_name: // qid -> { $qid.st }; // IInterface.Method logic added. -/////////////////////////////////////////////////////// - -accessor_declarations: - attributes? - (get_accessor_declaration attributes? set_accessor_declaration? - | set_accessor_declaration attributes? get_accessor_declaration?) ; -get_accessor_declaration: - accessor_modifier? 'get' accessor_body ; -set_accessor_declaration: - accessor_modifier? 'set' accessor_body ; -accessor_modifier: - 'public' | 'protected' | 'private' | 'internal' ; -accessor_body: - block ; - /////////////////////////////////////////////////////// event_declaration: 'event' type @@ -1062,16 +1046,8 @@ interface_member_declaration returns [List preComments]: | ^(METHOD attributes? modifiers? type identifier type_parameter_constraints_clauses? type_parameter_list[$type_parameter_constraints_clauses.tpConstraints]? formal_parameter_list? exception*) { $preComments = CollectedComments; } -> method(modifiers={$modifiers.st}, type={$type.st}, name={ $identifier.st }, typeparams = { $type_parameter_list.st }, params={ $formal_parameter_list.st }, exceptions= { $exception.st }, bodyIsSemi = { true }) - | ^(INDEXER attributes? modifiers? type type_name? { $preComments = CollectedComments; } indexer_declaration) ; -/////////////////////////////////////////////////////// -indexer_declaration: - indexer_declarator '{' accessor_declarations '}' ; -indexer_declarator: - //(type_name '.')? - 'this' '[' formal_parameter_list ']' ; - /////////////////////////////////////////////////////// operator_declaration: operator_declarator operator_body ; diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g index 89cb2ff..7b4678c 100644 --- a/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g +++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g @@ -294,7 +294,6 @@ class_member_declaration: | ^(METHOD attributes? modifiers? type member_name type_parameter_constraints_clauses? type_parameter_list? formal_parameter_list? method_body exception*) | ^(INTERFACE attributes? modifiers? interface_declaration) | ^(CLASS attributes? modifiers? class_declaration) - | ^(INDEXER attributes? modifiers? type type_name? indexer_declaration) | ^(FIELD attributes? modifiers? type field_declaration[$type.dotNetType]) | ^(OPERATOR attributes? modifiers? type operator_declaration) | ^(ENUM attributes? modifiers? enum_declaration) @@ -1106,21 +1105,6 @@ member_name: /////////////////////////////////////////////////////// -accessor_declarations: - attributes? - (get_accessor_declaration attributes? set_accessor_declaration? - | set_accessor_declaration attributes? get_accessor_declaration?) ; -get_accessor_declaration: - accessor_modifier? 'get' accessor_body ; -set_accessor_declaration: - accessor_modifier? 'set' accessor_body ; -accessor_modifier: - 'public' | 'protected' | 'private' | 'internal' ; -accessor_body: - block ; - -/////////////////////////////////////////////////////// - event_declaration: 'event' type ((member_name '{') => member_name '{' event_accessor_declarations '}' @@ -1220,16 +1204,8 @@ scope SymTab; }: ^(EVENT attributes? modifiers? event_declaration) | ^(METHOD attributes? modifiers? type identifier type_parameter_constraints_clauses? type_parameter_list? formal_parameter_list? exception*) - | ^(INDEXER attributes? modifiers? type type_name? indexer_declaration) ; -/////////////////////////////////////////////////////// -indexer_declaration: - indexer_declarator '{' accessor_declarations '}' ; -indexer_declarator: - //(type_name '.')? - 'this' '[' formal_parameter_list ']' ; - /////////////////////////////////////////////////////// operator_declaration: operator_declarator operator_body ;