From 8a3596dcbf8d88f8433469a2f0b5a3ca6b793cad Mon Sep 17 00:00:00 2001
From: Per Lindgren <per.lindgren@ltu.se>
Date: Mon, 21 Sep 2020 16:16:50 +0200
Subject: [PATCH] simple spans work, somewhat improved
---
src/ast/main.rs | 2 +-
src/ast/parser.lalrpop | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ast/main.rs b/src/ast/main.rs
index 2382591..253576f 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 539b88b..7e9c2b2 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 = {
--
GitLab