summaryrefslogtreecommitdiff
path: root/src/lexer.rs
diff options
context:
space:
mode:
authorNadrieril2019-02-27 19:27:28 +0100
committerNadrieril2019-02-27 19:27:28 +0100
commit8cd386521267bf95ae00b7068cda9422305eec29 (patch)
tree1032ac5e68e14ef0833358f645670d6858468fec /src/lexer.rs
parentd8b88c1a5da7218011fca2bccc525907aa439335 (diff)
Fix mixed up parsing of integers/naturals
Diffstat (limited to 'src/lexer.rs')
-rw-r--r--src/lexer.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lexer.rs b/src/lexer.rs
index d396951..32e6abe 100644
--- a/src/lexer.rs
+++ b/src/lexer.rs
@@ -89,11 +89,11 @@ macro_rules! digits {
}}
}
-named!(natural<&str, usize>, preceded!(tag!("+"), digits!(usize, 10)));
+named!(natural<&str, usize>, digits!(usize, 10));
named!(integral<&str, isize>, digits!(isize, 10));
named!(integer<&str, isize>, alt!(
preceded!(tag!("-"), map!(integral, |i: isize| -i)) |
- integral
+ preceded!(tag!("+"), integral)
));
named!(boolean<&str, bool>, alt!(
value!(true, tag!("True")) |