From: Rico Tzschichholz Date: Fri, 20 Apr 2018 18:51:22 +0000 (+0200) Subject: vala: Mark special parser errors strings translatable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34d99d4f6211c140cde3c35d9241c264f016670;p=thirdparty%2Fvala.git vala: Mark special parser errors strings translatable --- diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala index 1b7e65c1e..96beb8f10 100644 --- a/vala/valagenieparser.vala +++ b/vala/valagenieparser.vala @@ -162,7 +162,7 @@ public class Vala.Genie.Parser : CodeVisitor { void report_parse_error (ParseError e) { var begin = get_location (); next (); - Report.error (get_src (begin), _("syntax error, ") + e.message); + Report.error (get_src (begin), _("syntax error, %s").printf (e.message)); } inline bool expect (TokenType type) throws ParseError { @@ -173,7 +173,7 @@ public class Vala.Genie.Parser : CodeVisitor { TokenType cur = current (); TokenType pre = tokens[index - 1].type; - throw new ParseError.SYNTAX ("expected %s but got %s with previous %s", type.to_string (), cur.to_string (), pre.to_string()); + throw new ParseError.SYNTAX (_("expected %s but got %s with previous %s"), type.to_string (), cur.to_string (), pre.to_string()); } inline bool expect_separator () throws ParseError { @@ -183,7 +183,7 @@ public class Vala.Genie.Parser : CodeVisitor { TokenType cur = current (); - throw new ParseError.SYNTAX ("expected line end or comma but got %s", cur.to_string()); + throw new ParseError.SYNTAX (_("expected line end or comma but got %s"), cur.to_string()); } inline bool expect_terminator () throws ParseError { @@ -193,7 +193,7 @@ public class Vala.Genie.Parser : CodeVisitor { TokenType cur = current (); - throw new ParseError.SYNTAX ("expected line end or semicolon but got %s", cur.to_string()); + throw new ParseError.SYNTAX (_("expected line end or semicolon but got %s"), cur.to_string()); } inline SourceLocation get_location () { @@ -343,7 +343,7 @@ public class Vala.Genie.Parser : CodeVisitor { break; } - throw new ParseError.SYNTAX ("expected identifier"); + throw new ParseError.SYNTAX (_("expected identifier")); } string parse_identifier () throws ParseError { @@ -397,7 +397,7 @@ public class Vala.Genie.Parser : CodeVisitor { next (); return new NullLiteral (get_src (begin)); default: - throw new ParseError.SYNTAX ("expected literal"); + throw new ParseError.SYNTAX (_("expected literal")); } } @@ -1082,7 +1082,7 @@ public class Vala.Genie.Parser : CodeVisitor { // array of arrays: new T[][42] if (size_specified) { - throw new ParseError.SYNTAX ("size of inner arrays must not be specified in array creation expression"); + throw new ParseError.SYNTAX (_("size of inner arrays must not be specified in array creation expression")); } etype = new ArrayType (etype, size_specifier_list.size, etype.source_reference); @@ -1180,7 +1180,7 @@ public class Vala.Genie.Parser : CodeVisitor { var object_creation = expr as ObjectCreationExpression; if (call == null && object_creation == null) { Report.error (expr.source_reference, _("syntax error, expected method call")); - throw new ParseError.SYNTAX ("expected method call"); + throw new ParseError.SYNTAX (_("expected method call")); } if (call != null) { @@ -1890,7 +1890,7 @@ public class Vala.Genie.Parser : CodeVisitor { case TokenType.DELETE: return parse_delete_statement (); case TokenType.VAR: case TokenType.CONST: - throw new ParseError.SYNTAX ("embedded statement cannot be declaration "); + throw new ParseError.SYNTAX (_("embedded statement cannot be declaration ")); case TokenType.OP_INC: case TokenType.OP_DEC: case TokenType.SUPER: @@ -1903,7 +1903,7 @@ public class Vala.Genie.Parser : CodeVisitor { if (is_expression ()) { return parse_expression_statement (); } else { - throw new ParseError.SYNTAX ("embedded statement cannot be declaration"); + throw new ParseError.SYNTAX (_("embedded statement cannot be declaration")); } } } @@ -2349,10 +2349,10 @@ public class Vala.Genie.Parser : CodeVisitor { next (); return "-" + get_last_string (); default: - throw new ParseError.SYNTAX ("expected number"); + throw new ParseError.SYNTAX (_("expected number")); } default: - throw new ParseError.SYNTAX ("expected literal"); + throw new ParseError.SYNTAX (_("expected literal")); } } @@ -2455,7 +2455,7 @@ public class Vala.Genie.Parser : CodeVisitor { TokenType cur = current (); TokenType pre = tokens[index-1].type; - throw new ParseError.SYNTAX ("expected declaration but got %s with previous %s", cur.to_string (), pre.to_string()); + throw new ParseError.SYNTAX (_("expected declaration but got %s with previous %s"), cur.to_string (), pre.to_string()); } void parse_declarations (Symbol parent, bool root = false) throws ParseError { @@ -2975,13 +2975,13 @@ public class Vala.Genie.Parser : CodeVisitor { if ((method.is_abstract && method.is_virtual) || (method.is_abstract && method.overrides) || (method.is_virtual && method.overrides)) { - throw new ParseError.SYNTAX ("only one of `abstract', `virtual', or `override' may be specified"); + throw new ParseError.SYNTAX (_("only one of `abstract', `virtual', or `override' may be specified")); } } else { if (ModifierFlags.ABSTRACT in flags || ModifierFlags.VIRTUAL in flags || ModifierFlags.OVERRIDE in flags) { - throw new ParseError.SYNTAX ("the modifiers `abstract', `virtual', and `override' are not valid for static methods"); + throw new ParseError.SYNTAX (_("the modifiers `abstract', `virtual', and `override' are not valid for static methods")); } } @@ -3113,7 +3113,7 @@ public class Vala.Genie.Parser : CodeVisitor { if (accept (TokenType.GET)) { if (prop.get_accessor != null) { - throw new ParseError.SYNTAX ("property get accessor already defined"); + throw new ParseError.SYNTAX (_("property get accessor already defined")); } Block block = null; if (accept_block ()) { @@ -3127,17 +3127,17 @@ public class Vala.Genie.Parser : CodeVisitor { bool _construct = false; if (accept (TokenType.SET)) { if (readonly) { - throw new ParseError.SYNTAX ("set block not allowed for a read only property"); + throw new ParseError.SYNTAX (_("set block not allowed for a read only property")); } _construct = (context.profile == Profile.GOBJECT) && accept (TokenType.CONSTRUCT); } else if (context.profile == Profile.GOBJECT && accept (TokenType.CONSTRUCT)) { _construct = true; } else if (!accept (TokenType.EOL)) { - throw new ParseError.SYNTAX ("expected get, set, or construct"); + throw new ParseError.SYNTAX (_("expected get, set, or construct")); } if (prop.set_accessor != null) { - throw new ParseError.SYNTAX ("property set accessor already defined"); + throw new ParseError.SYNTAX (_("property set accessor already defined")); } Block block = null; @@ -3217,9 +3217,9 @@ public class Vala.Genie.Parser : CodeVisitor { } if (ModifierFlags.STATIC in flags) { - throw new ParseError.SYNTAX ("`static' modifier not allowed on signals"); + throw new ParseError.SYNTAX (_("`static' modifier not allowed on signals")); } else if (ModifierFlags.CLASS in flags) { - throw new ParseError.SYNTAX ("`class' modifier not allowed on signals"); + throw new ParseError.SYNTAX (_("`class' modifier not allowed on signals")); } set_attributes (sig, attrs); @@ -3724,7 +3724,7 @@ public class Vala.Genie.Parser : CodeVisitor { var type_param_list = parse_type_parameter_list (); if (ModifierFlags.NEW in flags) { - throw new ParseError.SYNTAX ("`new' modifier not allowed on delegates"); + throw new ParseError.SYNTAX (_("`new' modifier not allowed on delegates")); } var params = new ArrayList (); diff --git a/vala/valaparser.vala b/vala/valaparser.vala index 45c2a5f6c..717f14d7a 100644 --- a/vala/valaparser.vala +++ b/vala/valaparser.vala @@ -118,7 +118,7 @@ public class Vala.Parser : CodeVisitor { void report_parse_error (ParseError e) { var begin = get_location (); next (); - Report.error (get_src (begin), _("syntax error, ") + e.message); + Report.error (get_src (begin), _("syntax error, %s").printf (e.message)); } inline bool expect (TokenType type) throws ParseError { @@ -126,7 +126,7 @@ public class Vala.Parser : CodeVisitor { return true; } - throw new ParseError.SYNTAX ("expected %s", type.to_string ()); + throw new ParseError.SYNTAX (_("expected %s"), type.to_string ()); } inline SourceLocation get_location () { @@ -263,7 +263,7 @@ public class Vala.Parser : CodeVisitor { } break; default: - throw new ParseError.SYNTAX ("expected identifier"); + throw new ParseError.SYNTAX (_("expected identifier")); } } @@ -318,7 +318,7 @@ public class Vala.Parser : CodeVisitor { next (); return new NullLiteral (get_src (begin)); default: - throw new ParseError.SYNTAX ("expected literal"); + throw new ParseError.SYNTAX (_("expected literal")); } } @@ -877,7 +877,7 @@ public class Vala.Parser : CodeVisitor { var expr = parse_array_creation_expression (); return expr; } else { - throw new ParseError.SYNTAX ("expected ( or ["); + throw new ParseError.SYNTAX (_("expected `(' or `['")); } } } @@ -940,7 +940,7 @@ public class Vala.Parser : CodeVisitor { // array of arrays: new T[][42] if (size_specified) { - throw new ParseError.SYNTAX ("size of inner arrays must not be specified in array creation expression"); + throw new ParseError.SYNTAX (_("size of inner arrays must not be specified in array creation expression")); } element_type = new ArrayType (element_type, size_specifier_list.size, element_type.source_reference); @@ -1004,7 +1004,7 @@ public class Vala.Parser : CodeVisitor { var object_creation = expr as ObjectCreationExpression; if (call == null && object_creation == null) { Report.error (expr.source_reference, _("syntax error, expected method call")); - throw new ParseError.SYNTAX ("expected method call"); + throw new ParseError.SYNTAX (_("expected method call")); } if (call != null) { @@ -1737,7 +1737,7 @@ public class Vala.Parser : CodeVisitor { case TokenType.DELETE: return parse_delete_statement (); case TokenType.VAR: case TokenType.CONST: - throw new ParseError.SYNTAX ("embedded statement cannot be declaration "); + throw new ParseError.SYNTAX (_("embedded statement cannot be declaration ")); case TokenType.OP_INC: case TokenType.OP_DEC: case TokenType.BASE: @@ -1750,7 +1750,7 @@ public class Vala.Parser : CodeVisitor { if (is_expression ()) { return parse_expression_statement (); } else { - throw new ParseError.SYNTAX ("embedded statement cannot be declaration"); + throw new ParseError.SYNTAX (_("embedded statement cannot be declaration")); } } } @@ -2019,7 +2019,7 @@ public class Vala.Parser : CodeVisitor { type = parse_type (true, true); if (accept (TokenType.IN)) { Report.error (type.source_reference, _("syntax error, expected var or type")); - throw new ParseError.SYNTAX ("expected var or type"); + throw new ParseError.SYNTAX (_("expected var or type")); } } string id = parse_identifier (); @@ -2181,10 +2181,10 @@ public class Vala.Parser : CodeVisitor { next (); return "-" + get_last_string (); default: - throw new ParseError.SYNTAX ("expected number"); + throw new ParseError.SYNTAX (_("expected number")); } default: - throw new ParseError.SYNTAX ("expected literal"); + throw new ParseError.SYNTAX (_("expected literal")); } } @@ -2297,10 +2297,10 @@ public class Vala.Parser : CodeVisitor { // statement if (attrs != null) { // no attributes allowed before statements - throw new ParseError.SYNTAX ("expected statement"); + throw new ParseError.SYNTAX (_("expected statement")); } if (!root) { - throw new ParseError.SYNTAX ("statements outside blocks allowed only in root namespace"); + throw new ParseError.SYNTAX (_("statements outside blocks allowed only in root namespace")); } rollback (begin); parse_main_block (parent); @@ -2390,7 +2390,7 @@ public class Vala.Parser : CodeVisitor { rollback (begin); - throw new ParseError.SYNTAX ("expected declaration"); + throw new ParseError.SYNTAX (_("expected declaration")); } void parse_declarations (Symbol parent, bool root = false) throws ParseError { @@ -2731,13 +2731,13 @@ public class Vala.Parser : CodeVisitor { if ((method.is_abstract && method.is_virtual) || (method.is_abstract && method.overrides) || (method.is_virtual && method.overrides)) { - throw new ParseError.SYNTAX ("only one of `abstract', `virtual', or `override' may be specified"); + throw new ParseError.SYNTAX (_("only one of `abstract', `virtual', or `override' may be specified")); } } else { if (ModifierFlags.ABSTRACT in flags || ModifierFlags.VIRTUAL in flags || ModifierFlags.OVERRIDE in flags) { - throw new ParseError.SYNTAX ("the modifiers `abstract', `virtual', and `override' are not valid for %s methods", (ModifierFlags.CLASS in flags) ? "class" : "static"); + throw new ParseError.SYNTAX (_("the modifiers `abstract', `virtual', and `override' are not valid for %s methods"), (ModifierFlags.CLASS in flags) ? "class" : "static"); } } @@ -2816,7 +2816,7 @@ public class Vala.Parser : CodeVisitor { if ((prop.is_abstract && prop.is_virtual) || (prop.is_abstract && prop.overrides) || (prop.is_virtual && prop.overrides)) { - throw new ParseError.SYNTAX ("only one of `abstract', `virtual', or `override' may be specified"); + throw new ParseError.SYNTAX (_("only one of `abstract', `virtual', or `override' may be specified")); } if (accept (TokenType.THROWS)) { @@ -2829,7 +2829,7 @@ public class Vala.Parser : CodeVisitor { while (current () != TokenType.CLOSE_BRACE) { if (accept (TokenType.DEFAULT)) { if (prop.initializer != null) { - throw new ParseError.SYNTAX ("property default value already defined"); + throw new ParseError.SYNTAX (_("property default value already defined")); } expect (TokenType.ASSIGN); prop.initializer = parse_expression (); @@ -2853,7 +2853,7 @@ public class Vala.Parser : CodeVisitor { if (accept (TokenType.GET)) { if (prop.get_accessor != null) { - throw new ParseError.SYNTAX ("property get accessor already defined"); + throw new ParseError.SYNTAX (_("property get accessor already defined")); } Block block = null; @@ -2873,10 +2873,10 @@ public class Vala.Parser : CodeVisitor { _construct = true; writable = accept (TokenType.SET); } else { - throw new ParseError.SYNTAX ("expected get, set, or construct"); + throw new ParseError.SYNTAX (_("expected `get', `set' or `construct'")); } if (prop.set_accessor != null) { - throw new ParseError.SYNTAX ("property set accessor already defined"); + throw new ParseError.SYNTAX (_("property set accessor already defined")); } Block block = null; if (!accept (TokenType.SEMICOLON)) { @@ -2905,9 +2905,9 @@ public class Vala.Parser : CodeVisitor { sig.access = access; set_attributes (sig, attrs); if (ModifierFlags.STATIC in flags) { - throw new ParseError.SYNTAX ("`static' modifier not allowed on signals"); + throw new ParseError.SYNTAX (_("`static' modifier not allowed on signals")); } else if (ModifierFlags.CLASS in flags) { - throw new ParseError.SYNTAX ("`class' modifier not allowed on signals"); + throw new ParseError.SYNTAX (_("`class' modifier not allowed on signals")); } if (ModifierFlags.VIRTUAL in flags) { sig.is_virtual = true; @@ -2935,7 +2935,7 @@ public class Vala.Parser : CodeVisitor { var flags = parse_member_declaration_modifiers (); expect (TokenType.CONSTRUCT); if (ModifierFlags.NEW in flags) { - throw new ParseError.SYNTAX ("`new' modifier not allowed on constructor"); + throw new ParseError.SYNTAX (_("`new' modifier not allowed on constructor")); } var c = new Constructor (get_src (begin)); if (ModifierFlags.STATIC in flags && ModifierFlags.CLASS in flags) { @@ -2958,7 +2958,7 @@ public class Vala.Parser : CodeVisitor { expect (TokenType.OPEN_PARENS); expect (TokenType.CLOSE_PARENS); if (ModifierFlags.NEW in flags) { - throw new ParseError.SYNTAX ("`new' modifier not allowed on destructor"); + throw new ParseError.SYNTAX (_("`new' modifier not allowed on destructor")); } var d = new Destructor (get_src (begin)); if (identifier != parent.name) { @@ -3332,7 +3332,7 @@ public class Vala.Parser : CodeVisitor { var flags = parse_member_declaration_modifiers (); var sym = parse_symbol_name (); if (ModifierFlags.NEW in flags) { - throw new ParseError.SYNTAX ("`new' modifier not allowed on creation method"); + throw new ParseError.SYNTAX (_("`new' modifier not allowed on creation method")); } CreationMethod method; if (sym.inner == null) { @@ -3391,7 +3391,7 @@ public class Vala.Parser : CodeVisitor { var flags = parse_member_declaration_modifiers (); expect (TokenType.DELEGATE); if (ModifierFlags.NEW in flags) { - throw new ParseError.SYNTAX ("`new' modifier not allowed on delegates"); + throw new ParseError.SYNTAX (_("`new' modifier not allowed on delegates")); } var type = parse_type (true, false); var sym = parse_symbol_name ();