From f7d05ead2c79dc283267b5225e27ab8f8527bc35 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 27 Oct 2024 16:56:39 +0100 Subject: [PATCH] rename trait meta syntaxkinds --- crates/json-pawarser/src/syntax_kind.rs | 6 ++++-- crates/pawarser/src/parser.rs | 7 ++++--- crates/pawarser/src/parser/input.rs | 2 +- crates/pawarser/src/parser/output.rs | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/crates/json-pawarser/src/syntax_kind.rs b/crates/json-pawarser/src/syntax_kind.rs index 8713b2d..6e6b966 100644 --- a/crates/json-pawarser/src/syntax_kind.rs +++ b/crates/json-pawarser/src/syntax_kind.rs @@ -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 for rowan::SyntaxKind { diff --git a/crates/pawarser/src/parser.rs b/crates/pawarser/src/parser.rs index 2a666bf..3782f0f 100644 --- a/crates/pawarser/src/parser.rs +++ b/crates/pawarser/src/parser.rs @@ -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()) } _ => {} } diff --git a/crates/pawarser/src/parser/input.rs b/crates/pawarser/src/parser/input.rs index a20d73d..d7e14b3 100644 --- a/crates/pawarser/src/parser/input.rs +++ b/crates/pawarser/src/parser/input.rs @@ -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 diff --git a/crates/pawarser/src/parser/output.rs b/crates/pawarser/src/parser/output.rs index bea13e8..25b0c31 100644 --- a/crates/pawarser/src/parser/output.rs +++ b/crates/pawarser/src/parser/output.rs @@ -38,7 +38,7 @@ fn debug_print_output( 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