flay.rb in flay-2.9.0

- old
+ new

@@ -14,11 +14,11 @@
     alias :binread :read unless RUBY19
   end
 end
 
 class Flay
-  VERSION = "2.8.1" # :nodoc:
+  VERSION = "2.9.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
   end
 
@@ -536,11 +536,11 @@
   ##
   # Calculate the structural hash for this sexp. Cached, so don't
   # modify the sexp afterwards and expect it to be correct.
 
   def structural_hash
-    @structural_hash ||= self.structure.hash
+    @structural_hash ||= pure_ruby_hash
   end
 
   ##
   # Returns a list of structural hashes for all nodes (and sub-nodes)
   # of this sexp.
@@ -605,9 +605,59 @@
   # See #code_index.
 
   def split_code
     index = self.code_index
     self.split_at index if index
+  end
+end
+
+class Sexp # straight from flay-persistent
+  names = %w(alias and arglist args array attrasgn attrset back_ref
+             begin block block_pass break call case cdecl class colon2
+             colon3 const cvar cvasgn cvdecl defined defn defs dot2
+             dot3 dregx dregx_once dstr dsym dxstr ensure evstr false
+             flip2 flip3 for gasgn gvar hash iasgn if iter ivar lasgn
+             lit lvar masgn match match2 match3 module next nil not
+             nth_ref op_asgn op_asgn1 op_asgn2 op_asgn_and op_asgn_or or
+             postexe redo resbody rescue retry return sclass self
+             splat str super svalue to_ary true undef until valias
+             when while xstr yield zsuper kwarg kwsplat safe_call)
+
+  ##
+  # All ruby_parser nodes in an index hash. Used by jenkins algorithm.
+
+  NODE_NAMES = Hash[names.each_with_index.map {|n, i| [n.to_sym, i] }]
+
+  NODE_NAMES.default_proc = lambda { |h, k|
+    $stderr.puts "ERROR: couldn't find node type #{k} in Sexp::NODE_NAMES."
+    h[k] = NODE_NAMES.size
+  }
+
+  MAX_INT32 = 2 ** 32 - 1 # :nodoc:
+
+  def pure_ruby_hash # :nodoc: see above
+    hash = 0
+
+    n = NODE_NAMES[first]
+
+    raise "Bad lookup: #{first} in #{sexp.inspect}" unless n
+
+    hash += n          & MAX_INT32
+    hash += hash << 10 & MAX_INT32
+    hash ^= hash >>  6 & MAX_INT32
+
+    each do |o|
+      next unless Sexp === o
+      hash = hash + o.pure_ruby_hash  & MAX_INT32
+      hash = (hash + (hash << 10)) & MAX_INT32
+      hash = (hash ^ (hash >>  6)) & MAX_INT32
+    end
+
+    hash = (hash + (hash <<  3)) & MAX_INT32
+    hash = (hash ^ (hash >> 11)) & MAX_INT32
+    hash = (hash + (hash << 15)) & MAX_INT32
+
+    hash
   end
 end
 
 class Array # :nodoc:
 