duckling 0.1.6.1 → 0.2.0.0

raw patch · 1034 files changed

+87009/−33770 lines, 1034 filesdep +regex-pcre-builtindep ~aesondep ~attoparsecdep ~bytestringsetup-changednew-uploaderPVP ok

version bump matches the API change (PVP)

Dependencies added: regex-pcre-builtin

Dependency ranges changed: aeson, attoparsec, bytestring, containers, dependent-sum, extra, hashable, haskell-src-exts, regex-base, regex-pcre, snap-server, tasty, tasty-hunit, text-show, time, timezone-olson

API changes (from Hackage documentation)

This diff is very large; some files are shown as “too large to diff”. Download the raw patch for the complete diff.

Files

• CHANGELOG.md +784/−0
• Duckling/AmountOfMoney/AR/Corpus.hs +3/−2
• Duckling/AmountOfMoney/AR/Rules.hs +11/−2
• Duckling/AmountOfMoney/BG/Corpus.hs +1/−2
• Duckling/AmountOfMoney/BG/Rules.hs +1/−2
• Duckling/AmountOfMoney/EN/AU/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/AU/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/BZ/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/BZ/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/CA/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/CA/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/Corpus.hs +71/−2
• Duckling/AmountOfMoney/EN/GB/Corpus.hs +20/−2
• Duckling/AmountOfMoney/EN/GB/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/IE/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/IE/Rules.hs +21/−2
• Duckling/AmountOfMoney/EN/IN/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/IN/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/JM/Corpus.hs +21/−3
• Duckling/AmountOfMoney/EN/JM/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/NZ/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/NZ/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/PH/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/PH/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/Rules.hs +87/−4
• Duckling/AmountOfMoney/EN/TT/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/TT/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/US/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/US/Rules.hs +21/−3
• Duckling/AmountOfMoney/EN/ZA/Corpus.hs +21/−2
• Duckling/AmountOfMoney/EN/ZA/Rules.hs +21/−3
• Duckling/AmountOfMoney/ES/Corpus.hs +15/−2
• Duckling/AmountOfMoney/ES/Rules.hs +115/−2
• Duckling/AmountOfMoney/FR/Corpus.hs +1/−2
• Duckling/AmountOfMoney/FR/Rules.hs +1/−3
• Duckling/AmountOfMoney/GA/Corpus.hs +1/−2
• Duckling/AmountOfMoney/GA/Rules.hs +1/−2
• Duckling/AmountOfMoney/HE/Corpus.hs +124/−0
• Duckling/AmountOfMoney/HE/Rules.hs +348/−0
• Duckling/AmountOfMoney/HR/Corpus.hs +40/−4
• Duckling/AmountOfMoney/HR/Rules.hs +188/−3
• Duckling/AmountOfMoney/Helpers.hs +44/−8
• Duckling/AmountOfMoney/ID/Corpus.hs +46/−3
• Duckling/AmountOfMoney/ID/Rules.hs +128/−2
• Duckling/AmountOfMoney/IT/Corpus.hs +77/−0
• Duckling/AmountOfMoney/IT/Rules.hs +270/−0
• Duckling/AmountOfMoney/KA/Corpus.hs +136/−0
• Duckling/AmountOfMoney/KA/Rules.hs +347/−0
• Duckling/AmountOfMoney/KO/Corpus.hs +35/−2
• Duckling/AmountOfMoney/KO/Rules.hs +107/−5
• Duckling/AmountOfMoney/MN/Corpus.hs +95/−0
• Duckling/AmountOfMoney/MN/Rules.hs +260/−0
• Duckling/AmountOfMoney/NB/Corpus.hs +468/−2
• Duckling/AmountOfMoney/NB/Rules.hs +199/−36
• Duckling/AmountOfMoney/NL/Corpus.hs +3/−2
• Duckling/AmountOfMoney/NL/Rules.hs +1/−2
• Duckling/AmountOfMoney/PT/Corpus.hs +1/−2
• Duckling/AmountOfMoney/PT/Rules.hs +1/−2
• Duckling/AmountOfMoney/RO/Corpus.hs +1/−2
• Duckling/AmountOfMoney/RO/Rules.hs +1/−2
• Duckling/AmountOfMoney/RU/Corpus.hs +10/−2
• Duckling/AmountOfMoney/RU/Rules.hs +11/−2
• Duckling/AmountOfMoney/Rules.hs +37/−3
• Duckling/AmountOfMoney/SV/Corpus.hs +1/−2
• Duckling/AmountOfMoney/SV/Rules.hs +1/−2
• Duckling/AmountOfMoney/TR/Corpus.hs +55/−0
• Duckling/AmountOfMoney/TR/Rules.hs +160/−0
• Duckling/AmountOfMoney/Types.hs +51/−12
• Duckling/AmountOfMoney/VI/Corpus.hs +36/−2
• Duckling/AmountOfMoney/VI/Rules.hs +171/−11
• Duckling/AmountOfMoney/ZH/Corpus.hs +21/−2
• Duckling/AmountOfMoney/ZH/Rules.hs +88/−27
• Duckling/Api.hs +5/−6
• Duckling/Core.hs +3/−3
• Duckling/CreditCardNumber/Corpus.hs +75/−0
• Duckling/CreditCardNumber/Helpers.hs +123/−0
• Duckling/CreditCardNumber/Rules.hs +72/−0
• Duckling/CreditCardNumber/Types.hs +61/−0
• Duckling/Debug.hs +7/−8
• Duckling/Dimensions.hs +53/−22
• Duckling/Dimensions/AF.hs +17/−0
• Duckling/Dimensions/AR.hs +9/−10
• Duckling/Dimensions/BG.hs +7/−7
• Duckling/Dimensions/BN.hs +17/−0
• Duckling/Dimensions/CA.hs +17/−0
• Duckling/Dimensions/CS.hs +4/−5
• Duckling/Dimensions/Common.hs +8/−8
• Duckling/Dimensions/DA.hs +6/−7
• Duckling/Dimensions/DE.hs +8/−7
• Duckling/Dimensions/EL.hs +6/−7
• Duckling/Dimensions/EN.hs +10/−11
• Duckling/Dimensions/ES.hs +10/−10
• Duckling/Dimensions/ET.hs +4/−5
• Duckling/Dimensions/FA.hs +16/−0
• Duckling/Dimensions/FI.hs +16/−0
• Duckling/Dimensions/FR.hs +10/−11
• Duckling/Dimensions/GA.hs +9/−10
• Duckling/Dimensions/HE.hs +6/−7
• Duckling/Dimensions/HI.hs +6/−6
• Duckling/Dimensions/HR.hs +10/−11
• Duckling/Dimensions/HU.hs +6/−7
• Duckling/Dimensions/ID.hs +4/−5
• Duckling/Dimensions/IS.hs +17/−0
• Duckling/Dimensions/IT.hs +9/−9
• Duckling/Dimensions/JA.hs +6/−7
• Duckling/Dimensions/KA.hs +7/−4
• Duckling/Dimensions/KM.hs +22/−0
• Duckling/Dimensions/KN.hs +17/−0
• Duckling/Dimensions/KO.hs +10/−11
• Duckling/Dimensions/LO.hs +17/−0
• Duckling/Dimensions/ML.hs +18/−0
• Duckling/Dimensions/MN.hs +23/−0
• Duckling/Dimensions/MY.hs +3/−4
• Duckling/Dimensions/NB.hs +6/−7
• Duckling/Dimensions/NE.hs +3/−4
• Duckling/Dimensions/NL.hs +9/−9
• Duckling/Dimensions/PL.hs +6/−7
• Duckling/Dimensions/PT.hs +10/−11
• Duckling/Dimensions/RO.hs +10/−11
• Duckling/Dimensions/RU.hs +9/−9
• Duckling/Dimensions/SK.hs +18/−0
• Duckling/Dimensions/SV.hs +7/−8
• Duckling/Dimensions/SW.hs +17/−0
• Duckling/Dimensions/TA.hs +4/−4
• Duckling/Dimensions/TE.hs +17/−0
• Duckling/Dimensions/TH.hs +17/−0
• Duckling/Dimensions/TR.hs +9/−9
• Duckling/Dimensions/Types.hs +18/−17
• Duckling/Dimensions/UK.hs +6/−5
• Duckling/Dimensions/VI.hs +6/−7
• Duckling/Dimensions/ZH.hs +9/−10
• Duckling/Distance/BG/Corpus.hs +1/−2
• Duckling/Distance/BG/Rules.hs +1/−2
• Duckling/Distance/CS/Corpus.hs +1/−2
• Duckling/Distance/CS/Rules.hs +1/−2
• Duckling/Distance/DE/Corpus.hs +74/−0
• Duckling/Distance/DE/Rules.hs +172/−0
• Duckling/Distance/EN/Corpus.hs +47/−2
• Duckling/Distance/EN/Rules.hs +59/−58
• Duckling/Distance/ES/Corpus.hs +1/−2
• Duckling/Distance/ES/Rules.hs +1/−2
• Duckling/Distance/FR/Corpus.hs +1/−2
• Duckling/Distance/FR/Rules.hs +1/−2
• Duckling/Distance/GA/Corpus.hs +1/−2
• Duckling/Distance/GA/Rules.hs +1/−2
• Duckling/Distance/HR/Corpus.hs +1/−2
• Duckling/Distance/HR/Rules.hs +1/−2
• Duckling/Distance/Helpers.hs +22/−3
• Duckling/Distance/IT/Corpus.hs +50/−0
• Duckling/Distance/IT/Rules.hs +81/−0
• Duckling/Distance/KM/Corpus.hs +59/−0
• Duckling/Distance/KM/Rules.hs +178/−0
• Duckling/Distance/KO/Corpus.hs +1/−2
• Duckling/Distance/KO/Rules.hs +1/−2
• Duckling/Distance/MN/Corpus.hs +57/−0
• Duckling/Distance/MN/Rules.hs +49/−0
• Duckling/Distance/NL/Corpus.hs +1/−2
• Duckling/Distance/NL/Rules.hs +1/−2
• Duckling/Distance/PT/Corpus.hs +1/−2
• Duckling/Distance/PT/Rules.hs +1/−2
• Duckling/Distance/RO/Corpus.hs +1/−2
• Duckling/Distance/RO/Rules.hs +1/−2
• Duckling/Distance/RU/Corpus.hs +1/−2
• Duckling/Distance/RU/Rules.hs +1/−2
• Duckling/Distance/Rules.hs +1/−2
• Duckling/Distance/SV/Corpus.hs +1/−2
• Duckling/Distance/SV/Rules.hs +1/−2
• Duckling/Distance/TR/Corpus.hs +1/−2
• Duckling/Distance/TR/Rules.hs +1/−2
• Duckling/Distance/Types.hs +1/−2
• Duckling/Distance/ZH/Corpus.hs +27/−2
• Duckling/Distance/ZH/Rules.hs +116/−5
• Duckling/DistanceUnits/Types.hs +190/−0
• Duckling/Duration/AR/Corpus.hs +1/−2
• Duckling/Duration/AR/Rules.hs +1/−2
• Duckling/Duration/BG/Corpus.hs +1/−2
• Duckling/Duration/BG/Rules.hs +4/−5
• Duckling/Duration/DA/Rules.hs +1/−2
• Duckling/Duration/DE/Rules.hs +172/−60
• Duckling/Duration/EL/Corpus.hs +1/−2
• Duckling/Duration/EL/Rules.hs +4/−5
• Duckling/Duration/EN/Corpus.hs +73/−2
• Duckling/Duration/EN/Rules.hs +118/−11
• Duckling/Duration/ES/Corpus.hs +58/−0
• Duckling/Duration/ES/Rules.hs +98/−0
• Duckling/Duration/FR/Corpus.hs +1/−2
• Duckling/Duration/FR/Rules.hs +1/−2
• Duckling/Duration/GA/Corpus.hs +1/−2
• Duckling/Duration/GA/Rules.hs +1/−2
• Duckling/Duration/HE/Rules.hs +1/−2
• Duckling/Duration/HI/Corpus.hs +35/−2
• Duckling/Duration/HI/Rules.hs +121/−11
• Duckling/Duration/HR/Rules.hs +1/−2
• Duckling/Duration/HU/Corpus.hs +1/−2
• Duckling/Duration/HU/Rules.hs +1/−2
• Duckling/Duration/Helpers.hs +29/−5
• Duckling/Duration/IT/Rules.hs +1/−2
• Duckling/Duration/JA/Corpus.hs +1/−2
• Duckling/Duration/KA/Corpus.hs +58/−0
• Duckling/Duration/KA/Rules.hs +155/−0
• Duckling/Duration/KO/Corpus.hs +1/−2
• Duckling/Duration/KO/Rules.hs +1/−2
• Duckling/Duration/MN/Corpus.hs +67/−0
• Duckling/Duration/MN/Rules.hs +117/−0
• Duckling/Duration/NB/Corpus.hs +1/−2
• Duckling/Duration/NB/Rules.hs +1/−2
• Duckling/Duration/NL/Corpus.hs +17/−2
• Duckling/Duration/NL/Rules.hs +49/−2
• Duckling/Duration/PL/Corpus.hs +2/−2
• Duckling/Duration/PL/Rules.hs +2/−3
• Duckling/Duration/PT/Corpus.hs +1/−2
• Duckling/Duration/RO/Corpus.hs +1/−2
• Duckling/Duration/RO/Rules.hs +1/−2
• Duckling/Duration/RU/Corpus.hs +1/−2
• Duckling/Duration/RU/Rules.hs +2/−3
• Duckling/Duration/Rules.hs +1/−2
• Duckling/Duration/SV/Corpus.hs +1/−2
• Duckling/Duration/SV/Rules.hs +1/−2
• Duckling/Duration/TR/Corpus.hs +1/−2
• Duckling/Duration/TR/Rules.hs +18/−6
• Duckling/Duration/Types.hs +1/−2
• Duckling/Duration/UK/Corpus.hs +78/−0
• Duckling/Duration/UK/Rules.hs +144/−0
• Duckling/Duration/ZH/Corpus.hs +57/−2
• Duckling/Duration/ZH/Rules.hs +301/−0
• Duckling/Email/Corpus.hs +1/−2
• Duckling/Email/DE/Corpus.hs +64/−0
• Duckling/Email/DE/Rules.hs +41/−0
• Duckling/Email/EN/Corpus.hs +1/−2
• Duckling/Email/EN/Rules.hs +1/−2
• Duckling/Email/FR/Corpus.hs +1/−2
• Duckling/Email/FR/Rules.hs +1/−2
• Duckling/Email/IS/Corpus.hs +39/−0
• Duckling/Email/IS/Rules.hs +39/−0
• Duckling/Email/IT/Corpus.hs +1/−2
• Duckling/Email/IT/Rules.hs +1/−2
• Duckling/Email/Rules.hs +1/−2
• Duckling/Email/Types.hs +5/−3
• Duckling/Engine.hs +4/−6
• Duckling/Engine/Regex.hs +1/−2
• Duckling/Locale.hs +66/−15
• Duckling/Numeral/AF/Corpus.hs +152/−0
• Duckling/Numeral/AF/Rules.hs +210/−0
• Duckling/Numeral/AR/Corpus.hs +88/−2
• Duckling/Numeral/AR/EG/Corpus.hs +257/−0
• Duckling/Numeral/AR/EG/Helpers.hs +80/−0
• Duckling/Numeral/AR/EG/Rules.hs +343/−0
• Duckling/Numeral/AR/Helpers.hs +80/−0
• Duckling/Numeral/AR/Rules.hs +64/−23
• Duckling/Numeral/BG/Corpus.hs +1/−2
• Duckling/Numeral/BG/Rules.hs +1/−2
• Duckling/Numeral/BN/Corpus.hs +101/−0
• Duckling/Numeral/BN/Rules.hs +169/−0
• Duckling/Numeral/CA/Corpus.hs +162/−0
• Duckling/Numeral/CA/Rules.hs +300/−0
• Duckling/Numeral/CS/Corpus.hs +1/−2
• Duckling/Numeral/CS/Rules.hs +1/−2
• Duckling/Numeral/DA/Corpus.hs +1/−2
• Duckling/Numeral/DA/Rules.hs +4/−3
• Duckling/Numeral/DE/Corpus.hs +5/−2
• Duckling/Numeral/DE/Rules.hs +6/−5
• Duckling/Numeral/EL/Corpus.hs +1/−2
• Duckling/Numeral/EL/Rules.hs +1/−2
• Duckling/Numeral/EN/Corpus.hs +18/−2
• Duckling/Numeral/EN/Rules.hs +26/−13
• Duckling/Numeral/ES/AR/Corpus.hs +32/−0
• Duckling/Numeral/ES/AR/Rules.hs +58/−0
• Duckling/Numeral/ES/CL/Corpus.hs +32/−0
• Duckling/Numeral/ES/CL/Rules.hs +58/−0
• Duckling/Numeral/ES/CO/Corpus.hs +32/−0
• Duckling/Numeral/ES/CO/Rules.hs +58/−0
• Duckling/Numeral/ES/Corpus.hs +48/−92
• Duckling/Numeral/ES/ES/Corpus.hs +32/−0
• Duckling/Numeral/ES/ES/Rules.hs +67/−0
• Duckling/Numeral/ES/MX/Corpus.hs +32/−0
• Duckling/Numeral/ES/MX/Rules.hs +58/−0
• Duckling/Numeral/ES/PE/Corpus.hs +32/−0
• Duckling/Numeral/ES/PE/Rules.hs +58/−0
• Duckling/Numeral/ES/Rules.hs +132/−171
• Duckling/Numeral/ES/VE/Corpus.hs +32/−0
• Duckling/Numeral/ES/VE/Rules.hs +58/−0
• Duckling/Numeral/ET/Corpus.hs +1/−2
• Duckling/Numeral/ET/Rules.hs +1/−2
• Duckling/Numeral/FA/Corpus.hs +102/−0
• Duckling/Numeral/FA/Rules.hs +254/−0
• Duckling/Numeral/FI/Corpus.hs +122/−0
• Duckling/Numeral/FI/Rules.hs +141/−0
• Duckling/Numeral/FR/Corpus.hs +8/−2
• Duckling/Numeral/FR/Rules.hs +8/−3
• Duckling/Numeral/GA/Corpus.hs +1/−2
• Duckling/Numeral/GA/Rules.hs +1/−2
• Duckling/Numeral/HE/Corpus.hs +5/−2
• Duckling/Numeral/HE/Rules.hs +11/−2
• Duckling/Numeral/HI/Corpus.hs +18/−2
• Duckling/Numeral/HI/Rules.hs +143/−52
• Duckling/Numeral/HR/Corpus.hs +1/−2
• Duckling/Numeral/HR/Rules.hs +1/−2
• Duckling/Numeral/HU/Corpus.hs +1/−2
• Duckling/Numeral/HU/Rules.hs +1/−2
• Duckling/Numeral/Helpers.hs +1/−2
• Duckling/Numeral/ID/Corpus.hs +1/−2
• Duckling/Numeral/ID/Rules.hs +1/−2
• Duckling/Numeral/IS/Corpus.hs +79/−0
• Duckling/Numeral/IS/Rules.hs +73/−0
• Duckling/Numeral/IT/Corpus.hs +10/−2
• Duckling/Numeral/IT/Rules.hs +8/−8
• Duckling/Numeral/JA/Corpus.hs +1/−2
• Duckling/Numeral/JA/Rules.hs +1/−2
• Duckling/Numeral/KA/Corpus.hs +381/−4
• Duckling/Numeral/KA/Rules.hs +366/−22
• Duckling/Numeral/KM/Corpus.hs +107/−0
• Duckling/Numeral/KM/Rules.hs +163/−0
• Duckling/Numeral/KN/Corpus.hs +67/−0
• Duckling/Numeral/KN/Rules.hs +90/−0
• Duckling/Numeral/KO/Corpus.hs +1/−2
• Duckling/Numeral/KO/Rules.hs +1/−2
• Duckling/Numeral/LO/Corpus.hs +89/−0
• Duckling/Numeral/LO/Rules.hs +153/−0
• Duckling/Numeral/ML/Corpus.hs +100/−0
• Duckling/Numeral/ML/Rules.hs +138/−0
• Duckling/Numeral/MN/Corpus.hs +104/−0
• Duckling/Numeral/MN/Rules.hs +319/−0
• Duckling/Numeral/MY/Corpus.hs +1/−2
• Duckling/Numeral/MY/Rules.hs +1/−2
• Duckling/Numeral/NB/Corpus.hs +302/−2
• Duckling/Numeral/NB/Rules.hs +161/−20
• Duckling/Numeral/NE/Corpus.hs +1/−2
• Duckling/Numeral/NE/Rules.hs +1/−2
• Duckling/Numeral/NL/Corpus.hs +14/−2
• Duckling/Numeral/NL/Rules.hs +3/−4
• Duckling/Numeral/PL/Corpus.hs +17/−2
• Duckling/Numeral/PL/Rules.hs +31/−2
• Duckling/Numeral/PT/Corpus.hs +1/−2
• Duckling/Numeral/PT/Rules.hs +1/−2
• Duckling/Numeral/RO/Corpus.hs +9/−3
• Duckling/Numeral/RO/Rules.hs +33/−20
• Duckling/Numeral/RU/Corpus.hs +24/−2
• Duckling/Numeral/RU/Rules.hs +15/−4
• Duckling/Numeral/Rules.hs +1/−2
• Duckling/Numeral/SK/Corpus.hs +110/−0
• Duckling/Numeral/SK/Rules.hs +309/−0
• Duckling/Numeral/SV/Corpus.hs +1/−2
• Duckling/Numeral/SV/Rules.hs +1/−2
• Duckling/Numeral/SW/Corpus.hs +86/−0
• Duckling/Numeral/SW/Rules.hs +104/−0
• Duckling/Numeral/TA/Corpus.hs +1/−2
• Duckling/Numeral/TA/Rules.hs +1/−2
• Duckling/Numeral/TE/Corpus.hs +123/−0
• Duckling/Numeral/TE/Rules.hs +161/−0
• Duckling/Numeral/TH/Corpus.hs +153/−0
• Duckling/Numeral/TH/Rules.hs +460/−0
• Duckling/Numeral/TR/Corpus.hs +1/−2
• Duckling/Numeral/TR/Rules.hs +5/−5
• Duckling/Numeral/Types.hs +1/−2
• Duckling/Numeral/UK/Corpus.hs +1/−2
• Duckling/Numeral/UK/Rules.hs +1/−2
• Duckling/Numeral/VI/Corpus.hs +9/−3
• Duckling/Numeral/VI/Rules.hs +5/−7
• Duckling/Numeral/ZH/Corpus.hs +60/−2
• Duckling/Numeral/ZH/Rules.hs +180/−8
• Duckling/Ordinal/AR/Corpus.hs +1/−2
• Duckling/Ordinal/AR/Rules.hs +1/−2
• Duckling/Ordinal/BG/Corpus.hs +1/−2
• Duckling/Ordinal/BG/Rules.hs +1/−2
• Duckling/Ordinal/CA/Corpus.hs +126/−0
• Duckling/Ordinal/CA/Rules.hs +104/−0
• Duckling/Ordinal/DA/Corpus.hs +22/−8
• Duckling/Ordinal/DA/Rules.hs +124/−40
• Duckling/Ordinal/DE/Corpus.hs +1/−2
• Duckling/Ordinal/DE/Rules.hs +63/−51
• Duckling/Ordinal/EL/Corpus.hs +1/−2
• Duckling/Ordinal/EL/Rules.hs +1/−2
• Duckling/Ordinal/EN/Corpus.hs +1/−2
• Duckling/Ordinal/EN/Rules.hs +1/−2
• Duckling/Ordinal/ES/Corpus.hs +6/−2
• Duckling/Ordinal/ES/Rules.hs +2/−3
• Duckling/Ordinal/ET/Corpus.hs +1/−2
• Duckling/Ordinal/ET/Rules.hs +1/−2
• Duckling/Ordinal/FR/Corpus.hs +1/−2
• Duckling/Ordinal/FR/Rules.hs +48/−49
• Duckling/Ordinal/GA/Corpus.hs +1/−2
• Duckling/Ordinal/GA/Rules.hs +1/−2
• Duckling/Ordinal/HE/Corpus.hs +1/−2
• Duckling/Ordinal/HE/Rules.hs +1/−2
• Duckling/Ordinal/HI/Corpus.hs +1/−2
• Duckling/Ordinal/HI/Rules.hs +1/−2
• Duckling/Ordinal/HR/Corpus.hs +1/−2
• Duckling/Ordinal/HR/Rules.hs +1/−2
• Duckling/Ordinal/HU/Corpus.hs +1/−2
• Duckling/Ordinal/HU/Rules.hs +1/−2
• Duckling/Ordinal/Helpers.hs +8/−9
• Duckling/Ordinal/ID/Corpus.hs +1/−2
• Duckling/Ordinal/ID/Rules.hs +1/−2
• Duckling/Ordinal/IT/Corpus.hs +1/−2
• Duckling/Ordinal/IT/Rules.hs +1/−2
• Duckling/Ordinal/JA/Corpus.hs +1/−2
• Duckling/Ordinal/JA/Rules.hs +1/−2
• Duckling/Ordinal/KA/Corpus.hs +69/−0
• Duckling/Ordinal/KA/Rules.hs +145/−0
• Duckling/Ordinal/KM/Corpus.hs +37/−0
• Duckling/Ordinal/KM/Rules.hs too large to diff
• Duckling/Ordinal/KO/Corpus.hs too large to diff
• Duckling/Ordinal/KO/Rules.hs too large to diff
• Duckling/Ordinal/ML/Corpus.hs too large to diff
• Duckling/Ordinal/ML/Rules.hs too large to diff
• Duckling/Ordinal/MN/Corpus.hs too large to diff
• Duckling/Ordinal/MN/Rules.hs too large to diff
• Duckling/Ordinal/NB/Corpus.hs too large to diff
• Duckling/Ordinal/NB/Rules.hs too large to diff
• Duckling/Ordinal/NL/Corpus.hs too large to diff
• Duckling/Ordinal/NL/Rules.hs too large to diff
• Duckling/Ordinal/PL/Corpus.hs too large to diff
• Duckling/Ordinal/PL/Rules.hs too large to diff
• Duckling/Ordinal/PT/Corpus.hs too large to diff
• Duckling/Ordinal/PT/Rules.hs too large to diff
• Duckling/Ordinal/RO/Corpus.hs too large to diff
• Duckling/Ordinal/RO/Rules.hs too large to diff
• Duckling/Ordinal/RU/Corpus.hs too large to diff
• Duckling/Ordinal/RU/Rules.hs too large to diff
• Duckling/Ordinal/SV/Corpus.hs too large to diff
• Duckling/Ordinal/SV/Rules.hs too large to diff
• Duckling/Ordinal/TA/Corpus.hs too large to diff
• Duckling/Ordinal/TA/Rules.hs too large to diff
• Duckling/Ordinal/TR/Corpus.hs too large to diff
• Duckling/Ordinal/TR/Rules.hs too large to diff
• Duckling/Ordinal/Types.hs too large to diff
• Duckling/Ordinal/UK/Corpus.hs too large to diff
• Duckling/Ordinal/UK/Rules.hs too large to diff
• Duckling/Ordinal/VI/Corpus.hs too large to diff
• Duckling/Ordinal/VI/Rules.hs too large to diff
• Duckling/Ordinal/ZH/Corpus.hs too large to diff
• Duckling/Ordinal/ZH/Rules.hs too large to diff
• Duckling/PhoneNumber/AR/Corpus.hs too large to diff
• Duckling/PhoneNumber/AR/Rules.hs too large to diff
• Duckling/PhoneNumber/Corpus.hs too large to diff
• Duckling/PhoneNumber/PT/Corpus.hs too large to diff
• Duckling/PhoneNumber/PT/Rules.hs too large to diff
• Duckling/PhoneNumber/Rules.hs too large to diff
• Duckling/PhoneNumber/Types.hs too large to diff
• Duckling/Quantity/AR/Corpus.hs too large to diff
• Duckling/Quantity/AR/Rules.hs too large to diff
• Duckling/Quantity/EN/Corpus.hs too large to diff
• Duckling/Quantity/EN/Rules.hs too large to diff
• Duckling/Quantity/ES/Corpus.hs too large to diff
• Duckling/Quantity/ES/Rules.hs too large to diff
• Duckling/Quantity/FR/Corpus.hs too large to diff
• Duckling/Quantity/FR/Rules.hs too large to diff
• Duckling/Quantity/HR/Corpus.hs too large to diff
• Duckling/Quantity/HR/Rules.hs too large to diff
• Duckling/Quantity/Helpers.hs too large to diff
• Duckling/Quantity/KM/Corpus.hs too large to diff
• Duckling/Quantity/KM/Rules.hs too large to diff
• Duckling/Quantity/KO/Corpus.hs too large to diff
• Duckling/Quantity/KO/Rules.hs too large to diff
• Duckling/Quantity/MN/Corpus.hs too large to diff
• Duckling/Quantity/MN/Rules.hs too large to diff
• Duckling/Quantity/NL/Corpus.hs too large to diff
• Duckling/Quantity/NL/Rules.hs too large to diff
• Duckling/Quantity/PT/Corpus.hs too large to diff
• Duckling/Quantity/PT/Rules.hs too large to diff
• Duckling/Quantity/RO/Corpus.hs too large to diff
• Duckling/Quantity/RO/Rules.hs too large to diff
• Duckling/Quantity/RU/Corpus.hs too large to diff
• Duckling/Quantity/RU/Rules.hs too large to diff
• Duckling/Quantity/Types.hs too large to diff
• Duckling/Quantity/ZH/Corpus.hs too large to diff
• Duckling/Quantity/ZH/Rules.hs too large to diff
• Duckling/Ranking/Classifiers.hs too large to diff
• Duckling/Ranking/Classifiers/AF_XX.hs too large to diff
• Duckling/Ranking/Classifiers/AR_EG.hs too large to diff
• Duckling/Ranking/Classifiers/AR_XX.hs too large to diff
• Duckling/Ranking/Classifiers/BG_XX.hs too large to diff
• Duckling/Ranking/Classifiers/BN_XX.hs too large to diff
• Duckling/Ranking/Classifiers/CA_XX.hs too large to diff
• Duckling/Ranking/Classifiers/DA_XX.hs too large to diff
• Duckling/Ranking/Classifiers/DE_XX.hs too large to diff
• Duckling/Ranking/Classifiers/EL_XX.hs too large to diff
• Duckling/Ranking/Classifiers/EN_CA.hs too large to diff
• Duckling/Ranking/Classifiers/EN_GB.hs too large to diff
• Duckling/Ranking/Classifiers/EN_US.hs too large to diff
• Duckling/Ranking/Classifiers/EN_XX.hs too large to diff
• Duckling/Ranking/Classifiers/ES_XX.hs too large to diff
• Duckling/Ranking/Classifiers/FA_XX.hs too large to diff
• Duckling/Ranking/Classifiers/FI_XX.hs too large to diff
• Duckling/Ranking/Classifiers/FR_XX.hs too large to diff
• Duckling/Ranking/Classifiers/HE_XX.hs too large to diff
• Duckling/Ranking/Classifiers/HR_XX.hs too large to diff
• Duckling/Ranking/Classifiers/IS_XX.hs too large to diff
• Duckling/Ranking/Classifiers/IT_XX.hs too large to diff
• Duckling/Ranking/Classifiers/KM_XX.hs too large to diff
• Duckling/Ranking/Classifiers/KN_XX.hs too large to diff
• Duckling/Ranking/Classifiers/KO_XX.hs too large to diff
• Duckling/Ranking/Classifiers/LO_XX.hs too large to diff
• Duckling/Ranking/Classifiers/ML_XX.hs too large to diff
• Duckling/Ranking/Classifiers/MN_XX.hs too large to diff
• Duckling/Ranking/Classifiers/NB_XX.hs too large to diff
• Duckling/Ranking/Classifiers/NL_BE.hs too large to diff
• Duckling/Ranking/Classifiers/NL_NL.hs too large to diff
• Duckling/Ranking/Classifiers/NL_XX.hs too large to diff
• Duckling/Ranking/Classifiers/PL_XX.hs too large to diff
• Duckling/Ranking/Classifiers/PT_XX.hs too large to diff
• Duckling/Ranking/Classifiers/RO_XX.hs too large to diff
• Duckling/Ranking/Classifiers/RU_XX.hs too large to diff
• Duckling/Ranking/Classifiers/SK_XX.hs too large to diff
• Duckling/Ranking/Classifiers/SV_XX.hs too large to diff
• Duckling/Ranking/Classifiers/SW_XX.hs too large to diff
• Duckling/Ranking/Classifiers/TE_XX.hs too large to diff
• Duckling/Ranking/Classifiers/TH_XX.hs too large to diff
• Duckling/Ranking/Classifiers/TR_XX.hs too large to diff
• Duckling/Ranking/Classifiers/UK_XX.hs too large to diff
• Duckling/Ranking/Classifiers/VI_XX.hs too large to diff
• Duckling/Ranking/Classifiers/ZH_CN.hs too large to diff
• Duckling/Ranking/Classifiers/ZH_HK.hs too large to diff
• Duckling/Ranking/Classifiers/ZH_MO.hs too large to diff
• Duckling/Ranking/Classifiers/ZH_TW.hs too large to diff
• Duckling/Ranking/Classifiers/ZH_XX.hs too large to diff
• Duckling/Ranking/Extraction.hs too large to diff
• Duckling/Ranking/Rank.hs too large to diff
• Duckling/Ranking/Types.hs too large to diff
• Duckling/Regex/Types.hs too large to diff
• Duckling/Region.hs too large to diff
• Duckling/Resolve.hs too large to diff
• Duckling/Rules.hs too large to diff
• Duckling/Rules/AF.hs too large to diff
• Duckling/Rules/AR.hs too large to diff
• Duckling/Rules/BG.hs too large to diff
• Duckling/Rules/BN.hs too large to diff
• Duckling/Rules/CA.hs too large to diff
• Duckling/Rules/CS.hs too large to diff
• Duckling/Rules/Common.hs too large to diff
• Duckling/Rules/DA.hs too large to diff
• Duckling/Rules/DE.hs too large to diff
• Duckling/Rules/EL.hs too large to diff
• Duckling/Rules/EN.hs too large to diff
• Duckling/Rules/ES.hs too large to diff
• Duckling/Rules/ET.hs too large to diff
• Duckling/Rules/FA.hs too large to diff
• Duckling/Rules/FI.hs too large to diff
• Duckling/Rules/FR.hs too large to diff
• Duckling/Rules/GA.hs too large to diff
• Duckling/Rules/HE.hs too large to diff
• Duckling/Rules/HI.hs too large to diff
• Duckling/Rules/HR.hs too large to diff
• Duckling/Rules/HU.hs too large to diff
• Duckling/Rules/ID.hs too large to diff
• Duckling/Rules/IS.hs too large to diff
• Duckling/Rules/IT.hs too large to diff
• Duckling/Rules/JA.hs too large to diff
• Duckling/Rules/KA.hs too large to diff
• Duckling/Rules/KM.hs too large to diff
• Duckling/Rules/KN.hs too large to diff
• Duckling/Rules/KO.hs too large to diff
• Duckling/Rules/LO.hs too large to diff
• Duckling/Rules/ML.hs too large to diff
• Duckling/Rules/MN.hs too large to diff
• Duckling/Rules/MY.hs too large to diff
• Duckling/Rules/NB.hs too large to diff
• Duckling/Rules/NE.hs too large to diff
• Duckling/Rules/NL.hs too large to diff
• Duckling/Rules/PL.hs too large to diff
• Duckling/Rules/PT.hs too large to diff
• Duckling/Rules/RO.hs too large to diff
• Duckling/Rules/RU.hs too large to diff
• Duckling/Rules/SK.hs too large to diff
• Duckling/Rules/SV.hs too large to diff
• Duckling/Rules/SW.hs too large to diff
• Duckling/Rules/TA.hs too large to diff
• Duckling/Rules/TE.hs too large to diff
• Duckling/Rules/TH.hs too large to diff
• Duckling/Rules/TR.hs too large to diff
• Duckling/Rules/UK.hs too large to diff
• Duckling/Rules/VI.hs too large to diff
• Duckling/Rules/ZH.hs too large to diff
• Duckling/Temperature/AR/Corpus.hs too large to diff
• Duckling/Temperature/AR/Rules.hs too large to diff
• Duckling/Temperature/EN/Corpus.hs too large to diff
• Duckling/Temperature/EN/Rules.hs too large to diff
• Duckling/Temperature/ES/Corpus.hs too large to diff
• Duckling/Temperature/ES/Rules.hs too large to diff
• Duckling/Temperature/FR/Corpus.hs too large to diff
• Duckling/Temperature/FR/Rules.hs too large to diff
• Duckling/Temperature/GA/Corpus.hs too large to diff
• Duckling/Temperature/GA/Rules.hs too large to diff
• Duckling/Temperature/HI/Corpus.hs too large to diff
• Duckling/Temperature/HI/Rules.hs too large to diff
• Duckling/Temperature/HR/Corpus.hs too large to diff
• Duckling/Temperature/HR/Rules.hs too large to diff
• Duckling/Temperature/Helpers.hs too large to diff
• Duckling/Temperature/IT/Corpus.hs too large to diff
• Duckling/Temperature/IT/Rules.hs too large to diff
• Duckling/Temperature/JA/Corpus.hs too large to diff
• Duckling/Temperature/JA/Rules.hs too large to diff
• Duckling/Temperature/KM/Corpus.hs too large to diff
• Duckling/Temperature/KM/Rules.hs too large to diff
• Duckling/Temperature/KO/Corpus.hs too large to diff
• Duckling/Temperature/KO/Rules.hs too large to diff
• Duckling/Temperature/MN/Corpus.hs too large to diff
• Duckling/Temperature/MN/Rules.hs too large to diff
• Duckling/Temperature/PT/Corpus.hs too large to diff
• Duckling/Temperature/PT/Rules.hs too large to diff
• Duckling/Temperature/RO/Corpus.hs too large to diff
• Duckling/Temperature/RO/Rules.hs too large to diff
• Duckling/Temperature/Rules.hs too large to diff
• Duckling/Temperature/TR/Corpus.hs too large to diff
• Duckling/Temperature/TR/Rules.hs too large to diff
• Duckling/Temperature/Types.hs too large to diff
• Duckling/Temperature/ZH/Corpus.hs too large to diff
• Duckling/Temperature/ZH/Rules.hs too large to diff
• Duckling/Testing/Types.hs too large to diff
• Duckling/Time/AR/Corpus.hs too large to diff
• Duckling/Time/AR/Rules.hs too large to diff
• Duckling/Time/BG/Corpus.hs too large to diff
• Duckling/Time/BG/Rules.hs too large to diff
• Duckling/Time/Computed.hs too large to diff
• Duckling/Time/Corpus.hs too large to diff
• Duckling/Time/DA/Corpus.hs too large to diff
• Duckling/Time/DA/Rules.hs too large to diff
• Duckling/Time/DE/Corpus.hs too large to diff
• Duckling/Time/DE/Rules.hs too large to diff
• Duckling/Time/EL/Corpus.hs too large to diff
• Duckling/Time/EL/Rules.hs too large to diff
• Duckling/Time/EN/AU/Corpus.hs too large to diff
• Duckling/Time/EN/AU/Rules.hs too large to diff
• Duckling/Time/EN/BZ/Corpus.hs too large to diff
• Duckling/Time/EN/BZ/Rules.hs too large to diff
• Duckling/Time/EN/CA/Corpus.hs too large to diff
• Duckling/Time/EN/CA/Rules.hs too large to diff
• Duckling/Time/EN/Corpus.hs too large to diff
• Duckling/Time/EN/GB/Corpus.hs too large to diff
• Duckling/Time/EN/GB/Rules.hs too large to diff
• Duckling/Time/EN/IE/Corpus.hs too large to diff
• Duckling/Time/EN/IE/Rules.hs too large to diff
• Duckling/Time/EN/IN/Corpus.hs too large to diff
• Duckling/Time/EN/IN/Rules.hs too large to diff
• Duckling/Time/EN/JM/Corpus.hs too large to diff
• Duckling/Time/EN/JM/Rules.hs too large to diff
• Duckling/Time/EN/NZ/Corpus.hs too large to diff
• Duckling/Time/EN/NZ/Rules.hs too large to diff
• Duckling/Time/EN/PH/Corpus.hs too large to diff
• Duckling/Time/EN/PH/Rules.hs too large to diff
• Duckling/Time/EN/Rules.hs too large to diff
• Duckling/Time/EN/TT/Corpus.hs too large to diff
• Duckling/Time/EN/TT/Rules.hs too large to diff
• Duckling/Time/EN/US/Corpus.hs too large to diff
• Duckling/Time/EN/US/Rules.hs too large to diff
• Duckling/Time/EN/ZA/Corpus.hs too large to diff
• Duckling/Time/EN/ZA/Rules.hs too large to diff
• Duckling/Time/ES/Corpus.hs too large to diff
• Duckling/Time/ES/Rules.hs too large to diff
• Duckling/Time/FR/Corpus.hs too large to diff
• Duckling/Time/FR/Rules.hs too large to diff
• Duckling/Time/GA/Corpus.hs too large to diff
• Duckling/Time/GA/Rules.hs too large to diff
• Duckling/Time/HE/Corpus.hs too large to diff
• Duckling/Time/HE/Rules.hs too large to diff
• Duckling/Time/HR/Corpus.hs too large to diff
• Duckling/Time/HR/Rules.hs too large to diff
• Duckling/Time/HU/Corpus.hs too large to diff
• Duckling/Time/HU/Rules.hs too large to diff
• Duckling/Time/Helpers.hs too large to diff
• Duckling/Time/HolidayHelpers.hs too large to diff
• Duckling/Time/IT/Corpus.hs too large to diff
• Duckling/Time/IT/Rules.hs too large to diff
• Duckling/Time/KA/Corpus.hs too large to diff
• Duckling/Time/KA/Rules.hs too large to diff
• Duckling/Time/KO/Corpus.hs too large to diff
• Duckling/Time/KO/Rules.hs too large to diff
• Duckling/Time/NB/Corpus.hs too large to diff
• Duckling/Time/NB/Rules.hs too large to diff
• Duckling/Time/NL/BE/Corpus.hs too large to diff
• Duckling/Time/NL/BE/Rules.hs too large to diff
• Duckling/Time/NL/Corpus.hs too large to diff
• Duckling/Time/NL/NL/Rules.hs too large to diff
• Duckling/Time/NL/Rules.hs too large to diff
• Duckling/Time/PL/Corpus.hs too large to diff
• Duckling/Time/PL/Rules.hs too large to diff
• Duckling/Time/PT/Corpus.hs too large to diff
• Duckling/Time/PT/Rules.hs too large to diff
• Duckling/Time/RO/Corpus.hs too large to diff
• Duckling/Time/RO/Rules.hs too large to diff
• Duckling/Time/RU/Corpus.hs too large to diff
• Duckling/Time/RU/Rules.hs too large to diff
• Duckling/Time/SV/Corpus.hs too large to diff
• Duckling/Time/SV/Rules.hs too large to diff
• Duckling/Time/TR/Corpus.hs too large to diff
• Duckling/Time/TR/Rules.hs too large to diff
• Duckling/Time/TimeZone/Parse.hs too large to diff
• Duckling/Time/Types.hs too large to diff
• Duckling/Time/UK/Corpus.hs too large to diff
• Duckling/Time/UK/Rules.hs too large to diff
• Duckling/Time/VI/Corpus.hs too large to diff
• Duckling/Time/VI/Rules.hs too large to diff
• Duckling/Time/ZH/CN/Corpus.hs too large to diff
• Duckling/Time/ZH/CN/Rules.hs too large to diff
• Duckling/Time/ZH/Corpus.hs too large to diff
• Duckling/Time/ZH/HK/Corpus.hs too large to diff
• Duckling/Time/ZH/HK/Rules.hs too large to diff
• Duckling/Time/ZH/MO/Corpus.hs too large to diff
• Duckling/Time/ZH/MO/Rules.hs too large to diff
• Duckling/Time/ZH/Rules.hs too large to diff
• Duckling/Time/ZH/TW/Corpus.hs too large to diff
• Duckling/Time/ZH/TW/Rules.hs too large to diff
• Duckling/TimeGrain/AR/Rules.hs too large to diff
• Duckling/TimeGrain/BG/Rules.hs too large to diff
• Duckling/TimeGrain/DA/Rules.hs too large to diff
• Duckling/TimeGrain/DE/Rules.hs too large to diff
• Duckling/TimeGrain/EL/Rules.hs too large to diff
• Duckling/TimeGrain/EN/Rules.hs too large to diff
• Duckling/TimeGrain/ES/Rules.hs too large to diff
• Duckling/TimeGrain/FI/Rules.hs too large to diff
• Duckling/TimeGrain/FR/Rules.hs too large to diff
• Duckling/TimeGrain/GA/Rules.hs too large to diff
• Duckling/TimeGrain/HE/Rules.hs too large to diff
• Duckling/TimeGrain/HI/Rules.hs too large to diff
• Duckling/TimeGrain/HR/Rules.hs too large to diff
• Duckling/TimeGrain/HU/Rules.hs too large to diff
• Duckling/TimeGrain/IT/Rules.hs too large to diff
• Duckling/TimeGrain/JA/Rules.hs too large to diff
• Duckling/TimeGrain/KA/Rules.hs too large to diff
• Duckling/TimeGrain/KO/Rules.hs too large to diff
• Duckling/TimeGrain/MN/Rules.hs too large to diff
• Duckling/TimeGrain/NB/Rules.hs too large to diff
• Duckling/TimeGrain/NL/Rules.hs too large to diff
• Duckling/TimeGrain/PL/Rules.hs too large to diff
• Duckling/TimeGrain/PT/Rules.hs too large to diff
• Duckling/TimeGrain/RO/Rules.hs too large to diff
• Duckling/TimeGrain/RU/Rules.hs too large to diff
• Duckling/TimeGrain/SV/Rules.hs too large to diff
• Duckling/TimeGrain/TR/Rules.hs too large to diff
• Duckling/TimeGrain/Types.hs too large to diff
• Duckling/TimeGrain/UK/Rules.hs too large to diff
• Duckling/TimeGrain/VI/Rules.hs too large to diff
• Duckling/TimeGrain/ZH/Rules.hs too large to diff
• Duckling/Types.hs too large to diff
• Duckling/Types/Document.hs too large to diff
• Duckling/Types/Stash.hs too large to diff
• Duckling/Url/Corpus.hs too large to diff
• Duckling/Url/Helpers.hs too large to diff
• Duckling/Url/Rules.hs too large to diff
• Duckling/Url/Types.hs too large to diff
• Duckling/Volume/AR/Corpus.hs too large to diff
• Duckling/Volume/AR/Rules.hs too large to diff
• Duckling/Volume/DE/Corpus.hs too large to diff
• Duckling/Volume/DE/Rules.hs too large to diff
• Duckling/Volume/EN/Corpus.hs too large to diff
• Duckling/Volume/EN/Rules.hs too large to diff
• Duckling/Volume/ES/Corpus.hs too large to diff
• Duckling/Volume/ES/Rules.hs too large to diff
• Duckling/Volume/FR/Corpus.hs too large to diff
• Duckling/Volume/FR/Rules.hs too large to diff
• Duckling/Volume/GA/Corpus.hs too large to diff
• Duckling/Volume/GA/Rules.hs too large to diff
• Duckling/Volume/HR/Corpus.hs too large to diff
• Duckling/Volume/HR/Rules.hs too large to diff
• Duckling/Volume/Helpers.hs too large to diff
• Duckling/Volume/IT/Corpus.hs too large to diff
• Duckling/Volume/IT/Rules.hs too large to diff
• Duckling/Volume/KM/Corpus.hs too large to diff
• Duckling/Volume/KM/Rules.hs too large to diff
• Duckling/Volume/KO/Corpus.hs too large to diff
• Duckling/Volume/KO/Rules.hs too large to diff
• Duckling/Volume/MN/Corpus.hs too large to diff
• Duckling/Volume/MN/Rules.hs too large to diff
• Duckling/Volume/NL/Corpus.hs too large to diff
• Duckling/Volume/NL/Rules.hs too large to diff
• Duckling/Volume/PT/Corpus.hs too large to diff
• Duckling/Volume/PT/Rules.hs too large to diff
• Duckling/Volume/RO/Corpus.hs too large to diff
• Duckling/Volume/RO/Rules.hs too large to diff
• Duckling/Volume/RU/Corpus.hs too large to diff
• Duckling/Volume/RU/Rules.hs too large to diff
• Duckling/Volume/Rules.hs too large to diff
• Duckling/Volume/TR/Corpus.hs too large to diff
• Duckling/Volume/TR/Rules.hs too large to diff
• Duckling/Volume/Types.hs too large to diff
• Duckling/Volume/ZH/Corpus.hs too large to diff
• Duckling/Volume/ZH/Rules.hs too large to diff
• PATENTS too large to diff
• README.md too large to diff
• Setup.hs too large to diff
• duckling.cabal too large to diff
• exe/CustomDimensionExample.hs too large to diff
• exe/Duckling/Data/TimeZone.hs too large to diff
• exe/Duckling/Ranking/Generate.hs too large to diff
• exe/Duckling/Ranking/Train.hs too large to diff
• exe/DucklingExpensive.hs too large to diff
• exe/DucklingRequestSample.hs too large to diff
• exe/ExampleMain.hs too large to diff
• exe/RegenMain.hs too large to diff
• tests/Duckling/AmountOfMoney/AR/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/BG/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/EN/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/ES/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/FR/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/GA/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/HE/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/HR/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/ID/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/IT/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/KA/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/KO/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/MN/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/NB/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/NL/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/PT/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/RO/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/RU/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/SV/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/TR/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/VI/Tests.hs too large to diff
• tests/Duckling/AmountOfMoney/ZH/Tests.hs too large to diff
• tests/Duckling/Api/Tests.hs too large to diff
• tests/Duckling/CreditCardNumber/Tests.hs too large to diff
• tests/Duckling/Dimensions/Tests.hs too large to diff
• tests/Duckling/Distance/BG/Tests.hs too large to diff
• tests/Duckling/Distance/CS/Tests.hs too large to diff
• tests/Duckling/Distance/DE/Tests.hs too large to diff
• tests/Duckling/Distance/EN/Tests.hs too large to diff
• tests/Duckling/Distance/ES/Tests.hs too large to diff
• tests/Duckling/Distance/FR/Tests.hs too large to diff
• tests/Duckling/Distance/GA/Tests.hs too large to diff
• tests/Duckling/Distance/HR/Tests.hs too large to diff
• tests/Duckling/Distance/IT/Tests.hs too large to diff
• tests/Duckling/Distance/KM/Tests.hs too large to diff
• tests/Duckling/Distance/KO/Tests.hs too large to diff
• tests/Duckling/Distance/MN/Tests.hs too large to diff
• tests/Duckling/Distance/NL/Tests.hs too large to diff
• tests/Duckling/Distance/PT/Tests.hs too large to diff
• tests/Duckling/Distance/RO/Tests.hs too large to diff
• tests/Duckling/Distance/RU/Tests.hs too large to diff
• tests/Duckling/Distance/SV/Tests.hs too large to diff
• tests/Duckling/Distance/TR/Tests.hs too large to diff
• tests/Duckling/Distance/Tests.hs too large to diff
• tests/Duckling/Distance/ZH/Tests.hs too large to diff
• tests/Duckling/Duration/AR/Tests.hs too large to diff
• tests/Duckling/Duration/BG/Tests.hs too large to diff
• tests/Duckling/Duration/EL/Tests.hs too large to diff
• tests/Duckling/Duration/EN/Tests.hs too large to diff
• tests/Duckling/Duration/ES/Tests.hs too large to diff
• tests/Duckling/Duration/FR/Tests.hs too large to diff
• tests/Duckling/Duration/GA/Tests.hs too large to diff
• tests/Duckling/Duration/HI/Tests.hs too large to diff
• tests/Duckling/Duration/HU/Tests.hs too large to diff
• tests/Duckling/Duration/JA/Tests.hs too large to diff
• tests/Duckling/Duration/KA/Tests.hs too large to diff
• tests/Duckling/Duration/KO/Tests.hs too large to diff
• tests/Duckling/Duration/MN/Tests.hs too large to diff
• tests/Duckling/Duration/NB/Tests.hs too large to diff
• tests/Duckling/Duration/NL/Tests.hs too large to diff
• tests/Duckling/Duration/PL/Tests.hs too large to diff
• tests/Duckling/Duration/PT/Tests.hs too large to diff
• tests/Duckling/Duration/RO/Tests.hs too large to diff
• tests/Duckling/Duration/RU/Tests.hs too large to diff
• tests/Duckling/Duration/SV/Tests.hs too large to diff
• tests/Duckling/Duration/TR/Tests.hs too large to diff
• tests/Duckling/Duration/Tests.hs too large to diff
• tests/Duckling/Duration/UK/Tests.hs too large to diff
• tests/Duckling/Duration/ZH/Tests.hs too large to diff
• tests/Duckling/Email/DE/Tests.hs too large to diff
• tests/Duckling/Email/EN/Tests.hs too large to diff
• tests/Duckling/Email/FR/Tests.hs too large to diff
• tests/Duckling/Email/IS/Tests.hs too large to diff
• tests/Duckling/Email/IT/Tests.hs too large to diff
• tests/Duckling/Email/Tests.hs too large to diff
• tests/Duckling/Engine/Tests.hs too large to diff
• tests/Duckling/Numeral/AF/Tests.hs too large to diff
• tests/Duckling/Numeral/AR/Tests.hs too large to diff
• tests/Duckling/Numeral/BG/Tests.hs too large to diff
• tests/Duckling/Numeral/BN/Tests.hs too large to diff
• tests/Duckling/Numeral/CA/Tests.hs too large to diff
• tests/Duckling/Numeral/CS/Tests.hs too large to diff
• tests/Duckling/Numeral/DA/Tests.hs too large to diff
• tests/Duckling/Numeral/DE/Tests.hs too large to diff
• tests/Duckling/Numeral/EL/Tests.hs too large to diff
• tests/Duckling/Numeral/EN/Tests.hs too large to diff
• tests/Duckling/Numeral/ES/Tests.hs too large to diff
• tests/Duckling/Numeral/ET/Tests.hs too large to diff
• tests/Duckling/Numeral/FA/Tests.hs too large to diff
• tests/Duckling/Numeral/FI/Tests.hs too large to diff
• tests/Duckling/Numeral/FR/Tests.hs too large to diff
• tests/Duckling/Numeral/GA/Tests.hs too large to diff
• tests/Duckling/Numeral/HE/Tests.hs too large to diff
• tests/Duckling/Numeral/HI/Tests.hs too large to diff
• tests/Duckling/Numeral/HR/Tests.hs too large to diff
• tests/Duckling/Numeral/HU/Tests.hs too large to diff
• tests/Duckling/Numeral/ID/Tests.hs too large to diff
• tests/Duckling/Numeral/IS/Tests.hs too large to diff
• tests/Duckling/Numeral/IT/Tests.hs too large to diff
• tests/Duckling/Numeral/JA/Tests.hs too large to diff
• tests/Duckling/Numeral/KA/Tests.hs too large to diff
• tests/Duckling/Numeral/KM/Tests.hs too large to diff
• tests/Duckling/Numeral/KN/Tests.hs too large to diff
• tests/Duckling/Numeral/KO/Tests.hs too large to diff
• tests/Duckling/Numeral/LO/Tests.hs too large to diff
• tests/Duckling/Numeral/ML/Tests.hs too large to diff
• tests/Duckling/Numeral/MN/Tests.hs too large to diff
• tests/Duckling/Numeral/MY/Tests.hs too large to diff
• tests/Duckling/Numeral/NB/Tests.hs too large to diff
• tests/Duckling/Numeral/NE/Tests.hs too large to diff
• tests/Duckling/Numeral/NL/Tests.hs too large to diff
• tests/Duckling/Numeral/PL/Tests.hs too large to diff
• tests/Duckling/Numeral/PT/Tests.hs too large to diff
• tests/Duckling/Numeral/RO/Tests.hs too large to diff
• tests/Duckling/Numeral/RU/Tests.hs too large to diff
• tests/Duckling/Numeral/SK/Tests.hs too large to diff
• tests/Duckling/Numeral/SV/Tests.hs too large to diff
• tests/Duckling/Numeral/SW/Tests.hs too large to diff
• tests/Duckling/Numeral/TA/Tests.hs too large to diff
• tests/Duckling/Numeral/TE/Tests.hs too large to diff
• tests/Duckling/Numeral/TH/Tests.hs too large to diff
• tests/Duckling/Numeral/TR/Tests.hs too large to diff
• tests/Duckling/Numeral/Tests.hs too large to diff
• tests/Duckling/Numeral/UK/Tests.hs too large to diff
• tests/Duckling/Numeral/VI/Tests.hs too large to diff
• tests/Duckling/Numeral/ZH/Tests.hs too large to diff
• tests/Duckling/Ordinal/AR/Tests.hs too large to diff
• tests/Duckling/Ordinal/BG/Tests.hs too large to diff
• tests/Duckling/Ordinal/CA/Tests.hs too large to diff
• tests/Duckling/Ordinal/DA/Tests.hs too large to diff
• tests/Duckling/Ordinal/DE/Tests.hs too large to diff
• tests/Duckling/Ordinal/EL/Tests.hs too large to diff
• tests/Duckling/Ordinal/EN/Tests.hs too large to diff
• tests/Duckling/Ordinal/ES/Tests.hs too large to diff
• tests/Duckling/Ordinal/ET/Tests.hs too large to diff
• tests/Duckling/Ordinal/FR/Tests.hs too large to diff
• tests/Duckling/Ordinal/GA/Tests.hs too large to diff
• tests/Duckling/Ordinal/HE/Tests.hs too large to diff
• tests/Duckling/Ordinal/HI/Tests.hs too large to diff
• tests/Duckling/Ordinal/HR/Tests.hs too large to diff
• tests/Duckling/Ordinal/HU/Tests.hs too large to diff
• tests/Duckling/Ordinal/ID/Tests.hs too large to diff
• tests/Duckling/Ordinal/IT/Tests.hs too large to diff
• tests/Duckling/Ordinal/JA/Tests.hs too large to diff
• tests/Duckling/Ordinal/KA/Tests.hs too large to diff
• tests/Duckling/Ordinal/KM/Tests.hs too large to diff
• tests/Duckling/Ordinal/KO/Tests.hs too large to diff
• tests/Duckling/Ordinal/ML/Tests.hs too large to diff
• tests/Duckling/Ordinal/MN/Tests.hs too large to diff
• tests/Duckling/Ordinal/NB/Tests.hs too large to diff
• tests/Duckling/Ordinal/NL/Tests.hs too large to diff
• tests/Duckling/Ordinal/PL/Tests.hs too large to diff
• tests/Duckling/Ordinal/PT/Tests.hs too large to diff
• tests/Duckling/Ordinal/RO/Tests.hs too large to diff
• tests/Duckling/Ordinal/RU/Tests.hs too large to diff
• tests/Duckling/Ordinal/SV/Tests.hs too large to diff
• tests/Duckling/Ordinal/TA/Tests.hs too large to diff
• tests/Duckling/Ordinal/TR/Tests.hs too large to diff
• tests/Duckling/Ordinal/Tests.hs too large to diff
• tests/Duckling/Ordinal/UK/Tests.hs too large to diff
• tests/Duckling/Ordinal/VI/Tests.hs too large to diff
• tests/Duckling/Ordinal/ZH/Tests.hs too large to diff
• tests/Duckling/PhoneNumber/AR/Tests.hs too large to diff
• tests/Duckling/PhoneNumber/PT/Tests.hs too large to diff
• tests/Duckling/PhoneNumber/Tests.hs too large to diff
• tests/Duckling/Quantity/AR/Tests.hs too large to diff
• tests/Duckling/Quantity/EN/Tests.hs too large to diff
• tests/Duckling/Quantity/ES/Tests.hs too large to diff
• tests/Duckling/Quantity/FR/Tests.hs too large to diff
• tests/Duckling/Quantity/HR/Tests.hs too large to diff
• tests/Duckling/Quantity/KM/Tests.hs too large to diff
• tests/Duckling/Quantity/KO/Tests.hs too large to diff
• tests/Duckling/Quantity/MN/Tests.hs too large to diff
• tests/Duckling/Quantity/NL/Tests.hs too large to diff
• tests/Duckling/Quantity/PT/Tests.hs too large to diff
• tests/Duckling/Quantity/RO/Tests.hs too large to diff
• tests/Duckling/Quantity/RU/Tests.hs too large to diff
• tests/Duckling/Quantity/Tests.hs too large to diff
• tests/Duckling/Quantity/ZH/Tests.hs too large to diff
• tests/Duckling/Temperature/AR/Tests.hs too large to diff
• tests/Duckling/Temperature/EN/Tests.hs too large to diff
• tests/Duckling/Temperature/ES/Tests.hs too large to diff
• tests/Duckling/Temperature/FR/Tests.hs too large to diff
• tests/Duckling/Temperature/GA/Tests.hs too large to diff
• tests/Duckling/Temperature/HI/Tests.hs too large to diff
• tests/Duckling/Temperature/HR/Tests.hs too large to diff
• tests/Duckling/Temperature/IT/Tests.hs too large to diff
• tests/Duckling/Temperature/JA/Tests.hs too large to diff
• tests/Duckling/Temperature/KM/Tests.hs too large to diff
• tests/Duckling/Temperature/KO/Tests.hs too large to diff
• tests/Duckling/Temperature/MN/Tests.hs too large to diff
• tests/Duckling/Temperature/PT/Tests.hs too large to diff
• tests/Duckling/Temperature/RO/Tests.hs too large to diff
• tests/Duckling/Temperature/TR/Tests.hs too large to diff
• tests/Duckling/Temperature/Tests.hs too large to diff
• tests/Duckling/Temperature/ZH/Tests.hs too large to diff
• tests/Duckling/Testing/Asserts.hs too large to diff
• tests/Duckling/Tests.hs too large to diff
• tests/Duckling/Time/AR/Tests.hs too large to diff
• tests/Duckling/Time/BG/Tests.hs too large to diff
• tests/Duckling/Time/DA/Tests.hs too large to diff
• tests/Duckling/Time/DE/Tests.hs too large to diff
• tests/Duckling/Time/EL/Tests.hs too large to diff
• tests/Duckling/Time/EN/Tests.hs too large to diff
• tests/Duckling/Time/ES/Tests.hs too large to diff
• tests/Duckling/Time/FR/Tests.hs too large to diff
• tests/Duckling/Time/GA/Tests.hs too large to diff
• tests/Duckling/Time/HE/Tests.hs too large to diff
• tests/Duckling/Time/HR/Tests.hs too large to diff
• tests/Duckling/Time/HU/Tests.hs too large to diff
• tests/Duckling/Time/IT/Tests.hs too large to diff
• tests/Duckling/Time/KA/Tests.hs too large to diff
• tests/Duckling/Time/KO/Tests.hs too large to diff
• tests/Duckling/Time/NB/Tests.hs too large to diff
• tests/Duckling/Time/NL/Tests.hs too large to diff
• tests/Duckling/Time/PL/Tests.hs too large to diff
• tests/Duckling/Time/PT/Tests.hs too large to diff
• tests/Duckling/Time/RO/Tests.hs too large to diff
• tests/Duckling/Time/RU/Tests.hs too large to diff
• tests/Duckling/Time/SV/Tests.hs too large to diff
• tests/Duckling/Time/Tests.hs too large to diff
• tests/Duckling/Time/UK/Tests.hs too large to diff
• tests/Duckling/Time/VI/Tests.hs too large to diff
• tests/Duckling/Time/ZH/Tests.hs too large to diff
• tests/Duckling/Url/Tests.hs too large to diff
• tests/Duckling/Volume/AR/Tests.hs too large to diff
• tests/Duckling/Volume/DE/Tests.hs too large to diff
• tests/Duckling/Volume/EN/Tests.hs too large to diff
• tests/Duckling/Volume/ES/Tests.hs too large to diff
• tests/Duckling/Volume/FR/Tests.hs too large to diff
• tests/Duckling/Volume/GA/Tests.hs too large to diff
• tests/Duckling/Volume/HR/Tests.hs too large to diff
• tests/Duckling/Volume/IT/Tests.hs too large to diff
• tests/Duckling/Volume/KM/Tests.hs too large to diff
• tests/Duckling/Volume/KO/Tests.hs too large to diff
• tests/Duckling/Volume/MN/Tests.hs too large to diff
• tests/Duckling/Volume/NL/Tests.hs too large to diff
• tests/Duckling/Volume/PT/Tests.hs too large to diff
• tests/Duckling/Volume/RO/Tests.hs too large to diff
• tests/Duckling/Volume/RU/Tests.hs too large to diff
• tests/Duckling/Volume/TR/Tests.hs too large to diff
• tests/Duckling/Volume/Tests.hs too large to diff
• tests/Duckling/Volume/ZH/Tests.hs too large to diff
• tests/TestMain.hs too large to diff

