kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add parse error position

Browse Source
This commit is contained in:
dalance 2019-10-16 14:20:23 +09:00
parent f8fbad627d
commit 5049b5c0d8
11 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -7,3 +7,7 @@ members = [
"sv-parser-pp",
"sv-parser-syntaxtree",
]
#[patch.crates-io]
#nom = {path = "../nom"}
#nom_locate = {path = "../nom_locate"}

4
sv-parser-error/src/lib.rs
View File

@ -14,8 +14,8 @@ pub enum ErrorKind {
File(PathBuf),
#[fail(display = "Include error")]
Include,
#[fail(display = "Parse error")]
Parse,
#[fail(display = "Parse error: {:?}", _0)]
Parse(Option<usize>),
#[fail(display = "Preprocess error")]
Preprocess,
#[fail(display = "Define argument not found: {}", _0)]

3
sv-parser-parser/Cargo.toml
View File

@ -20,9 +20,10 @@ trace = ["nom-tracable/trace"]
[dependencies]
nom = "5.0.0"
nom_locate = "1.0.0"
nom-greedyerror = "0.1.0"
nom-packrat = "0.3.0"
nom-recursive = {version = "0.1.1", features = ["tracer128"]}
nom-tracable = "0.4.0"
nom-tracable = "0.4.1"
str-concat = "0.1.4"
sv-parser-macros = {version = "0.1.0", path = "../sv-parser-macros"}
sv-parser-syntaxtree = {version = "0.1.0", path = "../sv-parser-syntaxtree"}

7
sv-parser-parser/src/lib.rs
View File

@ -31,10 +31,12 @@ pub(crate) use nom::branch::*;
pub(crate) use nom::bytes::complete::*;
pub(crate) use nom::character::complete::*;
pub(crate) use nom::combinator::*;
pub(crate) use nom::error::{make_error, ErrorKind};
pub(crate) use nom::error::{context, make_error, ErrorKind};
pub(crate) use nom::multi::*;
pub(crate) use nom::sequence::*;
pub(crate) use nom::{Err, IResult};
//pub(crate) use nom::{Err, IResult};
pub(crate) use nom::Err;
pub(crate) use nom_greedyerror::GreedyError;
pub(crate) use nom_packrat::{self, packrat_parser, HasExtraState};
pub(crate) use nom_recursive::{recursive_parser, HasRecursiveInfo, RecursiveInfo};
pub(crate) use nom_tracable::tracable_parser;
@ -52,6 +54,7 @@ pub struct SpanInfo {
}
pub type Span<'a> = nom_locate::LocatedSpanEx<&'a str, SpanInfo>;
pub type IResult<T, U> = nom::IResult<T, U, GreedyError<T>>;
impl HasRecursiveInfo for SpanInfo {
fn get_recursive_info(&self) -> RecursiveInfo {

2
sv-parser-parser/src/source_text/configuration_source_text.rs
View File

@ -5,7 +5,7 @@ use crate::*;
#[tracable_parser]
#[packrat_parser]
pub(crate) fn config_declaration(s: Span) -> IResult<Span, ConfigDeclaration> {
let (s, a) = keyword("config")(s)?;
let (s, a) = context("config", keyword("config"))(s)?;
let (s, b) = config_identifier(s)?;
let (s, c) = symbol(";")(s)?;
let (s, d) = many0(pair(local_parameter_declaration, symbol(";")))(s)?;

4
sv-parser-parser/src/source_text/system_verilog_source_text.rs
View File

@ -7,8 +7,8 @@ use crate::*;
pub(crate) fn source_text(s: Span) -> IResult<Span, SourceText> {
let (s, a) = many0(white_space)(s)?;
let (s, b) = opt(timeunits_declaration)(s)?;
let (s, c) = many0(description)(s)?;
Ok((s, SourceText { nodes: (a, b, c) }))
let (s, c) = many_till(description, eof)(s)?;
Ok((s, SourceText { nodes: (a, b, c.0) }))
}
#[tracable_parser]

28
sv-parser-parser/src/utils.rs
View File

@ -51,8 +51,8 @@ pub(crate) fn symbol<'a>(t: &'a str) -> impl Fn(Span<'a>) -> IResult<Span<'a>, S
#[cfg(not(feature = "trace"))]
pub(crate) fn symbol_exact<'a>(t: &'a str) -> impl Fn(Span<'a>) -> IResult<Span<'a>, Symbol> {
move |s: Span<'a>| {
let (s, x) = map(no_ws(map(tag(t.clone()), into_locate)), |x| {
Symbol { nodes: x }
let (s, x) = map(no_ws(map(tag(t.clone()), into_locate)), |x| Symbol {
nodes: x,
})(s)?;
Ok((s, x))
}
@ -63,8 +63,8 @@ pub(crate) fn symbol_exact<'a>(t: &'a str) -> impl Fn(Span<'a>) -> IResult<Span<
move |s: Span<'a>| {
let (depth, s) = nom_tracable::forward_trace(s, &format!("symbol(\"{}\")", t));
let body = || {
let (s, x) = map(no_ws(map(tag(t.clone()), into_locate)), |x| {
Symbol { nodes: x }
let (s, x) = map(no_ws(map(tag(t.clone()), into_locate)), |x| Symbol {
nodes: x,
})(s)?;
Ok((s, x))
};
@ -79,10 +79,7 @@ pub(crate) fn keyword<'a>(t: &'a str) -> impl Fn(Span<'a>) -> IResult<Span<'a>,
let (s, x) = map(
ws(alt((
all_consuming(map(tag(t.clone()), into_locate)),
terminated(
map(tag(t.clone()), into_locate),
peek(none_of(AZ09_)),
),
terminated(map(tag(t.clone()), into_locate), peek(none_of(AZ09_))),
))),
|x| Keyword { nodes: x },
)(s)?;
@ -98,10 +95,7 @@ pub(crate) fn keyword<'a>(t: &'a str) -> impl Fn(Span<'a>) -> IResult<Span<'a>,
let (s, x) = map(
ws(alt((
all_consuming(map(tag(t.clone()), into_locate)),
terminated(
map(tag(t.clone()), into_locate),
peek(none_of(AZ09_)),
),
terminated(map(tag(t.clone()), into_locate), peek(none_of(AZ09_))),
))),
|x| Keyword { nodes: x },
)(s)?;
@ -315,6 +309,16 @@ where
// -----------------------------------------------------------------------------
pub(crate) fn eof(s: Span) -> IResult<Span, Span> {
use nom::InputLength;
if s.input_len() == 0 {
Ok((s, s))
} else {
Err(Err::Error(make_error(s, ErrorKind::Eof)))
}
}
#[tracable_parser]
#[packrat_parser]
pub(crate) fn white_space(s: Span) -> IResult<Span, WhiteSpace> {

1
sv-parser-pp/Cargo.toml
View File

@ -20,6 +20,7 @@ trace = ["sv-parser-parser/trace"]
[dependencies]
failure = "0.1.5"
nom = "5.0.0"
nom-greedyerror = "0.1.0"
sv-parser-error = {version = "0.1.0", path = "../sv-parser-error"}
sv-parser-parser = {version = "0.1.0", path = "../sv-parser-parser"}
sv-parser-syntaxtree = {version = "0.1.0", path = "../sv-parser-syntaxtree"}

7
sv-parser-pp/src/preprocess.rs
View File

@ -1,5 +1,6 @@
use crate::range::Range;
use failure::ResultExt;
use nom_greedyerror::error_position;
use std::collections::{BTreeMap, HashMap};
use std::convert::TryInto;
use std::fs::File;
@ -107,7 +108,11 @@ fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>>(
}
let span = Span::new_extra(&s, SpanInfo::default());
let (_, pp_text) = pp_parser(span).map_err(|_| ErrorKind::Parse)?;
let (_, pp_text) = pp_parser(span).map_err(|x| match x {
nom::Err::Incomplete(_) => ErrorKind::Parse(None),
nom::Err::Error(e) => ErrorKind::Parse(error_position(&e)),
nom::Err::Failure(e) => ErrorKind::Parse(error_position(&e)),
})?;
let mut ret = PreprocessedText::new();

1
sv-parser/Cargo.toml
View File

@ -16,6 +16,7 @@ trace = ["sv-parser-parser/trace"]
[dependencies]
nom = "5.0.0"
nom-greedyerror = "0.1.0"
sv-parser-error = {version = "0.1.0", path = "../sv-parser-error"}
sv-parser-parser = {version = "0.1.0", path = "../sv-parser-parser"}
sv-parser-pp = {version = "0.1.0", path = "../sv-parser-pp"}

19
sv-parser/src/lib.rs
View File

@ -1,6 +1,7 @@
#![recursion_limit = "256"]
use nom::combinator::all_consuming;
use nom_greedyerror::error_position;
use std::collections::HashMap;
use std::fmt;
use std::path::Path;
@ -79,7 +80,14 @@ pub fn parse_sv<T: AsRef<Path>, U: AsRef<Path>>(
},
defines,
)),
Err(_) => Err(ErrorKind::Parse.into()),
Err(x) => {
let pos = match x {
nom::Err::Incomplete(_) => None,
nom::Err::Error(e) => error_position(&e),
nom::Err::Failure(e) => error_position(&e),
};
Err(ErrorKind::Parse(pos).into())
}
}
}
@ -99,7 +107,14 @@ pub fn parse_lib<T: AsRef<Path>, U: AsRef<Path>>(
},
defines,
)),
Err(_) => Err(ErrorKind::Parse.into()),
Err(x) => {
let pos = match x {
nom::Err::Incomplete(_) => None,
nom::Err::Error(e) => error_position(&e),
nom::Err::Failure(e) => error_position(&e),
};
Err(ErrorKind::Parse(pos).into())
}
}
}