sourcify 0.1.2 → 0.2.0

data/spec/proc_scanner/to_proc_spec.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "#to_proc" do
+
+  should 'handle &:xxx' do
+    process(" &:xxx ").should.include([:to_proc, '&:xxx'])
+  end
+
+  %w{&xxx :xxx}.each do |expr|
+    should "handle not #{expr}" do
+      process(" #{expr} ").map(&:first).should.not.include(:to_proc)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,6 +6,18 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'sourcify'
 
+ragel_dir = File.join(File.dirname(__FILE__), '..', 'lib', 'sourcify', 'proc')
+ragel_file = File.join(ragel_dir, 'scanner.rl')
+ruby_file = File.join(ragel_dir, 'scanner.rb')
+File.delete(ruby_file) rescue nil
+system("ragel -R #{ragel_file}")
+
+begin
+  require File.join(ragel_dir, 'scanner.rb')
+rescue LoadError
+  raise $!
+end
+
 Bacon.summary_on_exit
 
 def watever(*args, &block)
@@ -39,3 +51,14 @@ def having_sexp(expected)
   end
 end
 
+def capture(stdin_str = '')
+  begin
+    require 'stringio'
+    $o_stdin, $o_stdout, $o_stderr = $stdin, $stdout, $stderr
+    $stdin, $stdout, $stderr = StringIO.new(stdin_str), StringIO.new, StringIO.new
+    yield
+    {:stdout => $stdout.string, :stderr => $stderr.string}
+  ensure
+    $stdin, $stdout, $stderr = $o_stdin, $o_stdout, $o_stderr
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sourcify
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - NgTzeYang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +08:00
+date: 2010-09-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,14 +67,19 @@ files:
 - VERSION
 - lib/sourcify.rb
 - lib/sourcify/proc.rb
-- lib/sourcify/proc/counter.rb
-- lib/sourcify/proc/lexer.rb
-- lib/sourcify/proc/lexer18.rb
-- lib/sourcify/proc/lexer19.rb
 - lib/sourcify/proc/parser.rb
+- lib/sourcify/proc/scanner.rb
+- lib/sourcify/proc/scanner.rl
+- lib/sourcify/proc/scanner/comment.rb
+- lib/sourcify/proc/scanner/counter.rb
+- lib/sourcify/proc/scanner/dstring.rb
+- lib/sourcify/proc/scanner/extensions.rb
+- lib/sourcify/proc/scanner/heredoc.rb
 - sourcify.gemspec
+- spec/dump_object_space_procs.rb
 - spec/proc/19x_extras.rb
-- spec/proc/misc_spec.rb
+- spec/proc/created_on_the_fly_proc_spec.rb
+- spec/proc/others_spec.rb
 - spec/proc/readme
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb
@@ -99,6 +104,17 @@ files:
 - spec/proc/to_source_magic_file_var_spec.rb
 - spec/proc/to_source_magic_line_var_spec.rb
 - spec/proc/to_source_variables_spec.rb
+- spec/proc_scanner/block_comment_spec.rb
+- spec/proc_scanner/double_colons_spec.rb
+- spec/proc_scanner/double_quote_str_w_interpolation_spec.rb
+- spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb
+- spec/proc_scanner/heredoc_spec.rb
+- spec/proc_scanner/kw_do_alias1_spec.rb
+- spec/proc_scanner/kw_do_alias2_spec.rb
+- spec/proc_scanner/per_line_comment_spec.rb
+- spec/proc_scanner/single_quote_str_spec.rb
+- spec/proc_scanner/spec_helper.rb
+- spec/proc_scanner/to_proc_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ngty/sourcify
@@ -135,9 +151,21 @@ signing_key:
 specification_version: 3
 summary: Workarounds before ruby-core officially supports Proc#to_source (& friends)
 test_files: 
+- spec/proc_scanner/kw_do_alias1_spec.rb
+- spec/proc_scanner/single_quote_str_spec.rb
+- spec/proc_scanner/to_proc_spec.rb
+- spec/proc_scanner/kw_do_alias2_spec.rb
+- spec/proc_scanner/double_colons_spec.rb
+- spec/proc_scanner/block_comment_spec.rb
+- spec/proc_scanner/per_line_comment_spec.rb
+- spec/proc_scanner/heredoc_spec.rb
+- spec/proc_scanner/double_quote_str_w_interpolation_spec.rb
+- spec/proc_scanner/spec_helper.rb
+- spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb
+- spec/proc/created_on_the_fly_proc_spec.rb
 - spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_while_spec.rb
 - spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb
@@ -151,13 +179,14 @@ test_files:
 - spec/proc/to_source_magic_line_var_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb
+- spec/proc/others_spec.rb
 - spec/proc/19x_extras.rb
 - spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb
 - spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb
 - spec/proc/to_source_variables_spec.rb
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_source_magic_file_var_spec.rb
-- spec/proc/misc_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_for_spec.rb
+- spec/dump_object_space_procs.rb
 - spec/spec_helper.rb

data/lib/sourcify/proc/counter.rb

@@ -1,41 +0,0 @@
-module Sourcify
-  module Proc
-    class Counter #:nodoc:all
-
-      attr_accessor :marker
-
-      def initialize
-        @marker, @counter = nil, {:start => 0, :end => 0}
-      end
-
-      def [](key)
-        @counter[key]
-      end
-
-      def started?
-        @counter.values != [0,0]
-      end
-
-      def telly?
-        @counter[:start] == @counter[:end]
-      end
-
-      def decrement_start
-        @counter[:start] -= 1
-        self
-      end
-
-      def increment_start
-        @counter[:start] += 1
-        self
-      end
-
-      def increment_end
-        @counter[:end] += 1
-        self
-      end
-
-    end
-  end
-end
-

data/lib/sourcify/proc/lexer.rb

@@ -1,40 +0,0 @@
-module Sourcify
-  module Proc
-    module Lexer #:nodoc:all
-
-      class << self
-        def new(*args)
-          begin
-            require 'sourcify/proc/lexer19'
-            Lexer19.new(*args)
-          rescue LoadError
-            require 'sourcify/proc/lexer18'
-            Lexer18.new(*args)
-          end
-        end
-      end
-
-      module Commons
-
-        class EndOfBlock < Exception ; end
-        class EndOfLine < Exception ; end
-
-        def work
-          begin
-            @results ||= []
-            @do_end_counter = Sourcify::Proc::Counter.new
-            @braced_counter = Sourcify::Proc::Counter.new
-            lex
-          rescue EndOfBlock
-            @results << @result.dup
-            @is_multiline_block ? @results : retry
-          rescue EndOfLine
-            @results
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/sourcify/proc/lexer18.rb

