convinius 0.1.1 → 0.2.0

data/README.md

@@ -45,6 +45,12 @@ A more realistic example:
       include Awesome
     end
 
+Import constants from Rubinius
+------------------------------
+in: `convinius/globals`
+
+Defines global constants `Tuple` and `Fiber`.
+
 Convenience for Rubinius::Generator
 -----------------------------------
 in: `convinius/generator`

data/convinius.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'convinius'
-  s.version = '0.1.1'
+  s.version = '0.2.0'
   s.date = '2011-01-26'
   s.description = 'Convenience library for Rubinius-only projects.'
   s.summary = s.description

data/lib/convinius.rb

@@ -1,3 +1,4 @@
 require 'convinius/asm'
 require 'convinius/generator'
+require 'convinius/globals'
 require 'convinius/to_class'

data/lib/convinius/asm.rb

@@ -2,33 +2,14 @@ module Convinius
   module ASM
     extend self
 
-    def asm(file = "(asm)", line = 1, method = :call, &block)
-      g = Rubinius::Generator.new
-      g.name = method.to_sym
-      g.file = file.to_sym
-      g.set_line line
-
-      g.required_args = 0
-      g.total_args = 0
-      g.splat_index = nil
-
-      g.local_count = 0
-      g.local_names = []
-
-      block.arity > 0 ? yield(g) : g.instance_eval(&block)
-
-      g.ret
-      g.close
-
-      g.encode
-      cm = g.package Rubinius::CompiledMethod
-      puts cm.decode if $DEBUG
-
-      code = Object.new
-      ss = Rubinius::StaticScope.new Object
-      Rubinius.attach_method g.name, cm, ss, code
-
-      code
+    def asm(opts = {}, &block)
+      object = opts[:object] || Object.new
+      opts = { :file => "(asm)", :line => 1, :method => :call }.merge! opts
+      Rubinius.object_metaclass(object).dynamic_method(opts[:method], opts[:file], opts[:line]) do |g|
+        block.arity > 0 ? yield(g) : g.instance_eval(&block)
+        g.ret
+      end
+      object
     end
 
     class << self

data/lib/convinius/generator.rb

@@ -3,10 +3,16 @@ module Convinius
     append_features Rubinius::Generator
 
     def make_tuple(count)
-      push_rubinius
-      find_const :Tuple
-      move_down count
-      send :[], count
+      push count
+      invoke_primitive :tuple_allocate, 1
+      (count - 1).downto(0) do |i|
+        dup
+        rotate 3
+        push i
+        swap
+        invoke_primitive :tuple_put, 3
+        pop
+      end
     end
   end
 end

data/lib/convinius/globals.rb

@@ -0,0 +1,4 @@
+require 'fiber'
+
+Tuple = Rubinius::Tuple unless defined? Tuple
+Fiber = Rubinius::Fiber unless defined? Fiber

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convinius
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -34,6 +34,7 @@ files:
 - lib/convinius.rb
 - lib/convinius/asm.rb
 - lib/convinius/generator.rb
+- lib/convinius/globals.rb
 - lib/convinius/to_class.rb
 - spec/asm_spec.rb
 - spec/generator_spec.rb