From 465c63706b6988e7071f7f9eae0c78759c8422d7 Mon Sep 17 00:00:00 2001 From: notafile Date: Tue, 4 Jan 2022 17:24:49 +0100 Subject: [PATCH] add nom_locate --- Cargo.lock | 18 ++++++++++++++++++ Cargo.toml | 1 + src/parser.rs | 3 +++ 3 files changed, 22 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index def017e..7f35d24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bytecount" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" + [[package]] name = "clap" version = "2.34.0" @@ -48,6 +54,7 @@ name = "futilehdl" version = "0.1.0" dependencies = [ "nom", + "nom_locate", "structopt", ] @@ -104,6 +111,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom_locate" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37794436ca3029a3089e0b95d42da1f0b565ad271e4d3bb4bad0c7bb70b10605" +dependencies = [ + "bytecount", + "memchr", + "nom", +] + [[package]] name = "proc-macro-error" version = "1.0.4" diff --git a/Cargo.toml b/Cargo.toml index 1741f65..5078356 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,5 @@ edition = "2021" [dependencies] nom = "7.1.0" +nom_locate = "4.0.0" structopt = "0.3.25" diff --git a/src/parser.rs b/src/parser.rs index 93bbb35..37b71d8 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -8,6 +8,9 @@ use nom::{ sequence::{delimited, pair, preceded, separated_pair, terminated, tuple}, }; +use nom_locate::{position, LocatedSpan}; +type Span<'a> = LocatedSpan<&'a str>; + use crate::literals::{decimal, hexadecimal}; use crate::IResult;