0
@@ -26,7 +26,8 @@
0
   To compile Ruby to a .pyc:
0
 
0
   > bin/unholy test.rb
0
-  > python test.rb.pyc
0
+  > PYTHONPATH=python \
0
+               python test.rb.pyc
0
   
0
             ---
0
 

0
@@ -4,13 +4,13 @@ class Pyasm
0
   }
0
 
0
   attr_accessor :argc, :nlocals, :stacksize, :flags, :consts, :bytecode,
0
-    :filename, :lineno, :name, :symbols, :stacknow, :varsyms, :jumps, :labels
0
-  def initialize(fname, name = "<module>")
0
+    :filename, :lineno, :name, :symbols, :stacknow, :varsyms, :jumps, :labels, :lines
0
+  def initialize(fname, name = "<module>", lineno = 0)
0
     @argc, @nlocals, @stacksize, @flags, @filename, @lineno, @name, @stack, @nopop = 
0
-      0, 0, 1, 0x40, fname, 1, name, [], 0
0
+      0, 0, 1, 0x40, fname, lineno, name, [], 0
0
     @consts = [-1, nil]
0
     @symbols = [:Kernel]
0
-    @bytecode, @varsyms, @labels, @jumps = [], [], {}, {}
0
+    @bytecode, @varsyms, @labels, @lines, @jumps = [], [], {}, [], {}
0
   end
0
 
0
   def add_const(obj)
0
@@ -43,6 +43,11 @@ class Pyasm
0
   end
0
 
0
   def pop_top; bc 0x01; dump_stack end
0
+  def binary_add
0
+    add = bc 0x17
0
+    @stack.pop
0
+    add
0
+  end
0
   def ret_val; bc 0x53 end
0
   def build_class; bc 0x59 end
0
   def store_name(name)
0
@@ -86,6 +91,7 @@ class Pyasm
0
     stack_push Object.new, bc(0x7c, n, 0x0)
0
   end
0
   def store_fast(n)
0
+    dump_stack
0
     bc 0x7d, n, 0x0
0
   end
0
   def call_func(arity)
0
@@ -95,6 +101,9 @@ class Pyasm
0
   def make_func(arity)
0
     bc 0x84, arity, 0x0
0
   end
0
+  def line n
0
+    @lines << [n, @bytecode.flatten.length]
0
+  end
0
   def prep_send
0
     @nopop -= 1 if @nopop > 0
0
   end
0
@@ -156,6 +165,9 @@ class Pyasm
0
   def newarray size
0
     build_list size
0
   end
0
+  def opt_plus
0
+    binary_add
0
+  end
0
   def putnil
0
     load_const(nil)
0
   end
0
@@ -227,7 +239,7 @@ class Pyasm
0
     bytes = @bytecode.slice! idx..-1
0
     bytes.shift unless receiver
0
 
0
-    asm = Pyasm.new(@filename, id.to_s)
0
+    asm = Pyasm.new(@filename, id.to_s, @lines.last[0])
0
     asm.load_iseq iseq
0
     if type == :class
0
       load_const(id.to_s)
0
@@ -268,9 +280,9 @@ class Pyasm
0
     iseq.last.each do |inst|
0
       case inst
0
       when Integer # line no
0
-        nil
0
+        line inst
0
       when Symbol
0
-        self.label inst
0
+        label inst
0
       when Array
0
         # p inst
0
         inst[0] = :message if inst[0] == :send
0
@@ -336,7 +348,14 @@ class Pyasm
0
     f << @filename.to_pickle
0
     f << @name.to_pickle
0
     f << 1.to_plong
0
-    f << "".to_pickle
0
+
0
+    lnotab = ""
0
+    lastn, lastpos = @lines[0]
0
+    @lines[1..-1].each do |n, pos|
0
+      lnotab << [pos - lastpos, n - lastn].pack("cc")
0
+      lastn, lastpos = n, pos
0
+    end
0
+    f << lnotab.to_pickle
0
     f
0
   end
0
 

0
@@ -1,3 +1,6 @@
0
 def puts(*args):
0
   for x in args: print x
0
   if not args: print
0
+
0
+class BasicObject:
0
+  pass