@@ -0,0 +1,784 @@+# Changelog for [`duckling` package](https://github.com/facebook/duckling)++## 0.2.0.0++### Core+  * Bump versions on dependencies+  * ExampleMain: add support for setting the port+  * Support for GHC >= 8.8.x && GHC <= 9.0.1+  * Relicense to BSD-3+  * Probabilistic layer bug fix+  * Remove dependency on Data.Some+  * Depend on regex-pcre-builtin on Windows+  * Update cabal-version to 2.2+  * Migrate to GitHub CI over Travis+  * Some attempts at getting smaller parse trees (less exploitable)++### Rulesets++* Common+  * Correct CDT TimeZone offset  CDT is (-300), not 540.+  * Fixed BST and IST offsets. BST is +1 (60) and IST is +5:30 (330)+  * Make unicode output in tests sane by not relying on `Show`+  * Add type=value to JSON response for Email, PhoneNumber, and Url, for consistency+  * CreditCardNumber: **new!** (duckling can now recognise credit cards)+  * Email: Add DE (German) + IS (Icelandic) spelled out email+  * Numeral: Don't accept dashes ('-') as token separators+  * Time: Add Karva Chauth holiday+  * Time: Add Vaisakhi holiday+  * Time: Add daylight savings start/endtimes to holidays+  * Time: Add Purim and Shushan Purim (Jewish holidays)+  * Time: Add Guru Gobind Singh Jayanti holiday+  * Time: Extend support for Ramadan and Eid al-Fitr from 1950 to 2050+  * Time: Add support for Parsi New Year+  * Time: Add support for Dayananda Saraswati Jayanti holiday+  * Time: Extend support for Mawlid from 1950 to 1998+  * Time: Add Rabindra Jayanti holiday+  * Time: Add Guru Ravidass Jayanti holiday+  * Time: Extend support for Eid al-Adha from 1950 to 2000+  * Time: Add Krishna Janmashtami holiday+  * Time: Add Mahavir Jayanti holiday+  * Time: Add Maha Shivaratri holiday+  * Time: add Ugadi holiday+  * Volume: interval support++* AF (Afrikaans)+  * Numeral: **new!**++* AR (Arabic)+  * Add a new locale: EG (Egyptian)+  * AmountOfMoney: Add more variants of EGP+  * Numeral: Add support for numerals written in Arabic script+  * Numeral: Support decimals and comma-separated integers+  * PhoneNumber: **new!**+  * Time: Add periodic times+  * Time: Add rule for a week ago++* BG (Bulgarian)+  * Time: **new!**++* BN (Bengali)+  * Numeral: **new!**++* CA (Catalan)+  * Numeral: **new!**+  * Ordinal: **new!**++* DA (Danish)+  * Ordinal: Add support for larger spelled-out ordinals+  * Time: recognise abbreviation 'kl'++* DE (German)+  * Distance: **new!**+  * Duration: Add more common durations+  * Numeral: Fix typo on "fünfzehn"(15)+  * Time: Fix wrong parsing of YYYY-MM-DD dates+  * Time: Add rule for 'the day before yesterday'+  * Time: Fix a bug for "fünfter"¬+  * Time: support for "am ersten Dezember" to " am einunddreißigsten Dezember"¬+  * Time: now recognise "der fünfte Dezember"¬+  * Time: Add support for (pre-)computed holidays+  * Time: Don't parse 'so'+  * Time: improve approximations+  * Time: Add rule for week after next+  * Time: Add rule for montag in n wochen+  * Volume: **new!**++* EN (English)+  * AmountOfMoney: Add support for subunits of dollars, e.g. nickels, dimes, quarters, as well as the number of coins+  * AmountOfMoney: Add support for latent+  * AmountOfMoney: Add support for lakh and crore+  * AmountOfMoney: correct regex to match three letter currency codes beginning with C+  * AmountOfMoney: Make ruleInterval{Max,Min} symmetric+  * AmountOfMoney: Support abbreviations of lakh and crore+  * AmountOfMoney: Add UAH currency+  * AmountOfMoney: Add HKD+  * AmountOfMoney: dollar and \<amount-of-money\>+  * AmountOfMoney: dollar and a half+  * AmountOfMoney: intersection for \<amount-of-money\> and a half+  * AmountOfMoney: extend interval support+  * AmountOfMoney: Add more variants of EGP+  * Distance: Support composite distances+  * Distance: one meter and \<distance\>+  * Distance: \<distance\> meters and \<distance\>+  * Distance: Add interval support+  * Duration: Fix composite durations without delimiters.+              It previously only worked with+              commas/'and'-separated tokens+  * Duration: Support more words in `ruleDurationNumeralMore`+  * Duration: \<integer\> and a half minutes+  * Duration: support for \<integer\> hour and \<integer\>+  * Duration: parse Xm as X minutes and X.Y hrs as X.Y hours+  * Duration: Leverage TimeGrain for x.y hours+  * Duration: Support composite duration+  * Numeral: Fix ambiguous parses when both ruleNegative and ruleMultiply apply+  * Numeral: Extend fraction rule+  * Numeral: Add mixed fraction rules+  * Numeral: Add prefix of 10/100/10_000 rules+  * Quantity: Support 'k.g' and 'k.g.' for kilograms+  * Temperature: Support temperatures with decimal values+  * Time: Fix palm sunday regex+  * Time: Fix latent time of days like "ten thirty"+  * Time: Don't parse time of days above 12 with meridiem+          like "13 am"+  * Time: Add rule to match \<time\> + \<timezone\>+  * Time: Add "all week"/"rest of the week" rules+  * Time: Parse time intervals like: 2015-03-28 17:00:00/2015-03-28 21:00:00+  * Time: Add rules to handle "DD/MM/YYYY" or "DD MM YYYY"+  * Time: Add support for YYYYQQ and YYQQ expressions, like+          '2018Q4' and '18Q4'+  * Time: Add rule for 'during \<month\>'+  * Time: Restrict 'on' absorption to days+  * Time: Fix durations, upper intervals should all be exclusive+  * Time: Fix grain on some intervals for time-of-days+  * Time: Add rule 'in \<duration\> at \<time-ofday\>+  * Time: Add \<datetime\> - \<datetime\> (interval) timezone rule+  * Time: '\<day\> in \<duration\> should only operate on grain \> Hour+  * Time: Add '\<integer\> \<day-of-week\> from \<time\>' rule+  * Time: Add \<duration\> past \<time\>+  * Time: Make 'the week' resolve to interval from `today` to `end of week`+  * Time: Add support for \<hour\>h\<min\>+  * Time: Add rule for a quarter after \<hour-of-day\>+  * Time: Support 'Martin Luther Kings Day'+  * Time: Add more holiday aliases (Veteran Day, Mardi Gras, St. Paddy's Day)+  * Time: Intersect "9 tomorrow morning"+  * Time: Support 'Chinese New Years'+  * Time: Support "Saint" Patrick's Day+  * Time: Add Ratha-Yatra Holiday+  * Time: Add support for Ganesh Chaturthi holiday+  * Time: Add rama navami holiday+  * Time: Add '\<part-of-day\> at \<time-of-day\>' rule+  * Time: Modify 'this|last|next \<cycle\>' to capture things like "the month" in "the first Saturday of the month"+  * Time: Support 'the \<day-of-month\> of \<month\>'+  * Time: Add Orthodox Good Friday holiday+  * Time: The (nth) closest (day) to (time)+  * Time: Add rule for 'midday'+  * Time: Fix a problem with parsing fractional minutes+  * Time: parse 'upcoming xxx weeks' and 'xxx upcoming weeks'+  * Time: Add new rule to parse phrase in the pattern 'xxx minutes to \<hour-of-day\>+  * Time: Add support for spelled-out times+  * Time: Add support to parse \<ordinal\> \<day-of-week\>+  * Time: Fix parsing 'next \<day-of-week\>'+  * Time: Treat 'coming' as 'next'+  * Time: Make duckling time not treat 0:xx and 12:xx ambiguously+  * Add 'asap', 'at the moment' to EN time+  * Parse latent year intervals+  * Time: last \<duration\>+  * Time: \<time\> \<day-of-month\>+  * Volume: Extend interval support+  * Time: Handle 2-digit date in existing DD/MM/YYYY rule++* EN_UK (English, United Kingdom)+  * Duration: **new!**+  * Time: **new!**++* EN_US (English, United States)+  * Time: Super Tuesday++* ES (Spanish)+  * AmountOfMoney: Add support for intervals+  * Duration: Add support for parsing phrases like half hour, quarter of an hour+  * Duration: Support composite durations+  * Numeral: Fix typo of 22 (veinto -> venti)+  * Numeral: Add locale rules, since Spain and South America use different decimal separators+  * Numeral: parse 'cero dos' as 'dos'+  * Numeral: composite numerals+  * Ordinal: Add missing 'tercer' regex+  * Quantity: **new!**+  * Time: Add support for periodic holidays+  * Time: Fix `ruleYearLatent` to not match numerals that could be hours+  * Time: Make 'n horas' latent+  * Time: Fixed a problem with parsing 'day of month' that contains 'dia'+  * Time: Add rule for 'next week'+  * Time: \<ordinal\> \<day-of-month\>+  * Time: support for 'noon'+  * Time: Allow para before timestamps+  * Time: Add rule to parse '\<time-of-day\> (in the afternoon)'+  * Time: Add rule to parse 'last \<day-of-week\> of \<time\>'+  * Time: Add rule for next week+  * Time: Add more corpus for tomorrow so that tomorrow latent doesn't prevail+  * Time: Fix multi-word timestamps++* FA (Persian)+  * Numeral: **new!**++* FI (Finnish)+  * Numeral: **new!**++* FR (French)+  * Temperature: Support temperatures with decimal values+  * Time: Update month interval rules to handle ordinals+          and spelled-out numerals (e.g. "du premier au+          quinze juin")+  * Volume: Add 'Centilitre' type++* HE (Hebrew)+  * AmountOfMoney: add more rules++* HI (Hindi)+  * Duration: Pakhwada (पखवाड़ा) is 15 days n, not a fortnight+  * Duration: Add support for composite duration+  * Duration: Add support for specific times+  * Numeral: Support more numerals+  * Temperature: **new!**+  * Time: Add support for quarter till, quarter past, and half++* ID (Indonesian)+  * AmountOfMoney: support intervals++* IS (Icelandic)+  * Numeral: **new!**++* IT (Italian)+  * AmountOfMoney: **new!**+  * Distance: **new!**+  * Duration: Fix ruleDurationAgo++* KA (Georgian)+  * AmountOfMoney: **new!**+  * Duration: **new!**+  * Numeral: **new!**+  * Ordinal: **new!**+  * Time: **new!**+  * Time: Improvements for times in the past+  * Time: Add support for quarters++* KM (Khmer)+  * Distance: **new!**+  * Numeral: **new!**+  * Ordinal: **new!**+  * Quantity: **new!**+  * Temperature: **new!**+  * Volume: **new!**++* KN (Kannada)+  * Numeral: **new!**++* KO (Korean)+  * AmountOfMoney: support intervals++* LO (Lao)+  * Numeral: **new!**++* ML (Malayalam)+  * Numeral: **new!**+  * Ordinal: **new!**++* MN (Mongolian)+  * Numeral: **new!**++* NL (Dutch)+  * AmountOfMoney: make decimal thousands separator optional+  * Duration: Add 'anderhalf uur'+  * Duration: support composite durations+  * Quantity: **new!**+  * Time: Add support for King's Day (Koningsdag)+  * Time: stop 'for \<number\>' from resolving as times+  * Volume: remove gallon+  * Volume: Fix typo in milliliter++* NO (Norwegian)+  * AmountOfMoney: Parse more currencies+  * Numeral: The written numeral 8 had a typo: "otte" -> "åtte"+  * Numeral: Parse powers of ten with spaces as well as dots+  * Numeral: Add more textual powers of ten+  * Numeral: Parse textual numbers from 21 to 99 with _and_ without spaces+  * Time: Add support for half an hour before as e.g. "halv to"+  * Time: Add support for alternative clock denotation "klokka"+  * Time: Add support for alternative tomorrow denotation "i morra"+  * Time: Add some more unambiguous datetime parsing++* PL (Polish)+  * Numeral: Add support for seventy, eighty, ninety+  * Duration: Fix typo: miej -> mniej+  * Time: Add 'evening' to corpus++* PT (Portuguese)+  * Ordinal: Add 13..99+  * Ordinal: Corpus, keep accents consistent+  * Time: Last and quarter expressions++* RO (Romanian)+  * Numeral: Fix multipliers with values above 20+             In Romanian, for numerals above 20, we+             say '20 de milioane', not '20 milioane'.+  * Time: Implement 'the day after tomorrow'++* RU (Russian)+  * AmountOfMoney: Add UAH currency+  * Numeral: Be more permissive with numerals [20, 90]+  * Time: **new!**++* SK (Slovak)+  * Numeral: **new!**++* SW (Swahili)+  * Numeral: **new!**++* TA (Tamil)+  * Ordinal: **new!**++* TE (Telugu)+  * Numeral: **new!**++* TH (Thai)+  * Numeral: **new!**++* TR (Turkish)+  * AmountOfMoney: **new!**+  * Time: **new!**++* VI (Vietnamese)+  * AmountOfMoney: Add interval support+  * AmountOfMoney: ruleNg, ruleDollar, ruleVND modified to better capture usage of VI+  * Numeral: Add "ngàn" common synonym of "nghìn", and "chục",+             colloquially used to count tens.+  * Numeral: Remove ? in some regex where they don't make sense+  * Time: Fix double-digit month matching+  * Time: don't parse ngày++* ZH (Chinese)+  * Duration: Add more common expressions+  * Numeral: Add more common expressions+  * Time: Parse YYYY-MM+  * Time: Value before month can be integer or chinese char+  * Time: Add support for (pre-)computed holidays+  * Time: Add more common expressions+  * Volume: **new!**++### Server+  * Skip logfile creation if no logging+  * Document how example application can use specific dimensions only+  * Use System.FilePath.Posix instead of System.FilePath+  * Use all dimensions by default+  * Load timezones more leniently+  * Docker: Reduce size of image drastically+  * Dockerfile: Use Debian Buster++## 0.1.6.1++### Core++* Warn against incomplete pattern matching in GHC options+* Updated readme for custom dimensions+* Coding style documentation++### Rulesets++* Common+  * AmountOfMoney: change `financeWith` to `isAmountOfMoney` where applicable+  * Temperature: implement temperature intervals++* EN+  * AmountOfMoney: support "grand"+  * Time: Absorb "since" before month/year+  * Time: Fix before/after/until/since + <year>+  * Time: Make partial meridies latent+  * Time: Global Youth Service Day+  * Time: Vesak+  * Time: Earth Hour+  * Time: Regex update for Rosh Hashanah and Chanukkah+  * Time: add <time> for <duration> rules+  * Distance: Millimeter units and UK spellings+  * Duration: Handle half time grains++* EN_US+  * Time: Fix Emancipation Day+  * Time: Tax Day+  * Time: Siblings Day+  * Time: EMS Week and EMSC Day++* EN_AU+  * Time: Ekka++* EN_XX+  * Time: Administrative Professionals' Day+  * Time: Parse 'second last week of October 2018'+  * Time: AD/BC parsing for years++* AR+  * Numeral: Fix dual big numbers+  * Numeral: Fix million++* DA_XX+  * Time: Remove 'man'++* DE+  * Time: Remove am/pm rule++* HI+  * Duration: **new!**+  * TimeGrain: **new!**++* NL+  * Time: Fix Sinterklaas for Belgium++* RO+  * AmountOfMoney: Fix for values above 20+  * AmountOfMoney: Support intervals+  * Distance: Fix for values above 20+  * Duration: Fix for values above 20+  * Quantity: Fix for values above 20+  * Temperature: Fix for values above 20+  * Volume: Fix for values above 20++* ZH+  * Quantity: **new!**+  * Time: Support Periodic Holidays++## 0.1.6.0++### Core++The `value` field of `Entity` is now typed! Use `toJText` to get the JSON-encoded string back.++## 0.1.5.0++### Testing+* Prompt ambiguous parses in corpus tests++### Rulesets++* Common+  * Add an option to return latent time entities.+  * AmountOfMoney: Distribute ruleUnitAmount to all languages+  * Time: Make all years latent+  * Lambda-case for Rule production+  * Numeral: fix intersect rule to work with negative numbers+  * Support custom dimensions++* BG_XX:+  * Distance: **new!**+  * TimeGrain: **new!**+  * Duration: **new!**+  * Ordinal: **new!**++* EN_XX+  * Time: periodic holidays+  * Time: handle Easter+  * Time: parse "DD MM YYYY", "MM DD YYYY"  as date instead of only phone fix+  * Time: added rules for the beginning / end of year / month / week+  * Time: "late tonight"+  * Time: "last night" and "late last night"+  * Time: fixes in holidays+  * Time: Return Holiday Name in response+  * Duration: composite+  * Time: support for this|last|next season+  * Time: added Easter-based holidays+  * Time: precomputed Orthodox Easter dates+  * Time: added Orthodox Easter-based holidays+  * Time: fix Labour Day, add Heroes' Day and National Patriots' Day+  * Time: Chinese New Year+  * Time: added Boss's Day+  * Time: fix computed past series and Jewish holidays+  * Time: added rules to cover EOY, EOM, BOY, BOM+  * Time: rule <Day of month> of month+  * Time: Islamic holidays+  * Time: fix "in" + year+  * Time: Added precomputed Jewish holiday "Tu BiShvat"+  * Time: time + n years ago/in n years+  * Time: make "may" latent+  * Duration: move composite duration rule to English+  * Time: add Diwali, Navaratri, Vasant Panchami, Holika Dahan, Holi and other Hindu holidays++* EN_AU+  * Time: add Reconciliation Day++* EN_CA+  * Time: add Discovery day+  * Time: Add "Groundhogs day" in regex for "Groundhog Day"++* EN_GB+  * Time: fixed mother's day++* EN_US+  * Time: Washington's birthday, President day and Lincoln's birthday+  * Time: Add "Groundhogs day" in regex for "Groundhog Day"++* ES_XX+  * Time: use `mkRuleSeasons`++* DE_XX+  * Time: return Holiday Name in response++* NL_XX+  * Time: return Holiday Name in response+  * AmountOfMoney: **new!**++* PL_XX+  * Time: month regex fix++* RU_XX+  * Ordinal: refactor pattern match to hashmap lookup++* SV_XX+  * Distance: **new!**+  * Distance: fix mil++* TA_XX+  * Numerals: **new!**++* VI_XX+  * AmountOfMoney: Use comma "," as decimal separator++* ZH_XX+  * Distance: **new!**+  * Time: remove unused `ruleLastTuesdayLastJuly`+  * Numeral/Distance/Time: generalize and expand digit specifier usage+  * AmountOfMoney: **new!**++## 0.1.4.0++### Core+* Bumped to LTS 9.10+* API: Added `Node` to `Entity` to return the parse tree++### Rulesets+* Common+  * AmountOfMoney: don't recursively compare cents+  * AmountOfMoney: don't allow decreasing intervals+  * Duration: added `type` in response+  * Numeral: common rule to parse numbers+  * Numeral: common rule to parse fractions+  * Numeral: don't compose negative numbers+  * Time: fixed empty values for past datetimes+  * Time: fixed case sensitivity for timezones+  * Url: fragments support+* AR_XX+  * AmountOfMoney: **new!**+  * Duration: **new!**+  * Ordinal: more rules+  * Quantity: **new!**+  * Temperature: **new!**+  * Time: **new!**+  * Volume: **new!**+* DE_XX+  * Numeral: fixed keiner+  * Time: fixed this/next/last for holidays/months/days of week/seasons/weekend only+* EL_XX+  * Duration: **new!**+  * Numeral: **new!**+  * Ordinal: **new!**+  * Time: **new!**+* EN_GB+  * Time: fix parsing Oct-Dec months+* EN_XX+  * AmountOfMoney: intervals support+  * Distance: intervals support+  * Email: spelled out 'dot'+  * Numeral: prevent double negatives+  * Numeral: skip hundred for alphabetical numbers only+  * Quantity: intervals support+  * Time: don't parse "at" + phone number+  * Time: fixed date format in non-US locales+  * Time: fixed Thanksgiving in locales+  * Time: don't parse "this in 2 minutes"+  * Time: spelled out times + AM/PM+  * Time: fixed case sensitivity+  * Time: fixed "from" + time of day+  * Time: support MM.DD.YYYY+* FR_XX+  * Numeral: space as thousand separator+* GA_XX+  * Numeral: fix old vigesimal+* HI_XX+  * Numeral: **new!**+  * Ordinal: **new!**+* JA_XX+  * Time: removed dimension, as it is not implemented yet+* NE_XX+  * Numeral: **new!**+* NL_XX+  * Time: **new!**+  * Time: don't be too eager on days of week+  * Time: today/tomorrow/yesterday evening/afternoon/morning+  * Time: fixed this/next/last for holidays/months/days of week/seasons/weekend only+* PT_XX+  * Numeral: fixed rules+* RU_XX+  * AmountOfMoney: **new!**+  * Distance: **new!**+  * Duration:: **new!**+  * Numeral: 1.5 rule, more 0 rules, fixed 11, 300 and 400+  * Ordinal: fixes+  * Quantity: **new!**+  * Volume: **new!**+* SV_XX+  * Duration: extend support for "about" + duration++### Server+* Fixed Dockerfile+* Added reference time parameter++## 0.1.3.0++### Core+* Support locales+* Don't allow matches in the middle of words++### Rulesets+* Common+  * All: converted back all escaped characters to unicode+  * Time: don't shift duration on "`Duration` before/after `Time`"+  * Time: don't parse subsequent numbers+  * Time: fix `nthDOWOfMonth`+  * Time: reuse the `weekend` helper in all languages+* BG_XX+  * AmountOfMoney: **new!**+  * Numeral: **new!**+* DA_XX+  * Time: Consolidated rules for months and days of week+* DE_XX+  * Time: don't parse "nächste 5"+  * Time: Consolidated rules for months and days of week+  * Time: Consolidated rules for holidays, instants and seasons+* EN_CA+  * Time: Fixed Thanksgiving Day+* EN_GB+  * Time: Fixed DDMM and YYYYDDMM+* EN_XX+  * Time: "for `Duration` from `Time`"+  * Time: "from 10 to 16 August"+  * Time: "August 27th-30th"+  * Time: "23rd to 26th Oct", "1-8 september"+  * Time: Support misspelled "tonights" and "weekends"+  * Quantity: Support ounces+  * Email: restrict domain extensions to letters when spelling out+* ES_XX+  * Time: Consolidated rules for months and days of week+  * Ordinal: Fixed "first" variants + accents+* FR_XX+  * Time: don't parse "a un"+  * Time: Consolidated rules for months and days of week+* GA_XX+  * Time: Consolidated rules for months and days of week+* HE_XX+  * Time: Consolidated rules for months+* HR_XX+  * Time: Consolidated rules for months and days of week+* HU_XX+  * Duration: **new!**+  * Numeral: **new!**+  * Ordinal: **new!**+  * Time: **new!**+* IT_XX+  * Time: Consolidated rules for months and days of week+* JA_XX+  *Numeral: Optimized regex lookup+* KA_XX+  * Numeral: **new!**+* NB_XX+  * Time: Consolidated rules for months and days of week+* NL_XX+  * Duration: **new!**+* PL_XX+  * Time: don't parse "nie"+  * Time: don't parse ordinals without context+  * Time: Consolidated rules for months and days of week+* PT_XX+  * Time: don't parse "um" alone+  * Time: don't parse "ter"+* RO_XX+  * Time: Consolidated rules for months and days of week+  * Time: don't parse "sa"+* SV_XX+  * Ordinal: Fixed ordinals+  * Time: "i + day-of-week"+  * Time: Consolidated rules for months and days of week+* VI_XX+  * Time: Consolidated rules for months and days of week+* ZH_TW+  * Time: Fixed National Day+* ZH_XX+  * Time: Consolidated rules for months and days of week++## 0.1.2.0++### Core++* `weekend` production helper+* Numeral flag for Time patterns++### Rulesets++* FR+  * Time+    * `début|milieu|fin de matinée` (`early|mid|late morning`)+    * `début|milieu|fin de après-midi` (`early|mid|late afternoon`)+    * `début|milieu|fin de journée` (`early|mid|late day`)+    * `début|fin de soirée` (`early|late evening`)+    * `début|fin de mois` (`early|late month`)+    * `début|fin d'année` (`early|late year`)+    * `plus tard` (`later`)+    * `plus tard que ...` (`later than ...`)+    * `plus tard <time>` (`later than <time>`)+    * `plus tard <part-of-day>` (`later than <part-of-day>`)+* EN+  * Time+    * Support dates of type mm-dd+    * Fix issue #50 "last weekend of october"+    * Added a rule to handle "from <month> dd-dd"+    * Add MM/YYYY+* DE+  * Time+    * Make last dot optional in "13.03."+    * Handle variations of "13.-15.10." correctly+    * Treat "14/15Uhr" the same as "14-15Uhr"+    * Extended "bis" to also match "bis zum" and "auf den"+    * Changed `hh:mm` matching to also get the expression "17h00"+* PT+  * Numeral+    * Numerals between 100 and 999 in Portuguese fixed+* GA+  * Ordinal+    * Also match old-style -adh ending++## 0.1.1.0++### Core+* More optimizations for `Time` internals.+* `Entity` value is now a `Value` (was a JSON-encoded `Text`).++### Rulesets+* Common+  * AmountOfMoney: MYR currency+  * Duration: Helper for "<numeral>.<numeral> hours"+* CS+  * Distance: **new!**+  * Numeral: **new!**+* DE+  * Ordinal: Don't parse "1.1."+  * Time: Small improvements+* EN+  * AmountOfMoney+    * Support pence as cents+    * Support Malaysian ringgits+  * Distance: Abbreviations for inches, miles+  * Numeral: Fractions+  * Quantity: Generic product+  * Time+    * Allow spaces in e.g. "2 / 15"+    * Afternoonish+    * Early/mid/late month+* ID+  * Numeral: Optimization for regex matching+* KO+  * Time: Fixed typo in the day after tomorrow+* SV+  * Time: vid+* TR+  * Distance: **new!**+  * Duration: **new!**+  * Numeral: Comma as decimal mark+  * Temperature: **new!**+  * Volume: **new!**+* ZH+  * Time: Cantonese support++### Server+* Added dockerfile+* Fixed warnings around logs++## 0.1.0.0++* Initial version. Released on an unsuspecting world.

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}@@ -87,6 +86,8 @@              [ "42 EGP"              , "42 جنيه مصري"              , "42 جنيهات مصريه"+             , "42 ج.م"+             , "42 ج.م."              ]   , examples (simple QAR 42)              [ "42 QAR"

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}@@ -52,6 +51,15 @@   , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly Pound   } +ruleEgpAbrreviation :: Rule+ruleEgpAbrreviation = Rule+  { name = "EGP abbreviation"+  , pattern =+    [ regex "ج[.]م[.]?"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly EGP+  }+ ruleDinars :: Rule ruleDinars = Rule   { name = "dinars"@@ -391,6 +399,7 @@   [ ruleUnitAmount   , ruleCent   , rulePounds+  , ruleEgpAbrreviation   , ruleDinars   , ruleDirhams   , ruleRiyals

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple AUD 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple AUD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple AUD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple AUD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple AUD 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -46,8 +50,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly AUD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple Dollar 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple CAD 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple CAD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple CAD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple CAD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple CAD 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -46,8 +50,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly CAD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}@@ -11,12 +10,14 @@ module Duckling.AmountOfMoney.EN.Corpus   ( corpus   , negativeCorpus+  , latentCorpus   ) where  import Data.String import Prelude  import Duckling.AmountOfMoney.Types+import Duckling.Resolve (Options(..)) import Duckling.Testing.Types  negativeCorpus :: NegativeCorpus@@ -29,6 +30,21 @@ corpus :: Corpus corpus = (testContext, testOptions, allExamples) +latentCorpus :: Corpus+latentCorpus = (testContext, testOptions {withLatent = True}, xs)+  where+    xs = concat+      [ examples (simple Unnamed 5)+                 [ "five"+                 , "5"+                 , "about 5"+                 ]+      , examples (simple Unnamed 7.2)+                 [ "7.2"+                 , "7.20000"+                 ]+      ]+ allExamples :: [Example] allExamples = concat   [ examples (simple Dollar 1)@@ -59,6 +75,7 @@              [ "USD3.14"              , "3.14US$"              , "US$ 3.14"+             , "US$3 and fourteen"              ]   , examples (simple EUR 20)              [ "20\x20ac"@@ -98,7 +115,24 @@              [ "GBP3.01"              , "GBP 3.01"              , "3 GBP 1 pence"+             , "3 GBP and one"              ]+  , examples (simple CAD 3.03)+             [ "CAD3.03"+             , "CAD 3.03"+             , "3 CAD 3 cents"+             ]+  , examples (simple CHF 3.04)+             [ "CHF3.04"+             , "CHF 3.04"+             , "3 CHF 4 cents"+             ]+  , examples (simple CNY 3)+             [ "CNY3"+             , "CNY 3"+             , "3 CNY"+             , "3 yuan"+             ]   , examples (simple Unnamed 42)              [ "42 bucks"              , "around 42 bucks"@@ -115,6 +149,12 @@   , examples (simple EGP 42)              [ "42 EGP"              , "42 egyptianpound"+             , "42 LE"+             , "42 L.E"+             , "42 l.e."+             , "42 le"+             , "42 geneh"+             , "42 genihat masriya"              ]   , examples (simple QAR 42)              [ "42 QAR"@@ -186,11 +226,40 @@              [ "under seven euros"              , "less than 7 EUR"              , "lower than 7€"+             , "no more than 7 euros"+             , "at most 7€"              ]   , examples (above Dollar 1.42)              [ "more than 1 dollar and forty-two cents"              , "at least $1.42"              , "over 1.42 dollars"              , "above a dollar and 42 cents"+             , "no less than $1.42"+             ]+   , examples (simple INR 5e5)+             [ "5 lakh rupees"+             , "five lakhs rupees"+             ]+   , examples (between INR (7, 9e5))+             [ "7-9 lakh rupees"+             ]+   , examples (simple INR 4e7)+             [ "four crore rupees"+             , "4 crores rupees"+             ]+   , examples (simple MNT 10)+             [ "ten tugriks"+             , "10 Tugrik"+             , "10MNT"+             ]+   , examples (simple USD 4.7e9)+             [ "US$4.7 billion"+             , "a US$4.7 billion"+             , "a US$ 4.7 billion"+             ]+  , examples (simple UAH 3.04)+             [ "UAH3.04"+             , "UAH 3.04"+             , "3 UAH 4 kopiykas"              ]   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,25 @@              ]   , examples (simple GBP 10000)              [ "10 grand"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -46,8 +50,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple Dollar 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,14 +12,20 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral  @@ -48,8 +53,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple Dollar 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -46,8 +50,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,9 +26,28 @@              ]   , examples (simple JMD 10000)              [ "10 grand"+             , "two hundred thousand nickels"              ]+  , examples (simple JMD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple JMD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple JMD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple JMD 0.05)+             [ "nickel"+             , "a nickel"+             ]   ]- negativeExamples :: [Text] negativeExamples =   [ "grand"

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly JMD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple NZD 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple NZD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple NZD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple NZD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple NZD 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly NZD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple Dollar 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) dollarCoins+        Just . Token AmountOfMoney . withValue c $ Helpers.currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}@@ -66,6 +65,24 @@       _ -> Nothing   } +ruleEgpAbrreviation :: Rule+ruleEgpAbrreviation = Rule+  { name = "livre égyptienne"+  , pattern =+    [ regex "[lL].?[eE].?"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly EGP+  }++ruleEgpArabizi :: Rule+ruleEgpArabizi = Rule+  { name = "geneh"+  , pattern =+    [ regex "[Gg][eiy]*n[eiy]*h(at)?( m[aiey]?sr[eiy]+a?)?"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly EGP+  }+ ruleRiyals :: Rule ruleRiyals = Rule   { name = "riyals"@@ -111,6 +128,15 @@   , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly MYR   } +ruleHryvnia :: Rule+ruleHryvnia = Rule+  { name = "hryvnia"+  , pattern =+      [ regex "hryvnia" -- TODO: complete+      ]+  , prod = \_ -> Just $ Token AmountOfMoney $ currencyOnly UAH+  }+ ruleCent :: Rule ruleCent = Rule   { name = "cent"@@ -120,6 +146,15 @@   , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly Cent   } +ruleKopiyka :: Rule+ruleKopiyka = Rule+  { name = "kopiyka"+  , pattern =+    [ regex "kopiy(ok|kas?)"+    ]+  , prod = \_ -> Just $ Token AmountOfMoney $ currencyOnly Cent+  }+ ruleBucks :: Rule ruleBucks = Rule   { name = "bucks"@@ -143,6 +178,47 @@       _ -> Nothing   } +ruleAbsorbA :: Rule+ruleAbsorbA = Rule+  { name = "a <amount-of-money>"+  , pattern =+    [ regex "an?"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:Token AmountOfMoney fd:_) -> Just $ Token AmountOfMoney fd+      _ -> Nothing+  }++ruleADollarCoin :: Rule+ruleADollarCoin = Rule+  { name = "a <dollar coin>"+  , pattern =+    [ regex "an?"+    , Predicate isDollarCoin+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney fd:+       _) -> Just . Token AmountOfMoney $ fd+      _ -> Nothing+  }++ruleNumDollarCoins :: Rule+ruleNumDollarCoins = Rule+  { name = "X <dollar coins>"+  , pattern =+    [ Predicate isNatural+    , Predicate isDollarCoin+    ]+  , prod = \tokens -> case tokens of+      (Token Numeral NumeralData{TNumeral.value = c}:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just d,+                                             TAmountOfMoney.currency = cur}:+       _) -> Just . Token AmountOfMoney $ withValue (c * d) $ currencyOnly cur+      _ -> Nothing+  }+ ruleIntersectAndXCents :: Rule ruleIntersectAndXCents = Rule   { name = "intersect (and X cents)"@@ -297,7 +373,7 @@ ruleIntervalMax = Rule   { name = "under/less/lower/no more than <amount-of-money>"   , pattern =-    [ regex "under|(less|lower|not? more) than"+    [ regex "under|at most|(less|lower|not? more) than"     , Predicate isSimpleAmountOfMoney     ]   , prod = \tokens -> case tokens of@@ -312,7 +388,7 @@ ruleIntervalMin = Rule   { name = "over/above/at least/more than <amount-of-money>"   , pattern =-    [ regex "over|above|at least|more than"+    [ regex "over|above|at least|(more|not? less) than"     , Predicate isSimpleAmountOfMoney     ]   , prod = \tokens -> case tokens of@@ -327,10 +403,14 @@ rules =   [ ruleUnitAmount   , ruleACurrency+  , ruleAbsorbA   , ruleBucks   , ruleCent+  , ruleADollarCoin+  , ruleNumDollarCoins   , ruleDinars   , ruleDirham+  , ruleHryvnia   , ruleIntersect   , ruleIntersectAndNumeral   , ruleIntersectAndXCents@@ -341,7 +421,10 @@   , ruleIntervalMin   , ruleIntervalNumeralDash   , ruleIntervalDash+  , ruleKopiyka   , ruleOtherPounds+  , ruleEgpAbrreviation+  , ruleEgpArabizi   , rulePounds   , rulePrecision   , ruleRinggit

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple TTD 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple TTD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple TTD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple TTD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple TTD 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly TTD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple USD 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple USD 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple USD 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple USD 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple USD 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -46,8 +50,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly USD+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -27,6 +26,26 @@              ]   , examples (simple Dollar 10000)              [ "10 grand"+             , "two hundred thousand nickels"+             ]+  , examples (simple Dollar 1)+             [ "four quarters"+             , "ten dimes"+             , "twenty nickels"+             ]+  , examples (simple Dollar 0.1)+             [ "dime"+             , "a dime"+             , "two nickels"+             ]+  , examples (simple Dollar 0.25)+             [ "quarter"+             , "a quarter"+             , "five nickels"+             ]+  , examples (simple Dollar 0.05)+             [ "nickel"+             , "a nickel"              ]   ] 

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -13,17 +12,22 @@   ( rules   ) where +import Data.HashMap.Strict (HashMap) import Data.String+import Data.Text (Text) import Prelude  import Duckling.AmountOfMoney.Helpers import Duckling.AmountOfMoney.Types (Currency(..)) import Duckling.Numeral.Helpers (isPositive)+import Duckling.Regex.Types import Duckling.Types +import qualified Data.HashMap.Strict as HashMap+import qualified Data.Text as Text+import qualified Duckling.AmountOfMoney.Helpers as Helpers import qualified Duckling.Numeral.Types as TNumeral - ruleAGrand :: Rule ruleAGrand = Rule   { name = "a grand"@@ -48,8 +52,22 @@       _ -> Nothing   } +ruleDollarCoin :: Rule+ruleDollarCoin = Rule+  { name = "dollar coin"+  , pattern =+    [ regex "(nickel|dime|quarter)s?"+    ]+  , prod = \tokens -> case tokens of+      (Token RegexMatch (GroupMatch (match:_)):_) -> do+        c <- HashMap.lookup (Text.toLower match) Helpers.dollarCoins+        Just . Token AmountOfMoney . withValue c $ currencyOnly Dollar+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleAGrand   , ruleGrand+  , ruleDollarCoin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}@@ -64,5 +63,19 @@              [ "15 Pt"              , "15pta"              , "15Ptas"+             ]+  , examples (between Dollar (10, 20))+             [ "entre 10 y 20 dólares"+             , "de $10 y $20"+             , "$10 - 20 dólares"+             , "10 - 20 $"+             ]+  , examples (under Dollar 10)+             [ "menos de 10 dólares"+             , "no más de $10"+             ]+  , examples (above Dollar 10)+             [ "no menos de 10 dólares"+             , "más de $10"              ]   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}@@ -128,6 +127,114 @@       _ -> Nothing   } +ruleIntervalBetweenNumeral :: Rule+ruleIntervalBetweenNumeral = Rule+  { name = "between|from <numeral> to|and <amount-of-money>"+  , pattern =+    [ regex "de|entre"+    , Predicate isPositive+    , regex "a|y"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c}:+       _) | from < to ->+        Just $ Token AmountOfMoney $ withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalBetween :: Rule+ruleIntervalBetween = Rule+  { name = "between|from <amount-of-money> to|and <amount-of-money>"+  , pattern =+    [ regex "de|entre"+    , Predicate isSimpleAmountOfMoney+    , regex "a|y"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                                             TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just $ Token AmountOfMoney $ withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalNumeralDash :: Rule+ruleIntervalNumeralDash = Rule+  { name = "<numeral> - <amount-of-money>"+  , pattern =+    [ Predicate isNatural+    , regex "-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c}:+       _) | from < to->+         Just $ Token AmountOfMoney $ withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalDash :: Rule+ruleIntervalDash = Rule+  { name = "<amount-of-money> - <amount-of-money>"+  , pattern =+    [ Predicate isSimpleAmountOfMoney+    , regex "-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                                             TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just $ Token AmountOfMoney $ withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalMax :: Rule+ruleIntervalMax = Rule+  { name = "less/no more than <amount-of-money>"+  , pattern =+    [ regex "menos de|no más de"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c}:+       _) -> Just $ Token AmountOfMoney $ withMax to $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalMin :: Rule+ruleIntervalMin = Rule+  { name = "no less/more than <amount-of-money>"+  , pattern =+    [ regex "más de|no menos de"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                                             TAmountOfMoney.currency = c}:+       _) -> Just $ Token AmountOfMoney $ withMin to $ currencyOnly c+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleUnitAmount@@ -138,4 +245,10 @@   , ruleIntersectAndXCents   , ruleIntersectXCents   , rulePounds+  , ruleIntervalBetweenNumeral+  , ruleIntervalBetween+  , ruleIntervalNumeralDash+  , ruleIntervalDash+  , ruleIntervalMax+  , ruleIntervalMin   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}@@ -205,7 +204,6 @@        _) -> Just . Token AmountOfMoney . withMin to $ currencyOnly c       _ -> Nothing   }-  rulePounds :: Rule rulePounds = Rule

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}

@@ -0,0 +1,124 @@+-- Copyright (c) 2016-present, Facebook, Inc.+-- All rights reserved.+--+-- This source code is licensed under the BSD-style license found in the+-- LICENSE file in the root directory of this source tree.++{-# LANGUAGE OverloadedStrings #-}++module Duckling.AmountOfMoney.HE.Corpus+  ( corpus+  ) where++import Data.String+import Prelude++import Duckling.AmountOfMoney.Types+import Duckling.Locale+import Duckling.Resolve+import Duckling.Testing.Types++corpus :: Corpus+corpus =+  (testContext { locale = makeLocale HE Nothing }, testOptions, allExamples)++allExamples :: [Example]+allExamples = concat+  [ examples (simple ILS 10)+             [ "עשר שקל"+             , "עשרה שקלים"+             , "עשר ש״ח"+             , "עשר שח"+             , "10₪"+             ]+  , examples (simple ILS 10000)+             [ "עשר אלף שקל"+             , "10000 שקלים"+             , "10 אשח"+             , "10 אש״ח"+             ]+  , examples (simple ILS 10000000)+             [ "10 מיליון שקלים"+             , "10 משח"+             , "10 מש״ח"+             ]+  , examples (simple ILS 0.01)+             [ "אגורה"+             ]+  , examples (simple ILS 1)+             [ "שקל"+             , "שקל אחד"+             , "שקל בודד"+             , "100 אגורות"+             ]+  , examples (simple ILS 0.05)+             [ "חמש אגורות"+             ]+  , examples (simple ILS 0)+             [ "אפס ש״ח"+             ]+  , examples (simple ILS 1.5)+             [ "שקל וחצי"+             , "1.5 ש״ח"+             ]+  , examples (simple ILS 2)+             [ "שנקל"+             , "2 שקל"+             ]+  , examples (simple Dollar 10)+             [ "$10"+             , "10$"+             , "עשר דולר"+             , "עשרה דולר"+             , "עשרה דולרים"+             , "עשר דולרים"+             ]+  , examples (simple Dollar 20)+             [ "עשרים דולר"+             ]+  , examples (simple Dollar 2.23)+             [ "2 דולר ו23 סנט"+             ]+  , examples (simple EUR 20)+             [ "20€"+             , "20 יורו"+             , "EUR 20"+             , "20 אירו"+             ]+  , examples (simple EUR 29.99)+             [ "29.99 יורו"+             ]+  , examples (simple Pound 9)+             [ "£9"+             , "תשע פאונד"+             ]+  , examples (simple GBP 1)+             [ "לירה שטרלינג"+             ]+  , examples (simple GBP 10)+             [ "10 לירות שטרלינג"+             ]+  , examples (between Dollar (10, 20))+             [ "מ10 עד 20 דולר"+             , "מעשר עד עשרים דולר"+             , "בין 10 ל20 דולר"+             , "10$-20$"+             , "10-20$"+             , "10-20 דולר"+             , "בין 10 דולר ל20 דולר"+             ]+  , examples (under EUR 7)+             [ "פחות מ7 יורו"+             , "עד 7 יורו"+             , "לא יותר מ7 יורו"+             , "מתחת ל7 יורו"+             , "לא מעל 7 יורו"+             ]+  , examples (above Dollar 5)+             [ "יותר מ5 דולר"+             , "מעל 5 דולר"+             , "מ5 דולר"+             , "לא פחות מ5 דולר"+             , "לא מתחת ל5 דולר"+             ]+    ]

@@ -0,0 +1,348 @@+-- Copyright (c) 2016-present, Facebook, Inc.+-- All rights reserved.+--+-- This source code is licensed under the BSD-style license found in the+-- LICENSE file in the root directory of this source tree.+++{-# LANGUAGE GADTs #-}+{-# LANGUAGE LambdaCase #-}+{-# LANGUAGE OverloadedStrings #-}+module Duckling.AmountOfMoney.HE.Rules+  ( rules+  ) where++import Data.Maybe+import Data.String+import Prelude++import Duckling.AmountOfMoney.Helpers+import Duckling.AmountOfMoney.Types+  ( Currency(..)+  , AmountOfMoneyData(..)+  )+import Duckling.Dimensions.Types+import Duckling.Numeral.Helpers+  ( isPositive+  )+import Duckling.Numeral.Types (NumeralData(..))+import Duckling.Types+import qualified Duckling.AmountOfMoney.Types as TAmountOfMoney+import qualified Duckling.Numeral.Types as TNumeral++ruleUnitAmount :: Rule+ruleUnitAmount = Rule+  { name = "<unit> <amount>"+  , pattern =+    [ Predicate isCurrencyOnly+    , Predicate isPositive+    ]+  , prod = \case+      (Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.currency = c}:+       Token Numeral NumeralData{TNumeral.value = v}:+       _) -> Just . Token AmountOfMoney . withValue v $ currencyOnly c+      _ -> Nothing+  }++ruleOneShekel :: Rule+ruleOneShekel = Rule+  { name    = "שקל"+  , pattern = [regex "שקל( אחד| בודד)?"]+  , prod    = \_ -> Just . Token AmountOfMoney $ withValue 1 $ currencyOnly ILS+  }+ruleTwoShekel :: Rule+ruleTwoShekel = Rule+  { name    = "שנקל"+  , pattern = [regex "שנקל"]+  , prod    = \_ -> Just . Token AmountOfMoney $ withValue 2 $ currencyOnly ILS+  }+ruleOneAgura :: Rule+ruleOneAgura = Rule+  { name    = "oneAgura"+  , pattern = [regex "אגורה( אחת| בודדת)?"]+  , prod    = \_ -> Just . Token AmountOfMoney $ withValue 0.01 $+                    currencyOnly ILS+  }+ruleShekel :: Rule+ruleShekel = Rule+  { name    = "שקל"+  , pattern = [regex "שקל(ים)?|ש״?ח"]+  , prod    = \_ -> Just . Token AmountOfMoney $ currencyOnly ILS+  }++ruleThousandShekel :: Rule+ruleThousandShekel = Rule+    { name = "אש״ח"+    , pattern =+      [ Predicate isPositive+      , regex "אש״?ח"+      ]+    , prod = \case+        (Token Numeral NumeralData{TNumeral.value = v}:+         _) -> Just . Token AmountOfMoney $ withValue (v*1000) $+               currencyOnly ILS+        _ -> Nothing+    }++ruleMillionShekel :: Rule+ruleMillionShekel = Rule+    { name = "מש״ח"+    , pattern =+      [ Predicate isPositive+      , regex "מש״?ח"+      ]+    , prod = \case+        (Token Numeral NumeralData{TNumeral.value = v}:+         _) -> Just . Token AmountOfMoney $ withValue (v*1000000) $+               currencyOnly ILS+        _ -> Nothing+    }+ruleAgura :: Rule+ruleAgura = Rule+    { name = "multiple agura"+    , pattern =+      [ Predicate isPositive+      , regex "אגורות"+      ]+    , prod = \case+        (Token Numeral NumeralData{TNumeral.value = v}:+         _) -> Just . Token AmountOfMoney $ withValue (v*0.01) $+               currencyOnly ILS+        _ -> Nothing+    }++ruleIntersect :: Rule+ruleIntersect = Rule+  { name = "intersect"+  , pattern =+    [ Predicate isWithoutCents+    , regex "ו"+    , Predicate isPositive+    ]+  , prod = \case+      (Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just v,+                  TAmountOfMoney.currency = c}:+       _:+       Token Numeral NumeralData { TNumeral.value = p }:+       _) -> Just . Token AmountOfMoney $ withValue (v + p) $ currencyOnly c+      _ -> Nothing+  }++ruleIntersectAndXCents :: Rule+ruleIntersectAndXCents = Rule+  { name = "intersect (and X cents)"+  , pattern =+    [ Predicate isWithoutCents+    , regex "ו"+    , Predicate isCents+    ]+  , prod = \case+      (Token AmountOfMoney fd :+       _ :+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just c }:+       _) -> Just . Token AmountOfMoney $ withCents c fd+      _ -> Nothing+  }++rulePounds :: Rule+rulePounds = Rule+  { name = "£"+  , pattern =+    [ regex "פאונד(ים)?"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly Pound+  }++ruleDollar :: Rule+ruleDollar = Rule+  { name    = "$"+  , pattern =+    [ regex "דולר(ים)?"+    ]+  , prod    = \_ -> Just . Token AmountOfMoney $ currencyOnly Dollar+  }++ruleCent :: Rule+ruleCent = Rule+  { name = "cent"+  , pattern =+      [ regex "סנט(ים)?"+      ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly Cent+  }++ruleEUR :: Rule+ruleEUR = Rule+  { name    = "€"+  , pattern =+    [ regex "אירו|יורו"+    ]+  , prod    = \_ -> Just . Token AmountOfMoney $ currencyOnly EUR+  }+ruleOneGBP :: Rule+ruleOneGBP = Rule+  { name = "OneGBP"+  , pattern =+    [ regex "לירה שטרלינג"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ withValue 1 $ currencyOnly GBP+  }+ruleGBP :: Rule+ruleGBP = Rule+  { name = "OneGBP"+  , pattern =+    [ regex "לירות שטרלינג"+    ]+  , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly GBP+  }++rulePrecision :: Rule+rulePrecision = Rule+  { name = "about|exactly <amount-of-money>"+  , pattern =+      [ regex "בערך|בדיוק|קרוב ל"+      , Predicate isMoneyWithValue+      ]+  , prod = \case+      (_:+       token:+       _) -> Just token+      _ -> Nothing+  }++ruleIntervalBetweenNumeral :: Rule+ruleIntervalBetweenNumeral = Rule+  { name = "between|from <numeral> to|and <amount-of-money>"+  , pattern =+      [ regex "מ?|בין "+      , Predicate isPositive+      , regex "עד |ל"+      , Predicate isSimpleAmountOfMoney+      ]+  , prod = \case+      (_:+       Token Numeral NumeralData { TNumeral.value = from }:+       _:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c }:+       _) | from < to ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalBetween :: Rule+ruleIntervalBetween = Rule+  { name = "between|from <amount-of-money> to|and <amount-of-money>"+  , pattern =+      [ regex "מ?|בין "+      , Predicate isSimpleAmountOfMoney+      , regex "עד |ל"+      , Predicate isSimpleAmountOfMoney+      ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1 }:+       _:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2 }:+       _) | from < to && c1 == c2 ->+            Just . Token AmountOfMoney . withInterval (from, to) $+              currencyOnly c1+      _ -> Nothing+  }++ruleIntervalNumeralDash :: Rule+ruleIntervalNumeralDash = Rule+  { name = "<numeral> - <amount-of-money>"+  , pattern =+    [ Predicate isPositive+    , regex "-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (Token Numeral NumeralData { TNumeral.value = from }:+       _:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c }:+       _) | from < to -> Just . Token AmountOfMoney . withInterval (from, to) $+            currencyOnly c+      _ -> Nothing+  }++ruleIntervalDash :: Rule+ruleIntervalDash = Rule+  { name = "<amount-of-money> - <amount-of-money>"+  , pattern =+      [ Predicate isSimpleAmountOfMoney+      , regex "-"+      , Predicate isSimpleAmountOfMoney+      ]+  , prod = \case+      (Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1 }:+       _:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2 }:+       _) | from < to && c1 == c2 ->+            Just . Token AmountOfMoney . withInterval (from, to) $+              currencyOnly c1+      _ -> Nothing+  }++ruleIntervalMax :: Rule+ruleIntervalMax = Rule+  { name = "under/less/lower/no more than <amount-of-money>"+  , pattern =+      [ regex "פחות מ|עד|לא יותר מ|מתחת ל?|לא מעל"+      , Predicate isSimpleAmountOfMoney+      ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c }:+       _) -> Just . Token AmountOfMoney . withMax to $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalMin :: Rule+ruleIntervalMin = Rule+  { name = "over/above/at least/more than <amount-of-money>"+  , pattern =+      [ regex "יותר מ|מעל|מ|לא פחות מ|לא מתחת ל"+      , Predicate isSimpleAmountOfMoney+      ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData { TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c }:+       _) -> Just . Token AmountOfMoney . withMin to $ currencyOnly c+      _ -> Nothing+  }++rules :: [Rule]+rules =+  [ ruleUnitAmount+  , ruleCent+  , ruleEUR+  , ruleIntersectAndXCents+  , ruleIntervalBetweenNumeral+  , ruleIntervalBetween+  , ruleIntervalMax+  , ruleIntervalMin+  , ruleIntervalNumeralDash+  , ruleIntervalDash+  , rulePounds+  , ruleOneGBP+  , ruleGBP+  , rulePrecision+  , ruleIntersect+  , ruleAgura+  , ruleShekel+  , ruleOneShekel+  , ruleTwoShekel+  , ruleOneAgura+  , ruleThousandShekel+  , ruleMillionShekel+  , ruleDollar+  ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE OverloadedStrings #-} @@ -24,11 +23,18 @@  allExamples :: [Example] allExamples = concat-  [ examples (simple Dollar 10)+  [ examples (simple Dollar 1)+             [ "$1"+             , "jedan dolar"+             ]+  , examples (simple Dollar 10)              [ "$10"              , "10$"              , "deset dolara"              ]+  , examples (simple Cent 1)+             [ "jedan cent"+             ]   , examples (simple Cent 10)              [ "deset centa"              ]@@ -46,6 +52,9 @@              , "2 dolara 23"              , "dva dolara i 23"              ]+  , examples (simple HRK 1)+             [ "jedna kuna"+             ]   , examples (simple HRK 2.23)              [ "2 kune i 23 lipe"              , "dvije kune 23 lipe"@@ -62,6 +71,9 @@              , "dvjesto kuna"              , "dvjesta kuna"              ]+  , examples (simple EUR 1)+             [ "jedan euro"+             ]   , examples (simple EUR 20)              [ "20€"              , "20 euros"@@ -94,4 +106,28 @@              [ "GBP3,01"              , "GBP 3,01"              ]-  ]+ , examples (between Dollar (100, 200))+            [ "od 100 do 200 dolara"+            , "od 100 dolara do 200 dolara"+            , "otprilike 100 do 200 dolara"+            , "otprilike 100 dolara do 200 dolara"+            , "100 dolara - 200 dolara"+            , "100-200 dolara"+            , "oko 100-200 dolara"+            , "u blizini 100-200 dolara"+            , "skoro 100-200 dolara"+            , "približno 100 do 200 dolara"+            , "izmedju 100 i 200 dolara"+            , "izmedju 100 dolara i 200 dolara"+            ]+  , examples (under EUR 7)+             [ "manje od EUR 7"+             , "ispod EUR 7"+             ]+  , examples (above Dollar 1.42)+             [ "više od jednog dolara i četrdeset dva centa"+             , "najmanje 1,42 dolara"+             , "preko 1,42 dolara"+             , "iznad 1,42 dolara"+             ]+ ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.  {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-}@@ -29,6 +28,20 @@ import qualified Duckling.AmountOfMoney.Types as TAmountOfMoney import qualified Duckling.Numeral.Types as TNumeral +ruleACurrency :: Rule+ruleACurrency = Rule+  { name = "a <currency>"+  , pattern =+    [ regex "jed(an|na|no)"+    , Predicate isCurrencyOnly+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.currency = c}:+       _) -> Just . Token AmountOfMoney $ withValue 1 $ currencyOnly c+      _ -> Nothing+  }+ ruleUnitAmount :: Rule ruleUnitAmount = Rule   { name = "<unit> <amount>"@@ -198,9 +211,172 @@   , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly AED   } +rulePrecision :: Rule+rulePrecision = Rule+  { name = "about|exactly <amount-of-money>"+  , pattern =+    [ regex "oko|otprilike|u blizini|skoro|približno"+    , Predicate isMoneyWithValue+    ]+  , prod = \tokens -> case tokens of+      (_:token:_) -> Just token+      _ -> Nothing+  }++ruleIntervalNumeralDash :: Rule+ruleIntervalNumeralDash = Rule+  { name = "<numeral> - <amount-of-money>"+  , pattern =+    [ Predicate isNatural+    , regex "-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) | from < to->+         Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalDash :: Rule+ruleIntervalDash = Rule+  { name = "<amount-of-money> - <amount-of-money>"+  , pattern =+    [ Predicate isSimpleAmountOfMoney+    , regex "-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalBetweenNumeral1 :: Rule+ruleIntervalBetweenNumeral1 = Rule+  { name = "between|from <numeral> to|and <amount-of-money>"+  , pattern =+    [ regex "od|otprilike|približno"+    , Predicate isPositive+    , regex "do"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) | from < to ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalBetweenNumeral2 :: Rule+ruleIntervalBetweenNumeral2 = Rule+  { name = "between|from <numeral> to|and <amount-of-money>"+  , pattern =+    [ regex "izmedju"+    , Predicate isPositive+    , regex "i"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) | from < to ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalBetween1 :: Rule+ruleIntervalBetween1 = Rule+  { name = "between|from <amount-of-money> to|and <amount-of-money>"+  , pattern =+    [ regex "od|otprilike"+    , Predicate isSimpleAmountOfMoney+    , regex "do"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalBetween2 :: Rule+ruleIntervalBetween2 = Rule+  { name = "between|from <amount-of-money> to|and <amount-of-money>"+  , pattern =+    [ regex "izmedju"+    , Predicate isSimpleAmountOfMoney+    , regex "i"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalMin :: Rule+ruleIntervalMin = Rule+  { name = "over/above/at least/more than <amount-of-money>"+  , pattern =+    [ regex "više od|najmanje|preko|iznad"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) -> Just . Token AmountOfMoney . withMin to $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalMax :: Rule+ruleIntervalMax = Rule+  { name = "under/less/lower/no more than <amount-of-money>"+  , pattern =+    [ regex "ispod|manje od"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \tokens -> case tokens of+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) -> Just . Token AmountOfMoney . withMax to $ currencyOnly c+      _ -> Nothing+  }++ rules :: [Rule] rules =-  [ ruleUnitAmount+  [ ruleACurrency+  , ruleUnitAmount   , ruleDollar   , rulePound   , ruleOtherPounds@@ -215,4 +391,13 @@   , ruleKwd   , ruleQar   , ruleSar+  , rulePrecision+  , ruleIntervalNumeralDash+  , ruleIntervalDash+  , ruleIntervalBetweenNumeral1+  , ruleIntervalBetweenNumeral2+  , ruleIntervalBetween1+  , ruleIntervalBetween2+  , ruleIntervalMin+  , ruleIntervalMax   ]

@@ -2,18 +2,19 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}-+{-# LANGUAGE NamedFieldPuns #-}  module Duckling.AmountOfMoney.Helpers   ( currencyOnly+  , valueOnly   , isSimpleAmountOfMoney   , isCent   , isCents+  , isDollarCoin   , isCurrencyOnly   , isDime   , isMoneyWithValue@@ -23,18 +24,42 @@   , withMax   , withMin   , withValue+  , mkLatent+  , dollarCoins   )   where +import Data.HashMap.Strict (HashMap) import Data.Maybe (isJust)+import Data.String+import Data.Text (Text) import Prelude -import Duckling.AmountOfMoney.Types (Currency (..), AmountOfMoneyData (..))+import Duckling.AmountOfMoney.Types+  ( Currency (..)+  , AmountOfMoneyData (..)+  , amountOfMoneyData'+  ) import Duckling.Numeral.Types (getIntValue, isInteger) import Duckling.Dimensions.Types import Duckling.Types hiding (Entity(..)) +import qualified Data.HashMap.Strict as HashMap+ -- -----------------------------------------------------------------+-- Dollar coin Types++dollarCoins :: HashMap Text Double+dollarCoins = HashMap.fromList+  [ ("nickel", 0.05)+  , ("nickels", 0.05)+  , ("dime", 0.1)+  , ("dimes", 0.1)+  , ("quarter", 0.25)+  , ("quarters", 0.25)+  ]++-- ----------------------------------------------------------------- -- Patterns  isCents :: Predicate@@ -56,6 +81,12 @@   {value = Nothing, minValue = Nothing, maxValue = Nothing}) = True isCurrencyOnly _ = False +isDollarCoin :: Predicate+isDollarCoin (Token AmountOfMoney AmountOfMoneyData{value = Just d, currency}) =+  elem d [0.05, 0.1, 0.25] && elem currency [Dollar, AUD, CAD, JMD,+                                             NZD,    SGD, TTD, USD]+isDollarCoin _ = False+ isSimpleAmountOfMoney :: Predicate isSimpleAmountOfMoney (Token AmountOfMoney AmountOfMoneyData   {value = Just _, minValue = Nothing, maxValue = Nothing}) = True@@ -77,17 +108,19 @@ -- Production  currencyOnly :: Currency -> AmountOfMoneyData-currencyOnly c = AmountOfMoneyData-  {currency = c, value = Nothing, minValue = Nothing, maxValue = Nothing}+currencyOnly c = amountOfMoneyData'{currency = c} +valueOnly :: Double -> AmountOfMoneyData+valueOnly x = amountOfMoneyData'{value = Just x}+ withValue :: Double -> AmountOfMoneyData -> AmountOfMoneyData withValue x fd = fd {value = Just x}  withCents :: Double -> AmountOfMoneyData -> AmountOfMoneyData withCents x fd@AmountOfMoneyData {value = Just value} = fd   {value = Just $ value + x / 100}-withCents x AmountOfMoneyData {value = Nothing} = AmountOfMoneyData-  {value = Just x, currency = Cent, minValue = Nothing, maxValue = Nothing}+withCents x AmountOfMoneyData {value = Nothing} =+  amountOfMoneyData'{value = Just x, currency = Cent}  withInterval :: (Double, Double) -> AmountOfMoneyData -> AmountOfMoneyData withInterval (from, to) fd = fd@@ -98,3 +131,6 @@  withMax :: Double -> AmountOfMoneyData -> AmountOfMoneyData withMax x fd = fd {maxValue = Just x}++mkLatent :: AmountOfMoneyData -> AmountOfMoneyData+mkLatent fd = fd {latent = True}

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE OverloadedStrings #-}@@ -39,7 +38,7 @@              [ "USD1,23"              ]   , examples (simple Dollar 2)-             [ "2 dola"+             [ "2 dolar"              , "dua dolar"              ]   , examples (simple EUR 20)@@ -79,5 +78,49 @@              [ "10 yen"              , "10¥"              , "10 ¥."+             ]+  , examples (between Dollar(10, 20))+             [ "antara 10 sampai 20 dolar"+             , "dari 10 dolar sampai 20 dolar"+             , "sekitar 10 sampai 20 dolar"+             , "antara 10 hingga 20 dolar"+             , "sekitar 10 dolar hingga 20 dolar"+             , "kira-kira 10-20 dolar"+             , "10-20 dolar"+             ]+  , examples (between IDR(1000, 10000))+             [ "antara Rp1000 sampai Rp10000"+             , "dari 1000 Rupiah hingga 10000 Rupiah"+             , "sekitar 1000 sampai 10000 Rupiah"+             , "1000-10000 Rupiah"+             , "kira-kira Rp1000 sampai Rp10000"+             , "dari Rp1.000 sampai Rp10.000"+             , "antara 1.000 hingga 10.000 Rupiah"+             , "kira-kira 1.000-10.000 Rupiah"+             , "sekitar 1.000 hingga 10.000 Rupiah"+             ]+  , examples (under EUR 7)+             [ "kurang dari 7 euro"+             , "di bawah EUR 7"+             , "tidak sampai 7 euro"+             , "lebih murah dari EUR 7"+             ]+  , examples (under IDR 500)+             [ "kurang dari 500 Rupiah"+             , "tidak sampai Rp500"+             , "di bawah Rp 500"+             , "lebih murah dari 500 rupiah"+             ]+  , examples (above USD 1.42)+             [ "di atas USD1,42"+             , "lebih dari USD1,42"+             , "melebihi USD1,42"+             , "melewati USD1,42"+             ]+  , examples (above IDR 33000)+             [ "di atas 33.000 Rupiah"+             , "lebih dari Rp33000"+             , "melebihi Rp33.000"+             , "melewati 33000 rupiah"              ]   ]

@@ -2,8 +2,7 @@ -- All rights reserved. -- -- This source code is licensed under the BSD-style license found in the--- LICENSE file in the root directory of this source tree. An additional grant--- of patent rights can be found in the PATENTS file in the same directory.+-- LICENSE file in the root directory of this source tree.   {-# LANGUAGE GADTs #-}@@ -91,6 +90,126 @@   , prod = \_ -> Just . Token AmountOfMoney $ currencyOnly JPY   } +rulePrecision :: Rule+rulePrecision = Rule+  { name = "about|exactly <amount-of-money>"+  , pattern =+    [ regex "tepatnya|kira-kira|sekitar|hampir"+    , Predicate isMoneyWithValue+    ]+  , prod = \case+      (_:token:_) -> Just token+      _ -> Nothing+  }++ruleIntervalBetweenNumeral :: Rule+ruleIntervalBetweenNumeral = Rule+  { name = "between|from <numeral> to|and <amount-of-money>"+  , pattern =+    [ regex "sekitar|dari|antara"+    , Predicate isPositive+    , regex "sampai|hingga"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) | from < to ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalBetween :: Rule+ruleIntervalBetween = Rule+  { name = "between|from <amount-of-money> to|and <amount-of-money>"+  , pattern =+    [ regex "sekitar|dari|antara|kira-kira"+    , Predicate isSimpleAmountOfMoney+    , regex "sampai|hingga"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalNumeralDash :: Rule+ruleIntervalNumeralDash = Rule+  { name = "<numeral> - <amount-of-money>"+  , pattern =+    [ Predicate isNatural+    , regex "\\-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (Token Numeral NumeralData{TNumeral.value = from}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) | from < to ->+         Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalDash :: Rule+ruleIntervalDash = Rule+  { name = "<amount-of-money> - <amount-of-money>"+  , pattern =+    [ Predicate isSimpleAmountOfMoney+    , regex "\\-"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just from,+                  TAmountOfMoney.currency = c1}:+       _:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c2}:+       _) | from < to && c1 == c2 ->+        Just . Token AmountOfMoney . withInterval (from, to) $ currencyOnly c1+      _ -> Nothing+  }++ruleIntervalMax :: Rule+ruleIntervalMax = Rule+  { name = "under/less/lower/no more than <amount-of-money>"+  , pattern =+    [ regex "(kurang|lebih murah) dari|tidak sampai|di bawah"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) -> Just . Token AmountOfMoney . withMax to $ currencyOnly c+      _ -> Nothing+  }++ruleIntervalMin :: Rule+ruleIntervalMin = Rule+  { name = "over/above/at least/more than <amount-of-money>"+  , pattern =+    [ regex "di atas|lebih dari|melebihi|melewati"+    , Predicate isSimpleAmountOfMoney+    ]+  , prod = \case+      (_:+       Token AmountOfMoney AmountOfMoneyData{TAmountOfMoney.value = Just to,+                  TAmountOfMoney.currency = c}:+       _) -> Just . Token AmountOfMoney . withMin to $ currencyOnly c+      _ -> Nothing+  }+ rules :: [Rule] rules =   [ ruleUnitAmount@@ -99,4 +218,11 @@   , ruleIntersect   , ruleJpy   , rulePounds+  , rulePrecision+  , ruleIntervalBetweenNumeral+  , ruleIntervalBetween+  , ruleIntervalMax+  , ruleIntervalMin+  , ruleIntervalNumeralDash+  , ruleIntervalDash   ]