clean_ripper 0.0.1.1 → 0.0.2

data/lib/clean_sexp_builder.rb

@@ -1,6 +1,6 @@
 
 require 'ripper'
-p 0
+
 class Ripper
   class CleanSexpBuilder < SexpBuilder
     
@@ -97,6 +97,10 @@ class Ripper
       var
     end
     
+    def on_aref(*args)
+      [:call, args[0], :[], args[1], nil]
+    end
+    
     def on_gvar(*args)
       [:gvar, args.first.to_sym]
     end
@@ -113,20 +117,20 @@ class Ripper
       [:ident, args.first.to_sym]
     end
     
-    def on_opassign(*args)
-      [:assign, args.first, [:binary, args.first, args[1][1][0..-2].to_sym, args.last]]
+    def on_op(*args)
+      args[0].to_sym
     end
     
     def on_method_add_arg(*args)
-      [:call, *args.first, (args[1][1] if args[1]) || [], nil]
+      [:call, *args.first[1..-3], (args[1][1] if args[1]) || [], nil]
     end
     
     def on_call(*args)
-      [args[0], args[-1][1]]
+      [:call, args[0], args[-1][1], [], nil]
     end
     
     def on_fcall(*args)
-      [nil, args[0][1]]
+      [:call, nil, args[0][1], [], nil]
     end
     
     def on_args_add_block(*args)
@@ -307,11 +311,11 @@ class Ripper
     end
     
     def on_field(*args)
-      [:field, args[0], args[2][1], []]
+      [:call, args[0], args[2][1], [], nil]
     end
     
     def on_aref_field(*args)
-      [:field, args[0], :[], args[1]]
+      [:call, args[0], :[], args[1], nil]
     end
     
     def on_mlhs_paren(*args)

data/test/clean_ripper_test.rb

@@ -297,10 +297,7 @@ class CleanRipperTest < Test::Unit::TestCase
         [:lvar, :a],
         [:assign, [:lvar, :b], [:lit, 2]]
       ],
-      [:assign,
-        [:lvar, :a], 
-        [:binary, [:lvar, :a], :+, [:lit, 5]]
-      ]
+      [:opassign, [:lvar, :a], :"+=", [:lit, 5]]
     ]
     
     # Ripper output
@@ -903,11 +900,11 @@ class CleanRipperTest < Test::Unit::TestCase
     # CleanRipper output
     clean_ripper = [:program,
       [:massign,
-        [[:field, [:ident, :a], :x, []], [:ident, :b]],
+        [[:call, [:ident, :a], :x, [], nil], [:ident, :b]],
         [[:lit, 1], [:lit, 2]]
       ],
       [:massign,
-        [[:field, [:ident, :a], :[], [[:lit, 2]]], [:ident, :b]],
+        [[:call, [:ident, :a], :[], [[:lit, 2]], nil], [:ident, :b]],
         [[:lit, 1], [:lit, 2]]
       ]
     ]
@@ -1044,5 +1041,71 @@ class CleanRipperTest < Test::Unit::TestCase
     assert_equal(clean_ripper, CleanRipper.parse(code))
     assert_equal(ripper, Ripper::SexpBuilder.new(code).parse)
   end
+  def test_021
+    code = <<-'END'
+    foo["bar".to_sym]
+    a[b] += 1
+    END
+    
+    # CleanRipper output
+    clean_ripper = [:program,
+      [:call,
+        [:ident, :foo],
+        :[],
+        [[:call, [:lit, "bar"], :to_sym, [], nil]],
+        nil
+      ],
+      [:opassign,
+        [:call, [:ident, :a], :[], [[:ident, :b]], nil],
+        :"+=",
+        [:lit, 1]
+      ]
+    ]
+    
+    # Ripper output
+    ripper = [:program,
+      [:stmts_add,
+        [:stmts_add,
+          [:stmts_new],
+          [:aref,
+            [:var_ref, [:@ident, "foo", [1, 4]]],
+            [:args_add_block,
+              [:args_add,
+                [:args_new],
+                [:call,
+                  [:string_literal,
+                    [:string_add,
+                      [:string_content],
+                      [:@tstring_content, "bar", [1, 9]]
+                    ]
+                  ],
+                  :".",
+                  [:@ident, "to_sym", [1, 14]]
+                ]
+              ],
+              false
+            ]
+          ]
+        ],
+        [:opassign,
+          [:aref_field,
+            [:var_ref, [:@ident, "a", [2, 4]]],
+            [:args_add_block,
+              [:args_add,
+                [:args_new],
+                [:var_ref, [:@ident, "b", [2, 6]]]
+              ],
+              false
+            ]
+          ],
+          [:@op, "+=", [2, 9]],
+          [:@int, "1", [2, 12]]
+        ]
+      ]
+    ]
+    
+    assert_equal(clean_ripper, CleanRipper.parse(code))
+    assert_equal(ripper, Ripper::SexpBuilder.new(code).parse)
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean_ripper
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: