sourcify 0.2.0 → 0.2.1

data/lib/sourcify/proc/scanner.rl

@@ -89,98 +89,9 @@ module Sourcify
     };
   *|;
 
-  ## MACHINE >> Double quote string
-  double_quote_str := |*
-    delimiter = [\~\`\!\@\#\$\%\^\&\*\)\-\_\+\=\}\]\:\;\'\"\>\,\.\?\/\|\\];
-    (^delimiter* . delimiter) -- ('\\' . delimiter) => {
-      unless push_dstring(ts, te)
-        fgoto main;
-      end
-    };
-  *|;
-
-  ## MACHINE >> Main
-  main := |*
-
-    ## == Start/end of do..end block
-
-    kw_do => {
-      push(:kw_do, ts, te)
-      increment_counter(:do_end)
-      fgoto new_statement;
-    };
-
-    kw_end => {
-      push(:kw_end, ts, te)
-      decrement_counter(:do_end)
-    };
-
-    ## == Start/end of {...} block
-
-    lbrace => {
-      push(:lbrace, ts, te)
-      increment_counter(:brace)
-    };
-
-    rbrace => {
-      push(:rbrace, ts, te)
-      decrement_counter(:brace)
-    };
-
-    assoc => {
-      push(:assoc, ts, te)
-      fix_counter_false_start(:brace)
-    };
-
-    label => {
-      push_label(ts, te)
-      fix_counter_false_start(:brace)
-    };
-
-    ## == New statement
-
-    newline => {
-      push(:newline, ts, te)
-      increment_lineno
-      fgoto new_statement;
-    };
-
-    smcolon | lparen | assgn | kw_then | comma => {
-      push(:newline_alias, ts, te)
-      fgoto new_statement;
-    };
-
-    ## == Comment
-
-    '#' => {
-      fgoto per_line_comment;
-    };
-
-    newline . '=begin' . ospaces . (ospaces . ^newline+)* . newline => {
-      push_comment(ts, te)
-      increment_lineno
-      fgoto block_comment;
-    };
-
-    ## == Misc
-
-    var         => { push(:var, ts, te) };
-    const       => { push(:const, ts, te) };
-    symbol      => { push(:symbol, ts, te) };
-    mspaces     => { push(:space, ts, te) };
-    any         => { push(:any, ts, te) };
-    '&:' . meth => { push(:to_proc, ts, te) };
-
-    ## == Heredoc
-
-    ('<<' | '<<-') . ["']? . (const | var) . ["']? . newline => {
-      push_heredoc(ts, te)
-      increment_lineno
-      fgoto heredoc;
-    };
-
+  ## MACHINE >> String
+  string := |*
     ## == Single quote strings
-
     sqs1  = "'" . ([^\']* | ([^\'\\]*[\\][\'][^\']*)*) . '\\\\'* . "'";
     sqs2  = '~' . ([^\~]* | ([^\~\\]*[\\][\~][^\~]*)*) . '\\\\'* . '~';
     sqs3  = '`' . ([^\`]* | ([^\`\\]*[\\][\`][^\`]*)*) . '\\\\'* . '`';
@@ -222,7 +133,6 @@ module Sourcify
     };
 
     ## == Double quote strings
-
     dqs1  = '"' . (([^\"]* | ([^\"\\]*[\\][\"][^\"]*)*) -- '#{') . '\\\\'* . ('"' | '#{');
     dqs2  = '`' . (([^\`]* | ([^\`\\]*[\\][\`][^\`]*)*) -- '#{') . '\\\\'* . ('`' | '#{');
     dqs3  = '/' . (([^\/]* | ([^\/\\]*[\\][\/][^\/]*)*) -- '#{') . '\\\\'* . ('/' | '#{');
@@ -266,6 +176,107 @@ module Sourcify
       end
     };
 
