ebnf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI4YWE4ZjExOGI5N2NkZDVmYzA4ZDMwMzM0ZGRhZThhNWU0ZGI2MQ==
+    YmExODQ4Njc3ZmYwMTI5YTk2MDg5N2M3M2UyZGViOTkzYzM5OTM3Yg==
   data.tar.gz: !binary |-
-    MWZmMjVkYjMwYzY1NmNlMDc0ZDM5MzUxOWU1ZTUwNGU2NDQ2YzFiYQ==
+    ODljMTFmZDY1NWM5Njg5N2ZiMTBkNmEzODJjOGJhY2RkNTM5ZjQ3MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2E2MTcyM2MyZWYyNTg5Y2E3ZDVkNWI2ODgwYjdhZjhlYmQ1YTUzZGE5Nzc3
-    M2M3MDFiYzllMzE5YjNmMDA2Zjc3NjQ5YzViMzhmMTNmZTBkYWZhMDk0M2Rl
-    MjlkNWMxNzY3ODM4ZDYxZjBiZWI2NzA4ZGRjYzQ2MGY2MTBiZDI=
+    ZDJjNjlmYjZhZWQ5OGIwZTgwMjNlYzc0NWZlMzA3NDExYTI3N2M3YTJiNjFj
+    MDAyOGQxMjUzYjkwNGM0NmQxZjdjMDVkNDU2MWE5MjE3OWEwZmRhN2ViYjQy
+    ZTE4NDM1MGUxOTNhZGU0OTJjNzEzOTlkMzEzYjQ2OWJmODBjMTM=
   data.tar.gz: !binary |-
-    OGIxZGZjNzNhZTlkZDAwZTM0ZmExYzMzMzUxMjQ4ZmNmYjBmNTM4OGJlMmM2
-    NmFmODM4MjMwODYyY2E1YjhjNjNlY2E1YjI0MTg1NjFlYWI0MzI4ZThhMjA2
-    MmMyMjBiZjA5NGQ2MjlhYzA0Yzg1YzYzNzhjNjNkZmQ2ZTg5N2I=
+    OTk3MzAzMzY4MGU0NjBhYjM4YWNkNDJhNDEwYTM2YzM5NDZiZGM0ZjZjZDA0
+    YTM4YTMyYzUyYmE0MjFkYTJmZjE2MDYyZjI2ZTAyMzI4NTMwNTI5ZThiOTcx
+    ZGQzMTdkMjdlM2Y0NTFjNTI1YTM0YjMxNjlhZWYwZTQ3ODMxNTE=

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/ebnf/ll1/parser.rb

@@ -499,12 +499,11 @@ module EBNF::LL1
     #   @option options [Integer] :depth
     #       Recursion depth for indenting output
     # @see {#debug}
-    def progress(node, *args)
+    def progress(node, *args, &block)
       return unless @options[:progress] || @options[:debug]
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      message = args.join(",")
-      message += yield.to_s if block_given?
-      debug(node, message, options.merge(:level => 2))
+      args << {} unless args.last.is_a?(Hash)
+      args.last[:level] ||= 2
+      debug(node, *args, &block)
     end
 
     ##
@@ -558,7 +557,7 @@ module EBNF::LL1
           self.class.eval_with_binding(self) {
             handler.call(@prod_data.last, data, @parse_callback)
           }
-        rescue Exception => e
+        rescue ArgumentError, Error => e
           error("start", "#{e.class}: #{e.message}", :production => prod)
           @recovering = false
         end
@@ -584,7 +583,7 @@ module EBNF::LL1
           self.class.eval_with_binding(self) {
             handler.call(@prod_data.last, data, @parse_callback)
           }
-        rescue Exception => e
+        rescue ArgumentError, Error => e
           error("finish", "#{e.class}: #{e.message}", :production => prod)
           @recovering = false
         end
@@ -607,7 +606,7 @@ module EBNF::LL1
             self.class.eval_with_binding(self) {
               handler.call(parentProd, token, @prod_data.last, @parse_callback)
             }
-          rescue Exception => e
+          rescue ArgumentError, Error => e
             error("terminal", "#{e.class}: #{e.message}", :production => prod)
             @recovering = false
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp