From e9f55783091fb1d5c07059be865d9d1fb02d3bfa Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 5 Mar 2019 22:30:34 +0100 Subject: Parse doubles --- dhall/src/parser.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'dhall') diff --git a/dhall/src/parser.rs b/dhall/src/parser.rs index 57af7b8..7bdc085 100644 --- a/dhall/src/parser.rs +++ b/dhall/src/parser.rs @@ -562,6 +562,18 @@ rule!(single_quote_literal; } ); +rule!(double_literal_raw; + raw_pair!(pair) => { + pair.as_str().trim() + .parse() + .map_err(|e: std::num::ParseFloatError| custom_parse_error(&pair, format!("{}", e)))? + } +); + +rule!(minus_infinity_literal<()>; children!() => ()); +rule!(plus_infinity_literal<()>; children!() => ()); +rule!(NaN_raw<()>; children!() => ()); + rule!(natural_literal_raw; raw_pair!(pair) => { pair.as_str().trim() @@ -677,6 +689,10 @@ rule!(selector_expression_raw>; ); rule!(literal_expression_raw>; + children!(n: double_literal_raw) => bx(Expr::DoubleLit(n)), + children!(n: minus_infinity_literal) => bx(Expr::DoubleLit(std::f64::NEG_INFINITY)), + children!(n: plus_infinity_literal) => bx(Expr::DoubleLit(std::f64::INFINITY)), + children!(n: NaN_raw) => bx(Expr::DoubleLit(std::f64::NAN)), children!(n: natural_literal_raw) => bx(Expr::NaturalLit(n)), children!(n: integer_literal_raw) => bx(Expr::IntegerLit(n)), children!(s: double_quote_literal) => bx(Expr::TextLit(s)), -- cgit v1.2.3