whittle 0.0.7 → 0.0.8

data/examples/calculator.rb

@@ -57,13 +57,3 @@ p calculator.parse("5 - -2").to_f
 
 p calculator.parse("5 * 2 - -2").to_f
 # => 12
-
-
-p calculator.parse(
-  <<-END
-    5 * 2 - -2
-  + 3 / 7 * 90
-  / 45 * 8 * 8 * 8 - 6 * (1 - 2 - 3 ) (45 / 5)) / (7 * 3)
-  - 6
-  END
-).to_f

data/lib/whittle/parse_error_builder.rb

@@ -39,7 +39,7 @@ module Whittle
         ERROR
 
         unless region.nil?
-          region = "\n\nExact region marked...\n\n#{region}"
+          region = "\n\n#{region}"
         end
 
         ParseError.new(message + region.to_s, token[:line], expected, token[:name])
@@ -75,7 +75,7 @@ module Whittle
           " " * region_before.length
         end
 
-        marker = "#{padding}^ ... right here\n\n"
+        marker = "#{padding}^ ... occurred here\n\n"
 
         unless error_line =~ /[\r\n]\Z/
           marker = "\n#{marker}"

data/lib/whittle/parser.rb

@@ -285,16 +285,19 @@ module Whittle
     private
 
     def next_token(source, offset, line)
+      best = nil
+
       rules.each do |name, rule|
         next unless rule.terminal?
 
         if token = rule.scan(source, offset, line)
+          best ||= token
           token[:name] = name
-          return token
+          best = token if token[:value].length > best[:value].length
         end
       end
 
-      nil
+      best
     end
   end
 end

data/lib/whittle/version.rb

@@ -3,5 +3,5 @@
 # Copyright (c) Chris Corbyn, 2011
 
 module Whittle
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/unit/parser/multiple_match_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "a parser with two terminal rules which overlap" do
+  let(:parser) do
+    Class.new(Whittle::Parser) do
+      rule("def")
+      rule("define")
+      rule(:id => /[a-z_]+/)
+
+      rule(:prog) do |r|
+        r["def"]
+        r["define"]
+        r[:id]
+      end
+
+      start(:prog)
+    end
+  end
+
+  it "uses the longest match" do
+    parser.new.parse("define_method").should == "define_method"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whittle
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312516285540 !ruby/object:Gem::Requirement
+  requirement: &70139412511200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70312516285540
+  version_requirements: *70139412511200
 description: ! "Write powerful parsers by defining a series of very simple rules\n
   \                    and operations to perform as those rules are matched.  Whittle\n
   \                    parsers are written in pure ruby and as such are extremely
@@ -59,6 +59,7 @@ files:
 - spec/unit/parser/empty_string_spec.rb
 - spec/unit/parser/error_reporting_spec.rb
 - spec/unit/parser/grouped_expr_spec.rb
+- spec/unit/parser/multiple_match_spec.rb
 - spec/unit/parser/multiple_precedence_spec.rb
 - spec/unit/parser/non_terminal_ambiguity_spec.rb
 - spec/unit/parser/noop_spec.rb
@@ -104,6 +105,7 @@ test_files:
 - spec/unit/parser/empty_string_spec.rb
 - spec/unit/parser/error_reporting_spec.rb
 - spec/unit/parser/grouped_expr_spec.rb
+- spec/unit/parser/multiple_match_spec.rb
 - spec/unit/parser/multiple_precedence_spec.rb
 - spec/unit/parser/non_terminal_ambiguity_spec.rb
 - spec/unit/parser/noop_spec.rb