ZenHacks 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,18 @@
+*** 1.0.1 / 2005-07-13
+
++ 4 minor enhancements:
+	+ Added Graph#save and edge accessors for customizations.
+	+ Added Proc#to_ruby in r2c_hacks.
+	+ Added RubyToRuby#rewrite_defn to support bmethods (read: procs).
+	+ Added Class#optimize(*methods) to zenoptimize.
+	+ Added bin/nopaste for cmdline access to nopaste on rafb.net.
+	+ Added bin/quickbench to generate ruby benchmark templates quickly.
++ 4 bug fixes:
+	+ Fixed gems for non-gem systems.
+	+ Fixed minor output problem with RubyToRuby#process_defn.
+	+ Added some minor (performance) enhancements to zenoptimize.
+	+ Added requirements to gemspec to quell whining.
+
 *** 1.0.0 / 2005-05-24
  
 + 1 major enhancement

data/Manifest.txt

@@ -1,8 +1,11 @@
 History.txt
 Manifest.txt
 README.txt
+ZenHacks.gemspec
 bin/macgraph
+bin/nopaste
 bin/parse_tree_graph
+bin/quickbench
 bin/test_stats
 fixloops-demo.sh
 lib/OrderedHash.rb

data/README.txt

@@ -4,6 +4,11 @@ ZenHacks
 
 ** DESCRIPTION:
   
+A cornucopia of hackery. Toys, Tricks and Tools that have spawned out
+of my other projects (RubyInline, ParseTree, Ruby2C, etc) but don't
+exactly fit there. This includes ZenDebugger, ZenProfiler,
+ZenOptimizer, ruby2ruby, and more.
+
 ZenHacks is a semi-random collection of libs and scripts that just
 don't belong in a package of their own. Many, if not most, have
 dependencies on other packages and use, abuse, or extend them in

data/ZenHacks.gemspec

@@ -0,0 +1,39 @@
+# -*- ruby -*-
+
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+
+  s.name = 'ZenHacks'
+  s.version = '1.0.1'
+  s.summary = "Tools and toys of mine that don't have a better home."
+
+  paragraphs = File.read("README.txt").split(/\n\n+/)
+  s.description = paragraphs[3]
+  puts s.description
+
+  s.add_dependency('RubyInline')
+  s.add_dependency('ParseTree')
+  s.add_dependency('RubyToC')
+
+  all_files = IO.readlines("Manifest.txt").map {|f| f.chomp }
+  s.files = all_files
+
+  s.bindir = "bin"
+  s.executables = all_files.grep(%r%bin/%).map { |f| File.basename(f) }
+  puts "Executables = #{s.executables.join(", ")}"
+
+  s.require_path = 'lib' 
+
+  s.has_rdoc = false                            # I SUCK - TODO
+
+  s.author = "Ryan Davis"
+  s.email = "ryand-ruby@zenspider.com"
+  s.homepage = "http://rubyforge.org/projects/zenhacks/"
+  s.rubyforge_project = "zenhacks"
+end
+
+if $0 == __FILE__
+  Gem.manage_gems
+  Gem::Builder.new(spec).build
+end

data/bin/nopaste

@@ -0,0 +1,74 @@
+#!/usr/local/bin/ruby -sw
+
+require 'net/http'
+require 'pp'
+require 'cgi'
+
+languages = %w(C90 C C++ C\# Java Pascal Perl PHP PL/I Python Ruby SQL VB XML Plain\ Text)
+default_language = languages.last
+tab_values       = %w(No 2 3 4 5 6 8)
+
+$l ||= default_language
+$n ||= ""
+$s ||= ""
+$t ||= tab_values.first
+
+lang             = $l
+nickname         = $n
+description      = $s
+tabs             = $t
+
+text =
+  if ARGV.empty? then
+    $stdin.read
+  else
+    File.read(ARGV.shift)
+  end
+
+data = {
+  :lang => lang,
+  :nick => nickname,
+  :desc => description,
+  :cvt_tabs => tabs,
+  :text => text,
+}
+
+order = %w(lang nick desc cvt_tabs text).map { |s| s.intern }
+data = order.map { |k|
+  v=data[k]
+  "#{CGI::escape k.to_s}=#{CGI::escape v}"
+}.join('&')
+
+headers = {
+  'Content-Type' => 'application/x-www-form-urlencoded',
+  'Referer' => 'http://www.rafb.net/paste/index.html',
+  'Host' => 'www.rafb.net',
+  'Accept' => 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, image/tiff, multipart/x-mixed-replace, */*;q=0.1',
+  'Accept-Encoding' => 'bzip2, gzip, deflate, identity',
+  'Accept-Charset' => 'iso-8859-1, utf-8, iso-10646-ucs-2, macintosh, windows-1252, *',
+  'Accept-Language' => 'en, fr;q=0.94, ja;q=0.88, it;q=0.81, de;q=0.75, es;q=0.69, nl;q=0.62, sv;q=0.56, no;q=0.50, da;q=0.44, fi;q=0.38, pt;q=0.31, zh-cn;q=0.25, zh-tw;q=0.19, ko;q=0.12',
+  'Pragma' => 'no-cache',
+  'Cache-Control' => 'max-age=0',
+  'Connection' => 'Keep-Alive',
+  'User-Agent' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/125.4 (KHTML, like Gecko, Safari) OmniWeb/v563.34',
+}
+
+Net::HTTP.start('www.rafb.net', 80) { |http|
+  response = http.post('/paste/paste.php', data, headers)
+
+  location = response['location']
+
+  if location then
+    puts "http://www.rafb.net#{location}"
+  else
+    puts "ERROR:"
+    puts "header:"
+    p response.header
+    puts
+    puts "body:"
+    puts response.body
+    puts "code/message:"
+    puts response.code
+    puts response.message
+  end
+}

data/bin/parse_tree_graph

@@ -17,14 +17,8 @@ end
 
 usage if defined? $h
 
-
-#begin
-#  require 'rubygems'
-#  require_gem 'ParseTree'
-#rescue LoadError
-  require 'parse_tree'
-#end
-
+begin require 'rubygems' rescue LoadError end
+require 'parse_tree'
 require 'sexp_processor'
 
 def discover_new_classes_from

data/bin/quickbench

@@ -0,0 +1,43 @@
+#!/usr/local/bin/ruby -w
+
+# TODO: while you are doing this, add an emacs method that toggles
+# between test file and implementation!
+
+def usage
+  puts "quickbench number-of-benchmarks"
+  exit 1
+end
+
+# path = ARGV.shift || usage
+count = ARGV.shift.to_i || usage
+usage unless ARGV.empty?
+
+require 'benchmark'
+
+print <<EOM
+require 'benchmark'
+
+MAX=1_000_000
+
+Benchmark::bm(20) do |x|
+  x.report("null_time") { 
+    for i in 0..MAX do
+      # do nothing
+    end
+  }
+
+EOM
+
+count.times do |n|
+  print <<"EOM"
+  x.report("benchmark-#{n+1}") { 
+    for i in 0..MAX do
+      # insert code here
+    end
+  }
+
+EOM
+end
+
+puts "end"
+

data/lib/graph.rb

@@ -5,11 +5,13 @@ class Graph < Hash
   attr_reader :attribs
   attr_reader :prefix
   attr_reader :order
-  def initialize(name="a_graph")
-    super() { |h,k| h[k] = [] }
-    @name = name
+  attr_reader :edge
+
+  def initialize
+    super { |h,k| h[k] = [] }
     @prefix = []
     @attribs = Hash.new { |h,k| h[k] = [] }
+    @edge = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
     @order = []
   end
 
@@ -25,7 +27,7 @@ class Graph < Hash
       end
     end
   end
-
+  
   def invert
     result = self.class.new
     each_pair do |from, to|
@@ -41,14 +43,14 @@ class Graph < Hash
     end
     result
   end
-
+  
   def keys_by_count
     counts.sort_by { |x,y| y }.map {|x| x.first }
   end
 
   def to_s
     result = []
-    result << "digraph #{@name}"
+    result << "digraph absent"
     result << "  {"
     @prefix.each do |line|
       result << line
@@ -57,10 +59,20 @@ class Graph < Hash
       result << "    #{node.inspect} [ #{attribs.join(',')} ]"
     end
     each_pair do |from, to|
-      result << "    #{from.inspect} -> #{to.inspect};"
+      edge = @edge[from][to].join(", ")
+      edge = " [ #{edge} ]" unless edge.empty?
+      result << "    #{from.inspect} -> #{to.inspect}#{edge};"
     end
     result << "  }"
     result.join("\n")
   end
 
+  def save(path, type="png")
+    File.open(path + ".dot", "w") do |f|
+      f.puts self.to_s
+      f.flush
+      cmd = "/usr/local/bin/dot -T#{type} #{path}.dot > #{path}.#{type}"
+      system cmd
+    end
+  end
 end

data/lib/r2c_hacks.rb

@@ -1,5 +1,4 @@
-#require 'rubygems'
-#require_gem 'ParseTree'
+begin require 'rubygems' rescue LoadError end
 require 'parse_tree'
 require 'sexp_processor'
 require 'ruby_to_c'
@@ -10,6 +9,7 @@ class Method
     if self.inspect =~ /<Method: (.*)\#(.*)>/ then
       klass = eval $1
       method  = $2.intern
+      raise "Couldn't determine class from #{self.inspect}" if klass.nil?
       return yield(klass, method)
     else
       raise "Can't parse signature: #{self.inspect}"
@@ -18,7 +18,7 @@ class Method
 
   def to_sexp
     with_class_and_method_name do |klass, method|
-      ParseTree.new.parse_tree_for_method(klass, method)
+      ParseTree.new(false).parse_tree_for_method(klass, method)
     end
   end
 
@@ -34,3 +34,13 @@ class Method
     end
   end
 end
+
+class Proc
+  ProcStoreTmp = Class.new unless defined? ProcStoreTmp
+  def to_ruby
+    ProcStoreTmp.send(:define_method, :myproc, self)
+    m = ProcStoreTmp.new.method(:myproc)
+    result = m.to_ruby.sub!(/def myproc\(([^\)]+)\)/, 'proc do |\1|')
+    return result
+  end
+end

data/lib/ruby2ruby.rb

@@ -6,9 +6,9 @@ class RubyToRuby < SexpProcessor
 
   def self.translate(klass, method=nil)
     unless method.nil? then
-      self.new.process(ParseTree.new.parse_tree_for_method(klass, method))
+      self.new.process(ParseTree.new(false).parse_tree_for_method(klass, method))
     else
-      self.new.process(ParseTree.new.parse_tree(klass).first) # huh? why is the :class node wrapped?
+      self.new.process(ParseTree.new(false).parse_tree(klass).first) # huh? why is the :class node wrapped?
     end
   end
 
@@ -115,14 +115,62 @@ class RubyToRuby < SexpProcessor
   def process_dasgn_curr(exp)
     exp.shift.to_s
   end
+
+  def rewrite_defn(exp)
+    exp.shift # :defn
+    name = exp.shift
+    args = s(:args)
+    body = Sexp.from_array exp.shift
+
+    case body.first
+    when :scope, :fbody then
+      body = body[1] if body.first == :fbody
+      args = body.last[1]
+      assert_type args, :args
+      assert_type body, :scope
+      assert_type body[1], :block
+      body.last.delete_at 1
+    when :bmethod then
+      # BEFORE: [:defn, :bmethod_added, [:bmethod, [:dasgn_curr, :x], ...]]
+      # AFTER:  [:defn, :bmethod_added, [:args, :x], [:scope, [:block, ...]]]
+      body.shift # :bmethod
+      # [:dasgn_curr, :x],
+      # [:call, [:dvar, :x], :+, [:arglist, [:lit, 1]]]]]
+      dasgn = body.shift
+      assert_type dasgn, :dasgn_curr
+      dasgn.shift # type
+      args.push(*dasgn)
+      body.find_and_replace_all(:dvar, :lvar)
+      if body.first.first == :block then
+        body = s(:scope, body.shift)
+      else
+        body = s(:scope, s(:block, body.shift)) # single statement
+      end
+    when :dmethod
+      # BEFORE: [:defn, :dmethod_added, [:dmethod, :bmethod_maker, ...]]
+      # AFTER:  [:defn, :dmethod_added, ...]
+      body = body[2][1][2] # UGH! FIX
+      args = body[1]
+      body.delete_at 1
+      body = s(:scope, body)
+    when :ivar then
+      body = s(:scope, s(:block, s(:return, body)))
+    when :attrset then
+      argname = body.last
+      args << :arg
+      body = s(:scope, s(:block, s(:return, s(:iasgn, argname, s(:lvar, :arg)))))
+    else
+      raise "Unknown :defn format: #{name.inspect} #{args.inspect} #{body.inspect}"
+    end
+
+    return s(:defn, name, args, body)
+  end
   
   def process_defn(exp)
     name = exp.shift
     args = process(exp.shift).to_a
-    args[1..-1] = indent(args[1..-1])
-    args.join
     body = indent(process(exp.shift))
-    return "def #{name}#{args}#{body}end".gsub(/\n\s*\n+/, "\n")
+    return "def #{name}#{args}\n#{body}end".gsub(/\n\s*\n+/, "\n")
   end
   
   def process_dot2(exp)

data/lib/zenoptimize.rb

@@ -1,7 +1,19 @@
-require 'inline'
+begin require 'rubygems' rescue LoadError end
 require 'singleton'
-require 'ruby_to_c'
+require 'inline'
 require 'pp'
+require 'ruby_to_c'
+
+class Class
+  def optimize(*methods)
+    methods.each do |method|
+      src = RubyToC.translate(self, method)
+      class_eval "alias :#{method}_slow :#{method}"
+      class_eval "remove_method :#{method}"
+      class_eval "inline(:C) { |b| b.c src }"
+    end
+  end
+end
 
 module Inline
   class Ruby < Inline::C
@@ -23,6 +35,7 @@ class ZenOptimizer
 
   include Singleton
 
+  @@signature = :fuck
   @@threshold = 500
   @@sacred = {
     Sexp => true,
@@ -30,6 +43,9 @@ class ZenOptimizer
   @@skip = Hash.new(false)
   @@data = Hash.new(0)
 
+  def self.data; @@data; end
+  def self.signature; @@signature; end
+
   def self.start_optimizing
     self.instance.add_event_hook
   end
@@ -80,6 +96,8 @@ static unsigned long threshold = 0;"
     prof_event_hook(rb_event_t event, NODE *node,
                     VALUE self, ID mid, VALUE klass) {
 
+      static int optimizing = 0;
+
       if (NIL_P(optimizer_klass))
         optimizer_klass = rb_path2class("ZenOptimizer");
       if (NIL_P(data))
@@ -88,34 +106,19 @@ static unsigned long threshold = 0;"
         skip = rb_cv_get(optimizer_klass, "@@skip");
       if (threshold == 0)
         threshold = NUM2ULONG(rb_cv_get(optimizer_klass, "@@threshold"));
+      if (optimizing) return;
+      optimizing++;
 
       switch (event) {
       case RUBY_EVENT_CALL:
         {
           VALUE signature;
     
-    #if 0
-          VALUE mod_name = rb_mod_name(klass);
-          if (NIL_P(mod_name))
-            signature = rb_str_new2("Unknown");
-          else
-            signature = mod_name;
-    
-          rb_str_cat(signature, ".", 1); // TODO: # or .
-
-          char * meth = rb_id2name(mid);
-          if (meth) {
-            size_t len = strlen(meth);
-            rb_str_cat(signature, meth, len);
-          } else {
-            rb_str_cat(signature, "unknown", 7);
-          }
-    #else
           signature = rb_ary_new2(2);
           rb_ary_store(signature, 0, klass);
           rb_ary_store(signature, 1, ID2SYM(mid));
-    #endif
 
+          rb_cv_set(optimizer_klass, "@@signature", signature);
           unsigned long count = NUM2ULONG(rb_hash_aref(data, signature)) + 1;
 
           if (count > threshold) {
@@ -128,6 +131,7 @@ static unsigned long threshold = 0;"
         }
         break;
       }
+      optimizing--;
     }
     EOF
 

data/zendebug-demo.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION='1.0.0' # this is mainly to appease my relese script's requirements.
+VERSION='1.0.1' # this is mainly to appease my relese script's requirements.
 
 export GEM_SKIP=RubyInline
 

metadata

@@ -3,15 +3,18 @@ rubygems_version: 0.8.10.1
 specification_version: 1
 name: ZenHacks
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-06-12
+  version: 1.0.1
+date: 2005-07-14
 summary: "Tools and toys of mine that don't have a better home."
 require_paths: 
   - lib
 email: ryand-ruby@zenspider.com
 homepage: http://rubyforge.org/projects/zenhacks/
 rubyforge_project: zenhacks
-description: "** INCLUDES"
+description: "This package is not supported in the same sense that my other packages are, but
+  since it is such a fun playground, I am very open to contributions, suggestions,
+  and bug fixes. I just can't put this project at the top of my priority list the
+  way I can/do the others, so it may take me longer to get to than normal."
 autorequire: 
 default_executable: 
 bindir: bin
@@ -30,8 +33,11 @@ files:
   - History.txt
   - Manifest.txt
   - README.txt
+  - ZenHacks.gemspec
   - bin/macgraph
+  - bin/nopaste
   - bin/parse_tree_graph
+  - bin/quickbench
   - bin/test_stats
   - fixloops-demo.sh
   - lib/OrderedHash.rb
@@ -61,9 +67,40 @@ rdoc_options: []
 extra_rdoc_files: []
 executables: 
   - macgraph
+  - nopaste
   - parse_tree_graph
+  - quickbench
   - test_stats
 extensions: []
-requirements: 
-  - Many. Depends on what you want to play with.
-dependencies: []
+requirements: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: RubyInline
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">"
+          - !ruby/object:Gem::Version 
+            version: 0.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: ParseTree
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">"
+          - !ruby/object:Gem::Version 
+            version: 0.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: RubyToC
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">"
+          - !ruby/object:Gem::Version 
+            version: 0.0.0
+      version: