ebnf 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bce4d1c681a0426e00d2aab724b58570e0406c7
-  data.tar.gz: 330e8371e50c0cb9ec7f51c7e69c0cc8d93220c7
+SHA256:
+  metadata.gz: 658c0da6f1ba2b472e94badcedabc0dabfab7b3cbce02e58fe6bfb286416e247
+  data.tar.gz: 9cc79c8f8c0ce5d4e24eb8e1dfbac9d52b1bfe26951c97fd435a547fdb80cf84
 SHA512:
-  metadata.gz: fe8809f249c2c4f048e542a57af6f7b765f8991220aa3dee4e61964c8f1ededec0f6247997ac266c9d7e790785b526bedf536bae3409e1cf740482304579e547
-  data.tar.gz: 8ebc6be59401e64c06646acdd5855c7c99feed3abed90bb24442df3a910df37b3057b3795efe76a7b17062502e97d126cd77e87c077719b45e5ada0088b2f6af
+  metadata.gz: b0cce6804a7d9afa85fe0559148110e2e3443242ff44fac31f77c5939a22158b5bd1fe7bdb5474a98e2221b474c0010bf1e93612e9bd01320212406557892469
+  data.tar.gz: 41f3a9b7b7bbaa650afa269f54a56724b029e6b14ac31a62632b8d09ce62578624221b15836f4fe52a549408b79d7bd8a20b841d9d6141bb18546efe211b0c59

data/README.md

@@ -3,9 +3,9 @@
 [EBNF][] parser and generic parser generator.
 
 [![Gem Version](https://badge.fury.io/rb/ebnf.png)](http://badge.fury.io/rb/ebnf)
-[![Build Status](https://secure.travis-ci.org/gkellogg/ebnf.png?branch=master)](http://travis-ci.org/gkellogg/ebnf)
-[![Coverage Status](https://coveralls.io/repos/gkellogg/ebnf/badge.svg)](https://coveralls.io/r/gkellogg/ebnf)
-[![Dependency Status](https://gemnasium.com/gkellogg/ebnf.png)](https://gemnasium.com/gkellogg/ebnf)
+[![Build Status](https://secure.travis-ci.org/dryruby/ebnf.png?branch=master)](http://travis-ci.org/dryruby/ebnf)
+[![Coverage Status](https://coveralls.io/repos/dryruby/ebnf/badge.svg)](https://coveralls.io/r/dryruby/ebnf)
+[![Dependency Status](https://gemnasium.com/dryruby/ebnf.png)](https://gemnasium.com/dryruby/ebnf)
 
 ## Description
 This is a [Ruby][] implementation of an [EBNF][] and [BNF][] parser and parser generator. It parses [EBNF][] grammars to [BNF][], generates [First/Follow][] and Branch tables for [LL(1)][] grammars, which can be used with the stream [Tokenizer][] and [LL(1) Parser][].
@@ -28,13 +28,14 @@ Of note in this implementation is that the tokenizer and parser are streaming, s
 
     require 'ebnf'
 
-    ebnf = EBNF.parse(File.open('./etc/ebnf.bnf'))
+    ebnf = EBNF.parse(File.open('./etc/ebnf.ebnf'))
 
-Output rules and terminals as S-Expressions, Turtle or EBNF
+Output rules and terminals as S-Expressions, Turtle, HTML or BNF
 
     puts ebnf.to_sxp
     puts ebnf.to_ttl
-    puts ebnf.to_ebnf
+    puts ebnf.to_html
+    puts ebnf.to_s
 
 Transform EBNF to BNF (generates sub-productions using `alt` or `seq` from `plus`, `star` or `opt`)
 
@@ -42,10 +43,11 @@ Transform EBNF to BNF (generates sub-productions using `alt` or `seq` from `plus
 
 Generate [First/Follow][] rules for BNF grammars
 
-    ebnf.first_follow(start_tokens)
+    ebnf.first_follow(:ebnf)
 
 Generate Terminal, [First/Follow][], Cleanup and Branch tables as Ruby for parsing grammars
 
+    ebnf.build_tables
     ebnf.to_ruby
 
 Generate formatted grammar using HTML (requires [Haml][Haml] gem)
@@ -255,7 +257,7 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [EBNF]:         http://www.w3.org/TR/REC-xml/#sec-notation
-[EBNF doc]:     http://rubydoc.info/github/gkellogg/ebnf/master/frames
+[EBNF doc]:     http://rubydoc.info/github/dryruby/ebnf/master/frames
 [First/Follow]: http://en.wikipedia.org/wiki/LL_parser#Constructing_an_LL.281.29_parsing_table
 [LL(1)]:        http://www.csd.uwo.ca/~moreno//CS447/Lectures/Syntax.html/node14.html
 [LL(1) Parser]: http://en.wikipedia.org/wiki/LL_parser

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/etc/doap.ttl

@@ -9,7 +9,7 @@
 
 <http://rubygems.org/gems/ebnf> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "ebnf" ;
-  doap:homepage      <http://gkellogg.github.com/ebnf> ;
+  doap:homepage      <http://dryruby.github.com/ebnf> ;
   doap:license       <http://creativecommons.org/licenses/publicdomain/> ;
   doap:shortdesc     "EBNF parser and parser generator"@en ;
   doap:description   "EBNF is a Ruby parser for W3C EBNF and a parser generator for compliant LL(1) grammars."@en ;
@@ -20,7 +20,7 @@
                      <http://dbpedia.org/resource/Ruby_(programming_language)> ;
   doap:download-page <http://rubygems.org/gems/ebnf> ;
   doap:mailing-list  <http://lists.w3.org/Archives/Public/public-rdf-ruby/> ;
-  doap:bug-database  <http://github.com/gkellogg/ebnf/issues> ;
+  doap:bug-database  <http://github.com/dryruby/ebnf/issues> ;
   doap:blog          <http://greggkellogg.net/> ;
   doap:developer     <http://greggkellogg.net/foaf#me> ;
   doap:maintainer    <http://greggkellogg.net/foaf#me> ;

data/lib/ebnf/base.rb

@@ -117,19 +117,19 @@ module EBNF
     #
     # @param [#read, #to_s] input
     # @param [Hash{Symbol => Object}] options
-    # @option options [Boolean, Array] :debug
-    #   Output debug information to an array or STDOUT.
-    # @option options [Symbol] :format (:ebnf)
+    # @param [Symbol] :format (:ebnf)
     #   Format of input, one of :ebnf, or :sxp
-    def initialize(input, options = {})
-      @options = {format: :ebnf}.merge(options)
+    # @option options [Boolean, Array] :debug
+    #   Output debug information to an array or $stdout.
+    def initialize(input, format: :ebnf, **options)
+      @options = options.dup
       @lineno, @depth, @errors = 1, 0, []
       terminal = false
       @ast = []
 
       input = input.respond_to?(:read) ? input.read : input.to_s
 
-      case @options[:format]
+      case format
       when :sxp
         require 'sxp' unless defined?(SXP)
         @ast = SXP::Reader::Basic.read(input).map {|e| Rule.from_sxp(e)}
@@ -144,7 +144,7 @@ module EBNF
             terminal = true
           when /^@pass\s*(.*)$/m
             expr = expression($1).first
-            rule = Rule.new(nil, nil, expr, kind: :pass)
+            rule = Rule.new(nil, nil, expr, kind: :pass, ebnf: self)
             rule.orig = expr
             @ast << rule
           else
@@ -156,7 +156,7 @@ module EBNF
           end
         end
       else
-        raise "unknown input format #{options[:format].inspect}"
+        raise "unknown input format #{format.inspect}"
       end
     end
 
@@ -194,17 +194,17 @@ module EBNF
     # Output Ruby parser files
     #
     # @param [IO, StringIO] output
-    # @param [Hash{Symbol => Object}] options
-    # @option options [String] :grammarFile
-    def to_ruby(output = STDOUT, options = {})
-      unless output == STDOUT
+    # @param [String] :grammarFile
+    # @param [String] :mod_name ('Branch')
+    def to_ruby(output = $stdout, grammarFile: nil, mod_name: 'Branch')
+      unless output == $stdout
         output.puts "# This file is automatically generated by #{__FILE__}"
-        output.puts "# BRANCH derived from #{options[:grammarFile]}" if options[:grammarFile]
+        output.puts "# BRANCH derived from #{grammarFile}" if grammarFile
         unless self.errors.empty?
           output.puts "# Note, tables completed with errors, may need to be resolved manually:"
           #output.puts "#   #{pp.conflicts.map{|c| c.join("\n#      ")}.join("\n#   ")}"
         end
-        output.puts "module #{options.fetch(:mod_name, 'Branch')}"
+        output.puts "module #{mod_name}"
         output.puts "  START = #{self.start.inspect}"
         output.puts
       end
@@ -214,7 +214,7 @@ module EBNF
       self.outputTable(output, 'FOLLOW', self.follow, 1)
       self.outputTable(output, 'CLEANUP', self.cleanup, 1)
       self.outputTable(output, 'PASS', [self.pass], 1) if self.pass
-      unless output == STDOUT
+      unless output == $stdout
         output.puts "end"
       end
     end
@@ -238,19 +238,19 @@ module EBNF
     # @param [String] prefix for language
     # @param [String] ns URI for language
     # @return [String]
-    def to_ttl(prefix, ns)
+    def to_ttl(prefix = nil, ns = "http://example.org/")
       unless ast.empty?
         [
           "@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.",
           "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.",
-          "@prefix #{prefix}: <#{ns}>.",
+          ("@prefix #{prefix}: <#{ns}>." if prefix),
           "@prefix : <#{ns}>.",
           "@prefix re: <http://www.w3.org/2000/10/swap/grammar/regex#>.",
           "@prefix g: <http://www.w3.org/2000/10/swap/grammar/ebnf#>.",
           "",
           ":language rdfs:isDefinedBy <>; g:start :#{ast.first.id}.",
           "",
-        ]
+        ].compact
       end.join("\n") +
 
       ast.sort.map(&:to_ttl).join("\n")
@@ -264,9 +264,8 @@ module EBNF
     end
 
     # Progress output, less than debugging
-    def progress(*args)
+    def progress(*args, **options)
       return unless @options[:progress] || @options[:debug]
-      options = args.last.is_a?(Hash) ? args.pop : {}
       depth = options[:depth] || @depth
       args << yield if block_given?
       message = "#{args.join(': ')}"
@@ -276,8 +275,7 @@ module EBNF
     end
 
     # Error output
-    def error(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
+    def error(*args, **options)
       depth = options[:depth] || @depth
       args << yield if block_given?
       message = "#{args.join(': ')}"
@@ -298,9 +296,8 @@ module EBNF
     #   @param [String] message ("")
     #
     # @yieldreturn [String] added to message
-    def debug(*args)
+    def debug(*args, **options)
       return unless @options[:debug]
-      options = args.last.is_a?(Hash) ? args.pop : {}
       depth = options[:depth] || @depth
       args << yield if block_given?
       message = "#{args.join(': ')}"

data/lib/ebnf/ll1.rb

@@ -216,7 +216,7 @@ module EBNF
       @branch = {}
       @already = []
       @agenda = []
-      @starts.each do |start|
+      Array(@starts).each do |start|
         do_production(start)
         while !@agenda.empty?
           x = @agenda.shift
@@ -265,7 +265,7 @@ module EBNF
           end
         end
         io.puts "#{ind0}}.freeze\n"
-      else
+      elsif table
         io.puts "#{ind0}#{name} = [\n#{ind1}" +
           table.sort_by{|t| t.to_s.sub(/^_/, '')}.map(&:inspect).join(",\n#{ind1}") +
           "\n#{ind0}].freeze\n"

data/lib/ebnf/rule.rb

@@ -60,23 +60,19 @@ module EBNF
     # @param [Integer] id
     # @param [Symbol] sym
     # @param [Array] expr
-    # @param [Hash{Symbol => Object}] options
-    # @option options [Symbol] :kind
-    # @option options [String] :ebnf
-    # @option options [Array] :first
-    # @option options [Array] :follow
-    # option options [Boolean] :start
-    def initialize(sym, id, expr, options = {})
+    # @param [Symbol] :kind
+    # @param [String] :ebnf
+    # @param [Array] :first
+    # @param [Array] :follow
+    # @param [Boolean] :start
+    # @param [Rule] :top_rule
+    # @param [Boolean] :cleanup
+    def initialize(sym, id, expr, kind: nil, ebnf: nil, first: nil, follow: nil, start: nil, top_rule: nil, cleanup: nil)
       @sym, @id = sym, id
       @expr = expr.is_a?(Array) ? expr : [:seq, expr]
-      @ebnf = options[:ebnf]
-      @top_rule = options.fetch(:top_rule, self)
-      @first = options[:first]
-      @follow = options[:follow]
-      @start = options[:start]
-      @cleanup = options[:cleanup]
-      @kind = case
-      when options[:kind] then options[:kind]
+      @ebnf, @kind, @first, @follow, @start, @cleanup, @top_rule = ebnf, kind, first, follow, start, cleanup, top_rule
+      @top_rule ||= self
+      @kind ||= case
       when sym.to_s == sym.to_s.upcase then :terminal
       when !BNF_OPS.include?(@expr.first) then :terminal
       else :rule
@@ -114,16 +110,15 @@ module EBNF
     #
     # @param [Array] expr
     # @param [Hash{Symbol => Object}] options
-    # @option options [Symbol] :kind
-    # @option options [String] :ebnf EBNF instance (used for messages)
-    def build(expr, options = {})
+    # @param [Symbol] :kind
+    def build(expr, kind: nil, cleanup: nil, **options)
       new_sym, new_id = (@top_rule ||self).send(:make_sym_id)
-      Rule.new(new_sym, new_id, expr, {
-        kind: options[:kind],
-        ebnf: @ebnf,
-        top_rule: @top_rule || self,
-        cleanup: options[:cleanup],
-      }.merge(options))
+      Rule.new(new_sym, new_id, expr,
+               kind: kind,
+               ebnf: @ebnf,
+               top_rule: (@top_rule || self),
+               cleanup: cleanup,
+               **options)
     end
 
     # Return representation for building S-Expressions
@@ -151,7 +146,7 @@ module EBNF
     # @return [String]
     def to_ttl
       @ebnf.debug("to_ttl") {inspect} if @ebnf
-      comment = orig.strip.
+      comment = orig.to_s.strip.
         gsub(/"""/, '\"\"\"').
         gsub("\\", "\\\\").
         sub(/^\"/, '\"').
@@ -389,7 +384,7 @@ module EBNF
     # Rules compare using their ids
     def <=>(other)
       if id.to_i == other.id.to_i
-        id <=> other.id
+        id.to_s <=> other.id.to_s
       else
         id.to_i <=> other.id.to_i
       end
@@ -398,8 +393,8 @@ module EBNF
     private
     def ttl_expr(expr, pfx, depth, is_obj = true)
       indent = '  ' * depth
-      @ebnf.debug("ttl_expr", depth: depth) {expr.inspect}
-      op = expr.shift if expr.is_a?(Array)
+      @ebnf.debug("ttl_expr", depth: depth) {expr.inspect} if @ebnf
+      op, *expr = expr if expr.is_a?(Array)
       statements = []
       
       if is_obj
@@ -435,7 +430,7 @@ module EBNF
       end
       
       statements.last << " ." unless is_obj
-      @ebnf.debug("statements", depth: depth) {statements.join("\n")}
+      @ebnf.debug("statements", depth: depth) {statements.join("\n")} if @ebnf
       statements
     end
     

data/lib/ebnf/writer.rb

@@ -54,14 +54,10 @@ module EBNF
     ##
     # @param [Array<Rule>] rules
     # @param [Hash{Symbol => Object}] options
+    # @param [#write] :out ($stdout)
     # @option options [Symbol] :format
-    # @option options [#write] :out ($stdout)
-    # @option options [Boolean] :html (false)
-    #   Format as HTML
-    def initialize(rules, options = {})
+    def initialize(rules, out: $stdout, html: false, **options)
       @options = options.dup
-      out = options.fetch(:out, $stdio)
-      #fmt = options.fetch(:format, :ebnf)
 
       # Determine max LHS length
       max_id = rules.max_by {|r| r.id.to_s.length}.id.to_s.length
@@ -74,15 +70,15 @@ module EBNF
       end
       rhs_length = LINE_LENGTH - lhs_length
 
-      if @options[:html]
+      if html
         # Output as formatted HTML
         begin
           require 'haml'
-          html = Haml::Engine.new(HAML_DESC).render(self, rules: rules) do |rule|
+          hout = Haml::Engine.new(HAML_DESC).render(self, rules: rules) do |rule|
             formatted_expr = format(rule.expr)
             formatted_expr.length > rhs_length ? format(rule.expr, "\n") : formatted_expr
           end
-          out.write html
+          out.write hout
           return
         rescue LoadError
           $stderr.puts "Generating HTML requires haml gem to be loaded"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
@@ -28,22 +28,30 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +163,7 @@ files:
 - lib/ebnf/rule.rb
 - lib/ebnf/version.rb
 - lib/ebnf/writer.rb
-homepage: http://github.com/gkellogg/ebnf
+homepage: http://github.com/dryruby/ebnf
 licenses:
 - Unlicense
 metadata: {}
@@ -175,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: EBNF parser and parser generator.