From c276cf15291881fdaa1a3bb6f939ea7bdf237ccd Mon Sep 17 00:00:00 2001 From: Al Date: Fri, 24 Nov 2017 15:36:50 -0500 Subject: [PATCH] [numex] adding a new type of left context for numeric expressions called conat_only_if_number (for something like "oh" which can be "Columbus, OH" or something like "Twenty-One Oh One" --- resources/numex/en.yaml | 1 + scripts/geodata/numbers/numex.py | 2 ++ src/numex.h | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/numex/en.yaml b/resources/numex/en.yaml index cd11f79e..5e35fe06 100644 --- a/resources/numex/en.yaml +++ b/resources/numex/en.yaml @@ -9,6 +9,7 @@ name: "oh" value: 0 type: "cardinal" + left: "concat_only_if_number" - name: "one" value: 1 diff --git a/scripts/geodata/numbers/numex.py b/scripts/geodata/numbers/numex.py index b1d09b62..558a4e6b 100644 --- a/scripts/geodata/numbers/numex.py +++ b/scripts/geodata/numbers/numex.py @@ -47,11 +47,13 @@ category_map = { LEFT_CONTEXT_MULTIPLY = 'NUMEX_LEFT_CONTEXT_MULTIPLY' LEFT_CONTEXT_ADD = 'NUMEX_LEFT_CONTEXT_ADD' +LEFT_CONTEXT_CONCAT_ONLY_IF_NUMBER = 'NUMEX_LEFT_CONTEXT_CONCAT_ONLY_IF_NUMBER' LEFT_CONTEXT_NONE = 'NUMEX_LEFT_CONTEXT_NONE' left_context_map = { 'add': LEFT_CONTEXT_ADD, 'multiply': LEFT_CONTEXT_MULTIPLY, + 'concat_only_if_number': LEFT_CONTEXT_CONCAT_ONLY_IF_NUMBER, None: LEFT_CONTEXT_NONE, } diff --git a/src/numex.h b/src/numex.h index d80f96e1..5b289f13 100644 --- a/src/numex.h +++ b/src/numex.h @@ -50,7 +50,8 @@ typedef enum { typedef enum { NUMEX_LEFT_CONTEXT_NONE, NUMEX_LEFT_CONTEXT_ADD, - NUMEX_LEFT_CONTEXT_MULTIPLY + NUMEX_LEFT_CONTEXT_MULTIPLY, + NUMEX_LEFT_CONTEXT_CONCAT_ONLY_IF_NUMBER } numex_left_context; typedef enum {