mist-go/mist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

error system: common

Browse Source
This commit is contained in:
selimaj-dev
2026-05-16 05:55:00 +02:00
parent 1a80fe074b
commit 32c411ba78
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser/src/parser/common/mod.rs
+16 -16
View File
@@ -6,7 +6,7 @@ pub mod types;
use crate::{ use crate::{
Rule, Rule,
ast::*, ast::*,
ast_ensure, ast_ensure, ast_expr,
error::{AstError, IntoErr, collect_recovered}, error::{AstError, IntoErr, collect_recovered},
parser::consume_rule, parser::consume_rule,
}; };
@@ -59,27 +59,27 @@ impl<'a> TryFrom<pest::iterators::Pair<'a, Rule>> for Pattern {
let rule = pair.as_rule(); let rule = pair.as_rule();
let mut inner = pair.clone().into_inner(); let mut inner = pair.clone().into_inner();
Ok(match rule { match rule {
Rule::tuple_pattern => Pattern::Tuple(collect_recovered(pair.into_inner()).get()?), Rule::tuple_pattern => ast_expr!(Pattern::Tuple(collect_recovered(pair.into_inner()))),
Rule::named_tuple_pattern => Pattern::NamedTuple( Rule::named_tuple_pattern => ast_expr!(Pattern::NamedTuple(
Path::try_from(inner.next().unwrap()).get()?, Path::try_from(inner.next().unwrap()),
collect_recovered(inner).get()?, collect_recovered(inner),
), )),
Rule::struct_pattern => Pattern::Struct( Rule::struct_pattern => ast_expr!(Pattern::Struct(
Path::try_from(inner.next().unwrap()).get()?, Path::try_from(inner.next().unwrap()),
collect_recovered(inner).get()?, collect_recovered(inner),
), )),
Rule::literal => Pattern::Literal(Literal::try_from(pair).get()?), Rule::literal => ast_expr!(Pattern::Literal(pair.try_into())),
Rule::identifier => Pattern::Id(Identifier::try_from(pair).get()?), Rule::identifier => ast_expr!(Pattern::Id(pair.try_into())),
Rule::static_path => Pattern::Path(Path::try_from(pair).get()?), Rule::static_path => ast_expr!(Pattern::Path(pair.try_into())),
_ => unimplemented!("{rule:?}"), _ => unimplemented!("{rule:?}"),
}) }
} }
} }
@@ -90,7 +90,7 @@ impl<'a> TryFrom<&mut pest::iterators::Pairs<'a, Rule>> for Visibility {
Ok(consume_rule(pairs, Rule::visibility) Ok(consume_rule(pairs, Rule::visibility)
.map(|pair| -> Result<Visibility, AstError<'a, Self>> { .map(|pair| -> Result<Visibility, AstError<'a, Self>> {
if let Some(path) = pair.into_inner().next() { if let Some(path) = pair.into_inner().next() {
Ok(Visibility::PublicTarget(Path::try_from(path).get()?)) ast_expr!(Visibility::PublicTarget(Path::try_from(path)))
} else { } else {
Ok(Visibility::Public) Ok(Visibility::Public)
} }