1 files changed, 29 insertions, 2 deletions
diff --git a/src/parcom.cr b/src/parcom.cr
index 760a450..8d7c754 100644
--- a/src/parcom.cr
+++ b/src/parcom.cr
@@ -246,10 +246,37 @@ module Parcom
     end
   end
 
-  class Many
+  class Many(T, V) < Parser(T, Array(V))
+    def initialize(@p : Parser(T, V))
+    end
+
+    def parse(tokens : TokenStream(T)) : Result(T, Array(V))
+      parsed = [] of V
+
+      loop do
+        result = @p.parse?(tokens)
+        if result.nil?
+          break
+        else
+          parsed << result.value
+          tokens = result.tokens
+        end
+      end
+
+      Result.new(tokens, parsed)
+    end
   end
 
-  class Some
+  class Some(T, V) < Parser(T, Array(V))
+    @p : Assert(T, Array(V))
+
+    def initialize(p : Parser(T, V))
+      @p = Many.new(p).assert { |arr| !arr.empty? }
+    end
+
+    def parse(tokens : TokenStream(T)) : Result(T, Array(V))
+      @p.parse(tokens)
+    end
   end
 
   class Exactly