ebnf 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff1ded5e44c9136111320f969eaa0825f216155
-  data.tar.gz: f6150889a8250eaecba0123f5589eeb9b0b59959
+  metadata.gz: 83c6af2a26c41f53c79e1bb289e35b261eb1eb1a
+  data.tar.gz: 8dabfd9d6025e868446389aa584bfd5c7a94f43a
 SHA512:
-  metadata.gz: 60b7be1a7d0aa55e7ce5af2f4569277d78a99741e3d474aeb6957dc5b5bd6983b6a1eec9dba3472e99706fc16f4d1ae1b32eecf9bccfd48739e285198401eb5c
-  data.tar.gz: 68bf7ea88a84cb418e6656e19bee3761ee214c0b0a68a586c557077e7867b4b86af9a55ff9534a52e8f2dfd32aadf9f4dc684e2ef1383038a7ee07f51761dc65
+  metadata.gz: 4878eb173f39de9e69acdbcc6547d0ce3c022cdad2fd4fa944029f93dde53749e874707fee4aa9aa66c70089d7270a5148bcde3386dda14bc61338fe70172293
+  data.tar.gz: 47cf8d873b75110c9cdd051c7178fe3bc287272074ea0f30ff39d3c6981e369d31dce1bbdadfcb1b718b5a5e51dd515449771b3d93ff0b30fc28cf090c74b8a4

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/bin/ebnf

@@ -11,30 +11,6 @@ require 'rubygems'
 require 'getoptlong'
 require 'ebnf'
 
-def dump_tables(grammarFile, ebnf, output, options)
-  ebnf.build_tables
-  unless output == STDOUT
-    output.puts "# This file is automatically generated by #{__FILE__}"
-    output.puts "# BRANCH derived from #{grammarFile}"
-    unless ebnf.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 "  START = #{ebnf.start.inspect}"
-    output.puts
-  end
-  ebnf.outputTable(output, 'BRANCH', ebnf.branch, 1)
-  ebnf.outputTable(output, 'TERMINALS', ebnf.terminals, 1)
-  ebnf.outputTable(output, 'FIRST', ebnf.first, 1)
-  ebnf.outputTable(output, 'FOLLOW', ebnf.follow, 1)
-  ebnf.outputTable(output, 'PASS', [ebnf.pass], 1) if ebnf.pass
-  unless output == STDOUT
-    output.puts "end"
-  end
-  ""
-end
-
 options = {
   :output_format => :sxp,
   :prefix => "ttl",
@@ -46,14 +22,14 @@ out = STDOUT
 OPT_ARGS = [
   ["--dbg",             GetoptLong::NO_ARGUMENT,      "Turn on debugging output"],
   ["--bnf",             GetoptLong::NO_ARGUMENT,      "Transform EBNF to BNF"],
-  ["--evaluate","-e",   GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as a JSON-LD document"],
+  ["--evaluate","-e",   GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as an EBNF document"],
   ["--ll1",             GetoptLong::REQUIRED_ARGUMENT,"Generate First/Follow rules, argument is start symbol"],
   ["--format", "-f",    GetoptLong::REQUIRED_ARGUMENT,"Specify output format one of ebnf, html, ttl, sxp, or rb"],
   ["--input-format",    GetoptLong::REQUIRED_ARGUMENT,"Specify input format one of ebnf or sxp"],
   ["--mod-name",        GetoptLong::REQUIRED_ARGUMENT,"Module name used when creating ruby tables"],
   ["--output", "-o",    GetoptLong::REQUIRED_ARGUMENT,"Output to the specified file path"],
   ["--prefix", "-p",    GetoptLong::REQUIRED_ARGUMENT,"Prefix to use when generating Turtle"],
-  ["--progress", "-v",  GetoptLong::NO_ARGUMENT,     "Detail on execution"],
+  ["--progress", "-v",  GetoptLong::NO_ARGUMENT,      "Detail on execution"],
   ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT,"Namespace to use when generating Turtle"],
   ["--help", "-?",      GetoptLong::NO_ARGUMENT,      "This message"]
 ]
@@ -108,7 +84,7 @@ 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 dump_tables(ARGV[0], ebnf, out, options)
+when :rb      then ebnf.to_ruby(out, options.merge(grammarFile: ARGV[0]))
 else          ebnf.ast.inspect
 end
 

data/etc/turtle.rb

@@ -1,4 +1,4 @@
-# This file is automatically generated by bin/ebnf
+# This file is automatically generated by /Users/gregg/Projects/ebnf/lib/ebnf/base.rb
 # BRANCH derived from etc/turtle.ebnf
 module Branch
   START = :turtleDoc

data/lib/ebnf/base.rb

@@ -190,6 +190,35 @@ module EBNF
       Writer.html(*ast)
     end
 
+    ##
+    # Output Ruby parser files
+    #
+    # @param [IO, StringIO] output
+    # @param [Hash{Symbol => Object}] options
+    # @option options [String] :grammarFile
+    def to_ruby(output = STDOUT, options = {})
+      self.build_tables
+      unless output == STDOUT
+        output.puts "# This file is automatically generated by #{__FILE__}"
+        output.puts "# BRANCH derived from #{options[:grammarFile]}" if options[: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 "  START = #{self.start.inspect}"
+        output.puts
+      end
+      self.outputTable(output, 'BRANCH', self.branch, 1)
+      self.outputTable(output, 'TERMINALS', self.terminals, 1)
+      self.outputTable(output, 'FIRST', self.first, 1)
+      self.outputTable(output, 'FOLLOW', self.follow, 1)
+      self.outputTable(output, 'PASS', [self.pass], 1) if self.pass
+      unless output == STDOUT
+        output.puts "end"
+      end
+    end
+
     def dup
       new_obj = super
       new_obj.instance_variable_set(:@ast, @ast.dup)

data/lib/ebnf/ll1/lexer.rb

@@ -263,7 +263,9 @@ module EBNF::LL1
         #STDERR.puts "match[#{term.type}] #{scanner.rest[0..100].inspect} against #{term.regexp.inspect}" #if term.type == :STRING_LITERAL_SINGLE_QUOTE
         if matched = scanner.scan(term.regexp)
           #STDERR.puts "  matched #{term.type.inspect}: #{matched.inspect}"
-          return token(term.type, term.canonicalize(matched))
+          tok = token(term.type, term.canonicalize(matched))
+          @lineno += matched.count("\n")
+          return tok
         end
       end
       nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
@@ -64,14 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +104,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 description: EBNF is a Ruby parser for W3C EBNF and a parser generator for compliant
   LL(1) grammars.
 email: public-rdf-ruby@w3.org
@@ -147,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: EBNF parser and parser generator.