ebnf 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb54bb9dd73a30b949c335b3b3ec864b3050041
-  data.tar.gz: 2bfbee2ec0bf5768ae03d2a36b7f830e814e1c6f
+  metadata.gz: b7016a2ce8e6c7b23ec669880a9b3f3ddd381793
+  data.tar.gz: 625460a7f6f2c8155960fc5a8640e4b0d854d1cd
 SHA512:
-  metadata.gz: 8cf6fde1acbc6282ee6da0f6eb9d6b10854bdd8473e8af87e53705903950ee6ac7f476dc830b9c1864f579628e6d4c383c97db08a44beafe399dc8f53f66a8f3
-  data.tar.gz: 830ed0642e8967a4f0f0bfba231a509d3dca6f4c05c0774aa68dc1e4bc11d08661eb6e49ca97839661720aef68a2242dffb29507a6cf8b6d239a6dbc951f11ff
+  metadata.gz: e09689686d97b44c8845f66129a313006a7264722eb9694b35a675edf2c369b7795f7b3ca6bb6ee82c7567d3be4a752c74b4388b1d57e3f242759eec47e37199
+  data.tar.gz: 6aa62a952f16d3ccd018397a6652b65d3053f68b00c0d0ee767cae3e4686d659e7c5f7e94d89a80a10fdab271ad45e3a733e780372379be5aa7a611ef71b6e46

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/bin/ebnf

@@ -17,10 +17,10 @@ options = {
   :namespace => "http://www.w3.org/ns/formats/Turtle#",
 }
 
-out = STDOUT
+input, out = nil, STDOUT
 
 OPT_ARGS = [
-  ["--dbg",             GetoptLong::NO_ARGUMENT,      "Turn on debugging output"],
+  ["--debug",           GetoptLong::NO_ARGUMENT,      "Turn on debugging output"],
   ["--bnf",             GetoptLong::NO_ARGUMENT,      "Transform EBNF to BNF"],
   ["--evaluate","-e",   GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as an EBNF document"],
   ["--ll1",             GetoptLong::REQUIRED_ARGUMENT,"Generate First/Follow rules, argument is start symbol"],
@@ -53,7 +53,7 @@ opts = GetoptLong.new(*OPT_ARGS.map {|o| o[0..-2]})
 
 opts.each do |opt, arg|
   case opt
-  when '--dbg'          then options[:debug] = true
+  when '--debug'        then options[:debug] = true
   when '--bnf'          then options[:bnf] = true
   when '--evaluate'     then input = arg
   when '--input-format' then options[:format] = arg.to_sym

data/lib/ebnf/ll1.rb

@@ -285,7 +285,7 @@ module EBNF
         # 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 rule.first.include?(:_eps) && !(overlap = ((rule.first & (rule.follow || [])) - [:eps])).empty?
           error("First/Follow Conflict: #{overlap.first.inspect} is both first and follow of #{rule.sym}")
         end
 
@@ -306,7 +306,8 @@ module EBNF
               # A First/First conflict appears when there are two rules having
               # the same first, so the parser can't know which one to choose.
               if branchDict.has_key?(f)
-                error("First/First Conflict: #{f.inspect} is also the condition for #{branchDict[f].first}")
+                #require 'byebug'; byebug
+                error("First/First Conflict: #{f.inspect} is the condition for both #{prod_rule.sym} and #{branchDict[f].first}")
               end
 
               debug("   alt") {"[#{f}] => #{prod}"}

data/lib/ebnf/parser.rb

@@ -18,14 +18,20 @@ module EBNF
           #debug("eachRule(ws)") { "[#{cur_lineno}] #{s.inspect}" }
         when s = scanner.scan(%r(/\*([^\*]|\*[^\/])*\*/)m)
           # Eat comments /* .. */
+          cur_lineno += s.count("\n")
           debug("eachRule(comment)") { "[#{cur_lineno}] #{s.inspect}" }
         when s = scanner.scan(%r(\(\*([^\*]|\*[^\)])*\*\))m)
           # Eat comments (* .. *)
+          cur_lineno += s.count("\n")
           debug("eachRule(comment)") { "[#{cur_lineno}] #{s.inspect}" }
         when s = scanner.scan(%r((#(?!x)|//).*$))
-          # Eat comments
+          # Eat comments // & #
           cur_lineno += s.count("\n")
           debug("eachRule(comment)") { "[#{cur_lineno}] #{s.inspect}" }
+        when s = scanner.scan(/\A["']/)
+          # Found a quote, scan until end of matching quote
+          s += scanner.scan_until(/#{scanner.matched}|$/)
+          r += s
         when s = scanner.scan(%r(^@terminals))
           #debug("eachRule(@terminals)") { "[#{cur_lineno}] #{s.inspect}" }
           yield(r) unless r.empty?
@@ -45,8 +51,15 @@ module EBNF
           @lineno = cur_lineno
           r = s
         else
-          # Collect until end of line, or start of comment
-          s = scanner.scan_until(%r((?:/\*)|$)m)
+          # Collect until end of line, or start of comment or quote
+          s = scanner.scan_until(%r{(?:[/\(]\*)|#(?!x)|//|["']|$})
+          if scanner.matched.length > 0
+            # Back up scan head before ending match
+            scanner.pos = scanner.pos - scanner.matched.length
+
+            # Remove matched from end of string
+            s = s[0..-(scanner.matched.length+1)]
+          end
           cur_lineno += s.count("\n")
           #debug("eachRule(rest)") { "[#{cur_lineno}] #{s.inspect}" }
           r += s
@@ -268,6 +281,7 @@ module EBNF
     #     ((range "^<>'{}|^`") '-\[#x00-#x20\]')
     def terminal(s)
       s = s.strip
+      #STDERR.puts s.inspect
       case m = s[0,1]
       when '"', "'" # STRING1 or STRING2
         l, s = s[1..-1].split(m.rstrip, 2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -169,9 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: EBNF parser and parser generator.
 test_files: []
-has_rdoc: false