parser 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d8bc198add0c9c9e021a8181852b1181acb18b
-  data.tar.gz: 8f88c887edf5beec84bffaf73eaf010067d1b311
+  metadata.gz: 1651bd7bc0d39e00057fd6f24dd4a6ef2239e108
+  data.tar.gz: 31d38b4035c2cb105075c204ff321b725653c7c9
 SHA512:
-  metadata.gz: 4aab5ebeaf4117abc466c56bf10a69398e426a6976cb23f013a4629a40ef28692bd2a001fff899a755b932ff83e47ec220e4935d8f51fde456a2b632c171ebfc
-  data.tar.gz: 231b1dcb3345a4b692fd2f4e9efb50f4d836a848cd0ce9002b6b99a06c6345767bb3cce4ea299ea76990a858c1e7eaebcbbd4ef9a23e57e6d11d90b6114f9c09
+  metadata.gz: 6452eeb521655b074987d3d17daf6b5cfbbd979769c3a892db9ba970a2f774180ad81eeeb8d9f2e412c6c14d8bed95510061266144e24a9fada054ec3071aae4
+  data.tar.gz: 4454c5b7db370bc275a2deb63eca54c8c8d896db0726a5a9f688576d8219670ff49527cac3a636551a920e773b7bfd2104b6570cb448e6fe7182d75b4de80b1d

data/lib/parser/source/buffer.rb

@@ -49,9 +49,12 @@ module Parser
       end
 
       def initialize(name, first_line = 1)
-        @name       = name
-        @first_line = first_line
-        @source     = nil
+        @name        = name
+        @source      = nil
+        @first_line  = first_line
+
+        @lines       = nil
+        @line_begins = nil
       end
 
       def read
@@ -71,56 +74,70 @@ module Parser
       end
 
       def source=(source)
+        if @source
+          raise ArgumentError, "Source::Buffer is immutable"
+        end
+
         if source.respond_to? :encoding
           source = source.dup if source.frozen?
           source = self.class.reencode_string(source)
         end
 
-        @source  = source.freeze
-
-        freeze
+        @source = source.freeze
       end
 
       def decompose_position(position)
-        line       = line_for(position)
-        line_begin = line_begin_positions[line]
+        line_no, line_begin = line_for(position)
 
-        [ @first_line + line, position - line_begin ]
+        [ @first_line + line_no, position - line_begin ]
       end
 
       def source_line(line)
-        mapped_line = line - @first_line
-
-        # Consider improving this naïve implementation.
-        source_line = source.lines.drop(mapped_line).first
-
-        # Line endings will be commonly present for all lines
-        # except the last one. It does not make sense to keep them.
-        if source_line.end_with? "\n"
-          source_line.chomp
-        else
-          source_line
+        unless @lines
+          @lines = @source.lines.map do |source_line|
+            # Line endings will be commonly present for all lines
+            # except the last one. It does not make sense to keep them.
+            if source_line.end_with? "\n"
+              source_line.chomp
+            else
+              source_line
+            end
+          end
         end
+
+        @lines[line - @first_line]
       end
 
       private
 
-      def line_begin_positions
-        # TODO: Optimize this.
-        [0] + source.
-          each_char.
-          with_index.
-          select do |char, index|
-            char == "\n"
-          end.map do |char, index|
-            index + 1
+      def line_begins
+        unless @line_begins
+          @line_begins, index = [ [ 0, 0 ] ], 1
+
+          @source.each_char do |char|
+            if char == "\n"
+              @line_begins << [ @line_begins.length, index ]
+            end
+
+            index += 1
           end
+
+          @line_begins = @line_begins.reverse
+        end
+
+        @line_begins
       end
 
       def line_for(position)
-        # TODO: Optimize this.
-        line_begin_positions.rindex do |line_beg|
-          line_beg <= position
+        if line_begins.respond_to? :bsearch
+          line_begins.bsearch do |line, line_begin|
+            line_begin <= position
+          end
+        else
+          # Slower variant for <= Ruby 2.0.
+          line_begins.find do |line, line_begin|
+            line_begin <= position
+          end
         end
       end
     end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/test/test_source_buffer.rb

@@ -18,10 +18,17 @@ class TestSourceBuffer < MiniTest::Unit::TestCase
     @buffer.source = 'foo'
     assert_equal 'foo', @buffer.source
 
-    assert @buffer.frozen?
     assert @buffer.source.frozen?
   end
 
+  def test_source_double_setter
+    @buffer.source = 'foo'
+
+    assert_raises(ArgumentError) do
+      @buffer.source = 'bar'
+    end
+  end
+
   def test_read
     tempfile = Tempfile.new('parser')
     tempfile.write('foobar')
@@ -31,7 +38,6 @@ class TestSourceBuffer < MiniTest::Unit::TestCase
     buffer.read
     assert_equal 'foobar', buffer.source
 
-    assert buffer.frozen?
     assert buffer.source.frozen?
   end
 
@@ -41,11 +47,6 @@ class TestSourceBuffer < MiniTest::Unit::TestCase
     end
   end
 
-  def test_line_begin_positions
-    @buffer.source = "1\nfoo\nbar"
-    assert_equal [0, 2, 6], @buffer.send(:line_begin_positions)
-  end
-
   def test_decompose_position
     @buffer.source = "1\nfoo\nbar"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast