add: string_parser and char_satisfy parser.

src/combinators.rs

@@ -219,7 +219,7 @@ where
     PSeparator: Parser<'a, TToken, TSeparator, TContext>,
 {
     separate_by1(parser, separator).next(|r| match r {
-        Err((input, _)) => Ok((input, vec![])),
+        Err(r) => Ok((r.input(), vec![])),
         r => r,
     })
 }
@@ -274,7 +274,7 @@ where
     PSeparator: Parser<'a, TToken, TSeparator, TContext>,
 {
     separate_or_end_by1(parser, separator).next(|r| match r {
-        Err((i, _)) => Ok((i, vec![])),
+        Err(r) => Ok((r.input(), vec![])),
         r => r,
     })
 }

src/combinators/many_parsers.rs

@@ -136,9 +136,9 @@ where
                 input = i;
                 result.push(r);
             } else {
-                return Err((
+                return Err(FailedParserResult::new_with_str(
                     input,
-                    FailedParserResult::new("End with other elements.".to_owned()),
+                    "End with other elements.",
                 ));
             }
         }
@@ -174,9 +174,9 @@ where
                 result.push(r);
                 input = i;
             } else {
-                return Err((
+                return Err(FailedParserResult::new_with_str(
                     input,
-                    FailedParserResult::new("End with other elements.".to_owned()),
+                    "End with other elements.",
                 ));
             }
         }

src/parser.rs

@@ -10,33 +10,51 @@ use crate::parser::primitive_parsers::{
     TakeParser,
 };
 use std::cell::RefCell;
+use std::error::Error;
 use std::fmt::{Debug, Display, Formatter};
 use std::marker::PhantomData;
 use std::rc::Rc;
 
 #[derive(Debug)]
-pub struct FailedParserResult {
+pub struct FailedParserResult<'a, TToken: Debug> {
+    input: &'a [TToken],
     message: String,
 }
 
-impl FailedParserResult {
-    pub fn new(message: String) -> Self {
-        Self { message }
+impl<'a, TToken: Debug> FailedParserResult<'a, TToken> {
+    pub fn new(input: &'a [TToken], message: String) -> Self {
+        Self { input, message }
+    }
+
+    pub fn new_with_str(input: &'a [TToken], message: &'static str) -> Self {
+        Self {
+            input,
+            message: message.to_owned(),
+        }
     }
 
     pub fn message(&self) -> &str {
         self.message.as_str()
     }
-}
 
-impl Display for FailedParserResult {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Parse failed: {}.", self.message)
+    pub fn input(&self) -> &'a [TToken] {
+        self.input
     }
 }
 
-pub type ParserResult<'a, TToken, T> =
-    Result<(&'a [TToken], T), (&'a [TToken], FailedParserResult)>;
+impl<'a, TToken: Debug> Error for FailedParserResult<'a, TToken> {}
+
+impl<'a, TToken: Debug> Display for FailedParserResult<'a, TToken> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "Parse failed: {}, the input is '{:?}'.",
+            self.message, self.input
+        )
+    }
+}
+
+pub type ParserResult<'a, TToken, T> = Result<(&'a [TToken], T), FailedParserResult<'a, TToken>>;
 
 pub struct ParserContext<TToken, TContext>
 where

src/parser/modified_parsers.rs

