Add + operator for infix space

wrsturgeon · Sep 27, 2023 · 7a51a04 · 7a51a04
1 parent f77bbb8
commit 7a51a04
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/example/build.rs b/example/build.rs
@@ -3,7 +3,7 @@
 //!
 //! /// Surround this language in parentheses.
 //! pub fn parenthesized(p: Parser<char>) -> Parser<char> {
-//!     c('(') >> p >> c(')')
+//!     c('(') + p + c(')')
 //! }
 //!
 //! /// Accept any of these tokens here.

diff --git a/example/src/inator_config.rs b/example/src/inator_config.rs
@@ -1,3 +1,4 @@
+#![deny(dead_code)]
 #![allow(non_snake_case)]
 
 pub mod abc_tuple {

diff --git a/src/dfa.rs b/src/dfa.rs
@@ -771,14 +771,15 @@ impl<I: Clone + Ord + Expression> core::fmt::Display for Graph<I> {
 
 impl<I: Clone + Ord + Expression> core::fmt::Display for State<I> {
     #[inline]
+    #[allow(clippy::use_debug)]
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         writeln!(
             f,
             "({}accepting):",
             if self.accepting { "" } else { "NOT " }
         )?;
         for (input, transitions) in &self.transitions {
-            writeln!(f, "    {input} --> {transitions}")?;
+            writeln!(f, "    {input:?} --> {transitions}")?;
         }
         Ok(())
     }
@@ -901,8 +902,8 @@ impl<I: Clone + Ord> State<I> {
                                     match minimal_input.split_first() {
                                         None => "[this is the initial state]".to_owned(),
                                         Some((head, tail)) =>
-                                            tail.iter().fold(head.to_string(), |acc, token| {
-                                                acc + &format!(" -> {token}")
+                                            tail.iter().fold(format!("{head:?}"), |acc, token| {
+                                                acc + &format!(" -> {token:?}")
                                             }),
                                     },
                                 ),
@@ -1525,8 +1526,8 @@ impl<I: Clone + Ord> State<I> {
                                     match minimal_input.split_first() {
                                         None => "[this is the initial state]".to_owned(),
                                         Some((head, tail)) =>
-                                            tail.iter().fold(head.to_string(), |acc, token| {
-                                                acc + &format!(" -> {token}")
+                                            tail.iter().fold(format!("{head:?}"), |acc, token| {
+                                                acc + &format!(" -> {token:?}")
                                             }),
                                     },
                                 ),

diff --git a/src/expr.rs b/src/expr.rs
@@ -9,7 +9,7 @@
 use proc_macro2::Span;
 
 /// Convert to a variety of source-code-related formats.
-pub trait Expression: core::fmt::Display {
+pub trait Expression: core::fmt::Debug {
     /// Convert `&Self -> syn::Expr`.
     #[must_use]
     fn to_expr(&self) -> syn::Expr;
@@ -60,12 +60,13 @@ impl Expression for char {
         // If it ever does for you, let me know.
         match *self {
             'A'..='Z' | 'a'..='z' | '0'..='9' => return core::iter::once(self).collect(),
-            '\u{1}'..='\u{8}' | '\u{b}'..='\u{c}' | '\u{e}'..='\u{1f}' | '\u{80}'.. => {
+            '\u{1}'..='\u{8}' | '\u{b}' | '\u{e}'..='\u{1f}' | '\u{80}'.. => {
                 return format!("_x{:X}_", u32::from(*self))
             }
             '\0' => "_null_",
             '\t' => "_tab_",
             '\n' => "_newline_",
+            '\u{c}' => "_newpage_",
             '\r' => "_return_",
             ' ' => "_space_",
             '!' => "_bang_",

diff --git a/src/lib.rs b/src/lib.rs
@@ -206,7 +206,7 @@ pub fn opt<I: Clone + Ord>(token: I) -> Parser<I> {
 #[inline]
 #[must_use]
 pub fn space() -> Parser<char> {
-    any((0..u8::MAX).filter(u8::is_ascii_whitespace).map(char::from))
+    any((0..u8::MAX).filter(u8::is_ascii_whitespace).map(char::from)).star()
 }
 
 /// Surround this language in parentheses.
@@ -215,5 +215,5 @@ pub fn space() -> Parser<char> {
 #[must_use]
 #[allow(clippy::arithmetic_side_effects)]
 pub fn parenthesized(p: Parser<char>) -> Parser<char> {
-    c('(') >> space() >> p >> space() >> c(')')
+    c('(') + p + c(')')
 }
diff --git a/src/nfa.rs b/src/nfa.rs
@@ -236,7 +236,7 @@ impl<I: Clone + Ord + Expression> core::fmt::Display for State<I> {
             writeln!(f, "    epsilon --> {:?}", self.epsilon)?;
         }
         for (input, transitions) in &self.non_epsilon {
-            writeln!(f, "    {input} --> {transitions:?}")?;
+            writeln!(f, "    {input:?} --> {transitions:?}")?;
         }
         Ok(())
     }

diff --git a/src/ops.rs b/src/ops.rs
@@ -27,7 +27,7 @@ impl<I: Clone + Ord> core::ops::AddAssign<usize> for nfa::State<I> {
 }
 
 impl<I: Clone + Ord> core::ops::BitOr for Nfa<I> {
-    type Output = Nfa<I>;
+    type Output = Self;
     #[inline]
     #[allow(clippy::arithmetic_side_effects, clippy::suspicious_arithmetic_impl)]
     fn bitor(mut self, mut rhs: Self) -> Self::Output {
@@ -46,7 +46,7 @@ impl<I: Clone + Ord> core::ops::BitOr for Nfa<I> {
 }
 
 impl<I: Clone + Ord> core::ops::Shr for Nfa<I> {
-    type Output = Nfa<I>;
+    type Output = Self;
     #[inline]
     #[allow(clippy::todo)] // FIXME
     #[allow(clippy::arithmetic_side_effects, clippy::suspicious_arithmetic_impl)]
@@ -69,3 +69,12 @@ impl<I: Clone + Ord> core::ops::Shr for Nfa<I> {
         self
     }
 }
+
+impl core::ops::Add for Nfa<char> {
+    type Output = Self;
+    #[inline]
+    #[allow(clippy::arithmetic_side_effects, clippy::suspicious_arithmetic_impl)]
+    fn add(self, rhs: Self) -> Self::Output {
+        self >> crate::space() >> rhs
+    }
+}