From cff755aba1540d26eb051dcc5de73d4864aa8a3b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 15 Jan 2018 13:28:43 -0500 Subject: [PATCH] l10n: Eliminated STRING_EVAL_* --- src/Eval.cpp | 13 +++++++------ src/columns/ColProject.cpp | 2 +- src/l10n/deu-DEU.h | 8 -------- src/l10n/eng-USA.h | 8 -------- src/l10n/epo-RUS.h | 8 -------- src/l10n/esp-ESP.h | 8 -------- src/l10n/fra-FRA.h | 8 -------- src/l10n/ita-ITA.h | 8 -------- src/l10n/jpn-JPN.h | 8 -------- src/l10n/pol-POL.h | 8 -------- src/l10n/por-PRT.h | 8 -------- 11 files changed, 8 insertions(+), 79 deletions(-) diff --git a/src/Eval.cpp b/src/Eval.cpp index 89a75d8a4..bc9f62031 100644 --- a/src/Eval.cpp +++ b/src/Eval.cpp @@ -33,7 +33,8 @@ #include #include #include -#include + +#define STRING_EVAL_NO_EVAL "The expression could not be evaluated." extern Context context; extern Task& contextTask; @@ -221,7 +222,7 @@ void Eval::evaluatePostfixStack ( Variant& result) const { if (tokens.size () == 0) - throw std::string (STRING_EVAL_NO_EXPRESSION); + throw std::string ("No expression to evaluate."); // This is stack used by the postfix evaluator. std::vector values; @@ -303,7 +304,7 @@ void Eval::evaluatePostfixStack ( else if (token.first == "_hastag_") result = left.operator_hastag (right, contextTask); else if (token.first == "_notag_") result = left.operator_notag (right, contextTask); else - throw format (STRING_EVAL_UNSUPPORTED, token.first); + throw format ("Unsupported operator '{1}'.", token.first); values.push_back (result); @@ -333,7 +334,7 @@ void Eval::evaluatePostfixStack ( break; case Lexer::Type::op: - throw std::string (STRING_EVAL_OP_EXPECTED); + throw std::string ("Operator expected."); break; case Lexer::Type::dom: @@ -388,7 +389,7 @@ void Eval::evaluatePostfixStack ( // If there is more than one variant left on the stack, then the original // expression was not valid. if (values.size () != 1) - throw std::string (STRING_EVAL_NOT_EXPRESSION); + throw std::string ("The value is not an expression."); result = values[0]; } @@ -796,7 +797,7 @@ void Eval::infixToPostfix ( { if (op_stack.back ().first == "(" || op_stack.back ().first == ")") - throw std::string (STRING_PAREN_MISMATCH); + throw std::string ("Mismatched parentheses in expression"); postfix.push_back (op_stack.back ()); op_stack.pop_back (); diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp index d93643bd0..1c6afc4a7 100644 --- a/src/columns/ColProject.cpp +++ b/src/columns/ColProject.cpp @@ -134,7 +134,7 @@ void ColumnProject::modify (Task& task, const std::string& value) { // If the expression failed because it didn't look like an expression, // simply store it as-is. - if (e == STRING_EVAL_NOT_EXPRESSION) + if (e == "The value is not an expression.") { task.set (_name, value); context.debug (label + _name + " <-- '" + value + '\''); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 22fa1efd8..fcc60c730 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -540,14 +540,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Unbekannten Namen nicht erkannt '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "Kein Ausdruck auszuwerten." -#define STRING_EVAL_UNSUPPORTED "Nicht unterstützter Operator: '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operator erwartet." -#define STRING_EVAL_NO_EVAL "Der Ausdruck konnte nicht ausgewertet werden." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Ungültige Klammerung in Ausdruck." - // edit #define STRING_EDIT_NO_CHANGES "Keine Änderungen entdeckt." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 11244befa..4c0457a56 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -537,14 +537,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Cannot get unrecognized name '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "No expression to evaluate." -#define STRING_EVAL_UNSUPPORTED "Unsupported operator '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operator expected." -#define STRING_EVAL_NO_EVAL "The expression could not be evaluated." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Mismatched parentheses in expression" - // edit #define STRING_EDIT_NO_CHANGES "No edits were detected." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 22a8ec003..3086227f9 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -540,14 +540,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Ne povis inspekti nekonatan nomon '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "Nenia esprimo por kalkuli." -#define STRING_EVAL_UNSUPPORTED "Ne subtenas infikson '{1}'." -#define STRING_EVAL_OP_EXPECTED "Anticipis infikson." -#define STRING_EVAL_NO_EVAL "Ne povis kalkuli la esprimon." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Malbalancataj parentezoj en esprimo" - // edit #define STRING_EDIT_NO_CHANGES "Ne detektis nenian redakton." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index e8eb7bd56..f83330b8d 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -552,14 +552,6 @@ // DOM #define STRING_DOM_UNREC "DOM: No se pudo obtener el nombre no reconocido '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "Ninguna expresión para evaluar." -#define STRING_EVAL_UNSUPPORTED "Operador no soportado '{1}'." -#define STRING_EVAL_OP_EXPECTED "Se esperaba operador." -#define STRING_EVAL_NO_EVAL "La expresión podría no ser evaluada." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Paréntesis desemparejados en expresión" - // edit #define STRING_EDIT_NO_CHANGES "No se detectaron modificaciones." #define STRING_EDIT_FAILED "Edición fallida con código de salida {1}." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index edcbe07b9..8616d8497 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -542,14 +542,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Cannot get unrecognized name '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "No expression to evaluate." -#define STRING_EVAL_UNSUPPORTED "Unsupported operator '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operator expected." -#define STRING_EVAL_NO_EVAL "The expression could not be evaluated." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Mismatched parentheses in expression" - // edit #define STRING_EDIT_NO_CHANGES "Aucunes modifications détectées." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 1b953581b..e9534cb76 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -541,14 +541,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Impossibile ottenere il nome non riconosciuto '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "No expression to evaluate." -#define STRING_EVAL_UNSUPPORTED "Operatore non supportato '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operator expected." -#define STRING_EVAL_NO_EVAL "The expression could not be evaluated." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Mismatched parentheses in expression" - // edit #define STRING_EDIT_NO_CHANGES "Nessuna modifica riscontrata." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 7e7595a49..bacab0f39 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -542,14 +542,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Cannot get unrecognized name '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "No expression to evaluate." -#define STRING_EVAL_UNSUPPORTED "Unsupported operator '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operator expected." -#define STRING_EVAL_NO_EVAL "式を評価出来ません。" -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Mismatched parentheses in expression" - // edit #define STRING_EDIT_NO_CHANGES "No edits were detected." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 46ed0c7f6..2bdc7a79d 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -542,14 +542,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Nie mogę pobrać nierozpoznanej nazwy '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "Brak wyrażenia do przetworzenia." -#define STRING_EVAL_UNSUPPORTED "Niewspierany operator '{1}'." -#define STRING_EVAL_OP_EXPECTED "Oczekiwany operator." -#define STRING_EVAL_NO_EVAL "Wyrażenie nie może być przetworzone." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Niedopasowane nawiasy w wyrażeniu" - // edit #define STRING_EDIT_NO_CHANGES "Nie znaleziono żadnych edycji." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 4f0949e81..2f5e2f060 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -542,14 +542,6 @@ // DOM #define STRING_DOM_UNREC "DOM: Não foi possível obter nome não reconhecido '{1}'." -// Eval -#define STRING_EVAL_NO_EXPRESSION "Nenhuma expressão a calcular." -#define STRING_EVAL_UNSUPPORTED "Operador não suportado '{1}'." -#define STRING_EVAL_OP_EXPECTED "Operador em falta." -#define STRING_EVAL_NO_EVAL "Não foi possível calcular a expressão." -#define STRING_EVAL_NOT_EXPRESSION "The value is not an expression." -#define STRING_PAREN_MISMATCH "Parentesis incompatíveis na expressão." - // edit #define STRING_EDIT_NO_CHANGES "Não foram detetadas alterações." #define STRING_EDIT_FAILED "Editing failed with exit code {1}."