From 987e02f478be6d0e96d53394bd66b3a01118c921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Mon, 20 Apr 2020 02:51:46 +0200 Subject: [PATCH] Allow period character as word boundary --- src/parse/formulas.rs | 9 +++++---- src/parse/helpers.rs | 1 + src/parse/literals.rs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/parse/formulas.rs b/src/parse/formulas.rs index 995de35..aae31a0 100644 --- a/src/parse/formulas.rs +++ b/src/parse/formulas.rs @@ -542,10 +542,11 @@ mod tests #[test] fn parse_compare() { - assert_eq!(format_formula("X >= 0"), "X >= 0"); - assert_eq!(format_formula("N >= 0"), "N >= 0"); - assert_eq!(format_formula("n < 0"), "n < 0"); - assert_eq!(format_formula("n >= 0"), "n >= 0"); + assert_eq!(format_formula("X>=0."), "X >= 0"); + assert_eq!(format_formula("N>=0."), "N >= 0"); + assert_eq!(format_formula("n<0."), "n < 0"); + assert_eq!(format_formula("n>=0."), "n >= 0"); + assert_eq!(format_formula("p(0)>=q."), "p(0) >= q"); } #[test] diff --git a/src/parse/helpers.rs b/src/parse/helpers.rs index 4999d7e..ab1441f 100644 --- a/src/parse/helpers.rs +++ b/src/parse/helpers.rs @@ -28,6 +28,7 @@ fn is_character_word_boundary(c: char) -> bool | '%' | '|' | '#' + | '.' => true, _ => false, } diff --git a/src/parse/literals.rs b/src/parse/literals.rs index 0f816b3..afb201e 100644 --- a/src/parse/literals.rs +++ b/src/parse/literals.rs @@ -185,7 +185,7 @@ mod tests assert!(integer("10000a").is_err()); assert!(integer("+10000a").is_err()); assert!(integer("-10000a").is_err()); - assert!(integer("1.5").is_err()); + assert_eq!(integer("1.5"), Ok((".5", 1))); assert!(integer("a").is_err()); assert!(integer("-").is_err()); assert!(integer(" ").is_err());