diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs index 42eaa1c..63ca763 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs @@ -52,9 +52,9 @@ class(modifiers, comments, attributes, name, typeparams, extends, imps, body) :: } >> -iface(modifiers, comments, attributes, name, imps, body) ::= << +iface(modifiers, comments, attributes, name, typeparams, imps, body) ::= << -interface +interface { } diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g index 5e31c1d..bd556c3 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g @@ -1062,9 +1062,9 @@ delegate_modifiers: modifier+ ; // 4.0 variant_generic_parameter_list [Dictionary tpConstraints]: - (ps+=variant_generic_parameter[$tpConstraints])+ -> commalist(items={$ps}); + (ps+=variant_generic_parameter[$tpConstraints])+ -> type_parameter_list(items={$ps}); variant_generic_parameter [Dictionary tpConstraints]: - attributes? variance_annotation? t=type_parameter[$tpConstraints] -> parameter(param={$t.st}, annotation={$variance_annotation.st}); + attributes? variance_annotation? t=type_parameter[$tpConstraints] -> { $t.st }; variance_annotation: IN -> string(payload={ "in" }) | OUT -> string(payload={ "out" }) ;