diff options
Diffstat (limited to 'parser/parser.fnl')
| -rw-r--r-- | parser/parser.fnl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/parser/parser.fnl b/parser/parser.fnl index 15d9cd4..41b9112 100644 --- a/parser/parser.fnl +++ b/parser/parser.fnl @@ -158,7 +158,7 @@ (let [peg (peg.Ct (anywhere (* (+ (* (peg.C pegs.number) - (peg.S "xXхХ") + (+ (peg.P "x") "X" "х" "Х") (peg.C pegs.number)) (peg.C pegs.number)) (maybe (+ (peg.P " ") " ")) @@ -181,13 +181,15 @@ (fn test-guess-weight [] (assert (= nil (guess-weight "за 1")) "1") (assert (= 120 (guess-weight "6x20гр")) "2") - (assert (= 1260 (guess-weight "за 6x210гр")) "3") + (assert (= 140 (guess-weight "Знакомство с китайским чаем, 7х20 гр.")) "3") (assert (= 357 (guess-weight "за 1 шт 357 гр")) "4") (assert (= 1 (guess-weight "1гр")) "5") (assert (= 150 (guess-weight "150 гр")) "6") (assert (= 1000 (guess-weight "1кг")) "7") (assert (= 150 (guess-weight "150 г" ["г"])) "8")) +(test-guess-weight) + (fn guess-volume [text] (if text (let [peg (peg.Ct |