Compare commits
No commits in common. "dfae432055de068c12b72103bdcb3ac9e9fc71f5" and "73580c4ff0fc6470eae0bbd224a5de44853a8c98" have entirely different histories.
dfae432055
...
73580c4ff0
|
|
@ -20,6 +20,12 @@ dependencies = [
|
|||
"yansi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
|
|
@ -37,12 +43,24 @@ version = "1.3.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bytecount"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f861d9ce359f56dbcb6e0c2a1cb84e52ad732cadb57b806adeb3c7668caccbd8"
|
||||
|
||||
[[package]]
|
||||
name = "bytecount"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.34.0"
|
||||
|
|
@ -63,8 +81,9 @@ name = "futilehdl"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"ariadne",
|
||||
"nom",
|
||||
"nom_locate",
|
||||
"nom 7.1.0",
|
||||
"nom-greedyerror",
|
||||
"nom_locate 4.0.0",
|
||||
"smol_str",
|
||||
"structopt",
|
||||
]
|
||||
|
|
@ -93,6 +112,19 @@ version = "1.4.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lexical-core"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
"ryu",
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.115"
|
||||
|
|
@ -111,6 +143,17 @@ version = "0.2.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "5.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
|
||||
dependencies = [
|
||||
"lexical-core",
|
||||
"memchr",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "7.1.0"
|
||||
|
|
@ -122,15 +165,50 @@ dependencies = [
|
|||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom-greedyerror"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcd01dcb46ac4b8133a093685c5133b044d45c35f10ac9b6606e4db780d94ac7"
|
||||
dependencies = [
|
||||
"nom 5.1.2",
|
||||
"nom 7.1.0",
|
||||
"nom_locate 1.0.0",
|
||||
"nom_locate 2.1.0",
|
||||
"nom_locate 4.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom_locate"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f932834fd8e391fc7710e2ba17e8f9f8645d846b55aa63207e17e110a1e1ce35"
|
||||
dependencies = [
|
||||
"bytecount 0.3.2",
|
||||
"memchr",
|
||||
"nom 5.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom_locate"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a67484adf5711f94f2f28b653bf231bff8e438be33bf5b0f35935a0db4f618a2"
|
||||
dependencies = [
|
||||
"bytecount 0.6.2",
|
||||
"memchr",
|
||||
"nom 5.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom_locate"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "37794436ca3029a3089e0b95d42da1f0b565ad271e4d3bb4bad0c7bb70b10605"
|
||||
dependencies = [
|
||||
"bytecount",
|
||||
"bytecount 0.6.2",
|
||||
"memchr",
|
||||
"nom",
|
||||
"nom 7.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -175,6 +253,12 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.136"
|
||||
|
|
@ -190,6 +274,12 @@ dependencies = [
|
|||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ edition = "2021"
|
|||
[dependencies]
|
||||
ariadne = "0.1.3"
|
||||
nom = "7.1.0"
|
||||
nom-greedyerror = "0.4.0"
|
||||
nom_locate = "4.0.0"
|
||||
smol_str = "0.1.21"
|
||||
structopt = "0.3.26"
|
||||
|
||||
[features]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ mod package;
|
|||
mod parser;
|
||||
mod rtlil;
|
||||
|
||||
use ariadne::Source;
|
||||
use std::fs::File;
|
||||
use std::io::prelude::*;
|
||||
use std::path::PathBuf;
|
||||
|
|
@ -49,9 +48,11 @@ fn main() {
|
|||
if opt.debug {
|
||||
println!("{err:#?}");
|
||||
}
|
||||
/*
|
||||
parser::error::convert_error(input, err)
|
||||
.eprint(Source::from(input.fragment()))
|
||||
.unwrap();
|
||||
*/
|
||||
}
|
||||
Err(_) => (unreachable!()),
|
||||
Ok(res) => {
|
||||
|
|
|
|||
|
|
@ -1,124 +1,23 @@
|
|||
use super::tokens::{TokenKind, TokenSpan};
|
||||
use super::{IErr, Span};
|
||||
use ariadne::{Label, Report, ReportKind};
|
||||
use nom::error::{ContextError, ParseError};
|
||||
use nom::InputTake;
|
||||
use nom_greedyerror::{GreedyErrorKind, Position};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Error<I> {
|
||||
pub errors: Vec<(I, ErrorKind)>,
|
||||
fn span_to_range(input: Span) -> std::ops::Range<usize> {
|
||||
input.position()..(input.position() + input.len())
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum ErrorKind {
|
||||
/// A static context string
|
||||
Context(&'static str),
|
||||
/// An expected character
|
||||
Char(char),
|
||||
/// An expected token
|
||||
Token(TokenKind),
|
||||
/// A list of valid tokens
|
||||
Tokens(Vec<TokenKind>),
|
||||
/// A nom error
|
||||
Nom(nom::error::ErrorKind),
|
||||
}
|
||||
|
||||
impl<I> ParseError<I> for Error<I>
|
||||
where
|
||||
I: InputPos + std::fmt::Debug + Clone,
|
||||
{
|
||||
fn from_error_kind(input: I, kind: nom::error::ErrorKind) -> Self {
|
||||
Self {
|
||||
errors: vec![(input, ErrorKind::Nom(kind))],
|
||||
}
|
||||
}
|
||||
|
||||
fn append(input: I, kind: nom::error::ErrorKind, mut other: Self) -> Self {
|
||||
other.errors.push((input, ErrorKind::Nom(kind)));
|
||||
other
|
||||
}
|
||||
|
||||
fn from_char(input: I, c: char) -> Self {
|
||||
Self {
|
||||
errors: vec![(input, ErrorKind::Char(c))],
|
||||
}
|
||||
}
|
||||
|
||||
fn or(self, mut other: Self) -> Self {
|
||||
let self_first = self.errors.first();
|
||||
let other_first = other.errors.first();
|
||||
match (self_first, other_first) {
|
||||
(Some((_is, ErrorKind::Token(s))), Some((io, ErrorKind::Token(o)))) => {
|
||||
let combined_kind = ErrorKind::Tokens(vec![*s, *o]);
|
||||
other.errors[0] = (io.clone(), combined_kind);
|
||||
other
|
||||
}
|
||||
_ => {
|
||||
other.errors.extend_from_slice(&self.errors[..]);
|
||||
other
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<I> ContextError<I> for Error<I> {
|
||||
fn add_context(input: I, ctx: &'static str, mut other: Self) -> Self {
|
||||
other.errors.push((input, ErrorKind::Context(ctx)));
|
||||
other
|
||||
}
|
||||
}
|
||||
|
||||
impl<I> Error<I> {
|
||||
pub fn from_tokenkind(input: I, kind: TokenKind) -> Self {
|
||||
Self {
|
||||
errors: vec![(input, ErrorKind::Token(kind))],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub trait InputPos {
|
||||
fn position(&self) -> usize;
|
||||
}
|
||||
|
||||
impl InputPos for Span<'_> {
|
||||
fn position(&self) -> usize {
|
||||
self.location_offset()
|
||||
}
|
||||
}
|
||||
|
||||
fn tokspan_to_range(input: TokenSpan) -> std::ops::Range<usize> {
|
||||
let first = input.first().unwrap().span().position();
|
||||
let last_span = input.last().unwrap().span();
|
||||
let last = last_span.position() + last_span.len();
|
||||
first..last
|
||||
}
|
||||
|
||||
fn label_tokspan(input: TokenSpan) -> Label {
|
||||
Label::new(tokspan_to_range(input))
|
||||
}
|
||||
|
||||
pub fn convert_error(_input: Span, e: IErr<TokenSpan>) -> Report {
|
||||
pub fn convert_error(_input: Span, e: IErr<Span>) -> Report {
|
||||
let mut labels = Vec::new();
|
||||
let mut colors = ariadne::ColorGenerator::new();
|
||||
for (input, err) in e.errors {
|
||||
let label = match err {
|
||||
ErrorKind::Context(ctx) => label_tokspan(input).with_message(format!("in {ctx}")),
|
||||
ErrorKind::Char(c) => label_tokspan(input).with_message(format!("expected {c:?}")),
|
||||
ErrorKind::Nom(kind) => {
|
||||
label_tokspan(input).with_message(format!("nom error {kind:?}"))
|
||||
}
|
||||
ErrorKind::Token(t) => {
|
||||
let next = input.first().unwrap().kind();
|
||||
let msg = format!("expected {t:?} found {next:?}");
|
||||
label_tokspan(input.take(1)).with_message(msg)
|
||||
}
|
||||
ErrorKind::Tokens(ts) => {
|
||||
let next = input.first().unwrap().kind();
|
||||
let msg = format!("expected one of {ts:?} found {next:?}");
|
||||
label_tokspan(input.take(1)).with_message(msg)
|
||||
for err in e.errors {
|
||||
let label = match err.1 {
|
||||
GreedyErrorKind::Context(ctx) => {
|
||||
Label::new(span_to_range(err.0)).with_message(format!("in {ctx}"))
|
||||
}
|
||||
GreedyErrorKind::Char(c) => Label::new(err.0.position()..err.0.position())
|
||||
.with_message(format!("expected {c:?}")),
|
||||
GreedyErrorKind::Nom(kind) => Label::new(err.0.position()..err.0.position())
|
||||
.with_message(format!("nom error {kind:?}")),
|
||||
};
|
||||
let label = label.with_color(colors.next());
|
||||
labels.push(label);
|
||||
}
|
||||
let mut rep = Report::build(ReportKind::Error, (), 0).with_message("Parse Error");
|
||||
|
|
|
|||
|
|
@ -6,12 +6,22 @@ pub mod module;
|
|||
pub mod proc;
|
||||
pub mod tokens;
|
||||
|
||||
use nom::{
|
||||
branch::alt,
|
||||
bytes::complete::tag,
|
||||
character::complete::{alpha1, alphanumeric1, multispace0},
|
||||
combinator::{map, opt, recognize},
|
||||
error::{ErrorKind, ParseError},
|
||||
multi::{many0, separated_list0},
|
||||
sequence::{delimited, pair, preceded, separated_pair, tuple},
|
||||
};
|
||||
use nom_greedyerror::GreedyError;
|
||||
use nom_locate::LocatedSpan;
|
||||
|
||||
// custom span type for nom_locate
|
||||
pub type Span<'a> = LocatedSpan<&'a str>;
|
||||
|
||||
pub type IErr<I> = error::Error<I>;
|
||||
pub type IErr<I> = GreedyError<I, ErrorKind>;
|
||||
// custom IResult type for VerboseError
|
||||
pub type IResult<I, O, E = IErr<I>> = nom::IResult<I, O, E>;
|
||||
|
||||
|
|
@ -20,7 +30,7 @@ pub use crate::parser::declaration::{
|
|||
};
|
||||
pub use crate::parser::expression::{expression, Call, Expression, Operation};
|
||||
pub use crate::parser::module::{module, Module, ModuleItem, PortDirection};
|
||||
use crate::parser::tokens::TokenSpan;
|
||||
use crate::parser::tokens::{token, TokenKind as tk, TokenSpan};
|
||||
|
||||
pub fn parse(input: TokenSpan) -> IResult<TokenSpan, Module> {
|
||||
module(input)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use nom::{
|
||||
branch::alt,
|
||||
combinator::{cut, map},
|
||||
combinator::map,
|
||||
error::context,
|
||||
multi::{many0, separated_list0},
|
||||
sequence::{delimited, preceded, tuple},
|
||||
|
|
@ -52,11 +52,7 @@ fn inputs_list(input: TokenSpan) -> IResult<TokenSpan, Vec<PortDecl>> {
|
|||
fn assign_item(input: TokenSpan) -> IResult<TokenSpan, Assign> {
|
||||
context(
|
||||
"assignment",
|
||||
delimited(
|
||||
token(tk::Assign),
|
||||
cut(assign_statement),
|
||||
cut(token(tk::Semicolon)),
|
||||
),
|
||||
delimited(token(tk::Assign), assign_statement, token(tk::Semicolon)),
|
||||
)(input)
|
||||
}
|
||||
|
||||
|
|
@ -68,22 +64,23 @@ fn module_item(input: TokenSpan) -> IResult<TokenSpan, ModuleItem> {
|
|||
}
|
||||
|
||||
pub fn module(input: TokenSpan) -> IResult<TokenSpan, Module> {
|
||||
context(
|
||||
"module",
|
||||
map(
|
||||
preceded(
|
||||
tuple((
|
||||
token(tk::Module),
|
||||
cut(tuple((
|
||||
token(tk::Ident),
|
||||
delimited(token(tk::LParen), inputs_list, token(tk::RParen)),
|
||||
preceded(token(tk::RArrow), typename),
|
||||
delimited(token(tk::LBrace), many0(module_item), token(tk::RBrace)),
|
||||
))),
|
||||
),
|
||||
|(name, inputs, _ret, items)| Module {
|
||||
)),
|
||||
|(_, name, inputs, _ret, items)| Module {
|
||||
// TODO: bring back returns
|
||||
name: name.span(),
|
||||
ports: inputs,
|
||||
items,
|
||||
},
|
||||
),
|
||||
)(input)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
//! convert text into a token stream
|
||||
|
||||
use super::{
|
||||
error::{Error, InputPos},
|
||||
literals::{identifier, ws0},
|
||||
IResult, Span,
|
||||
};
|
||||
|
|
@ -10,6 +9,7 @@ use nom::{
|
|||
bytes::complete::tag,
|
||||
character::complete::{anychar, digit1},
|
||||
combinator::{consumed, map, recognize},
|
||||
error::ParseError,
|
||||
multi::many0,
|
||||
};
|
||||
use std::fmt;
|
||||
|
|
@ -40,12 +40,9 @@ impl<'a> Token<'a> {
|
|||
pub fn span(&self) -> Span {
|
||||
self.span
|
||||
}
|
||||
pub fn kind(&self) -> TokenKind {
|
||||
self.kind
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Copy, Clone)]
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub enum TokenKind {
|
||||
// no whitespace, for now
|
||||
// no token trees either, for now
|
||||
|
|
@ -95,12 +92,6 @@ impl<'a> TokenSpan<'a> {
|
|||
pub fn with_pos(rest: &'a [Token<'a>], pos: usize) -> Self {
|
||||
Self { rest, pos }
|
||||
}
|
||||
pub fn first(&self) -> Option<&Token> {
|
||||
self.rest.first()
|
||||
}
|
||||
pub fn last(&self) -> Option<&Token> {
|
||||
self.rest.last()
|
||||
}
|
||||
}
|
||||
|
||||
impl nom::InputTake for TokenSpan<'_> {
|
||||
|
|
@ -123,22 +114,30 @@ impl nom::InputLength for TokenSpan<'_> {
|
|||
}
|
||||
}
|
||||
|
||||
impl InputPos for TokenSpan<'_> {
|
||||
impl nom_greedyerror::Position for TokenSpan<'_> {
|
||||
fn position(&self) -> usize {
|
||||
self.pos
|
||||
}
|
||||
}
|
||||
|
||||
/// combinator that matches a token kind
|
||||
pub fn token<'a>(kind: TokenKind) -> impl FnMut(TokenSpan<'a>) -> IResult<TokenSpan, &Token> {
|
||||
pub fn token<'a, E>(
|
||||
kind: TokenKind,
|
||||
) -> impl FnMut(TokenSpan<'a>) -> nom::IResult<TokenSpan, &Token, E>
|
||||
where
|
||||
E: ParseError<TokenSpan<'a>>,
|
||||
{
|
||||
move |input: TokenSpan| {
|
||||
let next = &input.rest[0];
|
||||
let kind = kind;
|
||||
if next.kind == kind {
|
||||
if next.kind == kind.clone() {
|
||||
let rest = TokenSpan::with_pos(&input.rest[1..], input.pos + 1);
|
||||
Ok((rest, next))
|
||||
} else {
|
||||
Err(nom::Err::Error(Error::from_tokenkind(input, kind)))
|
||||
Err(nom::Err::Error(E::from_error_kind(
|
||||
input,
|
||||
// TODO: Proper errors here
|
||||
nom::error::ErrorKind::Tag,
|
||||
)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue