Kill off some unused methods

diff --git a/lib/walrat/parslet_combining.rb b/lib/walrat/parslet_combining.rb
index a57c17037d82d2b42d22f807cbd2865edfceab95..6217245ec745f489ab2f863a6dc105b22a8f3c70 100755 (executable)
--- a/lib/walrat/parslet_combining.rb
+++ b/lib/walrat/parslet_combining.rb
@@ -21,19 +21,11 @@ module Walrat
       to_parseable.parse string, options
     end
 
-    # Defines a sequence of Parslets (or ParsletCombinations).
-    # Returns a ParsletSequence instance.
-    def sequence first, second, *others
-      ParsletSequence.new first.to_parseable,
-        second.to_parseable, *others
-    end
-
-    # Shorthand for ParsletCombining.sequence(first, second).
     def &(next_parslet)
-      sequence self, next_parslet
+      ParsletSequence.new self.to_parseable, next_parslet.to_parseable
     end
 
-    # Defines a sequence of Parslets similar to the sequence method but with
+    # Defines a sequence of Parslets similar to the #& method but with
     # the difference that the contents of array results from the component
     # parslets will be merged into a single array rather than being added as
     # arrays. To illustrate:
@@ -41,49 +33,29 @@ module Walrat
     #   'foo' & 'bar'.one_or_more   # returns results like ['foo', ['bar', 'bar', 'bar']]
     #   'foo' >> 'bar'.one_or_more  # returns results like ['foo', 'bar', 'bar', 'bar']
     #
-    def merge first, second, *others
-      ParsletMerge.new first.to_parseable,
-        second.to_parseable, *others
-    end
-
-    # Shorthand for ParsletCombining.sequence(first, second)
     def >>(next_parslet)
-      merge self, next_parslet
+      ParsletMerge.new self.to_parseable, next_parslet.to_parseable
     end
 
     # Defines a choice of Parslets (or ParsletCombinations).
     # Returns a ParsletChoice instance.
-    def choice left, right, *others
-      ParsletChoice.new left.to_parseable,
-        right.to_parseable, *others
-    end
-
-    # Shorthand for ParsletCombining.choice(left, right)
     def |(alternative_parslet)
-      choice self, alternative_parslet
+      ParsletChoice.new self.to_parseable,
+        alternative_parslet.to_parseable
     end
 
     # Defines a repetition of the supplied Parslet (or ParsletCombination).
     # Returns a ParsletRepetition instance.
-    def repetition parslet, min, max
-      ParsletRepetition.new parslet.to_parseable, min, max
-    end
-
-    # Shorthand for ParsletCombining.repetition.
     def repeat min = nil, max = nil
-      repetition self, min, max
-    end
-
-    def repetition_with_default parslet, min, max, default
-      ParsletRepetitionDefault.new parslet.to_parseable, min,
-        max, default
+      ParsletRepetition.new self.to_parseable, min, max
     end
 
     def repeat_with_default min = nil, max = nil, default = nil
-      repetition_with_default self, min, max, default
+      ParsletRepetitionDefault.new self.to_parseable, min,
+        max, default
     end
 
-    # Shorthand for ParsletCombining.repetition(0, 1).
+    # Shorthand for ParsletCombining#repetition(0, 1).
     # This method optionally takes a single parameter specifying what object
     # should be returned as a placeholder when there are no matches; this is
     # useful for packing into ASTs where it may be better to parse an empty
@@ -122,16 +94,8 @@ module Walrat
     # Parsing Expression Grammar support.
     # Succeeds if parslet succeeds but consumes no input (throws an
     # :AndPredicateSuccess symbol).
-    def and_predicate parslet
-      AndPredicate.new parslet.to_parseable
-    end
-
-    # Shorthand for and_predicate
-    # Strictly speaking, this shorthand breaks with established Ruby practice
-    # that "?" at the end of a method name should indicate a method that
-    # returns true or false.
     def and?
-      and_predicate self
+      AndPredicate.new self.to_parseable
     end
 
     # Parsing Expression Grammar support.
@@ -142,16 +106,8 @@ module Walrat
     # operator, like this:
     #       rule :foo, :p1 & :p2.not_predicate
     #       rule :foo, :p1 & :p2.not!
-    def not_predicate parslet = self
-      NotPredicate.new parslet.to_parseable
-    end
-
-    # Shorthand for not_predicate.
-    # Strictly speaking, this shorthand breaks with established Ruby practice
-    # that "!" at the end of a method name should indicate a destructive
-    # behaviour on (mutation of) the receiver.
     def not!
-      not_predicate self
+      NotPredicate.new self.to_parseable
     end
 
     # Succeeds if parsing succeeds, consuming the output, but doesn't actually
@@ -159,13 +115,8 @@ module Walrat
     #
     # This is for elements which are required but which shouldn't appear in the
     # final AST.
-    def omission parslet
-      ParsletOmission.new parslet.to_parseable
-    end
-
-    # Shorthand for ParsletCombining.omission
     def skip
-      omission self
+      ParsletOmission.new self.to_parseable
     end
   end # module ParsletCombining
 end # module Walrat