+    ## == Anything accidentally caught
+    any => {
+      push(:any, ts, te)
+      fgoto main;
+    };
+
+  *|;
+
+  ## MACHINE >> Double quote string
+  double_quote_str := |*
+    delimiter = [\~\`\!\@\#\$\%\^\&\*\)\-\_\+\=\}\]\:\;\'\"\>\,\.\?\/\|\\];
+    (^delimiter* . delimiter) -- ('\\' . delimiter) => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+
+  ## MACHINE >> Main
+  main := |*
+
+    ## == Start/end of do..end block
+
+    kw_do => {
+      push(:kw_do, ts, te)
+      increment_counter(:do_end)
+      fgoto new_statement;
+    };
+
+    kw_end => {
+      push(:kw_end, ts, te)
+      decrement_counter(:do_end)
+    };
+
+    ## == Start/end of {...} block
+
+    lbrace => {
+      push(:lbrace, ts, te)
+      increment_counter(:brace)
+    };
+
+    rbrace => {
+      push(:rbrace, ts, te)
+      decrement_counter(:brace)
+    };
+
+    assoc => {
+      push(:assoc, ts, te)
+      fix_counter_false_start(:brace)
+    };
+
+    label => {
+      push_label(ts, te)
+      fix_counter_false_start(:brace)
+    };
+
+    ## == New statement
+
+    newline => {
+      push(:newline, ts, te)
+      increment_lineno
+      fgoto new_statement;
+    };
+
+    smcolon | lparen | assgn | kw_then | comma => {
+      push(:newline_alias, ts, te)
+      fgoto new_statement;
+    };
+
+    ## == Comment
+
+    '#' => {
+      fgoto per_line_comment;
+    };
+
+    newline . '=begin' . ospaces . (ospaces . ^newline+)* . newline => {
+      push_comment(ts, te)
+      increment_lineno
+      fgoto block_comment;
+    };
+
+    ## == Strings
+
+    ('<<' | '<<-') . ["']? . (const | var) . ["']? . newline => {
+      push_heredoc(ts, te)
+      increment_lineno
+      fgoto heredoc;
+    };
+
+    ('"' | "'" | '`' | '/' | '%') => {
+      fhold; fgoto string;
+    };
+
+    ## == Misc
+
+    var         => { push(:var, ts, te) };
+    const       => { push(:const, ts, te) };
+    symbol      => { push(:symbol, ts, te) };
+    mspaces     => { push(:space, ts, te) };
+    any         => { push(:any, ts, te) };
+
   *|;
 
 }%%

data/lib/sourcify/proc/scanner/extensions.rb

@@ -25,7 +25,6 @@ module Sourcify
         end
 
         def push(key, ts, te)
-          @results << :symbol_to_proc if key == :to_proc && @lineno == 1
           @tokens << [key, data_frag(ts .. te.pred)]
         end
 

data/sourcify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sourcify}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-09-11}
+  s.date = %q{2010-09-14}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
   s.extra_rdoc_files = [
@@ -73,7 +73,6 @@ Gem::Specification.new do |s|
      "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"
   ]
   s.homepage = %q{http://github.com/ngty/sourcify}
@@ -84,7 +83,6 @@ Gem::Specification.new do |s|
   s.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",

data/spec/dump_object_space_procs.rb

@@ -26,7 +26,7 @@ def dump_object_space_procs(debug = false)
     '== NOTE: dump files can be found at %s' % dump_dir
 
   # Core processing
-  ObjectSpace.each_object(Proc).to_a.
+  ObjectSpace.each_object(Proc).to_a.select{|o| o.source_location }.
     group_by{|o| o.source_location[0] }.each do |ofile, objs|
       nfile = File.join(dump_dir, ofile.gsub('/','~'))
       File.open(nfile,'w') do |f|

data/spec/proc/created_on_the_fly_proc_spec.rb

@@ -17,153 +17,61 @@ describe "Created on the fly proc" do
         }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
       end
 
-      should "not raise even with prepending :to_proc on the same line" do
+      should "not raise even with prepending #to_proc on the same line" do
         x, y = klass.new.method(:test).to_proc, lambda { 1+2 }
         y.to_source.should.not.be.nil
       end
 
-      should "not raise even with appending :to_proc on the same line" do
+      should "not raise even with appending #to_proc on the same line" do
         x, y = lambda { 1+2 }, klass.new.method(:test).to_proc
         x.to_source.should.not.be.nil
       end
 
-      should "not raise even with nested :to_proc on the same line" do
+      should "not raise even with nested #to_proc on the same line" do
         x = lambda { klass.new.method(:test).to_proc }
         x.to_source.should.not.be.nil
       end
 
-    end
-
-    if RUBY_VERSION.include?('1.9.') or RUBY_PLATFORM =~ /java/i
+      should "not raise with nested #to_proc on diff line" do
+        (
+          lambda do
+            klass.new.method(:test).to_proc
+          end
+        ).to_source.should.not.be.nil
+      end
 
