ebnf 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e418c3276c9f6252edf2fb8e89b815a95731629
-  data.tar.gz: 1f9fa2b8690bb7d8e5491a94b0f7f0fcc781af99
+  metadata.gz: 1f8401a104bc55119f5021d19a88071889b64f24
+  data.tar.gz: 0de399d41cbfed84c393b219e2761208a63e8676
 SHA512:
-  metadata.gz: 597dcc0e0f174981fc7d8285238f1b74bec9c0e8b4e3294de792d555af36fac9ae4983e112b31534d42f8a24a05fb250535a5c0594d425c15a662d4e97a93187
-  data.tar.gz: b1df195a3f03dada05472fb222a8df83236c12de389e8566d914b847f85b1be66dd5b8e3e6efcf5c52420794336b185f8fb4e8af9663be455f34f7a325a0c078
+  metadata.gz: 2c35b089907a7e56b30992d18447ef3fc3f3d145c289d0853d68611f350170120bf48f8b3553bb3e754f53568c11e1dbce96cb561ae6fa165f5a66521e4a4214
+  data.tar.gz: 749257622576d3c09da9dd4eb45463e9838b149fb57f97e5fd24e31adf83d75c42e6410c8b0292619c0e4009300594fa0ce4264351f5a882c649f907b4d31f00

data/README.md

@@ -102,14 +102,16 @@ and [First Follow Notation-3 rules](http://www.w3.org/2000/10/swap/grammar/first
 Full documentation available on [Rubydoc.info][EBNF doc].
 
 ## Future Work
-* Detect FIRST/FOLLOW and left-recursion conflicts.
 * Generate HTML output of parser results.
 * Better LL(1) parser tests
+* Either generate [Packrat parser][Packrat] for a [Parsing Regular Expression Grammar][PEG], or integrate with [Treetop][] or similar.
 
 ## Author
 * [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
 ## Contributing
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
+
 * Do your best to adhere to the existing coding conventions and idioms.
 * Don't use hard tabs, and don't leave trailing whitespace on any line.
 * Do document every method you add using [YARD][] annotations. Read the
@@ -139,3 +141,6 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [LL(1) Parser]: http://en.wikipedia.org/wiki/LL_parser
 [Tokenizer]:    http://en.wikipedia.org/wiki/Lexical_analysis#Tokenizer
 [Turtle EBNF]:  http://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
+[Packrat]:      http://pdos.csail.mit.edu/~baford/packrat/thesis/
+[PEG]:          http://en.wikipedia.org/wiki/Parsing_expression_grammar
+[Treetop]:      http://rubygems.org/gems/treetop

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/ebnf/ll1/parser.rb

@@ -274,15 +274,14 @@ module EBNF::LL1
 
             if token.nil?
               if  !(first_include?(cur_prod, :_eps) && follow_include?(cur_prod, :_eof))
-                # End of file, and production does not contain eps, or it does, but follow does not contain eof 
-                raise Error.new("Unexpected end of input", :production => cur_prod)
+                # End of file, and production does not contain eps, or it does, but follow does not contain eof
+                error("parse(production)", "Unexpected end of input", lineno: lineno, production: cur_prod, raise: true)
               else
                 debug("parse(production)") {"End of input prod #{cur_prod.inspect}"}
               end
             elsif prod_branch = @branch[cur_prod]
               sequence = prod_branch.fetch(token.representation) do
-                raise Error.new("Expected one of #{@first[cur_prod].inspect}",
-                  :token => token, :production => cur_prod)
+                error("parse(production)", "Expected one of #{@first[cur_prod].inspect}", token: token, production: cur_prod, raise: true)
               end
               debug("parse(production)") do
                 "token #{token.representation.inspect} " +
@@ -292,8 +291,7 @@ module EBNF::LL1
               end
               todo_stack.last[:terms] += sequence
             else
-              raise Error.new("Unexpected",
-                :production => cur_prod, :token => token)
+              error("parse(production)", "Unexpected", token: token, production: cur_prod, raise: true)
             end
           end
 
@@ -309,8 +307,7 @@ module EBNF::LL1
             elsif terminals.include?(term) 
               # If term is a terminal, then it is an error if token does not
               # match it
-              raise Error.new("Expected #{term.inspect}",
-                :token => get_token, :production => cur_prod)
+              error("parse(token)", "Expected #{term.inspect}", token: get_token, production: cur_prod, raise: true)
             else
               token = get_token
 
@@ -340,12 +337,12 @@ module EBNF::LL1
             # Skip to the next valid terminal
             @lexer.recover
             error("parse(#{e.class})", "With input '#{e.input}': #{e.message}",
-                  :production => @productions.last)
+                  production: @productions.last, token: e.token)
           else
             # Otherwise, the terminal is fine, just not for this production.
             @lexer.shift
             error("parse(#{e.class})", "#{e.message}",
-                  :production => @productions.last, :token => e.token)
+                  production: @productions.last, token: e.token)
           end
 
           # Get the list of follows for this sequence, this production and the stacked productions.
@@ -468,14 +465,18 @@ module EBNF::LL1
     # @option options [Token] :token
     # @see {#debug}
     def error(node, message, options = {})
+      lineno = @lineno || (options[:token].lineno if options[:token].respond_to?(:lineno))
       m = "ERROR "
-      m += "[line: #{@lineno}] " if @lineno
+      m += "[line: #{lineno}] " if lineno
       m += message
       m += " (found #{options[:token].inspect})" if options[:token]
       m += ", production = #{options[:production].inspect}" if options[:production]
       @error_log << m unless @recovering
       @recovering = true
       debug(node, m, options.merge(:level => 0))
+      if options[:raise] || @options[:validate]
+        raise Error.new(m, lineno: lineno, token: options[:token], production: options[:production])
+      end
     end
 
     ##
@@ -673,7 +674,7 @@ module EBNF::LL1
       if recover
         # Recover from lexer error so that we can not bail out too early
         @lexer.recover
-        error("get_token", "With input '#{e.input}': #{e.message}}")
+        error("get_token", "With input '#{e.input}': #{e.message}}", token: e.token, lineno: e.lineno)
         retry
       end
       raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp