ebnf 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658c0da6f1ba2b472e94badcedabc0dabfab7b3cbce02e58fe6bfb286416e247
-  data.tar.gz: 9cc79c8f8c0ce5d4e24eb8e1dfbac9d52b1bfe26951c97fd435a547fdb80cf84
+  metadata.gz: aae4c0b2a8f6d03654bc5436b36c90e577669c41ea4df25d881be3aef86e5ace
+  data.tar.gz: 7f1b7fe448ae87f3755e6da4fc0faf47dbb3d3b573a3e4a8be9b3066f0fac6fa
 SHA512:
-  metadata.gz: b0cce6804a7d9afa85fe0559148110e2e3443242ff44fac31f77c5939a22158b5bd1fe7bdb5474a98e2221b474c0010bf1e93612e9bd01320212406557892469
-  data.tar.gz: 41f3a9b7b7bbaa650afa269f54a56724b029e6b14ac31a62632b8d09ce62578624221b15836f4fe52a549408b79d7bd8a20b841d9d6141bb18546efe211b0c59
+  metadata.gz: 6d0f441731842af8ac38f98352b96a47cf6810bfe81ce620f8ef57af87ce6d65c679d88903c35dbce99617b24bdea8fbb70a23d4873d941ae151275a11561627
+  data.tar.gz: f19f527e041a8f1c48da918497660466c5df71a02077e2183472b157a8611cbf87903fe2b6858e889c119211a7fedb279ad4889d811bec5d6132dd9287d74314

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/bin/ebnf

@@ -75,19 +75,19 @@ end
 
 input = File.open(ARGV[0]) if ARGV[0]
 
-ebnf = EBNF.parse(input || STDIN, options)
+ebnf = EBNF.parse(input || STDIN, **options)
 ebnf.make_bnf if options[:bnf] || options[:ll1]
 if options[:ll1]
   ebnf.first_follow(*options[:ll1])
   ebnf.build_tables
-  
+end
 
 res = case options[:output_format]
 when :ebnf    then ebnf.to_s
 when :html    then ebnf.to_html
 when :sxp     then ebnf.to_sxp
 when :ttl     then ebnf.to_ttl(options[:prefix], options[:namespace])
-when :rb      then ebnf.to_ruby(out, options.merge(grammarFile: ARGV[0]))
+when :rb      then ebnf.to_ruby(out, grammarFile: ARGV[0], **options)
 else          ebnf.ast.inspect
 end
 

data/lib/ebnf.rb

@@ -17,7 +17,7 @@ module EBNF
   # @param  [Hash{Symbol => Object}] options
   # @return [EBNF::Base]
   # @raise  [Exception] on invalid input
-  def self.parse(input, options = {})
-    query = ::EBNF::Base.new(input, options)
+  def self.parse(input, **options)
+    query = ::EBNF::Base.new(input, **options)
   end
 end

data/lib/ebnf/ll1.rb

@@ -168,6 +168,10 @@ module EBNF
           progress("first_follow") {"(#{ittr}) firsts #{firsts}, follows #{follows}"}
           ittr += 1
         end while (firsts + follows) > 0
+
+        debug("Fi.2-post: non-terminals without first") do
+          ast.reject(&:terminal?).reject(&:first).map(&:sym)
+        end if ast.reject(&:terminal?).any? {|r| r.first.nil?}
       end
     end
 
@@ -287,16 +291,16 @@ module EBNF
 
       if rule.expr.first == :matches
         debug("prod") {"Rule is regexp: #{rule}"}
-
-        error("No record of what token #{lhs} can start with") unless rule.first
         return
       end
 
+      error("No record of what token #{lhs.inspect} can start with") unless rule.first
+
       if rule.alt?
         # A First/Follow conflict appears when _eps is in the first
         # of one rule and there is a token in the first and
         # follow of the same rule
-        if rule.first.include?(:_eps) && !(overlap = ((rule.first & (rule.follow || [])) - [:eps])).empty?
+        if Array(rule.first).include?(:_eps) && !(overlap = ((Array(rule.first) & (rule.follow || [])) - [:eps])).empty?
           error("First/Follow Conflict: #{overlap.first.inspect} is both first and follow of #{rule.sym}")
         end
 

data/lib/ebnf/ll1/lexer.rb

@@ -98,8 +98,8 @@ module EBNF::LL1
     # @yieldparam [Lexer] lexer
     # @return [Lexer]
     # @raise  [Lexer::Error] on invalid input
-    def self.tokenize(input, terminals, options = {}, &block)
-      lexer = self.new(input, terminals, options)
+    def self.tokenize(input, terminals, **options, &block)
+      lexer = self.new(input, terminals, **options)
       block_given? ? block.call(lexer) : lexer
     end
 
@@ -115,17 +115,24 @@ module EBNF::LL1
     #   Whitespace between tokens, including comments
     # @option options[Integer] :high_water passed to scanner
     # @option options[Integer] :low_water passed to scanner
-    def initialize(input = nil, terminals = nil, options = {})
+    def initialize(input = nil, terminals = nil, **options)
       @options        = options.dup
       @whitespace     = @options[:whitespace]
       @terminals      = terminals.map do |term|
-        term.is_a?(Array) ? Terminal.new(*term) : term
+        if term.is_a?(Array) && term.length ==3
+          # Last element is options
+          Terminal.new(term[0], term[1], **term[2])
+        elsif term.is_a?(Array)
+          Terminal.new(*term)
+        else
+          term
+        end
       end
 
       raise Error, "Terminal patterns not defined" unless @terminals && @terminals.length > 0
 
       @lineno = 1
-      @scanner = Scanner.new(input, options)
+      @scanner = Scanner.new(input, **options)
     end
 
     ##
@@ -300,7 +307,7 @@ module EBNF::LL1
       #   Cause strings and codepoints to be unescaped.
       # @option options [Regexp] :partial_regexp
       #   A regular expression matching the beginning of this terminal; useful for terminals that match things longer than the scanner low water mark.
-      def initialize(type, regexp, options = {})
+      def initialize(type, regexp, **options)
         @type, @regexp, @options = type, regexp, options
         @partial_regexp = options[:partial_regexp]
         @map = options.fetch(:map, {})
@@ -353,8 +360,8 @@ module EBNF::LL1
     #   Scanner instance with access to matched groups
     # @param  [Hash{Symbol => Object}] options
     # @return [Token]
-    def token(type, value, options = {})
-      Token.new(type, value, options.merge(lineno: lineno))
+    def token(type, value, **options)
+      Token.new(type, value, lineno: lineno, **options)
     end
 
     ##
@@ -398,7 +405,7 @@ module EBNF::LL1
       # @param  [String]                 value
       # @param  [Hash{Symbol => Object}] options
       # @option options [Integer]        :lineno (nil)
-      def initialize(type, value, options = {})
+      def initialize(type, value, **options)
         @type = type.to_s.to_sym if type
         @value = value.to_s
         @options = options.dup
@@ -514,7 +521,7 @@ module EBNF::LL1
       # @option options [String]         :input  (nil)
       # @option options [String]         :token  (nil)
       # @option options [Integer]        :lineno (nil)
-      def initialize(message, options = {})
+      def initialize(message, **options)
         @input  = options[:input]
         @token  = options[:token]
         @lineno = options[:lineno]

data/lib/ebnf/ll1/parser.rb

@@ -51,10 +51,10 @@ module EBNF::LL1
       # @yieldparam [Proc] block
       #   Block passed to initialization for yielding to calling parser.
       #   Should conform to the yield specs for #initialize
-      def terminal(term, regexp, options = {}, &block)
+      def terminal(term, regexp, **options, &block)
         @patterns ||= []
         # Passed in order to define evaulation sequence
-        @patterns << EBNF::LL1::Lexer::Terminal.new(term, regexp, options)
+        @patterns << EBNF::LL1::Lexer::Terminal.new(term, regexp, **options)
         @terminal_handlers ||= {}
         @terminal_handlers[term] = block if block_given?
       end
@@ -122,7 +122,14 @@ module EBNF::LL1
 
       def method_missing(method, *args, &block)
         if @delegate ||= nil
-          @delegate.send method, *args, &block
+          # special handling when last arg is **options
+          params = @delegate.method(method).parameters
+          if params.any? {|t, _| t == :keyrest} && args.last.is_a?(Hash)
+            opts = args.pop
+            @delegate.send(method, *args, **opts, &block)
+          else
+            @delegate.send(method, *args, &block)
+          end
         else
           super
         end
@@ -219,7 +226,7 @@ module EBNF::LL1
     #   or errors raised during processing callbacks. Internal
     #   errors are raised using {Error}.
     # @see http://cs.adelaide.edu.au/~charles/lt/Lectures/07-ErrorRecovery.pdf
-    def parse(input = nil, start = nil, options = {}, &block)
+    def parse(input = nil, start = nil, **options, &block)
       @options = options.dup
       @options[:debug] ||= case
       when @options[:progress] then 2
@@ -229,7 +236,7 @@ module EBNF::LL1
       @first   = options[:first] ||= {}
       @follow  = options[:follow] ||= {}
       @cleanup = options[:cleanup] ||= {}
-      @lexer   = input.is_a?(Lexer) ? input : Lexer.new(input, self.class.patterns, @options)
+      @lexer   = input.is_a?(Lexer) ? input : Lexer.new(input, self.class.patterns, **@options)
       @productions = []
       @parse_callback = block
       @recovering = false
@@ -467,7 +474,7 @@ module EBNF::LL1
     # @option options [URI, #to_s] :production
     # @option options [Token] :token
     # @see {#debug}
-    def error(node, message, options = {})
+    def error(node, message, **options)
       lineno = @lineno || (options[:token].lineno if options[:token].respond_to?(:lineno))
       m = "ERROR "
       m += "[line: #{lineno}] " if lineno
@@ -476,7 +483,7 @@ module EBNF::LL1
       m += ", production = #{options[:production].inspect}" if options[:production]
       @error_log << m unless @recovering
       @recovering = true
-      debug(node, m, options.merge(level: 0))
+      debug(node, m, level: 0, **options)
       if options[:raise] || @options[:validate]
         raise Error.new(m, lineno: lineno, token: options[:token], production: options[:production])
       end
@@ -491,20 +498,20 @@ module EBNF::LL1
     # @option options [URI, #to_s] :production
     # @option options [Token] :token
     # @see {#debug}
-    def warn(node, message, options = {})
+    def warn(node, message, **options)
       m = "WARNING "
       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
-      debug(node, m, options.merge(level: 1))
+      debug(node, m, level: 1, **options)
     end
 
     ##
     # Progress output when parsing. Passed as level `2` debug messages.
     #
-    # @overload progress(node, message, options)
+    # @overload progress(node, message, **options)
     #   @param [String] node Relevant location associated with message
     #   @param [String] message ("")
     #   @param [Hash] options
@@ -526,7 +533,7 @@ module EBNF::LL1
     # if `@options[:debug]` is an Integer, the call is aborted if the
     # `:level` option is less than than `:level`.
     #
-    # @overload debug(node, message, options)
+    # @overload debug(node, message, **options)
     #   @param [Array<String>] args Relevant location associated with message
     #   @param [Hash] options
     #   @option options [Integer] :depth
@@ -751,7 +758,7 @@ module EBNF::LL1
       # @option options [Symbol]         :production  (nil)
       # @option options [String]         :token  (nil)
       # @option options [Integer]        :lineno (nil)
-      def initialize(message, options = {})
+      def initialize(message, **options)
         @production = options[:production]
         @token      = options[:token]
         @lineno     = options[:lineno] || (@token.lineno if @token.respond_to?(:lineno))

data/lib/ebnf/ll1/scanner.rb

@@ -20,11 +20,11 @@ module EBNF::LL1
     ##
     # If we don't have an IO input, simply use StringScanner directly
     # @private
-    def self.new(input, options = {})
+    def self.new(input, **options)
       input ||= ""
       if input.respond_to?(:read)
         scanner = self.allocate
-        scanner.send(:initialize, input, options)
+        scanner.send(:initialize, input, **options)
       else
         if input.encoding != Encoding::UTF_8
           input = input.dup if input.frozen?
@@ -42,7 +42,7 @@ module EBNF::LL1
     # @option options[Integer] :high_water (HIGH_WATER)
     # @option options[Integer] :low_water (LOW_WATER)
     # @return [Scanner]
-    def initialize(input, options = {})
+    def initialize(input, **options)
       @options = options.merge(high_water: HIGH_WATER, low_water: LOW_WATER)
 
       @input = input

data/lib/ebnf/rule.rb

@@ -137,6 +137,7 @@ module EBNF
     # Return SXP representation of this rule
     # @return [String]
     def to_sxp
+      require 'sxp' unless defined?(SXP)
       for_sxp.to_sxp
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: EBNF is a Ruby parser for W3C EBNF and a parser generator for compliant
   LL(1) grammars.
 email: public-rdf-ruby@w3.org
@@ -175,15 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: EBNF parser and parser generator.