[recipes] Drop support for number words
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Drop support for number words
- Date: Tue, 27 Dec 2016 22:37:46 +0000 (UTC)
commit 6a7c715e38ceeeb2896befdb21377f006c2e6948
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Dec 26 14:00:38 2016 -0500
Drop support for number words
Since we are no longer parsing free-form ingredients lists, this
is not really necessary anymore.
src/gr-number.c | 51 -----------------
tests/number-data/number1.expected | 104 ------------------------------------
tests/number-data/number1.in | 15 -----
3 files changed, 0 insertions(+), 170 deletions(-)
---
diff --git a/src/gr-number.c b/src/gr-number.c
index eb89665..663e75a 100644
--- a/src/gr-number.c
+++ b/src/gr-number.c
@@ -117,53 +117,6 @@ gr_number_add (GrNumber *a1,
}
typedef struct {
- const char *input;
- int value;
-} NumberForm;
-
-static NumberForm numberforms[] = {
- { NC_("number", "a dozen"), 12 },
- { NC_("number", "a"), 1 },
- { NC_("number", "an"), 1 },
- { NC_("number", "one"), 1 },
- { NC_("number", "two"), 2 },
- { NC_("number", "three"), 3 },
- { NC_("number", "four"), 4 },
- { NC_("number", "five"), 5 },
- { NC_("number", "six"), 6 },
- { NC_("number", "seven"), 7 },
- { NC_("number", "eight"), 8 },
- { NC_("number", "nine"), 9 },
- { NC_("number", "ten"), 10 },
- { NC_("number", "eleven"), 11 },
- { NC_("number", "twelve"), 12 }
-};
-
-static gboolean
-parse_as_number_form (GrNumber *number,
- char **input,
- GError **error)
-{
- int i;
-
- for (i = 0; i < G_N_ELEMENTS (numberforms); i++) {
- const char *nf;
-
- nf = g_dpgettext2 (NULL, "number", numberforms[i].input);
- if (g_str_has_prefix (*input, nf) &&
- space_or_nul ((*input)[strlen (nf)])) {
- gr_number_set_fraction (number, numberforms[i].value, 1);
- *input += strlen (nf);
- return TRUE;
- }
- }
-
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- _("Could not parse %s as a number form"), *input);
- return FALSE;
-}
-
-typedef struct {
int num;
int denom;
const char *ch;
@@ -299,10 +252,6 @@ gr_number_parse (GrNumber *number,
{
char *orig = *input;
- if (parse_as_number_form (number, input, NULL)) {
- return TRUE;
- }
-
if (parse_as_vulgar_fraction (number, input, NULL)) {
return TRUE;
}
diff --git a/tests/number-data/number1.expected b/tests/number-data/number1.expected
index dce99ce..7400de6 100644
--- a/tests/number-data/number1.expected
+++ b/tests/number-data/number1.expected
@@ -78,110 +78,6 @@ DENOMINATOR 4
VALUE 0.75
FORMATTED '¾'
-INPUT 'a dozen'
-REST ''
-FRACTION 1
-NUMERATOR 12
-DENOMINATOR 1
-VALUE 12
-FORMATTED '12'
-
-INPUT 'one'
-REST ''
-FRACTION 1
-NUMERATOR 1
-DENOMINATOR 1
-VALUE 1
-FORMATTED '1'
-
-INPUT 'two'
-REST ''
-FRACTION 1
-NUMERATOR 2
-DENOMINATOR 1
-VALUE 2
-FORMATTED '2'
-
-INPUT 'three'
-REST ''
-FRACTION 1
-NUMERATOR 3
-DENOMINATOR 1
-VALUE 3
-FORMATTED '3'
-
-INPUT 'four'
-REST ''
-FRACTION 1
-NUMERATOR 4
-DENOMINATOR 1
-VALUE 4
-FORMATTED '4'
-
-INPUT 'five'
-REST ''
-FRACTION 1
-NUMERATOR 5
-DENOMINATOR 1
-VALUE 5
-FORMATTED '5'
-
-INPUT 'six'
-REST ''
-FRACTION 1
-NUMERATOR 6
-DENOMINATOR 1
-VALUE 6
-FORMATTED '6'
-
-INPUT 'seven'
-REST ''
-FRACTION 1
-NUMERATOR 7
-DENOMINATOR 1
-VALUE 7
-FORMATTED '7'
-
-INPUT 'eight'
-REST ''
-FRACTION 1
-NUMERATOR 8
-DENOMINATOR 1
-VALUE 8
-FORMATTED '8'
-
-INPUT 'nine'
-REST ''
-FRACTION 1
-NUMERATOR 9
-DENOMINATOR 1
-VALUE 9
-FORMATTED '9'
-
-INPUT 'ten'
-REST ''
-FRACTION 1
-NUMERATOR 10
-DENOMINATOR 1
-VALUE 10
-FORMATTED '10'
-
-INPUT 'eleven'
-REST ''
-FRACTION 1
-NUMERATOR 11
-DENOMINATOR 1
-VALUE 11
-FORMATTED '11'
-
-INPUT 'twelve'
-REST ''
-FRACTION 1
-NUMERATOR 12
-DENOMINATOR 1
-VALUE 12
-FORMATTED '12'
-
INPUT '¼'
REST ''
FRACTION 1
diff --git a/tests/number-data/number1.in b/tests/number-data/number1.in
index b8a34d0..a744dd6 100644
--- a/tests/number-data/number1.in
+++ b/tests/number-data/number1.in
@@ -10,21 +10,6 @@
1/-1
-3/-4
-# number words we recognize
-a dozen
-one
-two
-three
-four
-five
-six
-seven
-eight
-nine
-ten
-eleven
-twelve
-
# vulgar fractions
¼
½
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]