sourcify 0.2.3 → 0.3.0

data/lib/sourcify/proc/scanner.rl

@@ -91,6 +91,10 @@ module Sourcify
 
   ## MACHINE >> String
   string := |*
+
+    sqm = '%q' | '%w';
+    dqm = '%Q' | '%W' | '%x' | '%r' | '%';
+
     ## == Single quote strings
     sqs1  = "'" . ([^\']* | ([^\'\\]*[\\][\'][^\']*)*) . '\\\\'* . "'";
     sqs2  = '~' . ([^\~]* | ([^\~\\]*[\\][\~][^\~]*)*) . '\\\\'* . '~';
@@ -121,8 +125,7 @@ module Sourcify
     sqs27 = '(' . ([^\)]* | ([^\)\\]*[\\][\)][^\)]*)*) . '\\\\'* . ')';
     sqs28 = '\\' . ([^\\]* | ([^\)]*[\\][\\][^\\]*)*) . '\\';
 
-    sqm = ('%q' | '%w'); (
-      sqs1        | sqm . sqs1  | sqm . sqs2  | sqm . sqs3  | sqm . sqs4  |
+    ( sqs1        | sqm . sqs1  | sqm . sqs2  | sqm . sqs3  | sqm . sqs4  |
       sqm . sqs5  | sqm . sqs6  | sqm . sqs7  | sqm . sqs8  | sqm . sqs9  |
       sqm . sqs10 | sqm . sqs11 | sqm . sqs12 | sqm . sqs13 | sqm . sqs14 |
       sqm . sqs15 | sqm . sqs16 | sqm . sqs17 | sqm . sqs18 | sqm . sqs19 |
@@ -133,61 +136,234 @@ module Sourcify
     };
 
     ## == Double quote strings
-    dqs1  = '"' . (([^\"]* | ([^\"\\]*[\\][\"][^\"]*)*) -- '#{') . '\\\\'* . ('"' | '#{');
-    dqs2  = '`' . (([^\`]* | ([^\`\\]*[\\][\`][^\`]*)*) -- '#{') . '\\\\'* . ('`' | '#{');
-    dqs3  = '/' . (([^\/]* | ([^\/\\]*[\\][\/][^\/]*)*) -- '#{') . '\\\\'* . ('/' | '#{');
-    dqs4  = "'" . (([^\']* | ([^\'\\]*[\\][\'][^\']*)*) -- '#{') . '\\\\'* . ("'" | '#{');
-    dqs5  = '~' . (([^\~]* | ([^\~\\]*[\\][\~][^\~]*)*) -- '#{') . '\\\\'* . ('~' | '#{');
-    dqs6  = '!' . (([^\!]* | ([^\!\\]*[\\][\!][^\!]*)*) -- '#{') . '\\\\'* . ('!' | '#{');
-    dqs7  = '@' . (([^\@]* | ([^\@\\]*[\\][\@][^\@]*)*) -- '#{') . '\\\\'* . ('@' | '#{');
-    dqs8  = '#' . (([^\#]* | ([^\#\\]*[\\][\#][^\#]*)*) -- '#{') . '\\\\'* . ('#' | '#{');
-    dqs9  = '$' . (([^\$]* | ([^\$\\]*[\\][\$][^\$]*)*) -- '#{') . '\\\\'* . ('$' | '#{');
-    dqs10 = '%' . (([^\%]* | ([^\%\\]*[\\][\%][^\%]*)*) -- '#{') . '\\\\'* . ('%' | '#{');
-    dqs11 = '^' . (([^\^]* | ([^\^\\]*[\\][\^][^\^]*)*) -- '#{') . '\\\\'* . ('^' | '#{');
-    dqs12 = '&' . (([^\&]* | ([^\&\\]*[\\][\&][^\&]*)*) -- '#{') . '\\\\'* . ('&' | '#{');
-    dqs13 = '*' . (([^\*]* | ([^\*\\]*[\\][\*][^\*]*)*) -- '#{') . '\\\\'* . ('*' | '#{');
-    dqs14 = '-' . (([^\-]* | ([^\-\\]*[\\][\-][^\-]*)*) -- '#{') . '\\\\'* . ('-' | '#{');
-    dqs15 = '_' . (([^\_]* | ([^\_\\]*[\\][\_][^\_]*)*) -- '#{') . '\\\\'* . ('_' | '#{');
-    dqs16 = '+' . (([^\+]* | ([^\+\\]*[\\][\+][^\+]*)*) -- '#{') . '\\\\'* . ('+' | '#{');
-    dqs17 = '=' . (([^\=]* | ([^\=\\]*[\\][\=][^\=]*)*) -- '#{') . '\\\\'* . ('=' | '#{');
-    dqs18 = '<' . (([^\>]* | ([^\>\\]*[\\][\>][^\>]*)*) -- '#{') . '\\\\'* . ('>' | '#{');
-    dqs19 = '|' . (([^\|]* | ([^\|\\]*[\\][\|][^\|]*)*) -- '#{') . '\\\\'* . ('|' | '#{');
-    dqs20 = ':' . (([^\:]* | ([^\:\\]*[\\][\:][^\:]*)*) -- '#{') . '\\\\'* . (':' | '#{');
-    dqs21 = ';' . (([^\;]* | ([^\;\\]*[\\][\;][^\;]*)*) -- '#{') . '\\\\'* . (';' | '#{');
-    dqs22 = ',' . (([^\,]* | ([^\,\\]*[\\][\,][^\,]*)*) -- '#{') . '\\\\'* . (',' | '#{');
-    dqs23 = '.' . (([^\.]* | ([^\.\\]*[\\][\.][^\.]*)*) -- '#{') . '\\\\'* . ('.' | '#{');
-    dqs24 = '?' . (([^\?]* | ([^\?\\]*[\\][\?][^\?]*)*) -- '#{') . '\\\\'* . ('?' | '#{');
-    dqs25 = '{' . (([^\}]* | ([^\}\\]*[\\][\}][^\}]*)*) -- '#{') . '\\\\'* . ('}' | '#{');
-    dqs26 = '[' . (([^\]]* | ([^\]\\]*[\\][\]][^\]]*)*) -- '#{') . '\\\\'* . (']' | '#{');
-    dqs27 = '(' . (([^\)]* | ([^\)\\]*[\\][\)][^\)]*)*) -- '#{') . '\\\\'* . (')' | '#{');
-    dqs28 = '\\' . (([^\\]* | ([^\\]*[\\][\\][^\\]*)*) -- '#{') . ('\\' | '#{');
-
-    dqm = ('%Q' | '%W' | '%x' | '%r' | '%'); (
-      dqs1        | dqs2        | dqs3        | dqm . dqs1  | dqm . dqs2  |
-      dqm . dqs3  | dqm . dqs4  | dqm . dqs5  | dqm . dqs6  | dqm . dqs7  |
-      dqm . dqs8  | dqm . dqs9  | dqm . dqs10 | dqm . dqs11 | dqm . dqs12 |
-      dqm . dqs13 | dqm . dqs14 | dqm . dqs15 | dqm . dqs16 | dqm . dqs17 |
-      dqm . dqs18 | dqm . dqs19 | dqm . dqs20 | dqm . dqs21 | dqm . dqs22 |
-      dqm . dqs23 | dqm . dqs24 | dqm . dqs25 | dqm . dqs26 | dqm . dqs27 |
-      dqm . dqs28
-    ) => {
-      if push_dstring(ts, te)
-        fgoto double_quote_str;
-      end
-    };
+    (dqm . '"') | '"' => { push_dstring(ts, te); fgoto dstring1; };
+    (dqm . "'") | "'" => { push_dstring(ts, te); fgoto dstring2; };
+    (dqm . '/') | '/' => { push_dstring(ts, te); fgoto dstring3; };
+    (dqm . '`') | '`' => { push_dstring(ts, te); fgoto dstring4; };
+    dqm . '~'  => { push_dstring(ts, te); fgoto dstring5; };
+    dqm . '!'  => { push_dstring(ts, te); fgoto dstring6; };
+    dqm . '@'  => { push_dstring(ts, te); fgoto dstring7; };
+    dqm . '#'  => { push_dstring(ts, te); fgoto dstring8; };
+    dqm . '$'  => { push_dstring(ts, te); fgoto dstring9; };
+    dqm . '%'  => { push_dstring(ts, te); fgoto dstring10; };
+    dqm . '^'  => { push_dstring(ts, te); fgoto dstring11; };
+    dqm . '&'  => { push_dstring(ts, te); fgoto dstring12; };
+    dqm . '*'  => { push_dstring(ts, te); fgoto dstring13; };
+    dqm . '-'  => { push_dstring(ts, te); fgoto dstring14; };
+    dqm . '_'  => { push_dstring(ts, te); fgoto dstring15; };
+    dqm . '+'  => { push_dstring(ts, te); fgoto dstring16; };
+    dqm . '='  => { push_dstring(ts, te); fgoto dstring17; };
+    dqm . '<'  => { push_dstring(ts, te); fgoto dstring18; };
+    dqm . '|'  => { push_dstring(ts, te); fgoto dstring19; };
+    dqm . ':'  => { push_dstring(ts, te); fgoto dstring20; };
+    dqm . ';'  => { push_dstring(ts, te); fgoto dstring21; };
+    dqm . ','  => { push_dstring(ts, te); fgoto dstring22; };
+    dqm . '.'  => { push_dstring(ts, te); fgoto dstring23; };
+    dqm . '?'  => { push_dstring(ts, te); fgoto dstring24; };
+    dqm . '{'  => { push_dstring(ts, te); fgoto dstring25; };
+    dqm . '['  => { push_dstring(ts, te); fgoto dstring26; };
+    dqm . '('  => { push_dstring(ts, te); fgoto dstring27; };
+    dqm . '\\' => { push_dstring(ts, te); fgoto dstring28; };
 
     ## == Anything accidentally caught
     any => {
       push(:any, ts, te)
       fgoto main;
     };
-
   *|;
 
-  ## MACHINE >> Double quote string
-  double_quote_str := |*
-    delimiter = [\~\`\!\@\#\$\%\^\&\*\)\-\_\+\=\}\]\:\;\'\"\>\,\.\?\/\|\\];
-    (^delimiter* . delimiter) -- ('\\' . delimiter) => {
+  ## MACHINES >> Double quote strings
+  dstring1 := |*
+    [^\"]*[\"] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring2 := |*
+    [^\']*[\'] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring3 := |*
+    [^\/]*[\/] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring4 := |*
+    [^\`]*[\`] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring5 := |*
+    [^\~]*[\~] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring6 := |*
+    [^\!]*[\!] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring7 := |*
+    [^\@]*[\@] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring8 := |*
+    [^\#]*[\#] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring9 := |*
+    [^\$]*[\$] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring10 := |*
+    [^\%]*[\%] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring11 := |*
+    [^\^]*[\^] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring12 := |*
+    [^\&]*[\&] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring13 := |*
+    [^\*]*[\*] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring14 := |*
+    [^\-]*[\-] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring15 := |*
+    [^\_]*[\_] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring16 := |*
+    [^\+]*[\+] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring17 := |*
+    [^\=]*[\=] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring18 := |*
+    [^\>]*[\>] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring19 := |*
+    [^\|]*[\|] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring20 := |*
+    [^\:]*[\:] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring21 := |*
+    [^\;]*[\;] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring22 := |*
+    [^\,]*[\,] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring23 := |*
+    [^\.]*[\.] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring24 := |*
+    [^\?]*[\?] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring25 := |*
+    [^\}]*[\}] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring26 := |*
+    [^\]]*[\]] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring27 := |*
+    [^\)]*[\)] => {
+      unless push_dstring(ts, te)
+        fgoto main;
+      end
+    };
+  *|;
+  dstring28 := |*
+    [^\\]*[\\] => {
       unless push_dstring(ts, te)
         fgoto main;
       end

data/sourcify.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sourcify}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-24}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
+  s.extensions = ["ext/sourcify/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
      "spec/proc/others_spec.rb",
      "spec/proc/readme",
      "spec/proc/to_sexp_variables_spec.rb",
+     "spec/proc/to_sexp_within_irb_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb",
      "spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb",
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
      "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/to_source_within_irb_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",
@@ -78,6 +81,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ngty/sourcify}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Workarounds before ruby-core officially supports Proc#to_source (& friends)}
   s.test_files = [
@@ -100,10 +104,12 @@ Gem::Specification.new do |s|
      "spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb",
      "spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb",
      "spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb",
+     "spec/proc/to_sexp_within_irb_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb",
+     "spec/proc/to_source_within_irb_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb",
      "spec/proc/to_source_magic_line_var_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb",
@@ -128,13 +134,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby2ruby>, [">= 1.2.5"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<otaku>, [">= 0.4.0"])
     else
       s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
       s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<otaku>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
     s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<otaku>, [">= 0.4.0"])
   end
 end
 

data/spec/proc/to_sexp_within_irb_spec.rb

@@ -0,0 +1,146 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe "Proc#to_sexp within IRB" do
+
+  class << self
+
+    def irb_eval(string)
+      irb_exec(string)[-1]
+    end
+
+    def equal_to(expected)
+      lambda {|found| found == expected }
+    end
+
+  end
+
+  should 'handle non var' do
+    expected = s(:iter, s(:call, nil, :proc, s(:arglist)), nil, s(:call, nil, :x, s(:arglist)))
+    irb_eval('lambda { x }.to_sexp').should.be equal_to(expected)
+  end
+
+  should 'handle local var' do
+    expected = s(:iter, s(:call, nil, :proc, s(:arglist)), nil, s(:lvar, :x))
+    irb_eval(%Q(
+      x = 'lx'
+      lambda { x }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle class_eval scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call, s(:const, :Object), :class_eval, s(:arglist)),
+          s(:lasgn, :x),
+          s(:lasgn, :y, s(:lvar, :x))))
+    irb_eval(%Q(
+      x = 1
+      lambda { Object.class_eval {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle instance_eval scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call, s(:str, "aa"), :instance_eval, s(:arglist)),
+          s(:lasgn, :x),
+          s(:lasgn, :y, s(:lvar, :x))))
+    irb_eval(%Q(
+      x = 1
+      lambda { 'aa'.instance_eval {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle define_method scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call,
+            s(:const, :Object),
+            :send,
+            s(:arglist, s(:lit, :define_method), s(:lit, :aa))),
+            s(:lasgn, :x),
+            s(:lasgn, :y, s(:lvar, :x))))
+    irb_eval(%Q(
+      x = 1
+      lambda { Object.send(:define_method, :aa) {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (simple)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:class, :AA, nil, s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    irb_eval(%Q(
+      x = 1
+      lambda { class AA ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (w inheritance)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:class,
+          :AA,
+          s(:const, :Object),
+          s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    irb_eval(%Q(
+      x = 1
+      lambda { class AA < Object; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (w singleton)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:sclass,
+          s(:str, "AA"),
+          s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    irb_eval(%Q(
+      x = 1
+      lambda { class << 'AA'; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle module scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:module, :AA, s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    irb_eval(%Q(
+      x = 1
+      lambda { module AA ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle method scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:defn,
+          :aa,
+          s(:args),
+          s(:scope, s(:block, s(:lasgn, :y, s(:call, nil, :x, s(:arglist)))))))
+    irb_eval(%Q(
+      x = 1
+      lambda { def aa ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+end