@@ -121,11 +121,9 @@ where
         let (input, _) = self.parser.parse(context, input)?;
 
         if origin_input.is_empty() {
-            return Err((
+            return Err(FailedParserResult::new_with_str(
                 input,
-                FailedParserResult::new(
-                    "Empty input, the 'literal' parser cann't get length of elememt.".to_owned(),
-                ),
+                "Empty input, the 'literal' parser cann't get length of elememt.",
             ));
         }
 
@@ -156,11 +154,9 @@ where
         let (input, _) = self.parser.parse(context, input)?;
 
         if origin_input.is_empty() {
-            return Err((
+            return Err(FailedParserResult::new_with_str(
                 input,
-                FailedParserResult::new(
-                    "Empty input, the 'literal' parser cann't get length of elememt.".to_owned(),
-                ),
+                "Empty input, the 'literal' parser cann't get length of elememt.",
             ));
         }
 
@@ -212,11 +208,11 @@ where
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, TResult> {
         match self.parser.parse(context, input) {
-            Ok((input, _)) => Err((
+            Ok(_) => Err(FailedParserResult::new_with_str(
                 input,
-                FailedParserResult::new("Reverse failed succeeded.".to_owned()),
+                "Reverse successful parser.",
             )),
-            Err((input, _)) => Ok((input, self.result.clone())),
+            Err(_) => Ok((input, self.result.clone())),
         }
     }
 }
@@ -269,7 +265,7 @@ mod test {
             let (input, result) = satisfy(|c: &char| c.is_numeric()).parse(context, input)?;
 
             match result.to_digit(10) {
-                None => Err((input, FailedParserResult::new("What?".to_string()))),
+                None => Err(FailedParserResult::new_with_str(input, "What?")),
                 Some(r) => Ok((input, Number(r as i32))),
             }
         }
@@ -300,7 +296,7 @@ mod test {
             satisfy(|c: &char| c.is_numeric())
                 .next(|r| match r {
                     Ok((input, result)) => match result.to_digit(10) {
-                        None => Err((input, FailedParserResult::new("What?".to_string()))),
+                        None => Err(FailedParserResult::new_with_str(input, "What?")),
                         Some(r) => Ok((input, Number(r as i32))),
                     },
                     Err(r) => Err(r),

src/parser/primitive_parsers.rs

@@ -35,9 +35,9 @@ where
         _: Rc<RefCell<ParserContext<TToken, TContext>>>,
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, T> {
-        Err((
+        Err(FailedParserResult::new_with_str(
             input,
-            FailedParserResult::new("Default failed parser.".to_owned()),
+            "Default failed parser.",
         ))
     }
 }
@@ -56,7 +56,7 @@ where
         _: Rc<RefCell<ParserContext<TToken, TContext>>>,
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, T> {
-        Err((input, FailedParserResult::new(self.message.clone())))
+        Err(FailedParserResult::new(input, self.message.clone()))
     }
 }
 
@@ -75,16 +75,13 @@ where
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, TToken> {
         if input.is_empty() {
-            return Err((input, FailedParserResult::new("Input is empty.".to_owned())));
+            return Err(FailedParserResult::new_with_str(input, "Input is empty"));
         }
 
         if (self.predicate)(&input[0]) {
             Ok((&input[1..], input[0].clone()))
         } else {
-            Err((
-                input,
-                FailedParserResult::new("Predicate failed.".to_owned()),
-            ))
+            Err(FailedParserResult::new_with_str(input, "Predicate failed."))
         }
     }
 }
@@ -101,7 +98,7 @@ where
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, TToken> {
         if input.is_empty() {
-            Err((input, FailedParserResult::new("Input is empty.".to_owned())))
+            Err(FailedParserResult::new_with_str(input, "Input is empty"))
         } else {
             Ok((&input[1..], input[0].clone()))
         }
@@ -122,12 +119,12 @@ where
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, Vec<TToken>> {
         if input.len() < self.count {
-            Err((
+            Err(FailedParserResult::new(
                 input,
-                FailedParserResult::new(format!(
+                format!(
                     "The input doesn't contain enough {} elemements.",
                     self.count
-                )),
+                ),
             ))
         } else {
             Ok((
@@ -152,12 +149,12 @@ where
         input: &'a [TToken],
     ) -> ParserResult<'a, TToken, ()> {
         if input.len() < self.count {
-            Err((
+            Err(FailedParserResult::new(
                 input,
-                FailedParserResult::new(format!(
+                format!(
                     "The input doesn't contain enough {} elemements.",
                     self.count
-                )),
+                ),
             ))
         } else {
             Ok((&input[self.count..], ()))

src/text.rs

@@ -1,23 +1,16 @@
-use crate::parser::{satisfy, take, FailedParserResult, Parser};
+mod string_parsers;
+
+use crate::parser::{satisfy, Parser};
+use crate::text::string_parsers::StringParser;
 
 pub fn char_parser<'a, TContext>(c: char) -> impl Parser<'a, char, char, TContext> {
     satisfy(move |x| *x == c)
 }
 
-pub fn string_parser<'a, TContext>(str: &'static str) -> impl Parser<'a, char, String, TContext> {
-    take::<char, TContext>(str.chars().count()).next(move |result| {
-        result.and_then(|(input, chars)| {
-            let chars: String = chars.iter().collect();
-            if chars == str {
-                Ok((input, chars))
-            } else {
-                Err((
-                    input,
-                    FailedParserResult::new(format!("Failed to parse '{}'.", str)),
-                ))
-            }
-        })
-    })
+pub fn string_parser<'a, TContext>(
+    str: &'static str,
+) -> impl Parser<'a, char, &'a [char], TContext> {
+    StringParser { str }
 }
 
 pub fn one_of<'a, TContext>(str: &'static str) -> impl Parser<'a, char, char, TContext> {
@@ -25,6 +18,13 @@ pub fn one_of<'a, TContext>(str: &'static str) -> impl Parser<'a, char, char, TC
     satisfy(move |c: &char| str.contains(c))
 }
 
+pub fn char_satisfy<'a, TContext, F>(condition: F) -> impl Parser<'a, char, char, TContext>
+where
+    F: Fn(&char) -> bool,
+{
+    satisfy(move |x: &char| condition(x))
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -52,7 +52,11 @@ mod test {
         parser_test_helper(
             ParserContext::new_with_str("Hello, world!", ()),
             &"Hello".to_owned(),
-            |context, input| string_parser("Hello").parse(context, input),
+            |context, input| {
+                string_parser("Hello")
+                    .map(|x| x.iter().collect())
+                    .parse(context, input)
+            },
         );
 
         fn test_parser(
@@ -62,7 +66,10 @@ mod test {
             let (input, first) = string_parser("hello, ").parse(context.clone(), input)?;
             let (input, second) = string_parser("world!").parse(context.clone(), input)?;
 
-            Ok((input, first + second.as_str()))
+            Ok((
+                input,
+                first.iter().collect::<String>() + second.iter().collect::<String>().as_str(),
+            ))
         }
 
         parser_test_helper(
@@ -76,4 +83,11 @@ mod test {
             |context, input| test_parser.map(|_| ()).parse(context, input),
         )
     }
+
+    #[test]
+    fn char_satsify_test() {
+        parser_test_helper(ParserContext::new_with_str("abc", ()), &'a', |c, i| {
+            char_satisfy(char::is_ascii).parse(c, i)
+        });
+    }
 }

src/text/string_parsers.rs

@@ -0,0 +1,37 @@
+use crate::parser::{FailedParserResult, Parser, ParserContext, ParserResult};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+pub struct StringParser {
+    pub(crate) str: &'static str,
+}
+
+impl<'a, TContext> Parser<'a, char, &'a [char], TContext> for StringParser {
+    fn parse(
+        &self,
+        _: Rc<RefCell<ParserContext<char, TContext>>>,
+        input: &'a [char],
+    ) -> ParserResult<'a, char, &'a [char]> {
+        let length = self.str.chars().count();
+        if input.len() < length {
+            return Err(FailedParserResult::new(
+                input,
+                format!("Failed to get enough elements for string '{}'.", self.str),
+            ));
+        }
+
+        if (&input[..length])
+            .iter()
+            .zip(self.str.chars())
+            .map(|(x, y)| *x == y)
+            .all(|x| x)
+        {
+            Ok((&input[length..], &input[..length]))
+        } else {
+            Err(FailedParserResult::new(
+                input,
+                format!("Input is not string '{}'", self.str),
+            ))
+        }
+    }
+}

tests/file_lexical_parser_tests.rs

@@ -78,7 +78,7 @@ fn file_lexical_parser_test() -> anyhow::Result<()> {
         let context = ParserContext::new_with_str(source_file.content.as_str(), ());
         let borrowed_context = context.borrow();
         let (_, zero_tokens) = zero_lexical_parser(context.clone(), borrowed_context.input_slice())
-            .or_else(|e| Err(anyhow!("{}", e.1)))?;
+            .or_else(|e| Err(anyhow!("{}", e)))?;
 
         assert_eq!(nom_tokens.len(), zero_tokens.len());