sorcerer 0.0.2 → 0.0.3

data/Rakefile

@@ -12,7 +12,7 @@ end
 
 PROJ = 'sorcerer'
 RUBY = 'ruby19'
-PKG_VERSION = '0.0.2'
+PKG_VERSION = '0.0.3'
 
 PKG_FILES = FileList[
   'README.textile',
@@ -25,7 +25,7 @@ PKG_FILES = FileList[
   
 BASE_RDOC_OPTIONS = [
   '--line-numbers', '--inline-source',
-  '--main' , 'README.rdoc',
+  '--main' , 'README.textile',
   '--title', 'Rake -- Ruby Make'
 ]
 

data/lib/sorcerer.rb

@@ -1,8 +1,13 @@
 module Sorcerer
   # Generate the source code for teh given Ripper S-Expression.
-  def Sorcerer.source(sexp, debug=false)
+  def self.source(sexp, debug=false)
     Sorcerer::Resource.new(sexp, debug).source
   end
+
+  # Generate a list of interesting subexpressions for sexp.
+  def self.subexpressions(sexp)
+    Sorcerer::Subexpression.new(sexp)
+  end
 end
 
 require 'sorcerer/resource'

data/lib/sorcerer/subexpression.rb

@@ -33,15 +33,15 @@ module Sorcerer
     def tagged_sexp(sexp)
       case sexp.first
       when :var_ref, :binary, :call, :array, :hash, :unary
-        list_sexp(sexp)
         @result << sexp
+        list_sexp(sexp)
       when :aref
-        recur(sexp[2])
         @result << sexp
+        recur(sexp[2])
       when :method_add_arg
-        list_sexp(sexp[2])
-        recur(sexp[1][1])
         @result << sexp
+        recur(sexp[1][1])
+        list_sexp(sexp[2])
       else
         list_sexp(sexp)
       end

data/test/sorcerer/subexpression_test.rb

@@ -9,7 +9,7 @@ class SubexpressionTest < Test::Unit::TestCase
     if debug
       pp sexp
     end
-    sub = Sorcerer::Subexpression.new(sexp)
+    sub = Sorcerer.subexpressions(sexp)
     assert_equal subexpressions, sub.subexpressions
   end
 
@@ -20,55 +20,59 @@ class SubexpressionTest < Test::Unit::TestCase
 
   def test_unary_expressions
     assert_subexpressions "-(a+b)", [
-      "a", "b", "a + b", "-(a + b)"
+      "-(a + b)", "a + b", "a", "b", 
     ]
   end
 
   def test_binary_expressions
-    assert_subexpressions "a + b", ["a", "b", "a + b"]
+    assert_subexpressions "a + b", ["a + b", "a", "b"]
     assert_subexpressions("a + b + c",
-      ["a", "b", "a + b", "c", "a + b + c"])
+      ["a + b + c", "a + b", "a", "b", "c", ])
   end
 
   def test_method_calls_without_args
-    assert_subexpressions "o.f", ["o", "o.f"]
+    assert_subexpressions "o.f", ["o.f", "o"]
     assert_subexpressions "f()", ["f()"]
   end
 
   def test_method_calls_with_args
-    assert_subexpressions "o.f", ["o", "o.f"]
+    assert_subexpressions "o.f()", ["o.f()", "o"]
     assert_subexpressions "o.f(a, b)", [
-      "a", "b", "o", "o.f(a, b)"
+      "o.f(a, b)", "o", "a", "b"
     ]
     assert_subexpressions "f(a, b)", [
-      "a", "b", "f(a, b)"
+      "f(a, b)", "a", "b"
     ]
   end
 
   def test_array_reference
-    assert_subexpressions "a[i]", ["i", "a[i]"]
+    assert_subexpressions "a[i]", ["a[i]", "i"]
   end
 
   def test_array_literal
     assert_subexpressions "[a, b, c]", [
-      "a", "b", "c", "[a, b, c]"
+      "[a, b, c]", "a", "b", "c"
     ]
   end
 
   def test_hash_literal
     assert_subexpressions "{:a => aa, :b => bb}", [
-      "aa", "bb", "{:a => aa, :b => bb}"
+      "{:a => aa, :b => bb}", "aa", "bb"
     ]
   end
 
   def test_pattern_matching
-    assert_subexpressions "a =~ /r/", ["a", "a =~ /r/"]
+    assert_subexpressions "a =~ /r/", ["a =~ /r/", "a"]
   end
 
   def test_complex_expression
     assert_subexpressions "o.f(a+b, c*d, x.y, z(k, 2, 3))", [
-      "a", "b", "a + b", "c", "d", "c * d", "x", "x.y", "k", "z(k, 2, 3)",
-      "o", "o.f(a + b, c * d, x.y, z(k, 2, 3))"
+      "o.f(a + b, c * d, x.y, z(k, 2, 3))",
+      "o",
+      "a + b", "a", "b",
+      "c * d", "c", "d", 
+      "x.y", "x",
+      "z(k, 2, 3)", "k",
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sorcerer
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jim Weirich
@@ -39,7 +39,7 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
-- README.rdoc
+- README.textile
 - --title
 - Rake -- Ruby Make
 require_paths: