flog 3.0.0.b1 → 3.0.0.b2

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.0.0.b2 / 2012-08-07
+
+* 1 bug fix:
+
+  * Fix for sexp structure changes (no arglists).
+
 === 3.0.0.b1 / 2012-07-26
 
 * 4 minor enhancements:

data/lib/flog.rb

@@ -12,7 +12,7 @@ class File
 end
 
 class Flog < SexpProcessor
-  VERSION = '3.0.0.b1'
+  VERSION = '3.0.0.b2'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -645,11 +645,11 @@ class Flog < SexpProcessor
       recv = exp.first
 
       # DSL w/ names. eg task :name do ... end
-      if (recv[0] == :call and recv[1] == nil and recv.arglist[1] and
-          [:lit, :str].include? recv.arglist[1][0]) then
-        msg = recv[2]
-        submsg = recv.arglist[1][1]
-        in_klass msg do                           # :task
+      #   looks like s(:call, nil, :task, s(:lit, :name))
+      t, r, m, a = recv
+      if (t == :call and r == nil and a and [:lit, :str].include? a[0]) then
+        submsg = a[1]
+        in_klass m do                             # :task
           in_method submsg, exp.file, exp.line do # :name
             process_until_empty exp
           end
@@ -660,7 +660,7 @@ class Flog < SexpProcessor
 
     add_to_score :branch
 
-    exp.delete 0 # TODO: what is this?
+    exp.delete 0 # { || ... } has 0 in arg slot
 
     process exp.shift # no penalty for LHS
 

data/test/test_flog.rb

@@ -266,12 +266,11 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_attrasgn
     sexp = s(:attrasgn,
-             s(:call, nil, :a, s(:arglist)),
+             s(:call, nil, :a),
              :[]=,
-             s(:arglist,
-               s(:splat,
-                 s(:call, nil, :b, s(:arglist))),
-               s(:call, nil, :c, s(:arglist))))
+             s(:splat,
+               s(:call, nil, :b)),
+             s(:call, nil, :c))
 
     util_process(sexp, 3.162,
                  :c => 1.0, :b => 1.0, :a => 1.0, :assignment => 1.0)
@@ -294,9 +293,8 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_block_pass
     sexp = s(:call, nil, :a,
-             s(:arglist,
-               s(:block_pass,
-                 s(:call, nil, :b, s(:arglist)))))
+             s(:block_pass,
+               s(:call, nil, :b)))
 
     util_process(sexp, 9.4,
                  :a              => 1.0,
@@ -307,9 +305,8 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_block_pass_colon2
     sexp = s(:call, nil, :a,
-             s(:arglist,
-               s(:block_pass,
-                 s(:colon2, s(:const, :A), :B))))
+             s(:block_pass,
+               s(:colon2, s(:const, :A), :B)))
 
     util_process(sexp, 2.2,
                  :a              => 1.0,
@@ -318,7 +315,7 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_block_pass_iter
     sexp = s(:block_pass,
-             s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:lit, 1)))
+             s(:iter, s(:call, nil, :lambda), nil, s(:lit, 1)))
 
     util_process(sexp, 12.316,
                  :lit_fixnum    =>  0.275,
@@ -332,7 +329,7 @@ class TestFlog < MiniTest::Unit::TestCase
     sexp = s(:block_pass,
              s(:lasgn,
                :b,
-               s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:lit, 1))))
+               s(:iter, s(:call, nil, :lambda), nil, s(:lit, 1))))
 
     util_process(sexp, 17.333,
                  :lit_fixnum    =>  0.275,
@@ -344,7 +341,7 @@ class TestFlog < MiniTest::Unit::TestCase
   end
 
   def test_process_call
-    sexp = s(:call, nil, :a, s(:arglist))
+    sexp = s(:call, nil, :a)
     util_process sexp, 1.0, :a => 1.0
   end
 
@@ -417,15 +414,15 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_if
     sexp = s(:if,
-             s(:call, nil, :b, s(:arglist)), # outside block, not penalized
-             s(:call, nil, :a, s(:arglist)), nil)
+             s(:call, nil, :b), # outside block, not penalized
+             s(:call, nil, :a), nil)
 
     util_process sexp, 2.326, :branch => 1.0, :b => 1.0, :a => 1.1
   end
 
   def test_process_iter
     sexp = s(:iter,
-             s(:call, nil, :loop, s(:arglist)), nil,
+             s(:call, nil, :loop), nil,
              s(:if, s(:true), s(:break), nil))
 
     util_process sexp, 2.326, :loop => 1.0, :branch => 2.1
@@ -437,9 +434,9 @@ class TestFlog < MiniTest::Unit::TestCase
     # end
 
     sexp = s(:iter,
-             s(:call, nil, :task, s(:arglist, s(:lit, :blah))),
+             s(:call, nil, :task, s(:lit, :blah)),
              nil,
-             s(:call, nil, :something, s(:arglist)))
+             s(:call, nil, :something))
 
     @klass, @meth = "task", "#blah"
 
@@ -452,9 +449,9 @@ class TestFlog < MiniTest::Unit::TestCase
     # end
 
     sexp = s(:iter,
-             s(:call, nil, :task, s(:arglist, s(:lit, /regexp/))),
+             s(:call, nil, :task, s(:lit, /regexp/)),
              nil,
-             s(:call, nil, :something, s(:arglist)))
+             s(:call, nil, :something))
 
     @klass, @meth = "task", "#/regexp/"
 
@@ -485,7 +482,7 @@ class TestFlog < MiniTest::Unit::TestCase
   def test_process_masgn
     sexp = s(:masgn,
              s(:array, s(:lasgn, :a), s(:lasgn, :b)),
-             s(:to_ary, s(:call, nil, :c, s(:arglist))))
+             s(:to_ary, s(:call, nil, :c)))
 
     util_process sexp, 3.162, :c => 1.0, :assignment => 3.0
   end
@@ -515,8 +512,8 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_process_while
     sexp = s(:while,
-             s(:call, nil, :a, s(:arglist)),
-             s(:call, nil, :b, s(:arglist)),
+             s(:call, nil, :a),
+             s(:call, nil, :b),
              true)
 
     util_process sexp, 2.417, :branch => 1.0, :a => 1.1, :b => 1.1

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: 1257799903
+  hash: -1937524008
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - b
-  - 1
-  version: 3.0.0.b1
+  - 2
+  version: 3.0.0.b2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-07-27 00:00:00 Z
+date: 2012-08-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1257782997
+        hash: -1937540908
         segments: 
         - 3
         - 0
@@ -81,11 +81,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 3
-        - 2
-        version: "3.2"
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency