From 1ece263579afcf94ca44acc8e157bce01c3226b8 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 7 Nov 2019 19:02:13 +0100 Subject: =?UTF-8?q?Create=20easy-to-use=20argument=20parser=20=F0=9F=92=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/syntax/mod.rs | 4 ++-- src/syntax/parsing.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/syntax') diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs index 286bb2c7..09a5bdc3 100644 --- a/src/syntax/mod.rs +++ b/src/syntax/mod.rs @@ -128,7 +128,7 @@ pub enum FuncArg { pub enum Expression { Ident(String), Str(String), - Number(f64), + Num(f64), Size(Size), Bool(bool), } @@ -145,7 +145,7 @@ impl Display for Expression { match self { Ident(s) => write!(f, "{}", s), Str(s) => write!(f, "{:?}", s), - Number(n) => write!(f, "{}", n), + Num(n) => write!(f, "{}", n), Size(s) => write!(f, "{}", s), Bool(b) => write!(f, "{}", b), } diff --git a/src/syntax/parsing.rs b/src/syntax/parsing.rs index f952f5e6..e4cda6a5 100644 --- a/src/syntax/parsing.rs +++ b/src/syntax/parsing.rs @@ -211,7 +211,7 @@ impl<'s> Parser<'s> { if let Ok(b) = text.parse::() { Expression::Bool(b) } else if let Ok(num) = text.parse::() { - Expression::Number(num) + Expression::Num(num) } else if let Ok(size) = text.parse::() { Expression::Size(size) } else { @@ -499,7 +499,7 @@ mod tests { mod args { use super::Expression; - pub use Expression::{Number as N, Size as Z, Bool as B}; + pub use Expression::{Num as N, Size as Z, Bool as B}; pub fn S(string: &str) -> Expression { Expression::Str(string.to_owned()) } pub fn I(string: &str) -> Expression { Expression::Ident(string.to_owned()) } -- cgit v1.2.3