use custom result

Author: juleswritescode

crates/pgt_statement_splitter/src/splitter.rs

@@ -8,7 +8,7 @@ pub use common::source;
 use pgt_lexer::{Lexed, SyntaxKind};
 use pgt_text_size::TextRange;
 
-use crate::splitter::common::ReachedEOFException;
+use crate::splitter::common::{ReachedEOFException, SplitterResult};
 
 pub struct SplitResult {
     pub ranges: Vec<TextRange>,
@@ -171,7 +171,7 @@ impl<'a> Splitter<'a> {
 
     /// Will advance if the `kind` matches the current token.
     /// Otherwise, will add a diagnostic to the internal `errors`.
-    fn expect(&mut self, kind: SyntaxKind) -> Result<(), ReachedEOFException> {
+    fn expect(&mut self, kind: SyntaxKind) -> SplitterResult {
         if self.current() == kind {
             self.advance()?;
         } else {

crates/pgt_statement_splitter/src/splitter/common.rs

@@ -21,7 +21,9 @@ impl std::fmt::Display for ReachedEOFException {
 
 impl Error for ReachedEOFException {}
 
-pub fn source(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) type SplitterResult = Result<(), ReachedEOFException>;
+
+pub fn source(p: &mut Splitter) -> SplitterResult {
     loop {
         match p.current() {
             SyntaxKind::EOF => {
@@ -42,7 +44,7 @@ pub fn source(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn statement(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn statement(p: &mut Splitter) -> SplitterResult {
     p.start_stmt();
 
     // Currently, Err means that we reached EOF.
@@ -64,7 +66,7 @@ pub(crate) fn statement(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn begin_end(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn begin_end(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::BEGIN_KW)?;
 
     let mut depth = 1;
@@ -93,7 +95,7 @@ pub(crate) fn begin_end(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn parenthesis(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn parenthesis(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::L_PAREN)?;
 
     let mut depth = 1;
@@ -122,7 +124,7 @@ pub(crate) fn parenthesis(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn plpgsql_command(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn plpgsql_command(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::BACKSLASH)?;
 
     loop {
@@ -142,7 +144,7 @@ pub(crate) fn plpgsql_command(p: &mut Splitter) -> Result<(), ReachedEOFExceptio
     Ok(())
 }
 
-pub(crate) fn case(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn case(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::CASE_KW)?;
 
     loop {
@@ -160,7 +162,7 @@ pub(crate) fn case(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn unknown(p: &mut Splitter, exclude: &[SyntaxKind]) -> Result<(), ReachedEOFException> {
+pub(crate) fn unknown(p: &mut Splitter, exclude: &[SyntaxKind]) -> SplitterResult {
     loop {
         match p.current() {
             SyntaxKind::SEMICOLON => {

crates/pgt_statement_splitter/src/splitter/ddl.rs

@@ -1,16 +1,16 @@
 use pgt_lexer::SyntaxKind;
 
-use crate::splitter::common::ReachedEOFException;
+use crate::splitter::common::SplitterResult;
 
 use super::{Splitter, common::unknown};
 
-pub(crate) fn create(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn create(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::CREATE_KW)?;
 
     unknown(p, &[SyntaxKind::WITH_KW])
 }
 
-pub(crate) fn alter(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn alter(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::ALTER_KW)?;
 
     unknown(p, &[SyntaxKind::ALTER_KW])

crates/pgt_statement_splitter/src/splitter/dml.rs

@@ -1,13 +1,13 @@
 use pgt_lexer::SyntaxKind;
 
-use crate::splitter::common::ReachedEOFException;
+use crate::splitter::common::SplitterResult;
 
 use super::{
     Splitter,
     common::{parenthesis, unknown},
 };
 
-pub(crate) fn cte(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn cte(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::WITH_KW)?;
     p.eat(SyntaxKind::RECURSIVE_KW)?;
 
@@ -36,26 +36,26 @@ pub(crate) fn cte(p: &mut Splitter) -> Result<(), ReachedEOFException> {
     Ok(())
 }
 
-pub(crate) fn select(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn select(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::SELECT_KW)?;
 
     unknown(p, &[])
 }
 
-pub(crate) fn insert(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn insert(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::INSERT_KW)?;
     p.expect(SyntaxKind::INTO_KW)?;
 
     unknown(p, &[SyntaxKind::SELECT_KW])
 }
 
-pub(crate) fn update(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn update(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::UPDATE_KW)?;
 
     unknown(p, &[])
 }
 
-pub(crate) fn delete(p: &mut Splitter) -> Result<(), ReachedEOFException> {
+pub(crate) fn delete(p: &mut Splitter) -> SplitterResult {
     p.expect(SyntaxKind::DELETE_KW)?;
     p.expect(SyntaxKind::FROM_KW)?;