@@ -1,237 +0,0 @@
-require 'irb/ruby-lex'
-require 'irb/ruby-token'
-
-module Sourcify
-  module Proc
-    class Lexer18 #:nodoc:all
-
-      # NOTE: Implementation of this class has been heavily inspired by:
-      # * the discussion @ http://www.justskins.com/forums/breaking-ruby-code-into-117453.html
-      # * Florian Groß's solution for ruby quiz 'SerializableProc (#38)'
-      #   @ http://rubyquiz.com/quiz38.html
-
-      include Lexer::Commons
-
-      def initialize(io, file, line)
-        @file, @line, @io, @pos = file, line, io, io.pos
-        @lex = RubyLex.new
-        @lex.set_input(@io)
-        @lex.get_readed
-      end
-
-      def lex
-        (@tokens = []).extend(Extensions)
-        @magic_lines = []
-
-        while @tk = @lex.token
-          tkc = @tk.class.to_s.sub(/\ARubyToken::/, '').downcase.to_sym
-          @tokens << [@tk.line_no, @tk.char_no, tkc]
-          post_qstring if @qstring_data
-          @lex.get_readed if tkc == :tknl
-          next if @do_end_counter.started? && @tokens.curr.symbolized_keyword?
-          send(:"on_#{tkc}") rescue NoMethodError
-        end
-      end
-
-      def on_tknl
-        raise EndOfLine unless @results.empty?
-      end
-
-      def on_tk__line__
-        @magic_lines << [@tk.seek, @tk.line_no + @line]
-      end
-
-      def on_tkdstring
-        @qstring_data = [@tk.seek, @tk.line_no + @line]
-      end
-
-      alias_method :on_tkstring, :on_tkdstring   # heredoc
-      alias_method :on_tkdregexp, :on_tkdstring  # regexp
-      alias_method :on_tkdxstring, :on_tkdstring # ` command
-
-      def post_qstring
-        seek, line = @qstring_data
-        @magic_lines << [(seek .. @tk.seek), line]
-        @qstring_data = nil
-      end
-
-      def on_tkdo
-        if !@do_end_counter.started?
-          @do_end_counter.marker = @tk.seek
-          @do_end_counter.increment_start
-        elsif @tokens.same_as_curr_line.keywords(:tkfor, :tkwhile, :tkuntil).empty?
-          # It is possible for a 'for', 'while' or 'until' to have an attached 'do',
-          # for such a case, we want to skip it
-          @do_end_counter.increment_start
-        end
-      end
-
-      def on_tkend
-        if @do_end_counter.started? && @do_end_counter.increment_end.telly?
-          @result = grab_result_and_reset_lex(@do_end_counter.marker, 3)
-          @is_multiline_block = @tokens.multiline?
-          raise EndOfBlock
-        end
-      end
-
-      def on_tkclass
-        # Pretty straightforward for these, each of them will consume an 'end' close it
-        @do_end_counter.increment_start if @do_end_counter.started?
-      end
-
-      # These work the same as 'class', the exception is 'for', which can have an optional
-      # 'do' attached:
-      # * for a in [1,2] do ... end
-      # * for a in [1,2] \n ... end
-      %w{def module begin case for}.each{|kw| alias_method :"on_tk#{kw}", :on_tkclass }
-
-      def on_tkwhile
-        # This has optional trailing 'do', and can work as a modifier as well, eg:
-        # * while true do ... end # => 'do' must be on the same line as 'while'
-        # * while true \n ... end
-        # * ... while true # => 'while' is pre-pended with non-spaces
-        if @do_end_counter.started? && @tokens.start_of_line?
-          @do_end_counter.increment_start
-        end
-      end
-
-      # These work exactly the same as 'while'.
-      %w{until if unless}.each{|kw| alias_method :"on_tk#{kw}", :on_tkwhile }
-
-      def on_tklbrace
-        unless @do_end_counter.started?
-          @braced_counter.marker = @tk.seek unless @braced_counter.started?
-          @braced_counter.increment_start
-        end
-      end
-
-      def on_tkrbrace
-        if @braced_counter.started? && @braced_counter.increment_end.telly?
-          @result = grab_result_and_reset_lex(@braced_counter.marker, 1)
-          @is_multiline_block = @tokens.multiline?
-          raise EndOfBlock
-        end
-      end
-
-      alias_method :on_tkflbrace, :on_tklbrace
-      alias_method :on_tkfrbrace, :on_tkrbrace
-
-      def on_tkassoc
-        if @braced_counter.started? && @braced_counter[:start] == 1
-          @braced_counter.decrement_start
-        end
-      end
-
-      def on_tkgt
-        on_tkassoc if @tokens[-2 .. -1].map(&:last) == [:tkassign, :tkgt]
-      end
-
-      def grab_result_and_reset_lex(marker, offset)
-        @io.seek(@pos+marker)
-        diff = @tk.seek - marker + offset
-        result = replace_magic_lines(@io.read(diff), marker)
-        @io.seek(@pos + diff)
-        @lex.set_input(@io)
-        @lex.get_readed
-        result
-      end
-
-      def replace_magic_lines(result, marker, offset = 0)
-        @magic_lines.inject(result) do |rs, (pos,val)|
-          meth = :"replace_magic_line_by_#{pos.class.to_s.downcase}"
-          n_rs = send(meth, rs, marker + offset, pos, val)
-          offset = result.length - n_rs.length
-          n_rs
-        end
-      end
-
-      def replace_magic_line_by_fixnum(rs, offset, pos, val)
-        m = rs.match(/^(.{#{pos - offset}})__LINE__(.*)$/m)
-        m[1] + val.pred.to_s + m[2]
-      end
-
-      def replace_magic_line_by_range(rs, offset, pos, lineno)
-        @io.seek(@pos + pos.begin)
-        subject = @io.read(pos.end - pos.begin)
-        return rs if %w{' %q %w}.any?{|q| subject.start_with?(q) }
-        prepend, append = rs.match(/^(.*?)#{Regexp.quote(subject)}(.*)$/m)[1..2]
-        middle = subject.split("\n").each_with_index do |line, i|
-          line.gsub!(pattern = /(.*?\#\{)__LINE__(\})/) do |s|
-            (m = s.match(pattern)[1..2])[0].end_with?('\\#{') ?
-              s : m.insert(1, (lineno + i).pred.to_s).join
-          end
-        end.join("\n")
-        prepend + middle + append
-      end
-
-      # Ease working with the hybrid token set collected from RubyLex
-      module Extensions
-
-        ROW, COL, TYP = 0, 1, 2
-
-        def same_as_curr_line
-          same_line(curr_line)
-        end
-
-        def multiline?
-          self[0][ROW] != self[-1][ROW]
-        end
-
-        def curr_line
-          curr[ROW]
-        end
-
-        def curr
-          (self[-1]).respond_to?(:symbolized_keyword?) ? self[-1] : (
-            preceding, current = self[-2 .. -1]
-            (class << current ; self ; end).class_eval do
-              define_method(:symbolized_keyword?) do
-                preceding[TYP] == :tksymbeg && %w{
-                  class module def while until if unless for do begin case end
-                }.include?(current[TYP].to_s.sub('tk',''))
-              end
-            end
-            current
-          )
-          self[-1]
-        end
-
-        def same_line(line)
-          (
-            # ignore the current node
-            self[0..-2].reverse.take_while do |e|
-              if e[TYP] == :tsemi
-                false
-              elsif e[ROW] == line
-                true
-              elsif e[ROW] == line.pred && e[TYP] != :tknl
-                line -= 1
-                true
-              end
-            end.reverse
-          ).extend(Extensions)
-        end
-
-        def keywords(*types)
-          (
-            types = [types].flatten
-            select{|e| types.include?(e[TYP]) }
-          ).extend(Extensions)
-        end
-
-        def non_spaces(*types)
-          (
-            types = [types].flatten
-            reject{|e| types.empty? or types.include?(e[TYP]) }
-          ).extend(Extensions)
-        end
-
-        def start_of_line?
-          same_as_curr_line.non_spaces.empty?
-        end
-
-      end
-
-    end
-  end
-end