sorcerer 0.3.5 → 0.3.6

data/lib/sorcerer/subexpression.rb

@@ -32,7 +32,9 @@ module Sorcerer
 
     def tagged_sexp(sexp)
       case sexp.first
-      when :var_ref, :vcall, :binary, :array, :hash, :unary
+      when :var_ref
+        list_sexp(sexp)
+      when :vcall, :binary, :array, :hash, :unary, :defined
         @result << sexp
         list_sexp(sexp)
       when :aref
@@ -43,6 +45,11 @@ module Sorcerer
       when :call, :method_add_block, :method_add_arg
         @result << sexp
         method_sexp(sexp)
+      when :@kw
+        # ignore
+      when :zsuper, :super
+        @result << sexp
+        list_sexp(sexp)
       else
         list_sexp(sexp)
       end

data/lib/sorcerer/version.rb

@@ -2,7 +2,7 @@ module Sorcerer
   VERSION_NUMBERS = [
     VERSION_MAJOR = 0,
     VERSION_MINOR = 3,
-    VERSION_BUILD = 5,
+    VERSION_BUILD = 6,
   ]
 
   VERSION = VERSION_NUMBERS.join('.')

data/test/sorcerer/subexpression_test.rb

@@ -61,8 +61,16 @@ class SubexpressionTest < Test::Unit::TestCase
   end
 
   def test_hash_literal
-    assert_subexpressions "{ :a => aa, :b => bb }", [
-      "{ :a => aa, :b => bb }", "aa", "bb"
+    assert_subexpressions "{ :a => aa, b => bb }", [
+      "{ :a => aa, b => bb }",
+      "aa",
+      "b",
+      "bb",
+    ]
+    assert_subexpressions "{ a: aa, b: bb }", [
+      "{ a: aa, b: bb }",
+      "aa",
+      "bb",
     ]
   end
 
@@ -70,6 +78,10 @@ class SubexpressionTest < Test::Unit::TestCase
     assert_subexpressions "a =~ /r/", ["a =~ /r/", "a"]
   end
 
+  def test_defined_is_not_omitted
+    assert_subexpressions "defined?(a)", ["defined?(a)", "a"]
+  end
+
   def test_complex_expression
     assert_subexpressions "o.f(a+b, c*d, x.y, z(k, 2, 3)) { xx }", [
       "o.f(a + b, c * d, x.y, z(k, 2, 3)) { xx }",
@@ -81,4 +93,51 @@ class SubexpressionTest < Test::Unit::TestCase
     ]
   end
 
+  def test_numeric_literals_are_omitted
+    assert_subexpressions "a+1", ["a + 1", "a"]
+  end
+
+  def test_boolean_literals_are_omitted
+    assert_subexpressions "a||true||false", [
+      "a || true || false",
+      "a || true",
+      "a",
+    ]
+  end
+
+  def test_nil_literals_are_omitted
+    assert_subexpressions "a || nil", [
+      "a || nil",
+      "a",
+    ]
+  end
+
+  def test_symbols_literals_are_omitted
+    assert_subexpressions "a || :x", [
+      "a || :x",
+      "a",
+    ]
+  end
+
+  def test_string_literals_are_omitted
+    assert_subexpressions "a || 'x'", [
+      "a || \"x\"",
+      "a",
+    ]
+  end
+
+  def test_super_is_not_omitted
+    assert_subexpressions "a || super", [
+      "a || super",
+      "a",
+      "super",
+    ]
+    assert_subexpressions "a || super(b)", [
+      "a || super(b)",
+      "a",
+      "super(b)",
+      "b",
+    ]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcerer
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies: []
 description: Generate the original Ruby source from a Ripper-style abstract syntax
   tree.