schrottkatze/iowo
1
0
Fork 0
forked from katzen-cafe/iowo
Code Pull requests Activity

rename trait meta syntaxkinds

Browse source
This commit is contained in:
Schrottkatze 2024-10-27 16:56:39 +01:00
parent cee9b97dbf
commit f7d05ead2c
Signed by: schrottkatze
SSH key fingerprint: SHA256:hXb3t1vINBFCiDCmhRABHX5ocdbLiKyCdKI4HK2Rbbc
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/json-pawarser/src/syntax_kind.rs
View file

@ -62,13 +62,15 @@ pub enum SyntaxKind {
PARSE_ERR,
// Meta SyntaxKinds
ROOT,
EOF,
}
impl pawarser::parser::SyntaxElement for SyntaxKind {
const EOF: Self = Self::EOF;
const SYNTAX_EOF: Self = Self::EOF;
const ERROR: Self = Self::PARSE_ERR;
const SYNTAX_ERROR: Self = Self::PARSE_ERR;
const SYNTAX_ROOT: Self = Self::ROOT;
}
impl From<SyntaxKind> for rowan::SyntaxKind {

7
crates/pawarser/src/parser.rs
View file

@ -26,9 +26,10 @@ where
+ Eq,
{
/// EOF value. This will be used by the rest of the parser library to represent an EOF.
const EOF: Self;
const SYNTAX_EOF: Self;
/// Error value. This will be used as a placeholder for associated respective errors.
const ERROR: Self;
const SYNTAX_ERROR: Self;
const SYNTAX_ROOT: Self;
}
pub struct Parser<'src, SyntaxKind: SyntaxElement, SyntaxErr: SyntaxError> {
@ -170,7 +171,7 @@ impl<'src, 'toks, SyntaxKind: SyntaxElement, SyntaxErr: SyntaxError>
NodeKind::Syntax(kind) => builder.start_node(kind.into()),
NodeKind::Error(err) => {
errors.push(err);
builder.start_node(SyntaxKind::ERROR.into())
builder.start_node(SyntaxKind::SYNTAX_ERROR.into())
}
_ => {}
}

2
crates/pawarser/src/parser/input.rs
View file

@ -34,7 +34,7 @@ impl<'src, SyntaxKind: SyntaxElement> Input<'src, SyntaxKind> {
pub fn kind(&self, idx: usize) -> SyntaxKind {
let Some(meaningful_idx) = self.meaningful_toks.get(idx) else {
return SyntaxKind::EOF;
return SyntaxKind::SYNTAX_EOF;
};
self.raw.get(*meaningful_idx).unwrap().0

2
crates/pawarser/src/parser/output.rs
View file

@ -38,7 +38,7 @@ fn debug_print_output<SyntaxKind: SyntaxElement, SyntaxErr: SyntaxError>(
match node {
NodeOrToken::Node(n) => {
let kind: SyntaxKind = node.kind().into();
if kind != SyntaxKind::ERROR {
if kind != SyntaxKind::SYNTAX_ERROR {
writeln!(f, "{:?} {{", kind)?;
} else {
let err = errs