chomsky 0.1.0 → 0.1.1

data/lib/chomsky/action.rb

@@ -7,9 +7,8 @@ module Chomsky
       @action = action
     end
 
-    def call string
-      @grammar.instance_exec(string, &@action)
-      [string, ""]
+    def call value
+      @grammar.instance_exec(value, &@action)
     end
   end
 end

data/lib/chomsky/parser_generator.rb

@@ -2,8 +2,9 @@ require 'chomsky/parser_generators/combinators'
 
 module Chomsky
   class ParserGenerator
-    autoload :And,            "chomsky/parser_generators/and"
+    autoload :Sequence,       "chomsky/parser_generators/sequence"
     autoload :Compose,        "chomsky/parser_generators/compose"
+    autoload :Bypass,         "chomsky/parser_generators/bypass"
     autoload :Repeat,         "chomsky/parser_generators/repeat"
     autoload :Not,            "chomsky/parser_generators/not"
     autoload :Or,             "chomsky/parser_generators/or"

data/lib/chomsky/parser_generators/bypass.rb

@@ -0,0 +1,25 @@
+require 'chomsky'
+
+module Chomsky
+  class ParserGenerator
+    class Bypass < ParserGenerator
+      def initialize left, right
+        @left, @right = left, right
+      end
+
+      def call string
+        head, rest = @left.(string)
+        if head
+          more = @right.(head)
+          if more
+            [head, rest]
+          else
+            [nil, string]
+          end
+        else
+          [nil, string]
+        end
+      end
+    end
+  end
+end

data/lib/chomsky/parser_generators/combinators.rb

@@ -12,7 +12,7 @@ module Chomsky
       end
 
       def & other
-        And.(self.to_pg, other.to_pg)
+        Sequence.(self.to_pg, other.to_pg)
       end
 
       def | other
@@ -63,6 +63,10 @@ module Chomsky
         Compose.(self.to_pg, other.to_pg)
       end
 
+      def >= other
+        Bypass.(self.to_pg, other.to_pg)
+      end
+
       def capture name
         captures[name] = Capture.new
       end

data/lib/chomsky/parser_generators/{and.rb → sequence.rb}

@@ -2,7 +2,7 @@ require 'chomsky/parser_generator'
 
 module Chomsky
   class ParserGenerator
-    class And < ParserGenerator
+    class Sequence < ParserGenerator
       def initialize left, right
         @left, @right = left, right
       end

data/lib/chomsky/rule.rb

@@ -11,9 +11,9 @@ module Chomsky
 
     def call string
       if parser = @grammar.instance_exec(&@pg)
-        tok, rest = parser.(string)
-        if tok
-          [tok, rest]
+        head, rest = parser.(string)
+        if head
+          [head, rest]
         else
           [nil, string]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chomsky
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies: []
 description: Chomsky generates parsing expression grammars with a nice pure-Ruby DSL,
   eliminating the need for secondary grammar definition files or out-of-band compilation,
@@ -24,8 +24,8 @@ files:
 - lib/chomsky/grammar.rb
 - lib/chomsky/parser.rb
 - lib/chomsky/parser_generator.rb
-- lib/chomsky/parser_generators/and.rb
 - lib/chomsky/parser_generators/backreference.rb
+- lib/chomsky/parser_generators/bypass.rb
 - lib/chomsky/parser_generators/capture.rb
 - lib/chomsky/parser_generators/combinators.rb
 - lib/chomsky/parser_generators/compose.rb
@@ -34,6 +34,7 @@ files:
 - lib/chomsky/parser_generators/peek.rb
 - lib/chomsky/parser_generators/perhaps.rb
 - lib/chomsky/parser_generators/repeat.rb
+- lib/chomsky/parser_generators/sequence.rb
 - lib/chomsky/parser_generators/skip.rb
 - lib/chomsky/parser_generators/some.rb
 - lib/chomsky/parsers/anything.rb