From 7889f396f324028075d39e5003f1083ad05d68f3 Mon Sep 17 00:00:00 2001 From: Josef Svenningsson Date: Mon, 28 Sep 2020 01:31:58 -0700 Subject: [PATCH] Remove dependency on Data.Some (#533) Summary: Pull Request resolved: https://github.com/facebook/duckling/pull/533 In recent versions of Data.Some the name of the constructor, `This` has changed name to `Some`. This has become rather problematic for us to migrate so we're just going to remove the dependency. The meat of this diff is adding the type `Seal` to `Duckling.Types`. That type replaces `Some`. Reviewed By: pepeiborra Differential Revision: D23929459 fbshipit-source-id: 8ff4146ecba4f1119a17899961b2d877547f6e4f --- Duckling/Api.hs | 8 +-- Duckling/Core.hs | 3 +- Duckling/Debug.hs | 12 ++-- Duckling/Dimensions.hs | 42 +++++------ Duckling/Dimensions/AF.hs | 4 +- Duckling/Dimensions/AR.hs | 16 ++--- Duckling/Dimensions/BG.hs | 12 ++-- Duckling/Dimensions/BN.hs | 4 +- Duckling/Dimensions/CS.hs | 6 +- Duckling/Dimensions/Common.hs | 12 ++-- Duckling/Dimensions/DA.hs | 10 +-- Duckling/Dimensions/DE.hs | 14 ++-- Duckling/Dimensions/EL.hs | 10 +-- Duckling/Dimensions/EN.hs | 18 ++--- Duckling/Dimensions/ES.hs | 16 ++--- Duckling/Dimensions/ET.hs | 6 +- Duckling/Dimensions/FI.hs | 4 +- Duckling/Dimensions/FR.hs | 18 ++--- Duckling/Dimensions/GA.hs | 16 ++--- Duckling/Dimensions/HE.hs | 10 +-- Duckling/Dimensions/HI.hs | 10 +-- Duckling/Dimensions/HR.hs | 18 ++--- Duckling/Dimensions/HU.hs | 10 +-- Duckling/Dimensions/ID.hs | 6 +- Duckling/Dimensions/IS.hs | 4 +- Duckling/Dimensions/IT.hs | 16 ++--- Duckling/Dimensions/JA.hs | 10 +-- Duckling/Dimensions/KA.hs | 10 +-- Duckling/Dimensions/KM.hs | 14 ++-- Duckling/Dimensions/KN.hs | 4 +- Duckling/Dimensions/KO.hs | 18 ++--- Duckling/Dimensions/LO.hs | 4 +- Duckling/Dimensions/ML.hs | 6 +- Duckling/Dimensions/MN.hs | 16 ++--- Duckling/Dimensions/MY.hs | 4 +- Duckling/Dimensions/NB.hs | 10 +-- Duckling/Dimensions/NE.hs | 4 +- Duckling/Dimensions/NL.hs | 16 ++--- Duckling/Dimensions/PL.hs | 10 +-- Duckling/Dimensions/PT.hs | 18 ++--- Duckling/Dimensions/RO.hs | 18 ++--- Duckling/Dimensions/RU.hs | 14 ++-- Duckling/Dimensions/SK.hs | 4 +- Duckling/Dimensions/SV.hs | 12 ++-- Duckling/Dimensions/SW.hs | 4 +- Duckling/Dimensions/TA.hs | 6 +- Duckling/Dimensions/TH.hs | 4 +- Duckling/Dimensions/TR.hs | 14 ++-- Duckling/Dimensions/Types.hs | 33 +++++---- Duckling/Dimensions/UK.hs | 10 +-- Duckling/Dimensions/VI.hs | 10 +-- Duckling/Dimensions/ZH.hs | 16 ++--- Duckling/Ranking/Rank.hs | 4 +- Duckling/Rules.hs | 10 +-- Duckling/Rules/AF.hs | 40 +++++------ Duckling/Rules/AR.hs | 40 +++++------ Duckling/Rules/BG.hs | 40 +++++------ Duckling/Rules/BN.hs | 40 +++++------ Duckling/Rules/CS.hs | 40 +++++------ Duckling/Rules/Common.hs | 34 ++++----- Duckling/Rules/DA.hs | 40 +++++------ Duckling/Rules/DE.hs | 40 +++++------ Duckling/Rules/EL.hs | 40 +++++------ Duckling/Rules/EN.hs | 90 ++++++++++++------------ Duckling/Rules/ES.hs | 56 +++++++-------- Duckling/Rules/ET.hs | 40 +++++------ Duckling/Rules/FI.hs | 40 +++++------ Duckling/Rules/FR.hs | 40 +++++------ Duckling/Rules/GA.hs | 40 +++++------ Duckling/Rules/HE.hs | 40 +++++------ Duckling/Rules/HI.hs | 40 +++++------ Duckling/Rules/HR.hs | 40 +++++------ Duckling/Rules/HU.hs | 40 +++++------ Duckling/Rules/ID.hs | 40 +++++------ Duckling/Rules/IS.hs | 40 +++++------ Duckling/Rules/IT.hs | 40 +++++------ Duckling/Rules/JA.hs | 40 +++++------ Duckling/Rules/KA.hs | 40 +++++------ Duckling/Rules/KM.hs | 40 +++++------ Duckling/Rules/KN.hs | 40 +++++------ Duckling/Rules/KO.hs | 40 +++++------ Duckling/Rules/LO.hs | 40 +++++------ Duckling/Rules/ML.hs | 40 +++++------ Duckling/Rules/MN.hs | 40 +++++------ Duckling/Rules/MY.hs | 40 +++++------ Duckling/Rules/NB.hs | 40 +++++------ Duckling/Rules/NE.hs | 40 +++++------ Duckling/Rules/NL.hs | 44 ++++++------ Duckling/Rules/PL.hs | 40 +++++------ Duckling/Rules/PT.hs | 40 +++++------ Duckling/Rules/RO.hs | 40 +++++------ Duckling/Rules/RU.hs | 40 +++++------ Duckling/Rules/SK.hs | 40 +++++------ Duckling/Rules/SV.hs | 40 +++++------ Duckling/Rules/SW.hs | 40 +++++------ Duckling/Rules/TA.hs | 40 +++++------ Duckling/Rules/TH.hs | 40 +++++------ Duckling/Rules/TR.hs | 40 +++++------ Duckling/Rules/UK.hs | 40 +++++------ Duckling/Rules/VI.hs | 40 +++++------ Duckling/Rules/ZH.hs | 48 ++++++------- Duckling/Types.hs | 28 ++++++-- exe/CustomDimensionExample.hs | 5 +- exe/Duckling/Ranking/Generate.hs | 2 +- exe/DucklingExpensive.hs | 5 +- exe/DucklingRequestSample.hs | 17 +++-- exe/ExampleMain.hs | 8 +-- tests/Duckling/AmountOfMoney/AR/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/BG/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/EN/Tests.hs | 58 +++++++-------- tests/Duckling/AmountOfMoney/ES/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/FR/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/GA/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/HE/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/HR/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/ID/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/IT/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/KA/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/KO/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/MN/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/NB/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/NL/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/PT/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/RO/Tests.hs | 4 +- tests/Duckling/AmountOfMoney/RU/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/SV/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/VI/Tests.hs | 2 +- tests/Duckling/AmountOfMoney/ZH/Tests.hs | 2 +- tests/Duckling/Api/Tests.hs | 60 ++++++++-------- tests/Duckling/CreditCardNumber/Tests.hs | 4 +- tests/Duckling/Distance/BG/Tests.hs | 2 +- tests/Duckling/Distance/CS/Tests.hs | 2 +- tests/Duckling/Distance/DE/Tests.hs | 2 +- tests/Duckling/Distance/EN/Tests.hs | 2 +- tests/Duckling/Distance/ES/Tests.hs | 2 +- tests/Duckling/Distance/FR/Tests.hs | 2 +- tests/Duckling/Distance/GA/Tests.hs | 2 +- tests/Duckling/Distance/HR/Tests.hs | 2 +- tests/Duckling/Distance/IT/Tests.hs | 2 +- tests/Duckling/Distance/KM/Tests.hs | 2 +- tests/Duckling/Distance/KO/Tests.hs | 2 +- tests/Duckling/Distance/MN/Tests.hs | 2 +- tests/Duckling/Distance/NL/Tests.hs | 2 +- tests/Duckling/Distance/PT/Tests.hs | 2 +- tests/Duckling/Distance/RO/Tests.hs | 2 +- tests/Duckling/Distance/RU/Tests.hs | 2 +- tests/Duckling/Distance/SV/Tests.hs | 2 +- tests/Duckling/Distance/TR/Tests.hs | 2 +- tests/Duckling/Distance/ZH/Tests.hs | 4 +- tests/Duckling/Duration/AR/Tests.hs | 2 +- tests/Duckling/Duration/BG/Tests.hs | 2 +- tests/Duckling/Duration/EL/Tests.hs | 4 +- tests/Duckling/Duration/EN/Tests.hs | 4 +- tests/Duckling/Duration/ES/Tests.hs | 2 +- tests/Duckling/Duration/FR/Tests.hs | 4 +- tests/Duckling/Duration/GA/Tests.hs | 2 +- tests/Duckling/Duration/HI/Tests.hs | 2 +- tests/Duckling/Duration/HU/Tests.hs | 2 +- tests/Duckling/Duration/JA/Tests.hs | 2 +- tests/Duckling/Duration/KA/Tests.hs | 2 +- tests/Duckling/Duration/KO/Tests.hs | 2 +- tests/Duckling/Duration/MN/Tests.hs | 2 +- tests/Duckling/Duration/NB/Tests.hs | 2 +- tests/Duckling/Duration/NL/Tests.hs | 4 +- tests/Duckling/Duration/PL/Tests.hs | 2 +- tests/Duckling/Duration/PT/Tests.hs | 2 +- tests/Duckling/Duration/RO/Tests.hs | 2 +- tests/Duckling/Duration/RU/Tests.hs | 2 +- tests/Duckling/Duration/SV/Tests.hs | 2 +- tests/Duckling/Duration/TR/Tests.hs | 2 +- tests/Duckling/Duration/UK/Tests.hs | 4 +- tests/Duckling/Duration/ZH/Tests.hs | 2 +- tests/Duckling/Email/DE/Tests.hs | 4 +- tests/Duckling/Email/EN/Tests.hs | 4 +- tests/Duckling/Email/FR/Tests.hs | 2 +- tests/Duckling/Email/IS/Tests.hs | 2 +- tests/Duckling/Email/IT/Tests.hs | 2 +- tests/Duckling/Email/Tests.hs | 4 +- tests/Duckling/Numeral/AF/Tests.hs | 2 +- tests/Duckling/Numeral/AR/Tests.hs | 2 +- tests/Duckling/Numeral/BG/Tests.hs | 2 +- tests/Duckling/Numeral/BN/Tests.hs | 2 +- tests/Duckling/Numeral/CS/Tests.hs | 2 +- tests/Duckling/Numeral/DA/Tests.hs | 2 +- tests/Duckling/Numeral/DE/Tests.hs | 2 +- tests/Duckling/Numeral/EL/Tests.hs | 2 +- tests/Duckling/Numeral/EN/Tests.hs | 8 +-- tests/Duckling/Numeral/ES/Tests.hs | 16 ++--- tests/Duckling/Numeral/ET/Tests.hs | 2 +- tests/Duckling/Numeral/FI/Tests.hs | 2 +- tests/Duckling/Numeral/FR/Tests.hs | 2 +- tests/Duckling/Numeral/GA/Tests.hs | 2 +- tests/Duckling/Numeral/HE/Tests.hs | 2 +- tests/Duckling/Numeral/HI/Tests.hs | 2 +- tests/Duckling/Numeral/HR/Tests.hs | 2 +- tests/Duckling/Numeral/HU/Tests.hs | 2 +- tests/Duckling/Numeral/ID/Tests.hs | 2 +- tests/Duckling/Numeral/IS/Tests.hs | 2 +- tests/Duckling/Numeral/IT/Tests.hs | 2 +- tests/Duckling/Numeral/JA/Tests.hs | 2 +- tests/Duckling/Numeral/KA/Tests.hs | 2 +- tests/Duckling/Numeral/KM/Tests.hs | 2 +- tests/Duckling/Numeral/KN/Tests.hs | 2 +- tests/Duckling/Numeral/KO/Tests.hs | 2 +- tests/Duckling/Numeral/LO/Tests.hs | 2 +- tests/Duckling/Numeral/ML/Tests.hs | 2 +- tests/Duckling/Numeral/MN/Tests.hs | 2 +- tests/Duckling/Numeral/MY/Tests.hs | 2 +- tests/Duckling/Numeral/NB/Tests.hs | 2 +- tests/Duckling/Numeral/NE/Tests.hs | 2 +- tests/Duckling/Numeral/NL/Tests.hs | 2 +- tests/Duckling/Numeral/PL/Tests.hs | 2 +- tests/Duckling/Numeral/PT/Tests.hs | 2 +- tests/Duckling/Numeral/RO/Tests.hs | 4 +- tests/Duckling/Numeral/RU/Tests.hs | 2 +- tests/Duckling/Numeral/SK/Tests.hs | 2 +- tests/Duckling/Numeral/SV/Tests.hs | 2 +- tests/Duckling/Numeral/SW/Tests.hs | 2 +- tests/Duckling/Numeral/TA/Tests.hs | 2 +- tests/Duckling/Numeral/TH/Tests.hs | 2 +- tests/Duckling/Numeral/TR/Tests.hs | 2 +- tests/Duckling/Numeral/UK/Tests.hs | 2 +- tests/Duckling/Numeral/VI/Tests.hs | 2 +- tests/Duckling/Numeral/ZH/Tests.hs | 2 +- tests/Duckling/Ordinal/AR/Tests.hs | 2 +- tests/Duckling/Ordinal/BG/Tests.hs | 2 +- tests/Duckling/Ordinal/DA/Tests.hs | 2 +- tests/Duckling/Ordinal/DE/Tests.hs | 4 +- tests/Duckling/Ordinal/EL/Tests.hs | 2 +- tests/Duckling/Ordinal/EN/Tests.hs | 2 +- tests/Duckling/Ordinal/ES/Tests.hs | 2 +- tests/Duckling/Ordinal/ET/Tests.hs | 2 +- tests/Duckling/Ordinal/FR/Tests.hs | 2 +- tests/Duckling/Ordinal/GA/Tests.hs | 2 +- tests/Duckling/Ordinal/HE/Tests.hs | 2 +- tests/Duckling/Ordinal/HI/Tests.hs | 2 +- tests/Duckling/Ordinal/HR/Tests.hs | 2 +- tests/Duckling/Ordinal/HU/Tests.hs | 2 +- tests/Duckling/Ordinal/ID/Tests.hs | 2 +- tests/Duckling/Ordinal/IT/Tests.hs | 2 +- tests/Duckling/Ordinal/JA/Tests.hs | 2 +- tests/Duckling/Ordinal/KA/Tests.hs | 2 +- tests/Duckling/Ordinal/KM/Tests.hs | 2 +- tests/Duckling/Ordinal/KO/Tests.hs | 2 +- tests/Duckling/Ordinal/ML/Tests.hs | 2 +- tests/Duckling/Ordinal/MN/Tests.hs | 2 +- tests/Duckling/Ordinal/NB/Tests.hs | 2 +- tests/Duckling/Ordinal/NL/Tests.hs | 2 +- tests/Duckling/Ordinal/PL/Tests.hs | 2 +- tests/Duckling/Ordinal/PT/Tests.hs | 2 +- tests/Duckling/Ordinal/RO/Tests.hs | 2 +- tests/Duckling/Ordinal/RU/Tests.hs | 2 +- tests/Duckling/Ordinal/SV/Tests.hs | 2 +- tests/Duckling/Ordinal/TA/Tests.hs | 2 +- tests/Duckling/Ordinal/TR/Tests.hs | 2 +- tests/Duckling/Ordinal/UK/Tests.hs | 2 +- tests/Duckling/Ordinal/VI/Tests.hs | 2 +- tests/Duckling/Ordinal/ZH/Tests.hs | 2 +- tests/Duckling/PhoneNumber/AR/Tests.hs | 4 +- tests/Duckling/PhoneNumber/PT/Tests.hs | 2 +- tests/Duckling/PhoneNumber/Tests.hs | 6 +- tests/Duckling/Quantity/AR/Tests.hs | 2 +- tests/Duckling/Quantity/EN/Tests.hs | 4 +- tests/Duckling/Quantity/FR/Tests.hs | 2 +- tests/Duckling/Quantity/HR/Tests.hs | 2 +- tests/Duckling/Quantity/KM/Tests.hs | 2 +- tests/Duckling/Quantity/KO/Tests.hs | 2 +- tests/Duckling/Quantity/MN/Tests.hs | 2 +- tests/Duckling/Quantity/NL/Tests.hs | 2 +- tests/Duckling/Quantity/PT/Tests.hs | 2 +- tests/Duckling/Quantity/RO/Tests.hs | 2 +- tests/Duckling/Quantity/RU/Tests.hs | 2 +- tests/Duckling/Quantity/ZH/Tests.hs | 2 +- tests/Duckling/Temperature/AR/Tests.hs | 2 +- tests/Duckling/Temperature/EN/Tests.hs | 4 +- tests/Duckling/Temperature/ES/Tests.hs | 2 +- tests/Duckling/Temperature/FR/Tests.hs | 2 +- tests/Duckling/Temperature/GA/Tests.hs | 2 +- tests/Duckling/Temperature/HI/Tests.hs | 2 +- tests/Duckling/Temperature/HR/Tests.hs | 2 +- tests/Duckling/Temperature/IT/Tests.hs | 2 +- tests/Duckling/Temperature/JA/Tests.hs | 2 +- tests/Duckling/Temperature/KM/Tests.hs | 2 +- tests/Duckling/Temperature/KO/Tests.hs | 2 +- tests/Duckling/Temperature/MN/Tests.hs | 2 +- tests/Duckling/Temperature/PT/Tests.hs | 2 +- tests/Duckling/Temperature/RO/Tests.hs | 2 +- tests/Duckling/Temperature/TR/Tests.hs | 2 +- tests/Duckling/Temperature/ZH/Tests.hs | 2 +- tests/Duckling/Testing/Asserts.hs | 20 +++--- tests/Duckling/Time/AR/Tests.hs | 4 +- tests/Duckling/Time/BG/Tests.hs | 4 +- tests/Duckling/Time/DA/Tests.hs | 2 +- tests/Duckling/Time/DE/Tests.hs | 6 +- tests/Duckling/Time/EL/Tests.hs | 2 +- tests/Duckling/Time/EN/Tests.hs | 64 ++++++++--------- tests/Duckling/Time/ES/Tests.hs | 4 +- tests/Duckling/Time/FR/Tests.hs | 4 +- tests/Duckling/Time/GA/Tests.hs | 2 +- tests/Duckling/Time/HE/Tests.hs | 2 +- tests/Duckling/Time/HR/Tests.hs | 2 +- tests/Duckling/Time/HU/Tests.hs | 2 +- tests/Duckling/Time/IT/Tests.hs | 4 +- tests/Duckling/Time/KA/Tests.hs | 4 +- tests/Duckling/Time/KO/Tests.hs | 2 +- tests/Duckling/Time/NB/Tests.hs | 2 +- tests/Duckling/Time/NL/Tests.hs | 10 +-- tests/Duckling/Time/PL/Tests.hs | 4 +- tests/Duckling/Time/PT/Tests.hs | 4 +- tests/Duckling/Time/RO/Tests.hs | 4 +- tests/Duckling/Time/SV/Tests.hs | 4 +- tests/Duckling/Time/Tests.hs | 2 +- tests/Duckling/Time/UK/Tests.hs | 4 +- tests/Duckling/Time/VI/Tests.hs | 4 +- tests/Duckling/Time/ZH/Tests.hs | 10 +-- tests/Duckling/Url/Tests.hs | 6 +- tests/Duckling/Volume/AR/Tests.hs | 2 +- tests/Duckling/Volume/DE/Tests.hs | 2 +- tests/Duckling/Volume/EN/Tests.hs | 2 +- tests/Duckling/Volume/ES/Tests.hs | 2 +- tests/Duckling/Volume/FR/Tests.hs | 2 +- tests/Duckling/Volume/GA/Tests.hs | 2 +- tests/Duckling/Volume/HR/Tests.hs | 2 +- tests/Duckling/Volume/IT/Tests.hs | 2 +- tests/Duckling/Volume/KM/Tests.hs | 2 +- tests/Duckling/Volume/KO/Tests.hs | 2 +- tests/Duckling/Volume/MN/Tests.hs | 2 +- tests/Duckling/Volume/NL/Tests.hs | 2 +- tests/Duckling/Volume/PT/Tests.hs | 2 +- tests/Duckling/Volume/RO/Tests.hs | 2 +- tests/Duckling/Volume/RU/Tests.hs | 2 +- tests/Duckling/Volume/TR/Tests.hs | 2 +- 332 files changed, 1693 insertions(+), 1680 deletions(-) diff --git a/Duckling/Api.hs b/Duckling/Api.hs index 1ae7c486..a48e905a 100644 --- a/Duckling/Api.hs +++ b/Duckling/Api.hs @@ -35,22 +35,22 @@ import Duckling.Rules import Duckling.Types -- | Parses `input` and returns a curated list of entities found. -parse :: Text -> Context -> Options -> [Some Dimension] -> [Entity] +parse :: Text -> Context -> Options -> [Seal Dimension] -> [Entity] parse input ctx options = map (formatToken input) . analyze input ctx options . HashSet.fromList -supportedDimensions :: HashMap Lang [Some Dimension] +supportedDimensions :: HashMap Lang [Seal Dimension] supportedDimensions = HashMap.fromList [ (l, allDimensions l) | l <- [minBound..maxBound] ] -- | Returns a curated list of resolved tokens found -- When `targets` is non-empty, returns only tokens of such dimensions. -analyze :: Text -> Context -> Options -> HashSet (Some Dimension) +analyze :: Text -> Context -> Options -> HashSet (Seal Dimension) -> [ResolvedToken] analyze input context@Context{..} options targets = rank (classifiers locale) targets . filter (\Resolved{node = Node{token = (Token d _)}} -> - HashSet.null targets || HashSet.member (This d) targets + HashSet.null targets || HashSet.member (Seal d) targets ) $ parseAndResolve (rulesFor locale targets) input context options diff --git a/Duckling/Core.hs b/Duckling/Core.hs index 6af7c45c..b1440776 100644 --- a/Duckling/Core.hs +++ b/Duckling/Core.hs @@ -20,7 +20,8 @@ module Duckling.Core , Range(..) , Region(..) , ResolvedVal(..) - , Some(..) + , Seal(..) + , withSeal , fromName , makeLocale , toJText diff --git a/Duckling/Debug.hs b/Duckling/Debug.hs index 13281fc2..3f27ccf0 100644 --- a/Duckling/Debug.hs +++ b/Duckling/Debug.hs @@ -36,20 +36,20 @@ import Duckling.Types -- ----------------------------------------------------------------- -- API -debug :: Locale -> Text -> [Some Dimension] -> IO [Entity] +debug :: Locale -> Text -> [Seal Dimension] -> IO [Entity] debug locale = debugCustom testContext {locale = locale} testOptions -allParses :: Locale -> Text -> [Some Dimension] -> IO [Entity] +allParses :: Locale -> Text -> [Seal Dimension] -> IO [Entity] allParses l sentence targets = debugTokens sentence $ parses l sentence targets -fullParses :: Locale -> Text -> [Some Dimension] -> IO [Entity] +fullParses :: Locale -> Text -> [Seal Dimension] -> IO [Entity] fullParses l sentence targets = debugTokens sentence . filter (\Resolved{range = Range start end} -> start == 0 && end == n) $ parses l sentence targets where n = Text.length sentence -debugCustom :: Context -> Options -> Text -> [Some Dimension] -> IO [Entity] +debugCustom :: Context -> Options -> Text -> [Seal Dimension] -> IO [Entity] debugCustom context options sentence targets = debugTokens sentence . analyze sentence context options $ HashSet.fromList targets @@ -59,12 +59,12 @@ ptree sentence Entity {enode} = pnode sentence 0 enode -- ----------------------------------------------------------------- -- Internals -parses :: Locale -> Text -> [Some Dimension] -> [ResolvedToken] +parses :: Locale -> Text -> [Seal Dimension] -> [ResolvedToken] parses l sentence targets = flip filter tokens $ \Resolved{node = Node{token = (Token d _)}} -> case targets of [] -> True - _ -> elem (This d) targets + _ -> elem (Seal d) targets where tokens = parseAndResolve rules sentence testContext {locale = l} testOptions rules = rulesFor l $ HashSet.fromList targets diff --git a/Duckling/Dimensions.hs b/Duckling/Dimensions.hs index e7e0db00..e8d4d218 100644 --- a/Duckling/Dimensions.hs +++ b/Duckling/Dimensions.hs @@ -69,36 +69,36 @@ import qualified Duckling.Dimensions.VI as VIDimensions import qualified Duckling.Dimensions.ZH as ZHDimensions -allDimensions :: Lang -> [Some Dimension] +allDimensions :: Lang -> [Seal Dimension] allDimensions lang = CommonDimensions.allDimensions ++ langDimensions lang -- | Augments `targets` with all dependent dimensions. -explicitDimensions :: HashSet (Some Dimension) -> HashSet (Some Dimension) +explicitDimensions :: HashSet (Seal Dimension) -> HashSet (Seal Dimension) explicitDimensions targets = HashSet.union targets deps where deps = HashSet.unions . map dependents $ HashSet.toList targets -- | Ordinal depends on Numeral for JA, KO, and ZH. -dependents :: Some Dimension -> HashSet (Some Dimension) -dependents (This CreditCardNumber) = HashSet.empty -dependents (This Distance) = HashSet.singleton (This Numeral) -dependents (This Duration) = HashSet.fromList [This Numeral, This TimeGrain] -dependents (This Numeral) = HashSet.empty -dependents (This Email) = HashSet.empty -dependents (This AmountOfMoney) = HashSet.singleton (This Numeral) -dependents (This Ordinal) = HashSet.singleton (This Numeral) -dependents (This PhoneNumber) = HashSet.empty -dependents (This Quantity) = HashSet.singleton (This Numeral) -dependents (This RegexMatch) = HashSet.empty -dependents (This Temperature) = HashSet.singleton (This Numeral) -dependents (This Time) = - HashSet.fromList [This Numeral, This Duration, This Ordinal, This TimeGrain] -dependents (This TimeGrain) = HashSet.empty -dependents (This Url) = HashSet.empty -dependents (This Volume) = HashSet.singleton (This Numeral) -dependents (This (CustomDimension dim)) = dimDependents dim +dependents :: Seal Dimension -> HashSet (Seal Dimension) +dependents (Seal CreditCardNumber) = HashSet.empty +dependents (Seal Distance) = HashSet.singleton (Seal Numeral) +dependents (Seal Duration) = HashSet.fromList [Seal Numeral, Seal TimeGrain] +dependents (Seal Numeral) = HashSet.empty +dependents (Seal Email) = HashSet.empty +dependents (Seal AmountOfMoney) = HashSet.singleton (Seal Numeral) +dependents (Seal Ordinal) = HashSet.singleton (Seal Numeral) +dependents (Seal PhoneNumber) = HashSet.empty +dependents (Seal Quantity) = HashSet.singleton (Seal Numeral) +dependents (Seal RegexMatch) = HashSet.empty +dependents (Seal Temperature) = HashSet.singleton (Seal Numeral) +dependents (Seal Time) = + HashSet.fromList [Seal Numeral, Seal Duration, Seal Ordinal, Seal TimeGrain] +dependents (Seal TimeGrain) = HashSet.empty +dependents (Seal Url) = HashSet.empty +dependents (Seal Volume) = HashSet.singleton (Seal Numeral) +dependents (Seal (CustomDimension dim)) = dimDependents dim -langDimensions :: Lang -> [Some Dimension] +langDimensions :: Lang -> [Seal Dimension] langDimensions AF = AFDimensions.allDimensions langDimensions AR = ARDimensions.allDimensions langDimensions BG = BGDimensions.allDimensions diff --git a/Duckling/Dimensions/AF.hs b/Duckling/Dimensions/AF.hs index 0045ffcb..8abae019 100644 --- a/Duckling/Dimensions/AF.hs +++ b/Duckling/Dimensions/AF.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.AF import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/AR.hs b/Duckling/Dimensions/AR.hs index c4df763e..3ed07259 100644 --- a/Duckling/Dimensions/AR.hs +++ b/Duckling/Dimensions/AR.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.AR import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/BG.hs b/Duckling/Dimensions/BG.hs index 4652799d..bb7f375b 100644 --- a/Duckling/Dimensions/BG.hs +++ b/Duckling/Dimensions/BG.hs @@ -11,11 +11,11 @@ module Duckling.Dimensions.BG import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/BN.hs b/Duckling/Dimensions/BN.hs index 99e8b70b..2577863e 100644 --- a/Duckling/Dimensions/BN.hs +++ b/Duckling/Dimensions/BN.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.BN import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/CS.hs b/Duckling/Dimensions/CS.hs index 6a5222f0..ac306e5e 100644 --- a/Duckling/Dimensions/CS.hs +++ b/Duckling/Dimensions/CS.hs @@ -11,8 +11,8 @@ module Duckling.Dimensions.CS import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Numeral + [ Seal Distance + , Seal Numeral ] diff --git a/Duckling/Dimensions/Common.hs b/Duckling/Dimensions/Common.hs index 184514da..56548836 100644 --- a/Duckling/Dimensions/Common.hs +++ b/Duckling/Dimensions/Common.hs @@ -11,11 +11,11 @@ module Duckling.Dimensions.Common import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This AmountOfMoney - , This Email - , This Numeral - , This PhoneNumber - , This Url + [ Seal AmountOfMoney + , Seal Email + , Seal Numeral + , Seal PhoneNumber + , Seal Url ] diff --git a/Duckling/Dimensions/DA.hs b/Duckling/Dimensions/DA.hs index 0eca29be..d29d75c5 100644 --- a/Duckling/Dimensions/DA.hs +++ b/Duckling/Dimensions/DA.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.DA import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/DE.hs b/Duckling/Dimensions/DE.hs index 9e24fdd8..83a7d88c 100644 --- a/Duckling/Dimensions/DE.hs +++ b/Duckling/Dimensions/DE.hs @@ -11,12 +11,12 @@ module Duckling.Dimensions.DE import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/EL.hs b/Duckling/Dimensions/EL.hs index 06ecf2f3..39bfb00e 100644 --- a/Duckling/Dimensions/EL.hs +++ b/Duckling/Dimensions/EL.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.EL import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/EN.hs b/Duckling/Dimensions/EN.hs index 8a4908b4..edc7ba44 100644 --- a/Duckling/Dimensions/EN.hs +++ b/Duckling/Dimensions/EN.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.EN import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/ES.hs b/Duckling/Dimensions/ES.hs index 40a481c2..7f6a639b 100644 --- a/Duckling/Dimensions/ES.hs +++ b/Duckling/Dimensions/ES.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.ES import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/ET.hs b/Duckling/Dimensions/ET.hs index 0535e698..f143e613 100644 --- a/Duckling/Dimensions/ET.hs +++ b/Duckling/Dimensions/ET.hs @@ -11,8 +11,8 @@ module Duckling.Dimensions.ET import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral - , This Ordinal + [ Seal Numeral + , Seal Ordinal ] diff --git a/Duckling/Dimensions/FI.hs b/Duckling/Dimensions/FI.hs index f9063524..52347269 100644 --- a/Duckling/Dimensions/FI.hs +++ b/Duckling/Dimensions/FI.hs @@ -10,7 +10,7 @@ module Duckling.Dimensions.FI import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/FR.hs b/Duckling/Dimensions/FR.hs index 67d73906..1ac7799c 100644 --- a/Duckling/Dimensions/FR.hs +++ b/Duckling/Dimensions/FR.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.FR import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/GA.hs b/Duckling/Dimensions/GA.hs index 72272879..e6915fb9 100644 --- a/Duckling/Dimensions/GA.hs +++ b/Duckling/Dimensions/GA.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.GA import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/HE.hs b/Duckling/Dimensions/HE.hs index f837ae4c..9666b509 100644 --- a/Duckling/Dimensions/HE.hs +++ b/Duckling/Dimensions/HE.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.HE import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/HI.hs b/Duckling/Dimensions/HI.hs index bcbce80a..1d9cc12b 100644 --- a/Duckling/Dimensions/HI.hs +++ b/Duckling/Dimensions/HI.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.HI import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Temperature + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature ] diff --git a/Duckling/Dimensions/HR.hs b/Duckling/Dimensions/HR.hs index 07bec725..ec9cde7c 100644 --- a/Duckling/Dimensions/HR.hs +++ b/Duckling/Dimensions/HR.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.HR import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/HU.hs b/Duckling/Dimensions/HU.hs index 7f2a4244..500240e5 100644 --- a/Duckling/Dimensions/HU.hs +++ b/Duckling/Dimensions/HU.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.HU import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/ID.hs b/Duckling/Dimensions/ID.hs index 7375ef37..e1672ea8 100644 --- a/Duckling/Dimensions/ID.hs +++ b/Duckling/Dimensions/ID.hs @@ -11,8 +11,8 @@ module Duckling.Dimensions.ID import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral - , This Ordinal + [ Seal Numeral + , Seal Ordinal ] diff --git a/Duckling/Dimensions/IS.hs b/Duckling/Dimensions/IS.hs index ca7a1da5..431d9c80 100644 --- a/Duckling/Dimensions/IS.hs +++ b/Duckling/Dimensions/IS.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.IS import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/IT.hs b/Duckling/Dimensions/IT.hs index 3d151e8f..dc5b338f 100644 --- a/Duckling/Dimensions/IT.hs +++ b/Duckling/Dimensions/IT.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.IT import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/JA.hs b/Duckling/Dimensions/JA.hs index 3c6e6616..e9e03885 100644 --- a/Duckling/Dimensions/JA.hs +++ b/Duckling/Dimensions/JA.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.JA import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Temperature + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature ] diff --git a/Duckling/Dimensions/KA.hs b/Duckling/Dimensions/KA.hs index 6b06c944..953a8278 100644 --- a/Duckling/Dimensions/KA.hs +++ b/Duckling/Dimensions/KA.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.KA import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral - , This Ordinal - , This Duration - , This Time + [ Seal Numeral + , Seal Ordinal + , Seal Duration + , Seal Time ] diff --git a/Duckling/Dimensions/KM.hs b/Duckling/Dimensions/KM.hs index a46235c9..a734f476 100644 --- a/Duckling/Dimensions/KM.hs +++ b/Duckling/Dimensions/KM.hs @@ -11,12 +11,12 @@ module Duckling.Dimensions.KM import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Volume + [ Seal Distance + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Volume ] diff --git a/Duckling/Dimensions/KN.hs b/Duckling/Dimensions/KN.hs index ae190432..dcb39c36 100644 --- a/Duckling/Dimensions/KN.hs +++ b/Duckling/Dimensions/KN.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.KN import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/KO.hs b/Duckling/Dimensions/KO.hs index 3c3d74e3..4aa8f44c 100644 --- a/Duckling/Dimensions/KO.hs +++ b/Duckling/Dimensions/KO.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.KO import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/LO.hs b/Duckling/Dimensions/LO.hs index a6e6be06..8f6c67cf 100644 --- a/Duckling/Dimensions/LO.hs +++ b/Duckling/Dimensions/LO.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.LO import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/ML.hs b/Duckling/Dimensions/ML.hs index a08a21dd..efb5565e 100644 --- a/Duckling/Dimensions/ML.hs +++ b/Duckling/Dimensions/ML.hs @@ -11,8 +11,8 @@ module Duckling.Dimensions.ML import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral, - This Ordinal + [ Seal Numeral, + Seal Ordinal ] diff --git a/Duckling/Dimensions/MN.hs b/Duckling/Dimensions/MN.hs index 0af72624..468cd2c1 100644 --- a/Duckling/Dimensions/MN.hs +++ b/Duckling/Dimensions/MN.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.MN import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Volume ] diff --git a/Duckling/Dimensions/MY.hs b/Duckling/Dimensions/MY.hs index 0ed0280c..6e850862 100644 --- a/Duckling/Dimensions/MY.hs +++ b/Duckling/Dimensions/MY.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.MY import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/NB.hs b/Duckling/Dimensions/NB.hs index e0c7d938..a1402cd9 100644 --- a/Duckling/Dimensions/NB.hs +++ b/Duckling/Dimensions/NB.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.NB import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/NE.hs b/Duckling/Dimensions/NE.hs index 8aa16084..00e6f650 100644 --- a/Duckling/Dimensions/NE.hs +++ b/Duckling/Dimensions/NE.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.NE import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/NL.hs b/Duckling/Dimensions/NL.hs index 7c20c7db..a23cb31e 100644 --- a/Duckling/Dimensions/NL.hs +++ b/Duckling/Dimensions/NL.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.NL import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/PL.hs b/Duckling/Dimensions/PL.hs index 9e8686d7..ab5ccfdb 100644 --- a/Duckling/Dimensions/PL.hs +++ b/Duckling/Dimensions/PL.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.PL import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/PT.hs b/Duckling/Dimensions/PT.hs index fd205abd..e3590b59 100644 --- a/Duckling/Dimensions/PT.hs +++ b/Duckling/Dimensions/PT.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.PT import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/RO.hs b/Duckling/Dimensions/RO.hs index 7025b944..8d9678de 100644 --- a/Duckling/Dimensions/RO.hs +++ b/Duckling/Dimensions/RO.hs @@ -11,14 +11,14 @@ module Duckling.Dimensions.RO import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time + , Seal Volume ] diff --git a/Duckling/Dimensions/RU.hs b/Duckling/Dimensions/RU.hs index ebdfad8e..3e6893f6 100644 --- a/Duckling/Dimensions/RU.hs +++ b/Duckling/Dimensions/RU.hs @@ -11,12 +11,12 @@ module Duckling.Dimensions.RU import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Volume ] diff --git a/Duckling/Dimensions/SK.hs b/Duckling/Dimensions/SK.hs index 9d714563..ed4bb282 100644 --- a/Duckling/Dimensions/SK.hs +++ b/Duckling/Dimensions/SK.hs @@ -12,7 +12,7 @@ module Duckling.Dimensions.SK import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/SV.hs b/Duckling/Dimensions/SV.hs index a69d6d9f..d17a30de 100644 --- a/Duckling/Dimensions/SV.hs +++ b/Duckling/Dimensions/SV.hs @@ -11,11 +11,11 @@ module Duckling.Dimensions.SV import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/SW.hs b/Duckling/Dimensions/SW.hs index 4729add0..11665a6f 100644 --- a/Duckling/Dimensions/SW.hs +++ b/Duckling/Dimensions/SW.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.SW import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/TA.hs b/Duckling/Dimensions/TA.hs index 909d74b1..5d34744b 100644 --- a/Duckling/Dimensions/TA.hs +++ b/Duckling/Dimensions/TA.hs @@ -11,8 +11,8 @@ module Duckling.Dimensions.TA import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral - , This Ordinal + [ Seal Numeral + , Seal Ordinal ] diff --git a/Duckling/Dimensions/TH.hs b/Duckling/Dimensions/TH.hs index f8390c95..1b95cf23 100644 --- a/Duckling/Dimensions/TH.hs +++ b/Duckling/Dimensions/TH.hs @@ -11,7 +11,7 @@ module Duckling.Dimensions.TH import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Numeral + [ Seal Numeral ] diff --git a/Duckling/Dimensions/TR.hs b/Duckling/Dimensions/TR.hs index 159b176a..74e52723 100644 --- a/Duckling/Dimensions/TR.hs +++ b/Duckling/Dimensions/TR.hs @@ -11,12 +11,12 @@ module Duckling.Dimensions.TR import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Temperature - , This Volume + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Temperature + , Seal Volume ] diff --git a/Duckling/Dimensions/Types.hs b/Duckling/Dimensions/Types.hs index 7e9e38fb..7bce6162 100644 --- a/Duckling/Dimensions/Types.hs +++ b/Duckling/Dimensions/Types.hs @@ -10,7 +10,7 @@ module Duckling.Dimensions.Types - ( Some(..) + ( Seal(..) , Dimension(..) , fromName @@ -18,7 +18,6 @@ module Duckling.Dimensions.Types ) where import Data.Maybe -import Data.Some import Data.Text (Text) import Prelude import qualified Data.HashMap.Strict as HashMap @@ -44,22 +43,22 @@ toName Url = "url" toName Volume = "volume" toName (CustomDimension dim) = Text.pack (show dim) -fromName :: Text -> Maybe (Some Dimension) +fromName :: Text -> Maybe (Seal Dimension) fromName name = HashMap.lookup name m where m = HashMap.fromList - [ ("amount-of-money", This AmountOfMoney) - , ("credit-card-number", This CreditCardNumber) - , ("distance", This Distance) - , ("duration", This Duration) - , ("email", This Email) - , ("number", This Numeral) - , ("ordinal", This Ordinal) - , ("phone-number", This PhoneNumber) - , ("quantity", This Quantity) - , ("temperature", This Temperature) - , ("time", This Time) - , ("time-grain", This TimeGrain) - , ("url", This Url) - , ("volume", This Volume) + [ ("amount-of-money", Seal AmountOfMoney) + , ("credit-card-number", Seal CreditCardNumber) + , ("distance", Seal Distance) + , ("duration", Seal Duration) + , ("email", Seal Email) + , ("number", Seal Numeral) + , ("ordinal", Seal Ordinal) + , ("phone-number", Seal PhoneNumber) + , ("quantity", Seal Quantity) + , ("temperature", Seal Temperature) + , ("time", Seal Time) + , ("time-grain", Seal TimeGrain) + , ("url", Seal Url) + , ("volume", Seal Volume) ] diff --git a/Duckling/Dimensions/UK.hs b/Duckling/Dimensions/UK.hs index 0bf9cc92..b435653e 100644 --- a/Duckling/Dimensions/UK.hs +++ b/Duckling/Dimensions/UK.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.UK import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/VI.hs b/Duckling/Dimensions/VI.hs index 2d08086a..212542a6 100644 --- a/Duckling/Dimensions/VI.hs +++ b/Duckling/Dimensions/VI.hs @@ -11,10 +11,10 @@ module Duckling.Dimensions.VI import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Duration - , This Numeral - , This Ordinal - , This Time + [ Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Time ] diff --git a/Duckling/Dimensions/ZH.hs b/Duckling/Dimensions/ZH.hs index 7c4333c0..322c0fd1 100644 --- a/Duckling/Dimensions/ZH.hs +++ b/Duckling/Dimensions/ZH.hs @@ -11,13 +11,13 @@ module Duckling.Dimensions.ZH import Duckling.Dimensions.Types -allDimensions :: [Some Dimension] +allDimensions :: [Seal Dimension] allDimensions = - [ This Distance - , This Duration - , This Numeral - , This Ordinal - , This Quantity - , This Temperature - , This Time + [ Seal Distance + , Seal Duration + , Seal Numeral + , Seal Ordinal + , Seal Quantity + , Seal Temperature + , Seal Time ] diff --git a/Duckling/Ranking/Rank.hs b/Duckling/Ranking/Rank.hs index a95b8d8e..add27b8b 100644 --- a/Duckling/Ranking/Rank.hs +++ b/Duckling/Ranking/Rank.hs @@ -53,7 +53,7 @@ winners xs = filter (\x -> all ((/=) LT . compare x) xs) xs -- | Return a curated list of tokens rank :: Classifiers - -> HashSet (Some Dimension) + -> HashSet (Seal Dimension) -> [ResolvedToken] -> [ResolvedToken] rank classifiers targets tokens = @@ -64,4 +64,4 @@ rank classifiers targets tokens = where makeCandidate :: ResolvedToken -> Candidate makeCandidate token@Resolved {node = n@Node {token = Token d _}} = - Candidate token (score classifiers n) $ HashSet.member (This d) targets + Candidate token (score classifiers n) $ HashSet.member (Seal d) targets diff --git a/Duckling/Rules.hs b/Duckling/Rules.hs index f964a7d5..5a55a845 100644 --- a/Duckling/Rules.hs +++ b/Duckling/Rules.hs @@ -70,7 +70,7 @@ import qualified Duckling.Rules.VI as VIRules import qualified Duckling.Rules.ZH as ZHRules -- | Returns the minimal set of rules required for `targets`. -rulesFor :: Locale -> HashSet (Some Dimension) -> [Rule] +rulesFor :: Locale -> HashSet (Seal Dimension) -> [Rule] rulesFor locale targets | HashSet.null targets = allRules locale | otherwise = [ rules | dims <- HashSet.toList $ explicitDimensions targets @@ -82,14 +82,14 @@ allRules :: Locale -> [Rule] allRules locale@(Locale lang _) = concatMap (rulesFor' locale) . HashSet.toList . explicitDimensions . HashSet.fromList $ allDimensions lang -rulesFor' :: Locale -> Some Dimension -> [Rule] +rulesFor' :: Locale -> Seal Dimension -> [Rule] rulesFor' (Locale lang (Just region)) dim = CommonRules.rules dim ++ langRules lang dim ++ localeRules lang region dim rulesFor' (Locale lang Nothing) dim = CommonRules.rules dim ++ defaultRules lang dim -- | Default rules when no locale, for backward compatibility. -defaultRules :: Lang -> Some Dimension -> [Rule] +defaultRules :: Lang -> Seal Dimension -> [Rule] defaultRules AF = AFRules.defaultRules defaultRules AR = ARRules.defaultRules defaultRules BG = BGRules.defaultRules @@ -137,7 +137,7 @@ defaultRules UK = UKRules.defaultRules defaultRules VI = VIRules.defaultRules defaultRules ZH = ZHRules.defaultRules -localeRules :: Lang -> Region -> Some Dimension -> [Rule] +localeRules :: Lang -> Region -> Seal Dimension -> [Rule] localeRules AF = AFRules.localeRules localeRules AR = ARRules.localeRules localeRules BG = BGRules.localeRules @@ -185,7 +185,7 @@ localeRules UK = UKRules.localeRules localeRules VI = VIRules.localeRules localeRules ZH = ZHRules.localeRules -langRules :: Lang -> Some Dimension -> [Rule] +langRules :: Lang -> Seal Dimension -> [Rule] langRules AF = AFRules.langRules langRules AR = ARRules.langRules langRules BG = BGRules.langRules diff --git a/Duckling/Rules/AF.hs b/Duckling/Rules/AF.hs index 7246e3a1..fd570ace 100644 --- a/Duckling/Rules/AF.hs +++ b/Duckling/Rules/AF.hs @@ -19,27 +19,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.AF.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules AF dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules AF dim diff --git a/Duckling/Rules/AR.hs b/Duckling/Rules/AR.hs index 35bfc5f7..f11d4c63 100644 --- a/Duckling/Rules/AR.hs +++ b/Duckling/Rules/AR.hs @@ -28,27 +28,27 @@ import qualified Duckling.Time.AR.Rules as Time import qualified Duckling.TimeGrain.AR.Rules as TimeGrain import qualified Duckling.Volume.AR.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = PhoneNumber.rules -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules AR dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = PhoneNumber.rules +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules AR dim diff --git a/Duckling/Rules/BG.hs b/Duckling/Rules/BG.hs index 40f92041..d5dbe560 100644 --- a/Duckling/Rules/BG.hs +++ b/Duckling/Rules/BG.hs @@ -25,27 +25,27 @@ import qualified Duckling.Time.BG.Rules as Time import qualified Duckling.TimeGrain.BG.Rules as TimeGrain import qualified Duckling.Ordinal.BG.Rules as Ordinal -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules BG dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules BG dim diff --git a/Duckling/Rules/BN.hs b/Duckling/Rules/BN.hs index badf8580..370d51b3 100644 --- a/Duckling/Rules/BN.hs +++ b/Duckling/Rules/BN.hs @@ -18,27 +18,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.BN.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Email) = [] -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules BN dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = [] +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules BN dim diff --git a/Duckling/Rules/CS.hs b/Duckling/Rules/CS.hs index fad712c4..4710b0c8 100644 --- a/Duckling/Rules/CS.hs +++ b/Duckling/Rules/CS.hs @@ -20,27 +20,27 @@ import Duckling.Types import qualified Duckling.Distance.CS.Rules as Distance import qualified Duckling.Numeral.CS.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules CS dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules CS dim diff --git a/Duckling/Rules/Common.hs b/Duckling/Rules/Common.hs index 686396d6..20e80211 100644 --- a/Duckling/Rules/Common.hs +++ b/Duckling/Rules/Common.hs @@ -25,20 +25,20 @@ import qualified Duckling.Temperature.Rules as Temperature import qualified Duckling.Url.Rules as Url import qualified Duckling.Volume.Rules as Volume -rules :: Some Dimension -> [Rule] -rules (This AmountOfMoney) = AmountOfMoney.rules -rules (This CreditCardNumber) = CreditCardNumber.rules -rules (This Distance) = Distance.rules -rules (This Duration) = Duration.rules -rules (This Email) = Email.rules -rules (This Numeral) = Numeral.rules -rules (This Ordinal) = [] -rules (This PhoneNumber) = PhoneNumber.rules -rules (This Quantity) = [] -rules (This RegexMatch) = [] -rules (This Temperature) = Temperature.rules -rules (This Time) = [] -rules (This TimeGrain) = [] -rules (This Url) = Url.rules -rules (This Volume) = Volume.rules -rules (This (CustomDimension dim)) = dimRules dim +rules :: Seal Dimension -> [Rule] +rules (Seal AmountOfMoney) = AmountOfMoney.rules +rules (Seal CreditCardNumber) = CreditCardNumber.rules +rules (Seal Distance) = Distance.rules +rules (Seal Duration) = Duration.rules +rules (Seal Email) = Email.rules +rules (Seal Numeral) = Numeral.rules +rules (Seal Ordinal) = [] +rules (Seal PhoneNumber) = PhoneNumber.rules +rules (Seal Quantity) = [] +rules (Seal RegexMatch) = [] +rules (Seal Temperature) = Temperature.rules +rules (Seal Time) = [] +rules (Seal TimeGrain) = [] +rules (Seal Url) = Url.rules +rules (Seal Volume) = Volume.rules +rules (Seal (CustomDimension dim)) = dimRules dim diff --git a/Duckling/Rules/DA.hs b/Duckling/Rules/DA.hs index 65ad1203..3c9dde35 100644 --- a/Duckling/Rules/DA.hs +++ b/Duckling/Rules/DA.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.DA.Rules as Ordinal import qualified Duckling.Time.DA.Rules as Time import qualified Duckling.TimeGrain.DA.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules DA dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules DA dim diff --git a/Duckling/Rules/DE.hs b/Duckling/Rules/DE.hs index a620266d..6f67ad39 100644 --- a/Duckling/Rules/DE.hs +++ b/Duckling/Rules/DE.hs @@ -24,27 +24,27 @@ import qualified Duckling.TimeGrain.DE.Rules as TimeGrain import Duckling.Types import qualified Duckling.Volume.DE.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = Email.rules -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules DE dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = Email.rules +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules DE dim diff --git a/Duckling/Rules/EL.hs b/Duckling/Rules/EL.hs index 5b450872..c000a350 100644 --- a/Duckling/Rules/EL.hs +++ b/Duckling/Rules/EL.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.EL.Rules as Ordinal import qualified Duckling.Time.EL.Rules as Time import qualified Duckling.TimeGrain.EL.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules EL dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules EL dim diff --git a/Duckling/Rules/EN.hs b/Duckling/Rules/EN.hs index 8a115986..3af87fdc 100644 --- a/Duckling/Rules/EN.hs +++ b/Duckling/Rules/EN.hs @@ -55,52 +55,52 @@ import qualified Duckling.Time.EN.ZA.Rules as TimeZA import qualified Duckling.TimeGrain.EN.Rules as TimeGrain import qualified Duckling.Volume.EN.Rules as Volume -defaultRules :: Some Dimension -> [Rule] -defaultRules dim@(This Time) = TimeUS.rulesBackwardCompatible ++ langRules dim +defaultRules :: Seal Dimension -> [Rule] +defaultRules dim@(Seal Time) = TimeUS.rulesBackwardCompatible ++ langRules dim defaultRules dim = langRules dim -localeRules :: Region -> Some Dimension -> [Rule] -localeRules AU (This AmountOfMoney) = AmountOfMoneyAU.rules -localeRules BZ (This AmountOfMoney) = AmountOfMoneyBZ.rules -localeRules CA (This AmountOfMoney) = AmountOfMoneyCA.rules -localeRules GB (This AmountOfMoney) = AmountOfMoneyGB.rules -localeRules IE (This AmountOfMoney) = AmountOfMoneyIE.rules -localeRules IN (This AmountOfMoney) = AmountOfMoneyIN.rules -localeRules JM (This AmountOfMoney) = AmountOfMoneyJM.rules -localeRules NZ (This AmountOfMoney) = AmountOfMoneyNZ.rules -localeRules PH (This AmountOfMoney) = AmountOfMoneyPH.rules -localeRules TT (This AmountOfMoney) = AmountOfMoneyTT.rules -localeRules US (This AmountOfMoney) = AmountOfMoneyUS.rules -localeRules ZA (This AmountOfMoney) = AmountOfMoneyZA.rules -localeRules AU (This Time) = TimeAU.rules -localeRules BZ (This Time) = TimeBZ.rules -localeRules CA (This Time) = TimeCA.rules -localeRules GB (This Time) = TimeGB.rules -localeRules IE (This Time) = TimeIE.rules -localeRules IN (This Time) = TimeIN.rules -localeRules JM (This Time) = TimeJM.rules -localeRules NZ (This Time) = TimeNZ.rules -localeRules PH (This Time) = TimePH.rules -localeRules TT (This Time) = TimeTT.rules -localeRules US (This Time) = TimeUS.rules -localeRules ZA (This Time) = TimeZA.rules -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules AU (Seal AmountOfMoney) = AmountOfMoneyAU.rules +localeRules BZ (Seal AmountOfMoney) = AmountOfMoneyBZ.rules +localeRules CA (Seal AmountOfMoney) = AmountOfMoneyCA.rules +localeRules GB (Seal AmountOfMoney) = AmountOfMoneyGB.rules +localeRules IE (Seal AmountOfMoney) = AmountOfMoneyIE.rules +localeRules IN (Seal AmountOfMoney) = AmountOfMoneyIN.rules +localeRules JM (Seal AmountOfMoney) = AmountOfMoneyJM.rules +localeRules NZ (Seal AmountOfMoney) = AmountOfMoneyNZ.rules +localeRules PH (Seal AmountOfMoney) = AmountOfMoneyPH.rules +localeRules TT (Seal AmountOfMoney) = AmountOfMoneyTT.rules +localeRules US (Seal AmountOfMoney) = AmountOfMoneyUS.rules +localeRules ZA (Seal AmountOfMoney) = AmountOfMoneyZA.rules +localeRules AU (Seal Time) = TimeAU.rules +localeRules BZ (Seal Time) = TimeBZ.rules +localeRules CA (Seal Time) = TimeCA.rules +localeRules GB (Seal Time) = TimeGB.rules +localeRules IE (Seal Time) = TimeIE.rules +localeRules IN (Seal Time) = TimeIN.rules +localeRules JM (Seal Time) = TimeJM.rules +localeRules NZ (Seal Time) = TimeNZ.rules +localeRules PH (Seal Time) = TimePH.rules +localeRules TT (Seal Time) = TimeTT.rules +localeRules US (Seal Time) = TimeUS.rules +localeRules ZA (Seal Time) = TimeZA.rules +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = Email.rules -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules EN dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = Email.rules +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules EN dim diff --git a/Duckling/Rules/ES.hs b/Duckling/Rules/ES.hs index 33e7c822..859cd4f7 100644 --- a/Duckling/Rules/ES.hs +++ b/Duckling/Rules/ES.hs @@ -40,36 +40,36 @@ import Duckling.Types import qualified Duckling.Volume.ES.Rules as Volume import qualified Duckling.Duration.ES.Rules as Duration -defaultRules :: Some Dimension -> [Rule] -defaultRules dim@(This Numeral) = +defaultRules :: Seal Dimension -> [Rule] +defaultRules dim@(Seal Numeral) = NumeralES.rulesBackwardCompatible ++ langRules dim defaultRules dim = langRules dim -localeRules :: Region -> Some Dimension -> [Rule] -localeRules R.AR (This Numeral) = NumeralAR.rules -localeRules CL (This Numeral) = NumeralCL.rules -localeRules CO (This Numeral) = NumeralCO.rules -localeRules R.ES (This Numeral) = NumeralES.rules -localeRules MX (This Numeral) = NumeralMX.rules -localeRules PE (This Numeral) = NumeralPE.rules -localeRules VE (This Numeral) = NumeralVE.rules -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules R.AR (Seal Numeral) = NumeralAR.rules +localeRules CL (Seal Numeral) = NumeralCL.rules +localeRules CO (Seal Numeral) = NumeralCO.rules +localeRules R.ES (Seal Numeral) = NumeralES.rules +localeRules MX (Seal Numeral) = NumeralMX.rules +localeRules PE (Seal Numeral) = NumeralPE.rules +localeRules VE (Seal Numeral) = NumeralVE.rules +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules ES dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules ES dim diff --git a/Duckling/Rules/ET.hs b/Duckling/Rules/ET.hs index 659c55dc..6efcab15 100644 --- a/Duckling/Rules/ET.hs +++ b/Duckling/Rules/ET.hs @@ -20,27 +20,27 @@ import Duckling.Types import qualified Duckling.Numeral.ET.Rules as Numeral import qualified Duckling.Ordinal.ET.Rules as Ordinal -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules ET dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules ET dim diff --git a/Duckling/Rules/FI.hs b/Duckling/Rules/FI.hs index 6219b533..896eccab 100644 --- a/Duckling/Rules/FI.hs +++ b/Duckling/Rules/FI.hs @@ -18,27 +18,27 @@ import Duckling.Types import qualified Duckling.Numeral.FI.Rules as Numeral import qualified Duckling.TimeGrain.FI.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules FI dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules FI dim diff --git a/Duckling/Rules/FR.hs b/Duckling/Rules/FR.hs index 0ca54339..b4280734 100644 --- a/Duckling/Rules/FR.hs +++ b/Duckling/Rules/FR.hs @@ -29,27 +29,27 @@ import qualified Duckling.Time.FR.Rules as Time import qualified Duckling.TimeGrain.FR.Rules as TimeGrain import qualified Duckling.Volume.FR.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = Email.rules -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules FR dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = Email.rules +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules FR dim diff --git a/Duckling/Rules/GA.hs b/Duckling/Rules/GA.hs index 009197db..82ab88c6 100644 --- a/Duckling/Rules/GA.hs +++ b/Duckling/Rules/GA.hs @@ -27,27 +27,27 @@ import qualified Duckling.Time.GA.Rules as Time import qualified Duckling.TimeGrain.GA.Rules as TimeGrain import qualified Duckling.Volume.GA.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules GA dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules GA dim diff --git a/Duckling/Rules/HE.hs b/Duckling/Rules/HE.hs index dd4599cf..b5478092 100644 --- a/Duckling/Rules/HE.hs +++ b/Duckling/Rules/HE.hs @@ -24,27 +24,27 @@ import qualified Duckling.Ordinal.HE.Rules as Ordinal import qualified Duckling.TimeGrain.HE.Rules as TimeGrain import qualified Duckling.Time.HE.Rules as Time -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules HE dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules HE dim diff --git a/Duckling/Rules/HI.hs b/Duckling/Rules/HI.hs index 7ccd9952..23cb24eb 100644 --- a/Duckling/Rules/HI.hs +++ b/Duckling/Rules/HI.hs @@ -22,27 +22,27 @@ import qualified Duckling.Duration.HI.Rules as Duration import qualified Duckling.TimeGrain.HI.Rules as TimeGrain import qualified Duckling.Temperature.HI.Rules as Temperature -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Numeral) = Numeral.rules -langRules (This Email) = [] -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules HI dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = [] +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules HI dim diff --git a/Duckling/Rules/HR.hs b/Duckling/Rules/HR.hs index 21d697d2..97a2c32a 100644 --- a/Duckling/Rules/HR.hs +++ b/Duckling/Rules/HR.hs @@ -29,27 +29,27 @@ import qualified Duckling.TimeGrain.HR.Rules as TimeGrain import qualified Duckling.Volume.HR.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules HR dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules HR dim diff --git a/Duckling/Rules/HU.hs b/Duckling/Rules/HU.hs index 70e7b370..e0ad2969 100644 --- a/Duckling/Rules/HU.hs +++ b/Duckling/Rules/HU.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.HU.Rules as Ordinal import qualified Duckling.Time.HU.Rules as Time import qualified Duckling.TimeGrain.HU.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules HU dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules HU dim diff --git a/Duckling/Rules/ID.hs b/Duckling/Rules/ID.hs index 5504e82d..8aa6ad99 100644 --- a/Duckling/Rules/ID.hs +++ b/Duckling/Rules/ID.hs @@ -21,27 +21,27 @@ import qualified Duckling.AmountOfMoney.ID.Rules as AmountOfMoney import qualified Duckling.Numeral.ID.Rules as Numeral import qualified Duckling.Ordinal.ID.Rules as Ordinal -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules ID dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules ID dim diff --git a/Duckling/Rules/IS.hs b/Duckling/Rules/IS.hs index dfc3bb54..0199ffa0 100644 --- a/Duckling/Rules/IS.hs +++ b/Duckling/Rules/IS.hs @@ -19,27 +19,27 @@ import Duckling.Types import qualified Duckling.Email.IS.Rules as Email import qualified Duckling.Numeral.IS.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Email) = Email.rules -langRules (This AmountOfMoney) = [] -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules IS dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = Email.rules +langRules (Seal AmountOfMoney) = [] +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules IS dim diff --git a/Duckling/Rules/IT.hs b/Duckling/Rules/IT.hs index 6bec2412..ae5a7336 100644 --- a/Duckling/Rules/IT.hs +++ b/Duckling/Rules/IT.hs @@ -28,27 +28,27 @@ import qualified Duckling.Time.IT.Rules as Time import qualified Duckling.TimeGrain.IT.Rules as TimeGrain import qualified Duckling.Volume.IT.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = Email.rules -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules IT dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = Email.rules +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules IT dim diff --git a/Duckling/Rules/JA.hs b/Duckling/Rules/JA.hs index f8171d89..b07086c7 100644 --- a/Duckling/Rules/JA.hs +++ b/Duckling/Rules/JA.hs @@ -22,27 +22,27 @@ import qualified Duckling.Ordinal.JA.Rules as Ordinal import qualified Duckling.Temperature.JA.Rules as Temperature import qualified Duckling.TimeGrain.JA.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules JA dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules JA dim diff --git a/Duckling/Rules/KA.hs b/Duckling/Rules/KA.hs index 65fe6b3e..ba904dbf 100644 --- a/Duckling/Rules/KA.hs +++ b/Duckling/Rules/KA.hs @@ -24,27 +24,27 @@ import qualified Duckling.TimeGrain.KA.Rules as TimeGrain import qualified Duckling.Ordinal.KA.Rules as Ordinal import qualified Duckling.Duration.KA.Rules as Duration -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules KA dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules KA dim diff --git a/Duckling/Rules/KM.hs b/Duckling/Rules/KM.hs index 9800ccc9..927c87e9 100644 --- a/Duckling/Rules/KM.hs +++ b/Duckling/Rules/KM.hs @@ -24,27 +24,27 @@ import qualified Duckling.Quantity.KM.Rules as Quantity import qualified Duckling.Temperature.KM.Rules as Temperature import qualified Duckling.Volume.KM.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules KM dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules KM dim diff --git a/Duckling/Rules/KN.hs b/Duckling/Rules/KN.hs index 4d2835e2..ade208d7 100644 --- a/Duckling/Rules/KN.hs +++ b/Duckling/Rules/KN.hs @@ -18,27 +18,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.KN.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Email) = [] -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules KN dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = [] +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules KN dim diff --git a/Duckling/Rules/KO.hs b/Duckling/Rules/KO.hs index 164b43ff..12eafc07 100644 --- a/Duckling/Rules/KO.hs +++ b/Duckling/Rules/KO.hs @@ -28,27 +28,27 @@ import qualified Duckling.Time.KO.Rules as Time import qualified Duckling.TimeGrain.KO.Rules as TimeGrain import qualified Duckling.Volume.KO.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules KO dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules KO dim diff --git a/Duckling/Rules/LO.hs b/Duckling/Rules/LO.hs index 8795593a..420a35ca 100644 --- a/Duckling/Rules/LO.hs +++ b/Duckling/Rules/LO.hs @@ -19,27 +19,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.LO.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules LO dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules LO dim diff --git a/Duckling/Rules/ML.hs b/Duckling/Rules/ML.hs index 05fb194b..a6e94ac1 100644 --- a/Duckling/Rules/ML.hs +++ b/Duckling/Rules/ML.hs @@ -20,27 +20,27 @@ import Duckling.Types import qualified Duckling.Numeral.ML.Rules as Numeral import qualified Duckling.Ordinal.ML.Rules as Ordinal -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules ML dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules ML dim diff --git a/Duckling/Rules/MN.hs b/Duckling/Rules/MN.hs index ded121fa..66d05ac3 100644 --- a/Duckling/Rules/MN.hs +++ b/Duckling/Rules/MN.hs @@ -27,27 +27,27 @@ import qualified Duckling.TimeGrain.MN.Rules as TimeGrain import qualified Duckling.Volume.MN.Rules as Volume import qualified Duckling.Temperature.MN.Rules as Temperature -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules MN dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules MN dim diff --git a/Duckling/Rules/MY.hs b/Duckling/Rules/MY.hs index c0da9902..c9f73783 100644 --- a/Duckling/Rules/MY.hs +++ b/Duckling/Rules/MY.hs @@ -19,27 +19,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.MY.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules MY dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules MY dim diff --git a/Duckling/Rules/NB.hs b/Duckling/Rules/NB.hs index 9a7f32b5..f2f1d0ba 100644 --- a/Duckling/Rules/NB.hs +++ b/Duckling/Rules/NB.hs @@ -24,27 +24,27 @@ import qualified Duckling.Ordinal.NB.Rules as Ordinal import qualified Duckling.Time.NB.Rules as Time import qualified Duckling.TimeGrain.NB.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules NB dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules NB dim diff --git a/Duckling/Rules/NE.hs b/Duckling/Rules/NE.hs index 220d721b..7e229e01 100644 --- a/Duckling/Rules/NE.hs +++ b/Duckling/Rules/NE.hs @@ -18,27 +18,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.NE.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Email) = [] -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules NE dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = [] +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules NE dim diff --git a/Duckling/Rules/NL.hs b/Duckling/Rules/NL.hs index 8fdd607e..2a968cc9 100644 --- a/Duckling/Rules/NL.hs +++ b/Duckling/Rules/NL.hs @@ -30,29 +30,29 @@ import qualified Duckling.Time.NL.NL.Rules as TimeNL import qualified Duckling.TimeGrain.NL.Rules as TimeGrain import qualified Duckling.Volume.NL.Rules as Volume -defaultRules :: Some Dimension -> [Rule] -defaultRules dim@(This Time) = TimeNL.rulesBackwardCompatible ++ langRules dim +defaultRules :: Seal Dimension -> [Rule] +defaultRules dim@(Seal Time) = TimeNL.rulesBackwardCompatible ++ langRules dim defaultRules dim = langRules dim -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim -localeRules BE (This Time) = TimeBE.rules +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim +localeRules BE (Seal Time) = TimeBE.rules localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules NL dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules NL dim diff --git a/Duckling/Rules/PL.hs b/Duckling/Rules/PL.hs index d12760ce..9bd52778 100644 --- a/Duckling/Rules/PL.hs +++ b/Duckling/Rules/PL.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.PL.Rules as Ordinal import qualified Duckling.Time.PL.Rules as Time import qualified Duckling.TimeGrain.PL.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules PL dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules PL dim diff --git a/Duckling/Rules/PT.hs b/Duckling/Rules/PT.hs index 01d125c1..54ad33cb 100644 --- a/Duckling/Rules/PT.hs +++ b/Duckling/Rules/PT.hs @@ -28,27 +28,27 @@ import qualified Duckling.Time.PT.Rules as Time import qualified Duckling.TimeGrain.PT.Rules as TimeGrain import qualified Duckling.Volume.PT.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = PhoneNumber.rules -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules PT dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = PhoneNumber.rules +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules PT dim diff --git a/Duckling/Rules/RO.hs b/Duckling/Rules/RO.hs index c0d471ee..73228258 100644 --- a/Duckling/Rules/RO.hs +++ b/Duckling/Rules/RO.hs @@ -28,27 +28,27 @@ import qualified Duckling.Time.RO.Rules as Time import qualified Duckling.TimeGrain.RO.Rules as TimeGrain import qualified Duckling.Volume.RO.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules RO dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules RO dim diff --git a/Duckling/Rules/RU.hs b/Duckling/Rules/RU.hs index 2ebcf84b..93c25fd5 100644 --- a/Duckling/Rules/RU.hs +++ b/Duckling/Rules/RU.hs @@ -26,27 +26,27 @@ import qualified Duckling.Quantity.RU.Rules as Quantity import qualified Duckling.TimeGrain.RU.Rules as TimeGrain import qualified Duckling.Volume.RU.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules RU dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules RU dim diff --git a/Duckling/Rules/SK.hs b/Duckling/Rules/SK.hs index 14382c5a..0030d9a6 100644 --- a/Duckling/Rules/SK.hs +++ b/Duckling/Rules/SK.hs @@ -20,27 +20,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.SK.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules SK dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules SK dim diff --git a/Duckling/Rules/SV.hs b/Duckling/Rules/SV.hs index a65dfe2d..bc5d035f 100644 --- a/Duckling/Rules/SV.hs +++ b/Duckling/Rules/SV.hs @@ -25,27 +25,27 @@ import qualified Duckling.Numeral.SV.Rules as Numeral import qualified Duckling.Time.SV.Rules as Time import qualified Duckling.TimeGrain.SV.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules SV dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules SV dim diff --git a/Duckling/Rules/SW.hs b/Duckling/Rules/SW.hs index d74d4660..6c72f47f 100644 --- a/Duckling/Rules/SW.hs +++ b/Duckling/Rules/SW.hs @@ -19,27 +19,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.SW.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules SW dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules SW dim diff --git a/Duckling/Rules/TA.hs b/Duckling/Rules/TA.hs index 2426ca4c..9276761a 100644 --- a/Duckling/Rules/TA.hs +++ b/Duckling/Rules/TA.hs @@ -19,27 +19,27 @@ import Duckling.Types import qualified Duckling.Numeral.TA.Rules as Numeral import qualified Duckling.Ordinal.TA.Rules as Ordinal -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Email) = [] -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules TA dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Email) = [] +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules TA dim diff --git a/Duckling/Rules/TH.hs b/Duckling/Rules/TH.hs index b69e5eb5..f606ca9a 100644 --- a/Duckling/Rules/TH.hs +++ b/Duckling/Rules/TH.hs @@ -19,27 +19,27 @@ import Duckling.Locale import Duckling.Types import qualified Duckling.Numeral.TH.Rules as Numeral -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = [] -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = [] -langRules (This TimeGrain) = [] -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules TH dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = [] +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = [] +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules TH dim diff --git a/Duckling/Rules/TR.hs b/Duckling/Rules/TR.hs index fba7a1d6..9122fbb6 100644 --- a/Duckling/Rules/TR.hs +++ b/Duckling/Rules/TR.hs @@ -25,27 +25,27 @@ import qualified Duckling.Temperature.TR.Rules as Temperature import qualified Duckling.TimeGrain.TR.Rules as TimeGrain import qualified Duckling.Volume.TR.Rules as Volume -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = [] -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = Volume.rules -langRules (This (CustomDimension dim)) = dimLangRules TR dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = [] +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = Volume.rules +langRules (Seal (CustomDimension dim)) = dimLangRules TR dim diff --git a/Duckling/Rules/UK.hs b/Duckling/Rules/UK.hs index 3c53c37f..dd5afd34 100644 --- a/Duckling/Rules/UK.hs +++ b/Duckling/Rules/UK.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.UK.Rules as Ordinal import qualified Duckling.Time.UK.Rules as Time import qualified Duckling.TimeGrain.UK.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = [] -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = Duration.rules -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules UK dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = [] +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = Duration.rules +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules UK dim diff --git a/Duckling/Rules/VI.hs b/Duckling/Rules/VI.hs index a5217466..4705584c 100644 --- a/Duckling/Rules/VI.hs +++ b/Duckling/Rules/VI.hs @@ -23,27 +23,27 @@ import qualified Duckling.Ordinal.VI.Rules as Ordinal import qualified Duckling.TimeGrain.VI.Rules as TimeGrain import qualified Duckling.Time.VI.Rules as Time -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = [] -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = [] -langRules (This RegexMatch) = [] -langRules (This Temperature) = [] -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules VI dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = [] +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = [] +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = [] +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules VI dim diff --git a/Duckling/Rules/ZH.hs b/Duckling/Rules/ZH.hs index 7afcf576..f81d20c1 100644 --- a/Duckling/Rules/ZH.hs +++ b/Duckling/Rules/ZH.hs @@ -30,31 +30,31 @@ import qualified Duckling.Time.ZH.MO.Rules as TimeMO import qualified Duckling.Time.ZH.TW.Rules as TimeTW import qualified Duckling.TimeGrain.ZH.Rules as TimeGrain -defaultRules :: Some Dimension -> [Rule] +defaultRules :: Seal Dimension -> [Rule] defaultRules = langRules -localeRules :: Region -> Some Dimension -> [Rule] -localeRules CN (This Time) = TimeCN.rules -localeRules HK (This Time) = TimeHK.rules -localeRules MO (This Time) = TimeMO.rules -localeRules TW (This Time) = TimeTW.rules -localeRules region (This (CustomDimension dim)) = dimLocaleRules region dim +localeRules :: Region -> Seal Dimension -> [Rule] +localeRules CN (Seal Time) = TimeCN.rules +localeRules HK (Seal Time) = TimeHK.rules +localeRules MO (Seal Time) = TimeMO.rules +localeRules TW (Seal Time) = TimeTW.rules +localeRules region (Seal (CustomDimension dim)) = dimLocaleRules region dim localeRules _ _ = [] -langRules :: Some Dimension -> [Rule] -langRules (This AmountOfMoney) = AmountOfMoney.rules -langRules (This CreditCardNumber) = [] -langRules (This Distance) = Distance.rules -langRules (This Duration) = [] -langRules (This Email) = [] -langRules (This Numeral) = Numeral.rules -langRules (This Ordinal) = Ordinal.rules -langRules (This PhoneNumber) = [] -langRules (This Quantity) = Quantity.rules -langRules (This RegexMatch) = [] -langRules (This Temperature) = Temperature.rules -langRules (This Time) = Time.rules -langRules (This TimeGrain) = TimeGrain.rules -langRules (This Url) = [] -langRules (This Volume) = [] -langRules (This (CustomDimension dim)) = dimLangRules ZH dim +langRules :: Seal Dimension -> [Rule] +langRules (Seal AmountOfMoney) = AmountOfMoney.rules +langRules (Seal CreditCardNumber) = [] +langRules (Seal Distance) = Distance.rules +langRules (Seal Duration) = [] +langRules (Seal Email) = [] +langRules (Seal Numeral) = Numeral.rules +langRules (Seal Ordinal) = Ordinal.rules +langRules (Seal PhoneNumber) = [] +langRules (Seal Quantity) = Quantity.rules +langRules (Seal RegexMatch) = [] +langRules (Seal Temperature) = Temperature.rules +langRules (Seal Time) = Time.rules +langRules (Seal TimeGrain) = TimeGrain.rules +langRules (Seal Url) = [] +langRules (Seal Volume) = [] +langRules (Seal (CustomDimension dim)) = dimLangRules ZH dim diff --git a/Duckling/Types.hs b/Duckling/Types.hs index 1c06c767..2c5cea4d 100644 --- a/Duckling/Types.hs +++ b/Duckling/Types.hs @@ -33,7 +33,6 @@ import Data.HashSet (HashSet) import Data.List (intersperse, sortOn) import Data.Maybe import Data.Semigroup ((<>)) -import Data.Some import Data.Text (Text, toLower, unpack) import Data.Typeable ((:~:)(Refl), eqT, Typeable) import GHC.Generics @@ -83,6 +82,23 @@ instance Hashable Token where instance NFData Token where rnf (Token _ v) = rnf v +-- ----------------------------------------------------------------- +-- Seal + +data Seal s where + Seal :: s a -> Seal s + +instance GEq s => Eq (Seal s) where + Seal x == Seal y = + defaultEq x y + +instance GShow s => Show (Seal s) where + showsPrec p (Seal s) + = showParen (p > 10) (showString "Seal " . gshowsPrec 11 s) + +withSeal :: Seal s -> (forall t. s t -> r) -> r +withSeal (Seal x) f = f x + -- ----------------------------------------------------------------- -- Dimension @@ -92,7 +108,7 @@ class (Show a, Typeable a, Typeable (DimensionData a)) => dimRules :: a -> [Rule] dimLangRules :: Lang -> a -> [Rule] dimLocaleRules :: Region -> a -> [Rule] - dimDependents :: a -> HashSet (Some Dimension) + dimDependents :: a -> HashSet (Seal Dimension) -- | GADT for differentiating between dimensions -- Each dimension should have its own constructor and provide the data structure @@ -138,12 +154,12 @@ instance GShow Dimension where gshowsPrec = showsPrec -- TextShow instance TextShow (Dimension a) where showb d = TS.fromString $ show d -instance TextShow (Some Dimension) where - showb (This d) = showb d +instance TextShow (Seal Dimension) where + showb (Seal d) = showb d -- Hashable -instance Hashable (Some Dimension) where - hashWithSalt s (This a) = hashWithSalt s a +instance Hashable (Seal Dimension) where + hashWithSalt s (Seal a) = hashWithSalt s a instance Hashable (Dimension a) where hashWithSalt s RegexMatch = hashWithSalt s (0::Int) hashWithSalt s Distance = hashWithSalt s (1::Int) diff --git a/exe/CustomDimensionExample.hs b/exe/CustomDimensionExample.hs index 981f30fe..e38faf49 100644 --- a/exe/CustomDimensionExample.hs +++ b/exe/CustomDimensionExample.hs @@ -21,7 +21,6 @@ import Control.Monad import Data.Aeson import Data.Hashable import Data.Semigroup ((<>)) -import Data.Some import Data.Text (Text) import Data.Typeable import GHC.Generics @@ -107,5 +106,5 @@ myDimensionRule' = Rule main :: IO () main = do let en = makeLocale EN Nothing - debug en "testing my dimension" [This (CustomDimension MyDimension)] >>= print - debug en "testing my dimension pattern match" [This (CustomDimension MyDimension)] >>= print + debug en "testing my dimension" [Seal (CustomDimension MyDimension)] >>= print + debug en "testing my dimension pattern match" [Seal (CustomDimension MyDimension)] >>= print diff --git a/exe/Duckling/Ranking/Generate.hs b/exe/Duckling/Ranking/Generate.hs index 59f7b8cd..11dd34f1 100644 --- a/exe/Duckling/Ranking/Generate.hs +++ b/exe/Duckling/Ranking/Generate.hs @@ -95,7 +95,7 @@ regenClassifiers locale = do filepath = "Duckling/Ranking/Classifiers/" ++ moduleName ++ ".hs" - rules = rulesFor locale . HashSet.singleton $ This Time + rules = rulesFor locale . HashSet.singleton $ Seal Time -- | The trained classifier to write out classifiers = makeClassifiers rules trainSet diff --git a/exe/DucklingExpensive.hs b/exe/DucklingExpensive.hs index 1f3f31c3..7d34f636 100644 --- a/exe/DucklingExpensive.hs +++ b/exe/DucklingExpensive.hs @@ -11,7 +11,6 @@ module Main (main) where import Control.Monad -import Data.Some import System.Environment import Duckling.Debug @@ -22,8 +21,8 @@ main :: IO () main = do (repeatCount :: Int) <- read . head <$> getArgs void $ replicateM repeatCount $ void $ do - debug en "Monday 3rd at 9.30am or 2.30pm, Saturday 8th at 10.30am, Tuesday 11th at 2pm, Wednesday 12th at 2.30pm, Friday 14th at 12.30pm xx" [This Time] - debug es "Horario es de Lunes a Viernes de 2 pm a 10 pm. S\195\161bado de 9 am a 7 pm" [This Time] + debug en "Monday 3rd at 9.30am or 2.30pm, Saturday 8th at 10.30am, Tuesday 11th at 2pm, Wednesday 12th at 2.30pm, Friday 14th at 12.30pm xx" [Seal Time] + debug es "Horario es de Lunes a Viernes de 2 pm a 10 pm. S\195\161bado de 9 am a 7 pm" [Seal Time] where en = makeLocale EN Nothing es = makeLocale ES Nothing diff --git a/exe/DucklingRequestSample.hs b/exe/DucklingRequestSample.hs index 7515ad11..0baf7eb6 100644 --- a/exe/DucklingRequestSample.hs +++ b/exe/DucklingRequestSample.hs @@ -11,7 +11,6 @@ module Main (main) where import Control.Monad -import Data.Some import System.Environment import Duckling.Debug @@ -22,14 +21,14 @@ main :: IO () main = do (repeatCount :: Int) <- read . head <$> getArgs void $ replicateM repeatCount $ void $ do - debug en "My number is 123" [This PhoneNumber,This Distance,This Numeral,This Email] - debug en "Wednesday 5:00PM 3/29/2017" [This Numeral,This Time] - debug zh "12:30pm" [This Time] - debug en "tomorrow at 4pm" [This Time] - debug en "Tomorrow at 12.30?" [This Time] - debug en "Wednesday 9am" [This Time] - debug en "Sure do! Will 11:30 work?" [This Time,This AmountOfMoney] - debug en "8:00am" [This Time] + debug en "My number is 123" [Seal PhoneNumber,Seal Distance,Seal Numeral,Seal Email] + debug en "Wednesday 5:00PM 3/29/2017" [Seal Numeral,Seal Time] + debug zh "12:30pm" [Seal Time] + debug en "tomorrow at 4pm" [Seal Time] + debug en "Tomorrow at 12.30?" [Seal Time] + debug en "Wednesday 9am" [Seal Time] + debug en "Sure do! Will 11:30 work?" [Seal Time,Seal AmountOfMoney] + debug en "8:00am" [Seal Time] where en = makeLocale EN Nothing zh = makeLocale ZH Nothing diff --git a/exe/ExampleMain.hs b/exe/ExampleMain.hs index a12b2dc3..edcf58f6 100644 --- a/exe/ExampleMain.hs +++ b/exe/ExampleMain.hs @@ -68,8 +68,8 @@ targetsHandler = do writeLBS $ encode $ HashMap.fromList . map dimText $ HashMap.toList supportedDimensions where - dimText :: (Lang, [Some Dimension]) -> (Text, [Text]) - dimText = (Text.toLower . showt) *** map (\(This d) -> toName d) + dimText :: (Lang, [Seal Dimension]) -> (Text, [Text]) + dimText = (Text.toLower . showt) *** map (\(Seal d) -> toName d) -- | Parse some text into the given dimensions @@ -110,10 +110,10 @@ parseHandler tzs = do defaultTimeZone = "America/Los_Angeles" defaultLatent = False - parseDimension :: Text -> Maybe (Some Dimension) + parseDimension :: Text -> Maybe (Seal Dimension) parseDimension x = fromName x <|> fromCustomName x where - fromCustomName :: Text -> Maybe (Some Dimension) + fromCustomName :: Text -> Maybe (Seal Dimension) fromCustomName name = HashMap.lookup name m m = HashMap.fromList [ -- ("my-dimension", This (CustomDimension MyDimension)) diff --git a/tests/Duckling/AmountOfMoney/AR/Tests.hs b/tests/Duckling/AmountOfMoney/AR/Tests.hs index 2bf803ae..d76582ad 100644 --- a/tests/Duckling/AmountOfMoney/AR/Tests.hs +++ b/tests/Duckling/AmountOfMoney/AR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/BG/Tests.hs b/tests/Duckling/AmountOfMoney/BG/Tests.hs index c39017b4..669e2d08 100644 --- a/tests/Duckling/AmountOfMoney/BG/Tests.hs +++ b/tests/Duckling/AmountOfMoney/BG/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/EN/Tests.hs b/tests/Duckling/AmountOfMoney/EN/Tests.hs index 0966343c..02308332 100644 --- a/tests/Duckling/AmountOfMoney/EN/Tests.hs +++ b/tests/Duckling/AmountOfMoney/EN/Tests.hs @@ -36,8 +36,8 @@ import qualified Duckling.AmountOfMoney.EN.ZA.Corpus as ZA tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This AmountOfMoney] corpus - , makeNegativeCorpusTest [This AmountOfMoney] negativeCorpus + [ makeCorpusTest [Seal AmountOfMoney] corpus + , makeNegativeCorpusTest [Seal AmountOfMoney] negativeCorpus , localeTests , intersectTests , rangeTests @@ -47,75 +47,75 @@ tests = testGroup "EN Tests" localeTests :: TestTree localeTests = testGroup "Locale Tests" [ testGroup "EN_AU Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeAU AU.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeAU AU.negativeExamples ] , testGroup "EN_BZ Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeBZ BZ.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeBZ BZ.negativeExamples ] , testGroup "EN_CA Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeCA CA.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeCA CA.negativeExamples ] , testGroup "EN_GB Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeGB GB.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeGB GB.negativeExamples ] , testGroup "EN_IE Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeIE IE.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeIE IE.negativeExamples ] , testGroup "EN_IN Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeIN IN.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeIN IN.negativeExamples ] , testGroup "EN_JM Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeJM JM.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeJM JM.negativeExamples ] , testGroup "EN_NZ Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeNZ NZ.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeNZ NZ.negativeExamples ] , testGroup "EN_PH Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localePH PH.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localePH PH.negativeExamples ] , testGroup "EN_TT Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeTT TT.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeTT TT.negativeExamples ] , testGroup "EN_US Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeUS US.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeUS US.negativeExamples ] , testGroup "EN_ZA Tests" - [ makeCorpusTest [This AmountOfMoney] + [ makeCorpusTest [Seal AmountOfMoney] $ withLocale corpus localeZA ZA.allExamples - , makeNegativeCorpusTest [This AmountOfMoney] + , makeNegativeCorpusTest [Seal AmountOfMoney] $ withLocale negativeCorpus localeZA ZA.negativeExamples ] ] @@ -136,7 +136,7 @@ localeTests = testGroup "Locale Tests" intersectTests :: TestTree intersectTests = testCase "Intersect Test" $ - mapM_ (analyzedNTest testContext testOptions . withTargets [This AmountOfMoney]) xs + mapM_ (analyzedNTest testContext testOptions . withTargets [Seal AmountOfMoney]) xs where xs = [ ("7c7", 2) , ("7c7c", 3) @@ -150,7 +150,7 @@ intersectTests = testCase "Intersect Test" $ rangeTests :: TestTree rangeTests = testCase "Range Test" $ - mapM_ (analyzedRangeTest testContext testOptions . withTargets [This AmountOfMoney]) xs + mapM_ (analyzedRangeTest testContext testOptions . withTargets [Seal AmountOfMoney]) xs where xs = [ ("between 3 and 1 dollars", Range 14 23) , ("between 1 and between 2 and 3 dollars", Range 14 37) @@ -159,4 +159,4 @@ rangeTests = testCase "Range Test" $ ] latentTests :: TestTree -latentTests = makeCorpusTest [This AmountOfMoney] latentCorpus +latentTests = makeCorpusTest [Seal AmountOfMoney] latentCorpus diff --git a/tests/Duckling/AmountOfMoney/ES/Tests.hs b/tests/Duckling/AmountOfMoney/ES/Tests.hs index 289f767c..4e1c51fe 100644 --- a/tests/Duckling/AmountOfMoney/ES/Tests.hs +++ b/tests/Duckling/AmountOfMoney/ES/Tests.hs @@ -18,5 +18,5 @@ import Duckling.AmountOfMoney.ES.Corpus tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/FR/Tests.hs b/tests/Duckling/AmountOfMoney/FR/Tests.hs index 513edcff..fb847b7c 100644 --- a/tests/Duckling/AmountOfMoney/FR/Tests.hs +++ b/tests/Duckling/AmountOfMoney/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/GA/Tests.hs b/tests/Duckling/AmountOfMoney/GA/Tests.hs index fba2e528..233db5d4 100644 --- a/tests/Duckling/AmountOfMoney/GA/Tests.hs +++ b/tests/Duckling/AmountOfMoney/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.AmountOfMoney.GA.Corpus tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/HE/Tests.hs b/tests/Duckling/AmountOfMoney/HE/Tests.hs index 83dca1da..ab0910b9 100644 --- a/tests/Duckling/AmountOfMoney/HE/Tests.hs +++ b/tests/Duckling/AmountOfMoney/HE/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HE Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/HR/Tests.hs b/tests/Duckling/AmountOfMoney/HR/Tests.hs index 1ec5c6ef..539a7415 100644 --- a/tests/Duckling/AmountOfMoney/HR/Tests.hs +++ b/tests/Duckling/AmountOfMoney/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/ID/Tests.hs b/tests/Duckling/AmountOfMoney/ID/Tests.hs index dfb510e3..713621c6 100644 --- a/tests/Duckling/AmountOfMoney/ID/Tests.hs +++ b/tests/Duckling/AmountOfMoney/ID/Tests.hs @@ -18,5 +18,5 @@ import Duckling.AmountOfMoney.ID.Corpus tests :: TestTree tests = testGroup "ID Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/IT/Tests.hs b/tests/Duckling/AmountOfMoney/IT/Tests.hs index 1b71b279..25ff2d4b 100644 --- a/tests/Duckling/AmountOfMoney/IT/Tests.hs +++ b/tests/Duckling/AmountOfMoney/IT/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/KA/Tests.hs b/tests/Duckling/AmountOfMoney/KA/Tests.hs index 7a391134..71baeecd 100644 --- a/tests/Duckling/AmountOfMoney/KA/Tests.hs +++ b/tests/Duckling/AmountOfMoney/KA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.AmountOfMoney.KA.Corpus tests :: TestTree tests = testGroup "KA Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/KO/Tests.hs b/tests/Duckling/AmountOfMoney/KO/Tests.hs index f2b4cddd..0e8721e7 100644 --- a/tests/Duckling/AmountOfMoney/KO/Tests.hs +++ b/tests/Duckling/AmountOfMoney/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.AmountOfMoney.KO.Corpus tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/MN/Tests.hs b/tests/Duckling/AmountOfMoney/MN/Tests.hs index 66434c54..4721ffdd 100644 --- a/tests/Duckling/AmountOfMoney/MN/Tests.hs +++ b/tests/Duckling/AmountOfMoney/MN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/NB/Tests.hs b/tests/Duckling/AmountOfMoney/NB/Tests.hs index bf52335c..2f958eb1 100644 --- a/tests/Duckling/AmountOfMoney/NB/Tests.hs +++ b/tests/Duckling/AmountOfMoney/NB/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NB Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/NL/Tests.hs b/tests/Duckling/AmountOfMoney/NL/Tests.hs index 75b9452e..a69ae3ac 100644 --- a/tests/Duckling/AmountOfMoney/NL/Tests.hs +++ b/tests/Duckling/AmountOfMoney/NL/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/PT/Tests.hs b/tests/Duckling/AmountOfMoney/PT/Tests.hs index d7ad9f5b..e16fcc0a 100644 --- a/tests/Duckling/AmountOfMoney/PT/Tests.hs +++ b/tests/Duckling/AmountOfMoney/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/RO/Tests.hs b/tests/Duckling/AmountOfMoney/RO/Tests.hs index 63e66968..6f64170c 100644 --- a/tests/Duckling/AmountOfMoney/RO/Tests.hs +++ b/tests/Duckling/AmountOfMoney/RO/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This AmountOfMoney] corpus - , makeNegativeCorpusTest [This AmountOfMoney] negativeCorpus + [ makeCorpusTest [Seal AmountOfMoney] corpus + , makeNegativeCorpusTest [Seal AmountOfMoney] negativeCorpus ] diff --git a/tests/Duckling/AmountOfMoney/RU/Tests.hs b/tests/Duckling/AmountOfMoney/RU/Tests.hs index 51303706..82741745 100644 --- a/tests/Duckling/AmountOfMoney/RU/Tests.hs +++ b/tests/Duckling/AmountOfMoney/RU/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/SV/Tests.hs b/tests/Duckling/AmountOfMoney/SV/Tests.hs index 87839a21..c94c2ce7 100644 --- a/tests/Duckling/AmountOfMoney/SV/Tests.hs +++ b/tests/Duckling/AmountOfMoney/SV/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/VI/Tests.hs b/tests/Duckling/AmountOfMoney/VI/Tests.hs index fa3b1084..54eaf3da 100644 --- a/tests/Duckling/AmountOfMoney/VI/Tests.hs +++ b/tests/Duckling/AmountOfMoney/VI/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "VI Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/AmountOfMoney/ZH/Tests.hs b/tests/Duckling/AmountOfMoney/ZH/Tests.hs index 9c8045a7..c6643fd1 100644 --- a/tests/Duckling/AmountOfMoney/ZH/Tests.hs +++ b/tests/Duckling/AmountOfMoney/ZH/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This AmountOfMoney] corpus + [ makeCorpusTest [Seal AmountOfMoney] corpus ] diff --git a/tests/Duckling/Api/Tests.hs b/tests/Duckling/Api/Tests.hs index 9227a44a..2df49475 100644 --- a/tests/Duckling/Api/Tests.hs +++ b/tests/Duckling/Api/Tests.hs @@ -38,7 +38,7 @@ tests = testGroup "API Tests" parseTest :: TestTree parseTest = testCase "Parse Test" $ - case parse sentence testContext testOptions [This Numeral] of + case parse sentence testContext testOptions [Seal Numeral] of [] -> assertFailure "empty result" (Entity dim body (RVal _ v) start end _ _:_) -> do assertEqual "dim" "number" dim @@ -60,39 +60,39 @@ rankFilterTest :: TestTree rankFilterTest = testCase "Rank Filter Tests" $ do mapM_ check [ ( "in 2 minutes" - , [This Numeral, This Duration, This Time] - , [This Time] + , [Seal Numeral, Seal Duration, Seal Time] + , [Seal Time] ) , ( "in 2 minutes, about 42 degrees" - , [This Numeral, This Temperature, This Time] - , [This Time, This Temperature] + , [Seal Numeral, Seal Temperature, Seal Time] + , [Seal Time, Seal Temperature] ) , ( "today works... and tomorrow at 9pm too" - , [This Numeral, This Time] - , [This Time, This Time] + , [Seal Numeral, Seal Time] + , [Seal Time, Seal Time] ) , ( "between 9:30 and 11:00 on thursday or Saturday and Thanksgiving Day" - , [This Numeral, This Time] - , [This Time, This Time, This Time] + , [Seal Numeral, Seal Time] + , [Seal Time, Seal Time, Seal Time] ) - , ("the day after tomorrow 5pm", [This Time], [This Time]) - , ("the day after tomorrow 5pm", [This Time, This Numeral], [This Time]) - , ("the day after tomorrow 5pm", [], [This Time]) + , ("the day after tomorrow 5pm", [Seal Time], [Seal Time]) + , ("the day after tomorrow 5pm", [Seal Time, Seal Numeral], [Seal Time]) + , ("the day after tomorrow 5pm", [], [Seal Time]) ] where - check :: (Text, [Some Dimension], [Some Dimension]) -> IO () + check :: (Text, [Seal Dimension], [Seal Dimension]) -> IO () check (sentence, targets, expected) = let go = analyze sentence testContext testOptions $ HashSet.fromList targets actual = flip map go $ - \(Resolved{node=Node{token=Token d _}}) -> This d + \(Resolved{node=Node{token=Token d _}}) -> Seal d in assertEqual ("wrong winners for " ++ show sentence) expected actual rankOrderTest :: TestTree rankOrderTest = testCase "Rank Order Tests" $ do mapM_ check - [ ("tomorrow at 5PM or 8PM", [This Time]) - , ("321 12 3456 ... 7", [This Numeral]) - , ("42 today 23 tomorrow", [This Numeral, This Time]) + [ ("tomorrow at 5PM or 8PM", [Seal Time]) + , ("321 12 3456 ... 7", [Seal Numeral]) + , ("42 today 23 tomorrow", [Seal Numeral, Seal Time]) ] where check (s, targets) = @@ -104,13 +104,13 @@ rangeTest = testCase "Range Tests" $ do mapM_ (analyzedFirstTest testContext testOptions) xs where xs = map (\(input, targets, range) -> (input, targets, f range)) - [ ( "order status 3233763377", [This PhoneNumber], Range 13 23 ) - , ( " 3233763377 " , [This PhoneNumber], Range 2 12 ) - , ( " -3233763377" , [This PhoneNumber], Range 2 12 ) - , ( " now" , [This Time] , Range 2 5 ) - , ( " Monday " , [This Time] , Range 3 9 ) - , ( " next week " , [This Time] , Range 2 13 ) - , ( " 42\n\n" , [This Numeral] , Range 3 5 ) + [ ( "order status 3233763377", [Seal PhoneNumber], Range 13 23 ) + , ( " 3233763377 " , [Seal PhoneNumber], Range 2 12 ) + , ( " -3233763377" , [Seal PhoneNumber], Range 2 12 ) + , ( " now" , [Seal Time] , Range 2 5 ) + , ( " Monday " , [Seal Time] , Range 3 9 ) + , ( " next week " , [Seal Time] , Range 2 13 ) + , ( " 42\n\n" , [Seal Numeral] , Range 3 5 ) ] f :: Range -> TestPredicate f expected _ (Resolved {range = actual}) = expected == actual @@ -119,19 +119,19 @@ supportedDimensionsTest :: TestTree supportedDimensionsTest = testCase "Supported Dimensions Test" $ do mapM_ check [ ( AR - , [ This Email, This AmountOfMoney, This PhoneNumber, This Url - , This Duration, This Numeral, This Ordinal, This Time, This Volume - , This Temperature, This Quantity + , [ Seal Email, Seal AmountOfMoney, Seal PhoneNumber, Seal Url + , Seal Duration, Seal Numeral, Seal Ordinal, Seal Time, Seal Volume + , Seal Temperature, Seal Quantity ] ) , ( PL - , [ This Email, This AmountOfMoney, This PhoneNumber, This Url - , This Duration, This Numeral, This Ordinal, This Time + , [ Seal Email, Seal AmountOfMoney, Seal PhoneNumber, Seal Url + , Seal Duration, Seal Numeral, Seal Ordinal, Seal Time ] ) ] where - check :: (Lang, [Some Dimension]) -> IO () + check :: (Lang, [Seal Dimension]) -> IO () check (l, expected) = case HashMap.lookup l supportedDimensions of Nothing -> assertFailure $ "no dimensions for " ++ show l Just actual -> diff --git a/tests/Duckling/CreditCardNumber/Tests.hs b/tests/Duckling/CreditCardNumber/Tests.hs index 842fe93c..7dc68c95 100644 --- a/tests/Duckling/CreditCardNumber/Tests.hs +++ b/tests/Duckling/CreditCardNumber/Tests.hs @@ -20,6 +20,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "CreditCardNumber Tests" - [ makeCorpusTest [This CreditCardNumber] corpus - , makeNegativeCorpusTest [This CreditCardNumber] negativeCorpus + [ makeCorpusTest [Seal CreditCardNumber] corpus + , makeNegativeCorpusTest [Seal CreditCardNumber] negativeCorpus ] diff --git a/tests/Duckling/Distance/BG/Tests.hs b/tests/Duckling/Distance/BG/Tests.hs index 8051af11..0e378fcb 100644 --- a/tests/Duckling/Distance/BG/Tests.hs +++ b/tests/Duckling/Distance/BG/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/CS/Tests.hs b/tests/Duckling/Distance/CS/Tests.hs index a3d916ff..31768a33 100644 --- a/tests/Duckling/Distance/CS/Tests.hs +++ b/tests/Duckling/Distance/CS/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "CS Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/DE/Tests.hs b/tests/Duckling/Distance/DE/Tests.hs index 2bcd9e38..a2934568 100644 --- a/tests/Duckling/Distance/DE/Tests.hs +++ b/tests/Duckling/Distance/DE/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/EN/Tests.hs b/tests/Duckling/Distance/EN/Tests.hs index 56f46339..3b52d9a1 100644 --- a/tests/Duckling/Distance/EN/Tests.hs +++ b/tests/Duckling/Distance/EN/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/ES/Tests.hs b/tests/Duckling/Distance/ES/Tests.hs index fdbfa749..58543e32 100644 --- a/tests/Duckling/Distance/ES/Tests.hs +++ b/tests/Duckling/Distance/ES/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.ES.Corpus tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/FR/Tests.hs b/tests/Duckling/Distance/FR/Tests.hs index bfbc824f..16266946 100644 --- a/tests/Duckling/Distance/FR/Tests.hs +++ b/tests/Duckling/Distance/FR/Tests.hs @@ -16,5 +16,5 @@ import Duckling.Distance.FR.Corpus tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/GA/Tests.hs b/tests/Duckling/Distance/GA/Tests.hs index 5893c7ca..9812ae22 100644 --- a/tests/Duckling/Distance/GA/Tests.hs +++ b/tests/Duckling/Distance/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/HR/Tests.hs b/tests/Duckling/Distance/HR/Tests.hs index 82737699..cb07665f 100644 --- a/tests/Duckling/Distance/HR/Tests.hs +++ b/tests/Duckling/Distance/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/IT/Tests.hs b/tests/Duckling/Distance/IT/Tests.hs index 078e0cd5..1c621916 100644 --- a/tests/Duckling/Distance/IT/Tests.hs +++ b/tests/Duckling/Distance/IT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/KM/Tests.hs b/tests/Duckling/Distance/KM/Tests.hs index 4dc1d7c4..33548def 100644 --- a/tests/Duckling/Distance/KM/Tests.hs +++ b/tests/Duckling/Distance/KM/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.KM.Corpus tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/KO/Tests.hs b/tests/Duckling/Distance/KO/Tests.hs index da5f6cb9..eb5ed7e7 100644 --- a/tests/Duckling/Distance/KO/Tests.hs +++ b/tests/Duckling/Distance/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.KO.Corpus tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/MN/Tests.hs b/tests/Duckling/Distance/MN/Tests.hs index 29c40f59..c3b51ff9 100644 --- a/tests/Duckling/Distance/MN/Tests.hs +++ b/tests/Duckling/Distance/MN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/NL/Tests.hs b/tests/Duckling/Distance/NL/Tests.hs index 91ad5595..65622ce9 100644 --- a/tests/Duckling/Distance/NL/Tests.hs +++ b/tests/Duckling/Distance/NL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.NL.Corpus tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/PT/Tests.hs b/tests/Duckling/Distance/PT/Tests.hs index d20efa8c..a4aa1522 100644 --- a/tests/Duckling/Distance/PT/Tests.hs +++ b/tests/Duckling/Distance/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.PT.Corpus tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/RO/Tests.hs b/tests/Duckling/Distance/RO/Tests.hs index 7b6faa1a..13abe00c 100644 --- a/tests/Duckling/Distance/RO/Tests.hs +++ b/tests/Duckling/Distance/RO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Distance.RO.Corpus tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/RU/Tests.hs b/tests/Duckling/Distance/RU/Tests.hs index 43bf9a5c..24217f4a 100644 --- a/tests/Duckling/Distance/RU/Tests.hs +++ b/tests/Duckling/Distance/RU/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/SV/Tests.hs b/tests/Duckling/Distance/SV/Tests.hs index d91ca5ef..586041c3 100644 --- a/tests/Duckling/Distance/SV/Tests.hs +++ b/tests/Duckling/Distance/SV/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/TR/Tests.hs b/tests/Duckling/Distance/TR/Tests.hs index c646467d..352315f6 100644 --- a/tests/Duckling/Distance/TR/Tests.hs +++ b/tests/Duckling/Distance/TR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus ] diff --git a/tests/Duckling/Distance/ZH/Tests.hs b/tests/Duckling/Distance/ZH/Tests.hs index 0c87dfb4..3af548cb 100644 --- a/tests/Duckling/Distance/ZH/Tests.hs +++ b/tests/Duckling/Distance/ZH/Tests.hs @@ -23,14 +23,14 @@ import Duckling.Testing.Types tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Distance] corpus + [ makeCorpusTest [Seal Distance] corpus , ambiguousTests ] ambiguousTests :: TestTree ambiguousTests = testCase "Ambiguous Tests" $ analyzedAmbiguousTest context testOptions - (testText, [This Distance], predicates) + (testText, [Seal Distance], predicates) where context = testContext {locale = makeLocale ZH Nothing} testText = "3千米" diff --git a/tests/Duckling/Duration/AR/Tests.hs b/tests/Duckling/Duration/AR/Tests.hs index 0ecbe745..7f113f74 100644 --- a/tests/Duckling/Duration/AR/Tests.hs +++ b/tests/Duckling/Duration/AR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/BG/Tests.hs b/tests/Duckling/Duration/BG/Tests.hs index 02f86107..42b36a44 100644 --- a/tests/Duckling/Duration/BG/Tests.hs +++ b/tests/Duckling/Duration/BG/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/EL/Tests.hs b/tests/Duckling/Duration/EL/Tests.hs index e0e6bb0b..67f70edf 100644 --- a/tests/Duckling/Duration/EL/Tests.hs +++ b/tests/Duckling/Duration/EL/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EL Tests" - [ makeCorpusTest [This Duration] corpus - , makeNegativeCorpusTest [This Duration] negativeCorpus + [ makeCorpusTest [Seal Duration] corpus + , makeNegativeCorpusTest [Seal Duration] negativeCorpus ] diff --git a/tests/Duckling/Duration/EN/Tests.hs b/tests/Duckling/Duration/EN/Tests.hs index 33cadd45..05b5a3be 100644 --- a/tests/Duckling/Duration/EN/Tests.hs +++ b/tests/Duckling/Duration/EN/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Duration] corpus - , makeNegativeCorpusTest [This Duration] negativeCorpus + [ makeCorpusTest [Seal Duration] corpus + , makeNegativeCorpusTest [Seal Duration] negativeCorpus ] diff --git a/tests/Duckling/Duration/ES/Tests.hs b/tests/Duckling/Duration/ES/Tests.hs index 79347b9b..9e07c798 100644 --- a/tests/Duckling/Duration/ES/Tests.hs +++ b/tests/Duckling/Duration/ES/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/FR/Tests.hs b/tests/Duckling/Duration/FR/Tests.hs index b3f5af9e..63a43c1d 100644 --- a/tests/Duckling/Duration/FR/Tests.hs +++ b/tests/Duckling/Duration/FR/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Duration] corpus - , makeNegativeCorpusTest [This Duration] negativeCorpus + [ makeCorpusTest [Seal Duration] corpus + , makeNegativeCorpusTest [Seal Duration] negativeCorpus ] diff --git a/tests/Duckling/Duration/GA/Tests.hs b/tests/Duckling/Duration/GA/Tests.hs index 21222edd..e5165bf5 100644 --- a/tests/Duckling/Duration/GA/Tests.hs +++ b/tests/Duckling/Duration/GA/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/HI/Tests.hs b/tests/Duckling/Duration/HI/Tests.hs index 25ff9b9f..d8c14720 100644 --- a/tests/Duckling/Duration/HI/Tests.hs +++ b/tests/Duckling/Duration/HI/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HI Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/HU/Tests.hs b/tests/Duckling/Duration/HU/Tests.hs index 402ab51f..8d9e2204 100644 --- a/tests/Duckling/Duration/HU/Tests.hs +++ b/tests/Duckling/Duration/HU/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HU Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/JA/Tests.hs b/tests/Duckling/Duration/JA/Tests.hs index 8da07378..62dfd20f 100644 --- a/tests/Duckling/Duration/JA/Tests.hs +++ b/tests/Duckling/Duration/JA/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "JA Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/KA/Tests.hs b/tests/Duckling/Duration/KA/Tests.hs index b80ab725..1046daea 100644 --- a/tests/Duckling/Duration/KA/Tests.hs +++ b/tests/Duckling/Duration/KA/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KA Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/KO/Tests.hs b/tests/Duckling/Duration/KO/Tests.hs index cad46ac9..cd503703 100644 --- a/tests/Duckling/Duration/KO/Tests.hs +++ b/tests/Duckling/Duration/KO/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/MN/Tests.hs b/tests/Duckling/Duration/MN/Tests.hs index a66fa158..53af2a61 100644 --- a/tests/Duckling/Duration/MN/Tests.hs +++ b/tests/Duckling/Duration/MN/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/NB/Tests.hs b/tests/Duckling/Duration/NB/Tests.hs index 59dc075f..373416f5 100644 --- a/tests/Duckling/Duration/NB/Tests.hs +++ b/tests/Duckling/Duration/NB/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NB Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/NL/Tests.hs b/tests/Duckling/Duration/NL/Tests.hs index f0858971..0f9fd848 100644 --- a/tests/Duckling/Duration/NL/Tests.hs +++ b/tests/Duckling/Duration/NL/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Duration] corpus - , makeNegativeCorpusTest [This Duration] negativeCorpus + [ makeCorpusTest [Seal Duration] corpus + , makeNegativeCorpusTest [Seal Duration] negativeCorpus ] diff --git a/tests/Duckling/Duration/PL/Tests.hs b/tests/Duckling/Duration/PL/Tests.hs index de3a7b9d..04c0783c 100644 --- a/tests/Duckling/Duration/PL/Tests.hs +++ b/tests/Duckling/Duration/PL/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PL Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/PT/Tests.hs b/tests/Duckling/Duration/PT/Tests.hs index 23ae4bbd..aa70db9c 100644 --- a/tests/Duckling/Duration/PT/Tests.hs +++ b/tests/Duckling/Duration/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/RO/Tests.hs b/tests/Duckling/Duration/RO/Tests.hs index cd800510..2be32163 100644 --- a/tests/Duckling/Duration/RO/Tests.hs +++ b/tests/Duckling/Duration/RO/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/RU/Tests.hs b/tests/Duckling/Duration/RU/Tests.hs index f4dbd6dc..5f6dbfba 100644 --- a/tests/Duckling/Duration/RU/Tests.hs +++ b/tests/Duckling/Duration/RU/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/SV/Tests.hs b/tests/Duckling/Duration/SV/Tests.hs index 435da3c0..35636415 100644 --- a/tests/Duckling/Duration/SV/Tests.hs +++ b/tests/Duckling/Duration/SV/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/TR/Tests.hs b/tests/Duckling/Duration/TR/Tests.hs index e88dd67e..7c760727 100644 --- a/tests/Duckling/Duration/TR/Tests.hs +++ b/tests/Duckling/Duration/TR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Duration/UK/Tests.hs b/tests/Duckling/Duration/UK/Tests.hs index 7f92ac1c..f4b61339 100644 --- a/tests/Duckling/Duration/UK/Tests.hs +++ b/tests/Duckling/Duration/UK/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "UK Tests" - [ makeCorpusTest [This Duration] corpus - , makeNegativeCorpusTest [This Duration] negativeCorpus + [ makeCorpusTest [Seal Duration] corpus + , makeNegativeCorpusTest [Seal Duration] negativeCorpus ] diff --git a/tests/Duckling/Duration/ZH/Tests.hs b/tests/Duckling/Duration/ZH/Tests.hs index ea7a1989..4ce3fb08 100644 --- a/tests/Duckling/Duration/ZH/Tests.hs +++ b/tests/Duckling/Duration/ZH/Tests.hs @@ -20,5 +20,5 @@ import Duckling.Testing.Types tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Duration] corpus + [ makeCorpusTest [Seal Duration] corpus ] diff --git a/tests/Duckling/Email/DE/Tests.hs b/tests/Duckling/Email/DE/Tests.hs index 3f6e17dc..a33858d1 100644 --- a/tests/Duckling/Email/DE/Tests.hs +++ b/tests/Duckling/Email/DE/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Email] corpus - , makeNegativeCorpusTest [This Email] negativeCorpus + [ makeCorpusTest [Seal Email] corpus + , makeNegativeCorpusTest [Seal Email] negativeCorpus ] diff --git a/tests/Duckling/Email/EN/Tests.hs b/tests/Duckling/Email/EN/Tests.hs index 797bf81b..ec1eda6b 100644 --- a/tests/Duckling/Email/EN/Tests.hs +++ b/tests/Duckling/Email/EN/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Email] corpus - , makeNegativeCorpusTest [This Email] negativeCorpus + [ makeCorpusTest [Seal Email] corpus + , makeNegativeCorpusTest [Seal Email] negativeCorpus ] diff --git a/tests/Duckling/Email/FR/Tests.hs b/tests/Duckling/Email/FR/Tests.hs index 100e7bbc..2d1c47c6 100644 --- a/tests/Duckling/Email/FR/Tests.hs +++ b/tests/Duckling/Email/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Email] corpus + [ makeCorpusTest [Seal Email] corpus ] diff --git a/tests/Duckling/Email/IS/Tests.hs b/tests/Duckling/Email/IS/Tests.hs index e1fe75fe..7281999b 100644 --- a/tests/Duckling/Email/IS/Tests.hs +++ b/tests/Duckling/Email/IS/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IS Tests" - [ makeCorpusTest [This Email] corpus + [ makeCorpusTest [Seal Email] corpus ] diff --git a/tests/Duckling/Email/IT/Tests.hs b/tests/Duckling/Email/IT/Tests.hs index ed26595e..e6bc7419 100644 --- a/tests/Duckling/Email/IT/Tests.hs +++ b/tests/Duckling/Email/IT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Email] corpus + [ makeCorpusTest [Seal Email] corpus ] diff --git a/tests/Duckling/Email/Tests.hs b/tests/Duckling/Email/Tests.hs index a2ef6195..2845d7b4 100644 --- a/tests/Duckling/Email/Tests.hs +++ b/tests/Duckling/Email/Tests.hs @@ -24,8 +24,8 @@ import qualified Duckling.Email.IT.Tests as IT tests :: TestTree tests = testGroup "Email Tests" - [ makeCorpusTest [This Email] corpus - , makeNegativeCorpusTest [This Email] negativeCorpus + [ makeCorpusTest [Seal Email] corpus + , makeNegativeCorpusTest [Seal Email] negativeCorpus , DE.tests , EN.tests , FR.tests diff --git a/tests/Duckling/Numeral/AF/Tests.hs b/tests/Duckling/Numeral/AF/Tests.hs index 6512e79e..b762c250 100644 --- a/tests/Duckling/Numeral/AF/Tests.hs +++ b/tests/Duckling/Numeral/AF/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AF Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/AR/Tests.hs b/tests/Duckling/Numeral/AR/Tests.hs index 2a992146..24f48f7a 100644 --- a/tests/Duckling/Numeral/AR/Tests.hs +++ b/tests/Duckling/Numeral/AR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/BG/Tests.hs b/tests/Duckling/Numeral/BG/Tests.hs index cad110bb..57485ef3 100644 --- a/tests/Duckling/Numeral/BG/Tests.hs +++ b/tests/Duckling/Numeral/BG/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/BN/Tests.hs b/tests/Duckling/Numeral/BN/Tests.hs index 8825a5b9..b19cf377 100644 --- a/tests/Duckling/Numeral/BN/Tests.hs +++ b/tests/Duckling/Numeral/BN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BN Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/CS/Tests.hs b/tests/Duckling/Numeral/CS/Tests.hs index c90562fc..a1b65f92 100644 --- a/tests/Duckling/Numeral/CS/Tests.hs +++ b/tests/Duckling/Numeral/CS/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "CS Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/DA/Tests.hs b/tests/Duckling/Numeral/DA/Tests.hs index 8b26c79a..2056fb32 100644 --- a/tests/Duckling/Numeral/DA/Tests.hs +++ b/tests/Duckling/Numeral/DA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DA Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/DE/Tests.hs b/tests/Duckling/Numeral/DE/Tests.hs index 74d0a05a..8cdb2fc8 100644 --- a/tests/Duckling/Numeral/DE/Tests.hs +++ b/tests/Duckling/Numeral/DE/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/EL/Tests.hs b/tests/Duckling/Numeral/EL/Tests.hs index 971a1990..d9e9217a 100644 --- a/tests/Duckling/Numeral/EL/Tests.hs +++ b/tests/Duckling/Numeral/EL/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EL Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/EN/Tests.hs b/tests/Duckling/Numeral/EN/Tests.hs index e1235e74..3b89a8d8 100644 --- a/tests/Duckling/Numeral/EN/Tests.hs +++ b/tests/Duckling/Numeral/EN/Tests.hs @@ -25,7 +25,7 @@ import Duckling.Types (Range(..)) tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus , surroundTests , intersectTests , rangeTests @@ -34,7 +34,7 @@ tests = testGroup "EN Tests" surroundTests :: TestTree surroundTests = testCase "Surround Tests" $ mapM_ (analyzedFirstTest testContext testOptions . - withTargets [This Numeral]) xs + withTargets [Seal Numeral]) xs where xs = concat [ examples (NumeralValue 3) @@ -51,14 +51,14 @@ surroundTests = testCase "Surround Tests" $ intersectTests :: TestTree intersectTests = testCase "Intersect Test" $ - mapM_ (analyzedNTest testContext testOptions . withTargets [This Numeral]) xs + mapM_ (analyzedNTest testContext testOptions . withTargets [Seal Numeral]) xs where xs = [ ("10 millions minus 10", 2) ] rangeTests :: TestTree rangeTests = testCase "Range Test" $ - mapM_ (analyzedRangeTest testContext testOptions . withTargets [This Numeral]) xs + mapM_ (analyzedRangeTest testContext testOptions . withTargets [Seal Numeral]) xs where xs = [ ("negative negative 5", Range 9 19) -- prevent double negatives , ("negative-5", Range 8 10) -- prevent double negatives diff --git a/tests/Duckling/Numeral/ES/Tests.hs b/tests/Duckling/Numeral/ES/Tests.hs index c1897f46..5fe33c09 100644 --- a/tests/Duckling/Numeral/ES/Tests.hs +++ b/tests/Duckling/Numeral/ES/Tests.hs @@ -33,32 +33,32 @@ import qualified Duckling.Region as R tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus , localeTests ] localeTests :: TestTree localeTests = testGroup "Locale Tests" [ testGroup "ES_AR Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeAR AR.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeAR AR.allExamples ] , testGroup "ES_CL Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeCL CL.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeCL CL.allExamples ] , testGroup "ES_CO Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeCO CO.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeCO CO.allExamples ] , testGroup "ES_ES Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeES ES.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeES ES.allExamples ] , testGroup "ES_MX Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeMX MX.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeMX MX.allExamples ] , testGroup "ES_PE Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localePE PE.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localePE PE.allExamples ] , testGroup "ES_VE Tests" - [ makeCorpusTest [This Numeral] $ withLocale corpus localeVE VE.allExamples + [ makeCorpusTest [Seal Numeral] $ withLocale corpus localeVE VE.allExamples ] ] where diff --git a/tests/Duckling/Numeral/ET/Tests.hs b/tests/Duckling/Numeral/ET/Tests.hs index 8191d182..2b35f3bd 100644 --- a/tests/Duckling/Numeral/ET/Tests.hs +++ b/tests/Duckling/Numeral/ET/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ET Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/FI/Tests.hs b/tests/Duckling/Numeral/FI/Tests.hs index 3658deb4..08f74e1b 100644 --- a/tests/Duckling/Numeral/FI/Tests.hs +++ b/tests/Duckling/Numeral/FI/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FI Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/FR/Tests.hs b/tests/Duckling/Numeral/FR/Tests.hs index 1d9a6a89..5010aed0 100644 --- a/tests/Duckling/Numeral/FR/Tests.hs +++ b/tests/Duckling/Numeral/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/GA/Tests.hs b/tests/Duckling/Numeral/GA/Tests.hs index 18897c0d..47c135c1 100644 --- a/tests/Duckling/Numeral/GA/Tests.hs +++ b/tests/Duckling/Numeral/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/HE/Tests.hs b/tests/Duckling/Numeral/HE/Tests.hs index 842f4507..ad2f214a 100644 --- a/tests/Duckling/Numeral/HE/Tests.hs +++ b/tests/Duckling/Numeral/HE/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HE Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/HI/Tests.hs b/tests/Duckling/Numeral/HI/Tests.hs index e455b1f8..64c0f421 100644 --- a/tests/Duckling/Numeral/HI/Tests.hs +++ b/tests/Duckling/Numeral/HI/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HI Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/HR/Tests.hs b/tests/Duckling/Numeral/HR/Tests.hs index 31543794..48f86ee6 100644 --- a/tests/Duckling/Numeral/HR/Tests.hs +++ b/tests/Duckling/Numeral/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/HU/Tests.hs b/tests/Duckling/Numeral/HU/Tests.hs index 8346b194..2fdd5290 100644 --- a/tests/Duckling/Numeral/HU/Tests.hs +++ b/tests/Duckling/Numeral/HU/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HU Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/ID/Tests.hs b/tests/Duckling/Numeral/ID/Tests.hs index 5b0d59d5..d37e0784 100644 --- a/tests/Duckling/Numeral/ID/Tests.hs +++ b/tests/Duckling/Numeral/ID/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ID Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/IS/Tests.hs b/tests/Duckling/Numeral/IS/Tests.hs index f7f47b1b..9c7003a4 100644 --- a/tests/Duckling/Numeral/IS/Tests.hs +++ b/tests/Duckling/Numeral/IS/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IS Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/IT/Tests.hs b/tests/Duckling/Numeral/IT/Tests.hs index 12a1a77d..7e8dd4bc 100644 --- a/tests/Duckling/Numeral/IT/Tests.hs +++ b/tests/Duckling/Numeral/IT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/JA/Tests.hs b/tests/Duckling/Numeral/JA/Tests.hs index be22b123..9d35358d 100644 --- a/tests/Duckling/Numeral/JA/Tests.hs +++ b/tests/Duckling/Numeral/JA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "JA Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/KA/Tests.hs b/tests/Duckling/Numeral/KA/Tests.hs index ed5f0c91..07e2ae60 100644 --- a/tests/Duckling/Numeral/KA/Tests.hs +++ b/tests/Duckling/Numeral/KA/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KA Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/KM/Tests.hs b/tests/Duckling/Numeral/KM/Tests.hs index b91209ed..bac7d107 100644 --- a/tests/Duckling/Numeral/KM/Tests.hs +++ b/tests/Duckling/Numeral/KM/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/KN/Tests.hs b/tests/Duckling/Numeral/KN/Tests.hs index 27db735f..81d731e3 100644 --- a/tests/Duckling/Numeral/KN/Tests.hs +++ b/tests/Duckling/Numeral/KN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KN Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/KO/Tests.hs b/tests/Duckling/Numeral/KO/Tests.hs index effb1f37..9eb256e5 100644 --- a/tests/Duckling/Numeral/KO/Tests.hs +++ b/tests/Duckling/Numeral/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/LO/Tests.hs b/tests/Duckling/Numeral/LO/Tests.hs index d7ee5749..5646b6c8 100644 --- a/tests/Duckling/Numeral/LO/Tests.hs +++ b/tests/Duckling/Numeral/LO/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "LO Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/ML/Tests.hs b/tests/Duckling/Numeral/ML/Tests.hs index 1ab5ea57..43e8fb86 100644 --- a/tests/Duckling/Numeral/ML/Tests.hs +++ b/tests/Duckling/Numeral/ML/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ML Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/MN/Tests.hs b/tests/Duckling/Numeral/MN/Tests.hs index 5560fc45..0a133f87 100644 --- a/tests/Duckling/Numeral/MN/Tests.hs +++ b/tests/Duckling/Numeral/MN/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/MY/Tests.hs b/tests/Duckling/Numeral/MY/Tests.hs index 1766fd9b..cf521716 100644 --- a/tests/Duckling/Numeral/MY/Tests.hs +++ b/tests/Duckling/Numeral/MY/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MY Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/NB/Tests.hs b/tests/Duckling/Numeral/NB/Tests.hs index fc07fe33..677de963 100644 --- a/tests/Duckling/Numeral/NB/Tests.hs +++ b/tests/Duckling/Numeral/NB/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NB Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/NE/Tests.hs b/tests/Duckling/Numeral/NE/Tests.hs index 1592abd3..0ccaf35f 100644 --- a/tests/Duckling/Numeral/NE/Tests.hs +++ b/tests/Duckling/Numeral/NE/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NE Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/NL/Tests.hs b/tests/Duckling/Numeral/NL/Tests.hs index cc8f6603..96cc59de 100644 --- a/tests/Duckling/Numeral/NL/Tests.hs +++ b/tests/Duckling/Numeral/NL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/PL/Tests.hs b/tests/Duckling/Numeral/PL/Tests.hs index 60ea2557..83e907b8 100644 --- a/tests/Duckling/Numeral/PL/Tests.hs +++ b/tests/Duckling/Numeral/PL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PL Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/PT/Tests.hs b/tests/Duckling/Numeral/PT/Tests.hs index 3263ddf2..424a63c2 100644 --- a/tests/Duckling/Numeral/PT/Tests.hs +++ b/tests/Duckling/Numeral/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/RO/Tests.hs b/tests/Duckling/Numeral/RO/Tests.hs index 26ddbd24..cad7d661 100644 --- a/tests/Duckling/Numeral/RO/Tests.hs +++ b/tests/Duckling/Numeral/RO/Tests.hs @@ -23,13 +23,13 @@ import Duckling.Testing.Types tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus , intersectTests ] intersectTests :: TestTree intersectTests = testCase "Intersect Test" $ - mapM_ (analyzedNTest context testOptions . withTargets [This Numeral]) + mapM_ (analyzedNTest context testOptions . withTargets [Seal Numeral]) [ ("19 de milioane", 2) -- make sure ruleMultiplyDe only takes >= 20 ] where diff --git a/tests/Duckling/Numeral/RU/Tests.hs b/tests/Duckling/Numeral/RU/Tests.hs index fc822b01..7ae3b3d5 100644 --- a/tests/Duckling/Numeral/RU/Tests.hs +++ b/tests/Duckling/Numeral/RU/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/SK/Tests.hs b/tests/Duckling/Numeral/SK/Tests.hs index 0eed07e2..ca65b20c 100644 --- a/tests/Duckling/Numeral/SK/Tests.hs +++ b/tests/Duckling/Numeral/SK/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SK Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/SV/Tests.hs b/tests/Duckling/Numeral/SV/Tests.hs index e69e5133..3dbf569f 100644 --- a/tests/Duckling/Numeral/SV/Tests.hs +++ b/tests/Duckling/Numeral/SV/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/SW/Tests.hs b/tests/Duckling/Numeral/SW/Tests.hs index f520b28b..9d680dbd 100644 --- a/tests/Duckling/Numeral/SW/Tests.hs +++ b/tests/Duckling/Numeral/SW/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SW Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/TA/Tests.hs b/tests/Duckling/Numeral/TA/Tests.hs index cf61c62c..c4b09938 100644 --- a/tests/Duckling/Numeral/TA/Tests.hs +++ b/tests/Duckling/Numeral/TA/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TA Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/TH/Tests.hs b/tests/Duckling/Numeral/TH/Tests.hs index e2695a71..fe32918d 100644 --- a/tests/Duckling/Numeral/TH/Tests.hs +++ b/tests/Duckling/Numeral/TH/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TH Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/TR/Tests.hs b/tests/Duckling/Numeral/TR/Tests.hs index e851eeb8..f0922a13 100644 --- a/tests/Duckling/Numeral/TR/Tests.hs +++ b/tests/Duckling/Numeral/TR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/UK/Tests.hs b/tests/Duckling/Numeral/UK/Tests.hs index b3950c36..53f8e0f2 100644 --- a/tests/Duckling/Numeral/UK/Tests.hs +++ b/tests/Duckling/Numeral/UK/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "UK Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/VI/Tests.hs b/tests/Duckling/Numeral/VI/Tests.hs index 8508f375..cccad818 100644 --- a/tests/Duckling/Numeral/VI/Tests.hs +++ b/tests/Duckling/Numeral/VI/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "VI Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Numeral/ZH/Tests.hs b/tests/Duckling/Numeral/ZH/Tests.hs index c903dfe7..07e1aa6d 100644 --- a/tests/Duckling/Numeral/ZH/Tests.hs +++ b/tests/Duckling/Numeral/ZH/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Numeral] corpus + [ makeCorpusTest [Seal Numeral] corpus ] diff --git a/tests/Duckling/Ordinal/AR/Tests.hs b/tests/Duckling/Ordinal/AR/Tests.hs index 23496ac7..e1d11cf3 100644 --- a/tests/Duckling/Ordinal/AR/Tests.hs +++ b/tests/Duckling/Ordinal/AR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/BG/Tests.hs b/tests/Duckling/Ordinal/BG/Tests.hs index 97e0b3cf..c51b1a1f 100644 --- a/tests/Duckling/Ordinal/BG/Tests.hs +++ b/tests/Duckling/Ordinal/BG/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/DA/Tests.hs b/tests/Duckling/Ordinal/DA/Tests.hs index f37a7e9c..d41c86e4 100644 --- a/tests/Duckling/Ordinal/DA/Tests.hs +++ b/tests/Duckling/Ordinal/DA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DA Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/DE/Tests.hs b/tests/Duckling/Ordinal/DE/Tests.hs index 70ac3500..68b8ac97 100644 --- a/tests/Duckling/Ordinal/DE/Tests.hs +++ b/tests/Duckling/Ordinal/DE/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Ordinal] corpus - , makeNegativeCorpusTest [This Ordinal] negativeCorpus + [ makeCorpusTest [Seal Ordinal] corpus + , makeNegativeCorpusTest [Seal Ordinal] negativeCorpus ] diff --git a/tests/Duckling/Ordinal/EL/Tests.hs b/tests/Duckling/Ordinal/EL/Tests.hs index de7d5fab..54fd6016 100644 --- a/tests/Duckling/Ordinal/EL/Tests.hs +++ b/tests/Duckling/Ordinal/EL/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EL Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/EN/Tests.hs b/tests/Duckling/Ordinal/EN/Tests.hs index b81ac6e6..a9f0d5dd 100644 --- a/tests/Duckling/Ordinal/EN/Tests.hs +++ b/tests/Duckling/Ordinal/EN/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/ES/Tests.hs b/tests/Duckling/Ordinal/ES/Tests.hs index 27933b0d..8f0b097d 100644 --- a/tests/Duckling/Ordinal/ES/Tests.hs +++ b/tests/Duckling/Ordinal/ES/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/ET/Tests.hs b/tests/Duckling/Ordinal/ET/Tests.hs index 8673fc99..21ff59ba 100644 --- a/tests/Duckling/Ordinal/ET/Tests.hs +++ b/tests/Duckling/Ordinal/ET/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ET Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/FR/Tests.hs b/tests/Duckling/Ordinal/FR/Tests.hs index 117cf3a0..d7f659b2 100644 --- a/tests/Duckling/Ordinal/FR/Tests.hs +++ b/tests/Duckling/Ordinal/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/GA/Tests.hs b/tests/Duckling/Ordinal/GA/Tests.hs index 2b3e2ace..1b268d24 100644 --- a/tests/Duckling/Ordinal/GA/Tests.hs +++ b/tests/Duckling/Ordinal/GA/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/HE/Tests.hs b/tests/Duckling/Ordinal/HE/Tests.hs index 54a491a6..9afb000a 100644 --- a/tests/Duckling/Ordinal/HE/Tests.hs +++ b/tests/Duckling/Ordinal/HE/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HE Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/HI/Tests.hs b/tests/Duckling/Ordinal/HI/Tests.hs index f356ab92..f44dee49 100644 --- a/tests/Duckling/Ordinal/HI/Tests.hs +++ b/tests/Duckling/Ordinal/HI/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HI Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/HR/Tests.hs b/tests/Duckling/Ordinal/HR/Tests.hs index c033bfa9..bc5cded1 100644 --- a/tests/Duckling/Ordinal/HR/Tests.hs +++ b/tests/Duckling/Ordinal/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/HU/Tests.hs b/tests/Duckling/Ordinal/HU/Tests.hs index 745356dd..a179d920 100644 --- a/tests/Duckling/Ordinal/HU/Tests.hs +++ b/tests/Duckling/Ordinal/HU/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HU Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/ID/Tests.hs b/tests/Duckling/Ordinal/ID/Tests.hs index 3b212049..32af07d9 100644 --- a/tests/Duckling/Ordinal/ID/Tests.hs +++ b/tests/Duckling/Ordinal/ID/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ID Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/IT/Tests.hs b/tests/Duckling/Ordinal/IT/Tests.hs index 332c9689..d8f9ed46 100644 --- a/tests/Duckling/Ordinal/IT/Tests.hs +++ b/tests/Duckling/Ordinal/IT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/JA/Tests.hs b/tests/Duckling/Ordinal/JA/Tests.hs index 71844c44..d8b7e6a8 100644 --- a/tests/Duckling/Ordinal/JA/Tests.hs +++ b/tests/Duckling/Ordinal/JA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "JA Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/KA/Tests.hs b/tests/Duckling/Ordinal/KA/Tests.hs index 915c4ce5..1b9c5b08 100644 --- a/tests/Duckling/Ordinal/KA/Tests.hs +++ b/tests/Duckling/Ordinal/KA/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KA Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/KM/Tests.hs b/tests/Duckling/Ordinal/KM/Tests.hs index bf8de006..f291a871 100644 --- a/tests/Duckling/Ordinal/KM/Tests.hs +++ b/tests/Duckling/Ordinal/KM/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/KO/Tests.hs b/tests/Duckling/Ordinal/KO/Tests.hs index 3c91cfeb..473f756e 100644 --- a/tests/Duckling/Ordinal/KO/Tests.hs +++ b/tests/Duckling/Ordinal/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/ML/Tests.hs b/tests/Duckling/Ordinal/ML/Tests.hs index cfeaf394..52ecc849 100644 --- a/tests/Duckling/Ordinal/ML/Tests.hs +++ b/tests/Duckling/Ordinal/ML/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ML Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/MN/Tests.hs b/tests/Duckling/Ordinal/MN/Tests.hs index 2105729c..89e92e96 100644 --- a/tests/Duckling/Ordinal/MN/Tests.hs +++ b/tests/Duckling/Ordinal/MN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/NB/Tests.hs b/tests/Duckling/Ordinal/NB/Tests.hs index 1ca2f95f..5d21ac61 100644 --- a/tests/Duckling/Ordinal/NB/Tests.hs +++ b/tests/Duckling/Ordinal/NB/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NB Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/NL/Tests.hs b/tests/Duckling/Ordinal/NL/Tests.hs index a72badf2..a74c6f15 100644 --- a/tests/Duckling/Ordinal/NL/Tests.hs +++ b/tests/Duckling/Ordinal/NL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/PL/Tests.hs b/tests/Duckling/Ordinal/PL/Tests.hs index 81737bd8..fe5708c1 100644 --- a/tests/Duckling/Ordinal/PL/Tests.hs +++ b/tests/Duckling/Ordinal/PL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PL Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/PT/Tests.hs b/tests/Duckling/Ordinal/PT/Tests.hs index 2c79ce28..66f907d2 100644 --- a/tests/Duckling/Ordinal/PT/Tests.hs +++ b/tests/Duckling/Ordinal/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/RO/Tests.hs b/tests/Duckling/Ordinal/RO/Tests.hs index 8ed87531..6562e412 100644 --- a/tests/Duckling/Ordinal/RO/Tests.hs +++ b/tests/Duckling/Ordinal/RO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/RU/Tests.hs b/tests/Duckling/Ordinal/RU/Tests.hs index f196b61a..56fb62a2 100644 --- a/tests/Duckling/Ordinal/RU/Tests.hs +++ b/tests/Duckling/Ordinal/RU/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/SV/Tests.hs b/tests/Duckling/Ordinal/SV/Tests.hs index 25196d02..8b4bb244 100644 --- a/tests/Duckling/Ordinal/SV/Tests.hs +++ b/tests/Duckling/Ordinal/SV/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/TA/Tests.hs b/tests/Duckling/Ordinal/TA/Tests.hs index f4c8ce49..ea1ed33c 100644 --- a/tests/Duckling/Ordinal/TA/Tests.hs +++ b/tests/Duckling/Ordinal/TA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TA Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/TR/Tests.hs b/tests/Duckling/Ordinal/TR/Tests.hs index 80bb4564..6699eea0 100644 --- a/tests/Duckling/Ordinal/TR/Tests.hs +++ b/tests/Duckling/Ordinal/TR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/UK/Tests.hs b/tests/Duckling/Ordinal/UK/Tests.hs index eafeb666..ff68b946 100644 --- a/tests/Duckling/Ordinal/UK/Tests.hs +++ b/tests/Duckling/Ordinal/UK/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "UK Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/VI/Tests.hs b/tests/Duckling/Ordinal/VI/Tests.hs index 9582b08f..aec636ac 100644 --- a/tests/Duckling/Ordinal/VI/Tests.hs +++ b/tests/Duckling/Ordinal/VI/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "VI Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/Ordinal/ZH/Tests.hs b/tests/Duckling/Ordinal/ZH/Tests.hs index bea01cf5..43260749 100644 --- a/tests/Duckling/Ordinal/ZH/Tests.hs +++ b/tests/Duckling/Ordinal/ZH/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Ordinal] corpus + [ makeCorpusTest [Seal Ordinal] corpus ] diff --git a/tests/Duckling/PhoneNumber/AR/Tests.hs b/tests/Duckling/PhoneNumber/AR/Tests.hs index 0857e1c8..a9a09b38 100644 --- a/tests/Duckling/PhoneNumber/AR/Tests.hs +++ b/tests/Duckling/PhoneNumber/AR/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PhoneNumber Tests" - [ makeCorpusTest [This PhoneNumber] corpus - , makeNegativeCorpusTest [This PhoneNumber] negativeCorpus + [ makeCorpusTest [Seal PhoneNumber] corpus + , makeNegativeCorpusTest [Seal PhoneNumber] negativeCorpus ] diff --git a/tests/Duckling/PhoneNumber/PT/Tests.hs b/tests/Duckling/PhoneNumber/PT/Tests.hs index 7dc13a28..14dd3962 100644 --- a/tests/Duckling/PhoneNumber/PT/Tests.hs +++ b/tests/Duckling/PhoneNumber/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PhoneNumber Tests" - [ makeCorpusTest [This PhoneNumber] corpus + [ makeCorpusTest [Seal PhoneNumber] corpus ] diff --git a/tests/Duckling/PhoneNumber/Tests.hs b/tests/Duckling/PhoneNumber/Tests.hs index 91accc62..59451cd5 100644 --- a/tests/Duckling/PhoneNumber/Tests.hs +++ b/tests/Duckling/PhoneNumber/Tests.hs @@ -26,8 +26,8 @@ import qualified Duckling.PhoneNumber.PT.Tests as PT tests :: TestTree tests = testGroup "PhoneNumber Tests" - [ makeCorpusTest [This PhoneNumber] corpus - , makeNegativeCorpusTest [This PhoneNumber] negativeCorpus + [ makeCorpusTest [Seal PhoneNumber] corpus + , makeNegativeCorpusTest [Seal PhoneNumber] negativeCorpus , surroundTests , PT.tests , AR.tests @@ -36,7 +36,7 @@ tests = testGroup "PhoneNumber Tests" surroundTests :: TestTree surroundTests = testCase "Surround Tests" $ mapM_ (analyzedFirstTest testContext testOptions . - withTargets [This PhoneNumber]) xs + withTargets [Seal PhoneNumber]) xs where xs = examples (PhoneNumberValue "06354640807") [ "hey 06354640807" diff --git a/tests/Duckling/Quantity/AR/Tests.hs b/tests/Duckling/Quantity/AR/Tests.hs index 02172766..1897e84f 100644 --- a/tests/Duckling/Quantity/AR/Tests.hs +++ b/tests/Duckling/Quantity/AR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/EN/Tests.hs b/tests/Duckling/Quantity/EN/Tests.hs index 5768a54f..fe318e46 100644 --- a/tests/Duckling/Quantity/EN/Tests.hs +++ b/tests/Duckling/Quantity/EN/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Quantity] corpus - , makeCorpusTest [This Quantity] latentCorpus + [ makeCorpusTest [Seal Quantity] corpus + , makeCorpusTest [Seal Quantity] latentCorpus ] diff --git a/tests/Duckling/Quantity/FR/Tests.hs b/tests/Duckling/Quantity/FR/Tests.hs index 156b5f72..e1a709ef 100644 --- a/tests/Duckling/Quantity/FR/Tests.hs +++ b/tests/Duckling/Quantity/FR/Tests.hs @@ -16,5 +16,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/HR/Tests.hs b/tests/Duckling/Quantity/HR/Tests.hs index 730d8d82..21327f9a 100644 --- a/tests/Duckling/Quantity/HR/Tests.hs +++ b/tests/Duckling/Quantity/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/KM/Tests.hs b/tests/Duckling/Quantity/KM/Tests.hs index 02bbc922..37fe35dc 100644 --- a/tests/Duckling/Quantity/KM/Tests.hs +++ b/tests/Duckling/Quantity/KM/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/KO/Tests.hs b/tests/Duckling/Quantity/KO/Tests.hs index 4b761269..f77eff4a 100644 --- a/tests/Duckling/Quantity/KO/Tests.hs +++ b/tests/Duckling/Quantity/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/MN/Tests.hs b/tests/Duckling/Quantity/MN/Tests.hs index 3107379a..9ddb77d0 100644 --- a/tests/Duckling/Quantity/MN/Tests.hs +++ b/tests/Duckling/Quantity/MN/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/NL/Tests.hs b/tests/Duckling/Quantity/NL/Tests.hs index cb26f983..c59da2d9 100644 --- a/tests/Duckling/Quantity/NL/Tests.hs +++ b/tests/Duckling/Quantity/NL/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/PT/Tests.hs b/tests/Duckling/Quantity/PT/Tests.hs index ac542b37..9c0865ad 100644 --- a/tests/Duckling/Quantity/PT/Tests.hs +++ b/tests/Duckling/Quantity/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/RO/Tests.hs b/tests/Duckling/Quantity/RO/Tests.hs index eb6dc534..a51f9e0a 100644 --- a/tests/Duckling/Quantity/RO/Tests.hs +++ b/tests/Duckling/Quantity/RO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/RU/Tests.hs b/tests/Duckling/Quantity/RU/Tests.hs index 45357425..8b22e2da 100644 --- a/tests/Duckling/Quantity/RU/Tests.hs +++ b/tests/Duckling/Quantity/RU/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Quantity/ZH/Tests.hs b/tests/Duckling/Quantity/ZH/Tests.hs index 71928375..726f535a 100644 --- a/tests/Duckling/Quantity/ZH/Tests.hs +++ b/tests/Duckling/Quantity/ZH/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Quantity] corpus + [ makeCorpusTest [Seal Quantity] corpus ] diff --git a/tests/Duckling/Temperature/AR/Tests.hs b/tests/Duckling/Temperature/AR/Tests.hs index 76b37ec1..241bc568 100644 --- a/tests/Duckling/Temperature/AR/Tests.hs +++ b/tests/Duckling/Temperature/AR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/EN/Tests.hs b/tests/Duckling/Temperature/EN/Tests.hs index 9c9be283..2eaff238 100644 --- a/tests/Duckling/Temperature/EN/Tests.hs +++ b/tests/Duckling/Temperature/EN/Tests.hs @@ -22,14 +22,14 @@ import Duckling.Types (Range(..)) tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus , rangeTests ] rangeTests :: TestTree rangeTests = testCase "Range Test" $ mapM_ (analyzedRangeTest testContext testOptions - . withTargets [This Temperature]) xs + . withTargets [Seal Temperature]) xs where xs = [ ("between 40 and 30 degrees", Range 15 25 ) , ("30 degrees degrees", Range 0 10 ) diff --git a/tests/Duckling/Temperature/ES/Tests.hs b/tests/Duckling/Temperature/ES/Tests.hs index 7f2c8202..62a20dd2 100644 --- a/tests/Duckling/Temperature/ES/Tests.hs +++ b/tests/Duckling/Temperature/ES/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/FR/Tests.hs b/tests/Duckling/Temperature/FR/Tests.hs index 304d38a1..135afa75 100644 --- a/tests/Duckling/Temperature/FR/Tests.hs +++ b/tests/Duckling/Temperature/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/GA/Tests.hs b/tests/Duckling/Temperature/GA/Tests.hs index 4df8cb12..b741a033 100644 --- a/tests/Duckling/Temperature/GA/Tests.hs +++ b/tests/Duckling/Temperature/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/HI/Tests.hs b/tests/Duckling/Temperature/HI/Tests.hs index a30e54a0..a0e7e107 100644 --- a/tests/Duckling/Temperature/HI/Tests.hs +++ b/tests/Duckling/Temperature/HI/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HI Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/HR/Tests.hs b/tests/Duckling/Temperature/HR/Tests.hs index fce56a2b..3b8482dd 100644 --- a/tests/Duckling/Temperature/HR/Tests.hs +++ b/tests/Duckling/Temperature/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/IT/Tests.hs b/tests/Duckling/Temperature/IT/Tests.hs index 391a7def..13c1d222 100644 --- a/tests/Duckling/Temperature/IT/Tests.hs +++ b/tests/Duckling/Temperature/IT/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/JA/Tests.hs b/tests/Duckling/Temperature/JA/Tests.hs index 878db373..bd164e34 100644 --- a/tests/Duckling/Temperature/JA/Tests.hs +++ b/tests/Duckling/Temperature/JA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "JA Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/KM/Tests.hs b/tests/Duckling/Temperature/KM/Tests.hs index 2c9c366a..06730525 100644 --- a/tests/Duckling/Temperature/KM/Tests.hs +++ b/tests/Duckling/Temperature/KM/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/KO/Tests.hs b/tests/Duckling/Temperature/KO/Tests.hs index 956e5216..665ad8f6 100644 --- a/tests/Duckling/Temperature/KO/Tests.hs +++ b/tests/Duckling/Temperature/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/MN/Tests.hs b/tests/Duckling/Temperature/MN/Tests.hs index 905d0369..60763fbf 100644 --- a/tests/Duckling/Temperature/MN/Tests.hs +++ b/tests/Duckling/Temperature/MN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/PT/Tests.hs b/tests/Duckling/Temperature/PT/Tests.hs index b4c1ed1f..b11ce54f 100644 --- a/tests/Duckling/Temperature/PT/Tests.hs +++ b/tests/Duckling/Temperature/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/RO/Tests.hs b/tests/Duckling/Temperature/RO/Tests.hs index 2087b340..f71e6388 100644 --- a/tests/Duckling/Temperature/RO/Tests.hs +++ b/tests/Duckling/Temperature/RO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/TR/Tests.hs b/tests/Duckling/Temperature/TR/Tests.hs index 2a77adb1..cb6b89e9 100644 --- a/tests/Duckling/Temperature/TR/Tests.hs +++ b/tests/Duckling/Temperature/TR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Temperature/ZH/Tests.hs b/tests/Duckling/Temperature/ZH/Tests.hs index ed54ea22..46018a28 100644 --- a/tests/Duckling/Temperature/ZH/Tests.hs +++ b/tests/Duckling/Temperature/ZH/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Temperature] corpus + [ makeCorpusTest [Seal Temperature] corpus ] diff --git a/tests/Duckling/Testing/Asserts.hs b/tests/Duckling/Testing/Asserts.hs index aca63cc4..6d228b40 100644 --- a/tests/Duckling/Testing/Asserts.hs +++ b/tests/Duckling/Testing/Asserts.hs @@ -40,20 +40,20 @@ newtype ExampleInput = ExampleInput Text instance Show ExampleInput where show (ExampleInput input) = "\"" ++ Text.unpack input ++ "\"" -withTargets :: [Some Dimension] -> (Text, a) -> (Text, [Some Dimension], a) +withTargets :: [Seal Dimension] -> (Text, a) -> (Text, [Seal Dimension], a) withTargets targets (input, expected) = (input, targets, expected) -analyzedTargetTest :: Context -> Options -> (Text, Some Dimension) -> IO () +analyzedTargetTest :: Context -> Options -> (Text, Seal Dimension) -> IO () analyzedTargetTest context options (input, target) = assertBool msg $ all (== target) dimensions where msg = "analyze " ++ show (ExampleInput input, [target]) ++ "dimensions = " ++ show dimensions dimensions = flip map (analyze input context options $ HashSet.singleton target) $ - \(Resolved{node=Node{token=Token dimension _}}) -> This dimension + \(Resolved{node=Node{token=Token dimension _}}) -> Seal dimension analyzedFirstTest :: Context -> Options -> - (Text, [Some Dimension], TestPredicate) -> IO () + (Text, [Seal Dimension], TestPredicate) -> IO () analyzedFirstTest context options (input, targets, predicate) = case tokens of [] -> assertFailure @@ -65,7 +65,7 @@ analyzedFirstTest context options (input, targets, predicate) = tokens = analyze input context options $ HashSet.fromList targets analyzedAmbiguousTest :: Context -> Options -> - (Text, [Some Dimension], [TestPredicate]) -> IO () + (Text, [Seal Dimension], [TestPredicate]) -> IO () analyzedAmbiguousTest context options (input, targets, predicates) = case tokens of [] -> assertFailure @@ -75,7 +75,7 @@ analyzedAmbiguousTest context options (input, targets, predicates) = where tokens = analyze input context options $ HashSet.fromList targets -makeCorpusTest :: [Some Dimension] -> Corpus -> TestTree +makeCorpusTest :: [Seal Dimension] -> Corpus -> TestTree makeCorpusTest targets (context, options, xs) = testCase "Corpus Tests" $ mapM_ check xs where @@ -101,12 +101,12 @@ makeCorpusTest targets (context, options, xs) = testCase "Corpus Tests" $ ++ " different ambiguous parses on " ++ show (ExampleInput input) -makeNegativeCorpusTest :: [Some Dimension] -> NegativeCorpus -> TestTree +makeNegativeCorpusTest :: [Seal Dimension] -> NegativeCorpus -> TestTree makeNegativeCorpusTest targets (context, options, xs) = testCase "Negative Corpus Tests" $ mapM_ (analyzedNothingTest context options . (, targets)) xs -analyzedRangeTest :: Context -> Options -> (Text, [Some Dimension], Range) +analyzedRangeTest :: Context -> Options -> (Text, [Seal Dimension], Range) -> IO () analyzedRangeTest context options (input, targets, expRange) = case tokens of [] -> assertFailure $ "empty result on " ++ show (ExampleInput input) @@ -118,11 +118,11 @@ analyzedRangeTest context options (input, targets, expRange) = case tokens of where tokens = analyze input context options $ HashSet.fromList targets -analyzedNothingTest :: Context -> Options -> (Text, [Some Dimension]) -> IO () +analyzedNothingTest :: Context -> Options -> (Text, [Seal Dimension]) -> IO () analyzedNothingTest context options (input, targets) = analyzedNTest context options (input, targets, 0) -analyzedNTest :: Context -> Options -> (Text, [Some Dimension], Int) -> IO () +analyzedNTest :: Context -> Options -> (Text, [Seal Dimension], Int) -> IO () analyzedNTest context options (input, targets, n) = assertBool msg . (== n) $ length tokens where diff --git a/tests/Duckling/Time/AR/Tests.hs b/tests/Duckling/Time/AR/Tests.hs index 75eadb8f..5514237b 100644 --- a/tests/Duckling/Time/AR/Tests.hs +++ b/tests/Duckling/Time/AR/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.AR.Corpus tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/BG/Tests.hs b/tests/Duckling/Time/BG/Tests.hs index b6710582..46b72dcd 100644 --- a/tests/Duckling/Time/BG/Tests.hs +++ b/tests/Duckling/Time/BG/Tests.hs @@ -30,6 +30,6 @@ import Duckling.Types (Range(..)) tests :: TestTree tests = testGroup "BG Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/DA/Tests.hs b/tests/Duckling/Time/DA/Tests.hs index fabb8a48..2748261e 100644 --- a/tests/Duckling/Time/DA/Tests.hs +++ b/tests/Duckling/Time/DA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Time.DA.Corpus tests :: TestTree tests = testGroup "DA Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/DE/Tests.hs b/tests/Duckling/Time/DE/Tests.hs index 10a79710..383ca751 100644 --- a/tests/Duckling/Time/DE/Tests.hs +++ b/tests/Duckling/Time/DE/Tests.hs @@ -23,15 +23,15 @@ import Duckling.Types (Range(..)) tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus , rangeTests ] rangeTests :: TestTree rangeTests = testCase "Range Test" $ mapM_ (analyzedRangeTest (testContext{locale = makeLocale DE Nothing}) - testOptions . withTargets [This Time]) xs + testOptions . withTargets [Seal Time]) xs where xs = [ ("Wir treffen uns am 17 Uhr am KiLa.", Range 16 25) ] diff --git a/tests/Duckling/Time/EL/Tests.hs b/tests/Duckling/Time/EL/Tests.hs index b1be1bba..ae437283 100644 --- a/tests/Duckling/Time/EL/Tests.hs +++ b/tests/Duckling/Time/EL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Time.EL.Corpus tests :: TestTree tests = testGroup "EL Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/EN/Tests.hs b/tests/Duckling/Time/EN/Tests.hs index 8ceb7c59..8f751c86 100644 --- a/tests/Duckling/Time/EN/Tests.hs +++ b/tests/Duckling/Time/EN/Tests.hs @@ -44,66 +44,66 @@ import qualified Duckling.Time.EN.ZA.Corpus as ZA tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Time] defaultCorpus - , makeNegativeCorpusTest [This Time] negativeCorpus - , makeCorpusTest [This Time] diffCorpus + [ makeCorpusTest [Seal Time] defaultCorpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus + , makeCorpusTest [Seal Time] diffCorpus , exactSecondTests , valuesTest , intersectTests , rangeTests , localeTests - , makeCorpusTest [This Time] latentCorpus + , makeCorpusTest [Seal Time] latentCorpus ] localeTests :: TestTree localeTests = testGroup "Locale Tests" [ testGroup "EN_AU Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeAU AU.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeAU [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeAU AU.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeAU [] ] , testGroup "EN_BZ Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeBZ BZ.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeBZ [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeBZ BZ.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeBZ [] ] , testGroup "EN_CA Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeCA CA.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeCA [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeCA CA.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeCA [] ] , testGroup "EN_GB Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeGB GB.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeGB [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeGB GB.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeGB [] ] , testGroup "EN_IE Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeIE IE.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeIE [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeIE IE.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeIE [] ] , testGroup "EN_IN Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeIN IN.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeIN [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeIN IN.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeIN [] ] , testGroup "EN_JM Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeJM JM.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeJM [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeJM JM.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeJM [] ] , testGroup "EN_NZ Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeNZ NZ.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeNZ [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeNZ NZ.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeNZ [] ] , testGroup "EN_PH Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localePH PH.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localePH [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localePH PH.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localePH [] ] , testGroup "EN_TT Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeTT TT.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeTT [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeTT TT.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeTT [] ] , testGroup "EN_US Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeUS US.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeUS [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeUS US.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeUS [] ] , testGroup "EN_ZA Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeZA ZA.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeZA [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeZA ZA.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeZA [] ] ] where @@ -122,7 +122,7 @@ localeTests = testGroup "Locale Tests" exactSecondTests :: TestTree exactSecondTests = testCase "Exact Second Tests" $ - mapM_ (analyzedFirstTest context testOptions . withTargets [This Time]) xs + mapM_ (analyzedFirstTest context testOptions . withTargets [Seal Time]) xs where context = testContext {referenceTime = refTime (2016, 12, 6, 13, 21, 42) 1} xs = concat @@ -141,7 +141,7 @@ exactSecondTests = testCase "Exact Second Tests" $ valuesTest :: TestTree valuesTest = testCase "Values Test" $ - mapM_ (analyzedFirstTest testContext testOptions . withTargets [This Time]) xs + mapM_ (analyzedFirstTest testContext testOptions . withTargets [Seal Time]) xs where xs = examplesCustom (parserCheck 1 parseValuesSize) [ "now" @@ -155,7 +155,7 @@ valuesTest = testCase "Values Test" $ intersectTests :: TestTree intersectTests = testCase "Intersect Test" $ - mapM_ (analyzedNTest testContext testOptions . withTargets [This Time]) xs + mapM_ (analyzedNTest testContext testOptions . withTargets [Seal Time]) xs where xs = [ ("tomorrow July", 2) , ("Mar tonight", 2) @@ -164,7 +164,7 @@ intersectTests = testCase "Intersect Test" $ rangeTests :: TestTree rangeTests = testCase "Range Test" $ - mapM_ (analyzedRangeTest testContext testOptions . withTargets [This Time]) xs + mapM_ (analyzedRangeTest testContext testOptions . withTargets [Seal Time]) xs where xs = [ ("at 615.", Range 0 6) -- make sure ruleHHMMLatent allows this , ("last in 2'", Range 5 10) -- ruleLastTime too eager diff --git a/tests/Duckling/Time/ES/Tests.hs b/tests/Duckling/Time/ES/Tests.hs index b7fd1123..dbf6cbb1 100644 --- a/tests/Duckling/Time/ES/Tests.hs +++ b/tests/Duckling/Time/ES/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.ES.Corpus tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Time] corpus - , makeCorpusTest [This Time] latentCorpus + [ makeCorpusTest [Seal Time] corpus + , makeCorpusTest [Seal Time] latentCorpus ] diff --git a/tests/Duckling/Time/FR/Tests.hs b/tests/Duckling/Time/FR/Tests.hs index c21fc3fa..0230a750 100644 --- a/tests/Duckling/Time/FR/Tests.hs +++ b/tests/Duckling/Time/FR/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.FR.Corpus tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/GA/Tests.hs b/tests/Duckling/Time/GA/Tests.hs index 236622b0..e1a25433 100644 --- a/tests/Duckling/Time/GA/Tests.hs +++ b/tests/Duckling/Time/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Time.GA.Corpus tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/HE/Tests.hs b/tests/Duckling/Time/HE/Tests.hs index 7898e42b..d267f91b 100644 --- a/tests/Duckling/Time/HE/Tests.hs +++ b/tests/Duckling/Time/HE/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HE Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/HR/Tests.hs b/tests/Duckling/Time/HR/Tests.hs index 1c52a798..fc91b20d 100644 --- a/tests/Duckling/Time/HR/Tests.hs +++ b/tests/Duckling/Time/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/HU/Tests.hs b/tests/Duckling/Time/HU/Tests.hs index aab05347..966c1089 100644 --- a/tests/Duckling/Time/HU/Tests.hs +++ b/tests/Duckling/Time/HU/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Time.HU.Corpus tests :: TestTree tests = testGroup "HU Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/IT/Tests.hs b/tests/Duckling/Time/IT/Tests.hs index de529c85..dba1c796 100644 --- a/tests/Duckling/Time/IT/Tests.hs +++ b/tests/Duckling/Time/IT/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.IT.Corpus tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/KA/Tests.hs b/tests/Duckling/Time/KA/Tests.hs index 1e6d77a7..e57745bf 100644 --- a/tests/Duckling/Time/KA/Tests.hs +++ b/tests/Duckling/Time/KA/Tests.hs @@ -19,6 +19,6 @@ import Duckling.Time.KA.Corpus tests :: TestTree tests = testGroup "KA Tests" - [ makeCorpusTest [This Time] corpus - , makeCorpusTest [This Time] latentCorpus + [ makeCorpusTest [Seal Time] corpus + , makeCorpusTest [Seal Time] latentCorpus ] diff --git a/tests/Duckling/Time/KO/Tests.hs b/tests/Duckling/Time/KO/Tests.hs index 3918242c..75697125 100644 --- a/tests/Duckling/Time/KO/Tests.hs +++ b/tests/Duckling/Time/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Time.KO.Corpus tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/NB/Tests.hs b/tests/Duckling/Time/NB/Tests.hs index b91455b2..ad446038 100644 --- a/tests/Duckling/Time/NB/Tests.hs +++ b/tests/Duckling/Time/NB/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Time.NB.Corpus tests :: TestTree tests = testGroup "NB Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus ] diff --git a/tests/Duckling/Time/NL/Tests.hs b/tests/Duckling/Time/NL/Tests.hs index 9d426dd3..02b84e8c 100644 --- a/tests/Duckling/Time/NL/Tests.hs +++ b/tests/Duckling/Time/NL/Tests.hs @@ -22,17 +22,17 @@ import qualified Duckling.Time.NL.BE.Corpus as BE tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Time] corpus - , makeCorpusTest [This Time] latentCorpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeCorpusTest [Seal Time] latentCorpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus , localeTests ] localeTests :: TestTree localeTests = testGroup "Locale Tests" [ testGroup "NL_BE Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeBE BE.allExamples - , makeNegativeCorpusTest [This Time] $ withLocale negativeCorpus localeBE [] + [ makeCorpusTest [Seal Time] $ withLocale corpus localeBE BE.allExamples + , makeNegativeCorpusTest [Seal Time] $ withLocale negativeCorpus localeBE [] ] ] where diff --git a/tests/Duckling/Time/PL/Tests.hs b/tests/Duckling/Time/PL/Tests.hs index eca0726c..c5ef9637 100644 --- a/tests/Duckling/Time/PL/Tests.hs +++ b/tests/Duckling/Time/PL/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.PL.Corpus tests :: TestTree tests = testGroup "PL Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/PT/Tests.hs b/tests/Duckling/Time/PT/Tests.hs index 7c5dca1b..45f6f449 100644 --- a/tests/Duckling/Time/PT/Tests.hs +++ b/tests/Duckling/Time/PT/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.PT.Corpus tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/RO/Tests.hs b/tests/Duckling/Time/RO/Tests.hs index f290e682..2438dfe5 100644 --- a/tests/Duckling/Time/RO/Tests.hs +++ b/tests/Duckling/Time/RO/Tests.hs @@ -18,6 +18,6 @@ import Duckling.Time.RO.Corpus tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/SV/Tests.hs b/tests/Duckling/Time/SV/Tests.hs index dcf0e727..ecc44d81 100644 --- a/tests/Duckling/Time/SV/Tests.hs +++ b/tests/Duckling/Time/SV/Tests.hs @@ -29,7 +29,7 @@ import Duckling.TimeGrain.Types (Grain(..)) tests :: TestTree tests = testGroup "SV Tests" - [ makeCorpusTest [This Time] corpus + [ makeCorpusTest [Seal Time] corpus , ambiguousTests ] @@ -43,7 +43,7 @@ ambiguousTests = testCase "Ambiguous Tests" $ mapM_ check xs [ "i morgonen" ] ctx = testContext {locale = makeLocale SV Nothing} - dims = HashSet.singleton $ This Time + dims = HashSet.singleton $ Seal Time check :: Example -> IO () check (input, predicate) = case analyze input ctx testOptions dims of [] -> assertFailure $ "empty result on " ++ show input diff --git a/tests/Duckling/Time/Tests.hs b/tests/Duckling/Time/Tests.hs index 85c2fca6..4ad27611 100644 --- a/tests/Duckling/Time/Tests.hs +++ b/tests/Duckling/Time/Tests.hs @@ -80,7 +80,7 @@ tests = testGroup "Time Tests" timeFormatTest :: TestTree timeFormatTest = testCase "Format Test" $ - mapM_ (analyzedFirstTest testContext testOptions . withTargets [This Time]) xs + mapM_ (analyzedFirstTest testContext testOptions . withTargets [Seal Time]) xs where xs = examplesCustom (parserCheck expected parseValue) ["now"] expected = "2013-02-12T04:30:00.000-02:00" diff --git a/tests/Duckling/Time/UK/Tests.hs b/tests/Duckling/Time/UK/Tests.hs index a20f6ca5..49c5fca1 100644 --- a/tests/Duckling/Time/UK/Tests.hs +++ b/tests/Duckling/Time/UK/Tests.hs @@ -23,6 +23,6 @@ import Duckling.Types (Range(..)) tests :: TestTree tests = testGroup "UK Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/VI/Tests.hs b/tests/Duckling/Time/VI/Tests.hs index d1a9513d..6e263923 100644 --- a/tests/Duckling/Time/VI/Tests.hs +++ b/tests/Duckling/Time/VI/Tests.hs @@ -17,6 +17,6 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "VI Tests" - [ makeCorpusTest [This Time] corpus - , makeNegativeCorpusTest [This Time] negativeCorpus + [ makeCorpusTest [Seal Time] corpus + , makeNegativeCorpusTest [Seal Time] negativeCorpus ] diff --git a/tests/Duckling/Time/ZH/Tests.hs b/tests/Duckling/Time/ZH/Tests.hs index 96e643aa..8f4f34f0 100644 --- a/tests/Duckling/Time/ZH/Tests.hs +++ b/tests/Duckling/Time/ZH/Tests.hs @@ -25,23 +25,23 @@ import qualified Duckling.Time.ZH.TW.Corpus as TW tests :: TestTree tests = testGroup "ZH Tests" - [ makeCorpusTest [This Time] defaultCorpus + [ makeCorpusTest [Seal Time] defaultCorpus , localeTests ] localeTests :: TestTree localeTests = testGroup "Locale Tests" [ testGroup "ZH_CN Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeCN CN.allExamples + [ makeCorpusTest [Seal Time] $ withLocale corpus localeCN CN.allExamples ] , testGroup "ZH_HK Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeHK HK.allExamples + [ makeCorpusTest [Seal Time] $ withLocale corpus localeHK HK.allExamples ] , testGroup "ZH_MO Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeMO MO.allExamples + [ makeCorpusTest [Seal Time] $ withLocale corpus localeMO MO.allExamples ] , testGroup "ZH_TW Tests" - [ makeCorpusTest [This Time] $ withLocale corpus localeTW TW.allExamples + [ makeCorpusTest [Seal Time] $ withLocale corpus localeTW TW.allExamples ] ] where diff --git a/tests/Duckling/Url/Tests.hs b/tests/Duckling/Url/Tests.hs index 92ac574a..8927c95b 100644 --- a/tests/Duckling/Url/Tests.hs +++ b/tests/Duckling/Url/Tests.hs @@ -24,14 +24,14 @@ import Duckling.Url.Types tests :: TestTree tests = testGroup "Url Tests" - [ makeCorpusTest [This Url] corpus - , makeNegativeCorpusTest [This Url] negativeCorpus + [ makeCorpusTest [Seal Url] corpus + , makeNegativeCorpusTest [Seal Url] negativeCorpus , surroundTests ] surroundTests :: TestTree surroundTests = testCase "Surround Tests" $ - mapM_ (analyzedFirstTest testContext testOptions . withTargets [This Url]) xs + mapM_ (analyzedFirstTest testContext testOptions . withTargets [Seal Url]) xs where xs = examples (UrlData "www.lets-try-this-one.co.uk/episode-7" "lets-try-this-one.co.uk") [ "phishing link: www.lets-try-this-one.co.uk/episode-7 If you want my job" diff --git a/tests/Duckling/Volume/AR/Tests.hs b/tests/Duckling/Volume/AR/Tests.hs index a01ee775..16704188 100644 --- a/tests/Duckling/Volume/AR/Tests.hs +++ b/tests/Duckling/Volume/AR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Volume.AR.Corpus tests :: TestTree tests = testGroup "AR Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/DE/Tests.hs b/tests/Duckling/Volume/DE/Tests.hs index 9427a04f..fe46131c 100644 --- a/tests/Duckling/Volume/DE/Tests.hs +++ b/tests/Duckling/Volume/DE/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Volume.DE.Corpus tests :: TestTree tests = testGroup "DE Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/EN/Tests.hs b/tests/Duckling/Volume/EN/Tests.hs index fbd5e655..b2d49771 100644 --- a/tests/Duckling/Volume/EN/Tests.hs +++ b/tests/Duckling/Volume/EN/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Volume.EN.Corpus tests :: TestTree tests = testGroup "EN Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/ES/Tests.hs b/tests/Duckling/Volume/ES/Tests.hs index a8bd3a84..4acbc451 100644 --- a/tests/Duckling/Volume/ES/Tests.hs +++ b/tests/Duckling/Volume/ES/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.ES.Corpus tests :: TestTree tests = testGroup "ES Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/FR/Tests.hs b/tests/Duckling/Volume/FR/Tests.hs index 63827a27..9b01a0b2 100644 --- a/tests/Duckling/Volume/FR/Tests.hs +++ b/tests/Duckling/Volume/FR/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.FR.Corpus tests :: TestTree tests = testGroup "FR Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/GA/Tests.hs b/tests/Duckling/Volume/GA/Tests.hs index f8ae91f8..59663a17 100644 --- a/tests/Duckling/Volume/GA/Tests.hs +++ b/tests/Duckling/Volume/GA/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.GA.Corpus tests :: TestTree tests = testGroup "GA Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/HR/Tests.hs b/tests/Duckling/Volume/HR/Tests.hs index c76c71f8..8039af79 100644 --- a/tests/Duckling/Volume/HR/Tests.hs +++ b/tests/Duckling/Volume/HR/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Testing.Asserts tests :: TestTree tests = testGroup "HR Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/IT/Tests.hs b/tests/Duckling/Volume/IT/Tests.hs index 63353a9d..e033e7d7 100644 --- a/tests/Duckling/Volume/IT/Tests.hs +++ b/tests/Duckling/Volume/IT/Tests.hs @@ -17,5 +17,5 @@ import Duckling.Volume.IT.Corpus tests :: TestTree tests = testGroup "IT Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/KM/Tests.hs b/tests/Duckling/Volume/KM/Tests.hs index 0ebe2895..5257cb91 100644 --- a/tests/Duckling/Volume/KM/Tests.hs +++ b/tests/Duckling/Volume/KM/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Volume.KM.Corpus tests :: TestTree tests = testGroup "KM Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/KO/Tests.hs b/tests/Duckling/Volume/KO/Tests.hs index 6abf4d8c..e2a42396 100644 --- a/tests/Duckling/Volume/KO/Tests.hs +++ b/tests/Duckling/Volume/KO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.KO.Corpus tests :: TestTree tests = testGroup "KO Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/MN/Tests.hs b/tests/Duckling/Volume/MN/Tests.hs index 6f703508..e4702955 100644 --- a/tests/Duckling/Volume/MN/Tests.hs +++ b/tests/Duckling/Volume/MN/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.MN.Corpus tests :: TestTree tests = testGroup "MN Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/NL/Tests.hs b/tests/Duckling/Volume/NL/Tests.hs index af3e9792..56c398aa 100644 --- a/tests/Duckling/Volume/NL/Tests.hs +++ b/tests/Duckling/Volume/NL/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.NL.Corpus tests :: TestTree tests = testGroup "NL Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/PT/Tests.hs b/tests/Duckling/Volume/PT/Tests.hs index 7f6de9bd..2937646d 100644 --- a/tests/Duckling/Volume/PT/Tests.hs +++ b/tests/Duckling/Volume/PT/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.PT.Corpus tests :: TestTree tests = testGroup "PT Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/RO/Tests.hs b/tests/Duckling/Volume/RO/Tests.hs index 2d497349..2395eb89 100644 --- a/tests/Duckling/Volume/RO/Tests.hs +++ b/tests/Duckling/Volume/RO/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.RO.Corpus tests :: TestTree tests = testGroup "RO Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/RU/Tests.hs b/tests/Duckling/Volume/RU/Tests.hs index 13625560..c1180f68 100644 --- a/tests/Duckling/Volume/RU/Tests.hs +++ b/tests/Duckling/Volume/RU/Tests.hs @@ -18,5 +18,5 @@ import Duckling.Volume.RU.Corpus tests :: TestTree tests = testGroup "RU Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ] diff --git a/tests/Duckling/Volume/TR/Tests.hs b/tests/Duckling/Volume/TR/Tests.hs index 3ed0ed73..24f05ccd 100644 --- a/tests/Duckling/Volume/TR/Tests.hs +++ b/tests/Duckling/Volume/TR/Tests.hs @@ -19,5 +19,5 @@ import Duckling.Volume.TR.Corpus tests :: TestTree tests = testGroup "TR Tests" - [ makeCorpusTest [This Volume] corpus + [ makeCorpusTest [Seal Volume] corpus ]