diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g index 1085dc1..0dfd9a1 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g @@ -1157,7 +1157,7 @@ variance_annotation: 'in' -> IN | 'out' -> OUT; type_parameter_constraints_clauses: - type_parameter_constraints_clause (',' type_parameter_constraints_clause)* -> type_parameter_constraints_clause+ ; + type_parameter_constraints_clause+ ; type_parameter_constraints_clause: 'where' type_variable_name ':' type_parameter_constraint_list -> ^(TYPE_PARAM_CONSTRAINT type_variable_name type_parameter_constraint_list?) ; // class, Circle, new() diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g index 050ec5f..165f2fc 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g @@ -898,7 +898,7 @@ variance_annotation: 'in' | 'out' ; type_parameter_constraints_clauses: - type_parameter_constraints_clause (',' type_parameter_constraints_clause)* ; + type_parameter_constraints_clause+ ; type_parameter_constraints_clause: 'where' type_variable_name ':' type_parameter_constraint_list ; // class, Circle, new() diff --git a/CSharpTranslator/antlr3/src/CSharpParser/cs.g b/CSharpTranslator/antlr3/src/CSharpParser/cs.g index 0d0c53c..e213d60 100644 --- a/CSharpTranslator/antlr3/src/CSharpParser/cs.g +++ b/CSharpTranslator/antlr3/src/CSharpParser/cs.g @@ -819,7 +819,7 @@ public variance_annotation: 'in' | 'out' ; public type_parameter_constraints_clauses: - type_parameter_constraints_clause (',' type_parameter_constraints_clause)* ; + type_parameter_constraints_clause+; public type_parameter_constraints_clause: 'where' type_variable_name ':' type_parameter_constraint_list ; // class, Circle, new()