diff --git a/src/ast/main.rs b/src/ast/main.rs index 2382591ad3292d33cdfc587ab11f51d04b6f5f78..253576fd51e4c6945ee17c121d7cfcbb47900c87 100644 --- a/src/ast/main.rs +++ b/src/ast/main.rs @@ -10,5 +10,5 @@ fn main() {} #[test] fn loc() { - println!("{:?}", NumSeqParser::new().parse("1, 2").unwrap()); + println!("{:?}", NumSeqParser::new().parse("1, 2, 54").unwrap()); } diff --git a/src/ast/parser.lalrpop b/src/ast/parser.lalrpop index 539b88bb96a72b8af6473b564d0c0bcdde311266..7e9c2b2a50455f4e6ad2c2d8cbe316e56d1c6012 100644 --- a/src/ast/parser.lalrpop +++ b/src/ast/parser.lalrpop @@ -36,11 +36,11 @@ CommaNoTrail<T>: Vec<T> = { } pub NumSeq: Vec<(usize, usize, i32)> = { - CommaNoTrail<Num> + CommaNoTrail<Spanned<Num>>, } -pub Num: (usize, usize, i32) = { - <l: @L> <n: r"[0-9]+"> <r: @R> => (l, r, i32::from_str(n).unwrap()), +pub Num: i32 = { + <n: r"[0-9]+"> => i32::from_str(n).unwrap(), }; Id: String = {