2 files changed, 33 insertions, 14 deletions
diff --git a/src/parcom.cr b/src/parcom.cr
index c1d9791..16abe22 100644
--- a/src/parcom.cr
+++ b/src/parcom.cr
@@ -81,20 +81,6 @@ module Parcom
     end
   end
 
-  class Satisfy(T) < Parser(T, T)
-    @p : Assert(T, T)
-
-    def initialize(&block : T -> Bool)
-      @p = AnyToken(T).new.assert(&block)
-    end
-
-    def parse(tokens : Tokens(T)) : Result(T, T)
-      @p.parse(tokens)
-    rescue ex : ParserFail
-      raise ParserFail.new("Satisfy: #{ex.message}")
-    end
-  end
-
   class Token(T) < Parser(T, T)
     def initialize(@expected : T)
       @p = Satisfy(T).new { |x| x == @expected }
diff --git a/src/parcom/satisfy.cr b/src/parcom/satisfy.cr
new file mode 100644
index 0000000..9734635
--- /dev/null
+++ b/src/parcom/satisfy.cr
@@ -0,0 +1,33 @@
+require "./parser.cr"
+require "./any_token.cr"
+require "./assert.cr"
+
+module Parcom
+  # `Satisfy` is a `Parser` that parses a single token
+  # if that token passes a predefined test, similar
+  # to `Assert`. This class is effectively a shorthand
+  # for the following:
+  # ```
+  # # These parsers are equivalent.
+  # letter_assert = Assert.new(AnyToken(Char).new) { |x| x.letter? }
+  # letter_satisfy = Satisfy(Char).new { |x| x.letter? }
+  # ```
+  class Satisfy(T) < Parser(T, T)
+    @p : Assert(T, T)
+
+    # Accepts the `Bool`-returning block containing the test
+    # to run on the parsed token.
+    def initialize(&block : T -> Bool)
+      @p = AnyToken(T).new.assert(&block)
+    end
+
+    # Returns the first token of the input if that
+    # token passes the test.
+    def parse(tokens : Tokens(T)) : Result(T, T)
+      @p.parse(tokens)
+    rescue ex : ParserFail
+      raise ParserFail.new("Satisfy: #{ex.message}")
+    end
+  end
+end
+