-      describe '&:blah raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
+    end
 
-        should "raise when created by &:blah" do
-          lambda {
-            x, y = klass.new.test(&:blah), lambda { 1+2 }
-            x.to_source
-          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
-        end
+    describe '&:blah raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
 
-        should "not raise even with prepending &:blah on the same line" do
+      should "raise when created by &:blah" do
+        lambda {
           x, y = klass.new.test(&:blah), lambda { 1+2 }
-          y.to_source.should.not.be.nil
-        end
-
-        should "not raise even with appending &:blah on the same line" do
-          x, y = lambda { 1+2 }, klass.new.test(&:blah)
-          x.to_source.should.not.be.nil
-        end
-
-        should "not raise even with nested &:blah on the same line" do
-          x = lambda { klass.new.test(&:blah) }
-          x.to_source.should.not.be.nil
-        end
-
-        should "not raise with nested &:blah on diff line" do
-          (
-            lambda do
-              klass.new.test(&:blah)
-            end
-          ).to_source.should.not.be.nil
-        end
-
+          x.to_source
+        }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
       end
 
-    else
-
-      describe '&:blah raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
-
-        should "raise w no other proc on the same line" do
-          lambda {
-            x = klass.new.test(&:blah)
-            x.to_source
-          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
-        end
-
-        should "raise w prepending proc of different arity on the same line" do
-          lambda {
-            y, x = lambda {|a| 1+2 }, klass.new.test(&:blah)
-            x.to_source
-          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
-        end
-
-        should "raise w appending proc of different arity on the same line" do
-          lambda {
-            x, y = klass.new.test(&:blah), lambda {|a| 1+2 }
-            x.to_source
-          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
-        end
-
-        should "raise w nested proc of different arity on the same line" do
-          lambda {
-            y = lambda {|a| klass.new.test(&:blah) }
-            x = y.call(1).to_source
-          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
-        end
-
-        should "not raise with nested &:blah on diff line" do
-          (
-            lambda do
-              klass.new.test(&:blah)
-            end
-          ).to_source.should.not.be.nil
-        end
+      should "not raise even with prepending &:blah on the same line" do
+        x, y = klass.new.test(&:blah), lambda { 1+2 }
+        y.to_source.should.not.be.nil
+      end
 
+      should "not raise even with appending &:blah on the same line" do
+        x, y = lambda { 1+2 }, klass.new.test(&:blah)
+        x.to_source.should.not.be.nil
       end
 
-      describe '&:blah raising Sourcify::MultipleMatchingProcsPerLineError' do
-
-        should 'raise w prepending proc w zero arg (arity -1) on the same line' do
-          lambda {
-            y, x = lambda { 1+2 }, klass.new.test(&:blah)
-            x.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should 'raise w appending proc w zero arg (arity -1) on the same line' do
-          lambda {
-            x, y = klass.new.test(&:blah), lambda { 1+2 }
-            x.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should 'raise w nested proc w zero arg (arity -1) on the same line' do
-          lambda {
-            x = lambda { klass.new.test(&:blah) }
-            x.call.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should 'raise w prepending proc w single optional arg (arity -1) on the same line' do
-          lambda {
-            y, x = lambda {|*a| 1+2 }, klass.new.test(&:blah)
-            x.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should 'raise w appending proc w single optional arg (arity -1) on the same line' do
-          lambda {
-            x, y = klass.new.test(&:blah), lambda {|*a| 1+2 }
-            x.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should 'raise w nested proc w single optional arg (arity -1) on the same line' do
-          lambda {
-            x = lambda {|*a| klass.new.test(&:blah) }
-            x.call.to_source
-          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-        end
-
-        should "not raise with nested &:blah on diff line" do
-          (
-            lambda do
-              x = klass.new.test(&:blah)
-            end
-          ).to_source.should.not.be.nil
-        end
+      should "not raise even with nested &:blah on the same line" do
+        x = lambda { klass.new.test(&:blah) }
+        x.to_source.should.not.be.nil
+      end
 
+      should "not raise with nested &:blah on diff line" do
+        (
+          lambda do
+            klass.new.test(&:blah)
+          end
+        ).to_source.should.not.be.nil
       end
 
     end