rubymirrors 0.0.1 → 0.0.2

data/lib/abstract_reflection/method_mirror.rb

@@ -16,7 +16,7 @@ module AbstractReflection
     def defining_class
       raise CapabilitiesExceeded
     end
-    
+
     # @return [String] The source code of this method
     def source
       raise CapabilitiesExceeded
@@ -39,7 +39,7 @@ module AbstractReflection
 
     # Queries the method for it's arguments and returns a list of
     # mirrors that hold name and value information.
-    # 
+    #
     # @return [Array<FieldMirror>]
     def arguments
       raise CapabilitiesExceeded

data/lib/maglev/reflection/class_mirror.rb

@@ -1,4 +1,5 @@
 require 'maglev/reflection/core_ext/module'
+require 'maglev/reflection/core_ext/class'
 
 module Maglev
   class Reflection

data/lib/maglev/reflection/core_ext/class.rb

@@ -0,0 +1,3 @@
+class Class
+  primitive '__subclasses', '_subclasses'
+end

data/lib/maglev/reflection/core_ext/exception.rb

@@ -0,0 +1,3 @@
+class Exception
+  primitive '__resume', 'resume:'
+end

data/lib/maglev/reflection/core_ext/method.rb

@@ -15,9 +15,14 @@ class GsNMethod
   primitive '__ip_steps', '_ipSteps'
   primitive '__opcode_info_at', '_opcodeInfoAt:'
   primitive '__in_class', 'inClass'
+  primitive '__all_breakpoints_source_offsets', '_allBreakpointsSourceOffsets'
+  primitive '__set_break_at', 'setBreakAtStepPoint:'
+  primitive '__clear_break_at', 'clearBreakAtStepPoint:'
 end
 
 class UnboundMethod
+  primitive '__nonbridge_meth', '_nonBridgeMeth'
+
   def __st_gsmeth
     @_st_gsmeth
   end

data/lib/maglev/reflection/core_ext/module.rb

@@ -37,5 +37,4 @@ class Module
   primitive '__inst_var_names', 'instVarNames'
   primitive '__compile_method_category_environment_id', 'compileMethod:category:environmentId:'
   primitive '__compile_method_category_environment_id', 'compileMethod:category:environmentId:'
-  primitive '__subclasses', 'subclasses'
 end

data/lib/maglev/reflection/core_ext/proc.rb

@@ -0,0 +1,21 @@
+require File.expand_path("../method.rb", __FILE__)
+require File.expand_path("../thread.rb", __FILE__)
+
+class ExecBlock
+  primitive 'shift', 'shift'
+  primitive 'reset', 'reset'
+end
+
+class Proc
+  def __shift
+    @_st_block.shift
+  end
+
+  def __reset
+    @_st_block.reset
+  end
+end
+
+class Thread
+  primitive 'call', 'call:'
+end

data/lib/maglev/reflection/core_ext/thread.rb

@@ -13,7 +13,8 @@ class Thread
   # Remove all frames above [Fixnum]
   primitive '__trim_stack_to_level', '_trimStackToLevel:'
   # Change temporary at level to value
-  primitive '__frame_at_temp_named_put', '_frameAt:tempNamed:put:'
+  primitive '__frame_at_temp_at_put', '_frameAt:tempAt:put:'
+  primitive '__frame_at_offset_of_temp_named', '_frameAt:offsetOfTempNamed:'
   # => Array
   #    with:
   #  1  gsMethod
@@ -33,7 +34,7 @@ class Thread
   primitive 'convert_to_persistable_state', "convertToPersistableState"
   primitive 'convert_to_runnable_state', 'convertToRunnableState'
   primitive '__ar_stack', 'arStack'
-  primitive '__client_data', '_clientData'
+  primitive '__client_data', 'clientData'
   #  Private.  Returns an Array describing the specified level in the receiver.
   #  aLevel == 1 is top of stack.  If aLevel is less than 1 or greater than
   #  stackDepth, returns nil.
@@ -62,6 +63,12 @@ class Thread
 
   class_primitive '__installPartialContinuation_atLevel_value', 'installPartialContinuation:atLevel:value:'
   class_primitive '__partialContinuationFromLevel_to', 'partialContinuationFromLevel:to:'
+
+  # Re-add behavior which was removed in GS 3.1.0.1
+  def __frame_at_temp_named_put(frameidx, tempname, value)
+    offset = __frame_at_offset_of_temp_named(frameidx, tempname)
+    __frame_at_temp_at_put(frameidx, offset, value)
+  end
 end
 
 # require 'maglev/objectlog'

data/lib/maglev/reflection/field_mirror/fixed_instance_variable_mirror.rb

@@ -1,4 +1,5 @@
 require 'maglev/reflection/core_ext/module'
+require 'maglev/reflection/core_ext/class'
 
 module Maglev
   class Reflection

data/lib/maglev/reflection/method_mirror.rb

@@ -113,7 +113,29 @@ module Maglev
         gsmeth.__in_class.remove_method(selector)
       end
 
+      def breakpoints
+        gsmeth.__all_breakpoints_source_offsets
+      end
+
+      def break(source_offset = 1)
+        step_point = find_step_point_just_before(source_offset)
+        if gsmeth.__is_method_for_block
+          gsmeth.__set_break_at_step_point(step_point)
+        else
+          @subject.__nonbridge_meth.__set_break_at_step_point(step_point)
+        end
+      end
+
+      def clear_break(source_offset)
+        gsmeth.__clear_break_at(find_step_point_just_before(source_offset))
+      end
+
       private
+      def find_step_point_just_before(source_offset)
+        nxt = step_offsets.detect {|o| o > source_offset }
+        [step_offsets.index(nxt) - 1, 1].max
+      end
+
       def wrap_gsmeth(gsmethod)
         label = gsmethod.__name.to_s
         cls = gsmethod.__in_class

data/lib/maglev/reflection/support/partial_continuation.rb

@@ -0,0 +1,50 @@
+class PartialContinuation
+  attr_accessor :markerBlock, :partial
+
+  def self.currentDomarkerBlock(block, markerBlock)
+    if (marker = markerBlock.call).nil?
+      raise RuntimeError, 'Marker not found when capturing partial continuation.'
+    end
+    return block.call to_offset_markerBlock(marker, 1, markerBlock)
+  end
+
+  def self.to_offset_markerBlock(method, offset, &block)
+    idx = find_frame_for(method)
+    partial = Thread.__partialContinuationFromLevel_to(3 + offset, idx)
+    new.tap do |o|
+      o.partial = partial
+      o.markerBlock = block
+    end
+  end
+
+  def self.find_frame_for(method)
+    index = 1
+    while frame = Thread.current.__frame_contents_at(index) do
+      if frame[0] == method
+        return level
+      else
+        level += 1
+      end
+    end
+    nil
+  end
+
+  def call(arg = nil)
+    marker = markerBlock.call
+    if marker.nil?
+      marker = Thread.current.__frame_contents_at(2).first
+      frameIndex = 2
+    else
+      frameIndex = self.class.find_frame_for marker
+    end
+    Thread.current.__installPartialContinuation_atLevel_value partial, frameIndex, arg
+  end
+
+  alias [] call
+end
+
+def test_callcc
+  PartialContinuation.currentDomarkerBlock
+  currentDo: aBlock 
+  markerBlock: [ self callbackMarker ]
+end

data/lib/ruby/reflection/method_mirror.rb

@@ -23,7 +23,7 @@ module Ruby
       end
 
       def line
-        source_location.last
+        source_location.last - 1
       end
 
       def line=(num)
@@ -77,6 +77,25 @@ module Ruby
 
       def source
         try_send(:source) or raise(CapabilitiesExceeded)
+      rescue => e
+        e.message
+      end
+
+      def source=(str)
+        src = try_send(:source)
+        raise "cannot write to source location" unless file and line and File.writable?(file)
+
+        f = File.read(file).lines.to_a
+        srclen = src.lines.to_a.size
+        prefix = f[0...line].join
+        method_src = f[line...line + srclen].join
+        postfix = f[line + srclen..-1].join
+        raise "source differs from runtime" unless method_src.strip == src.strip
+
+        File.open(file, 'w') {|f| f << prefix << str << postfix }
+        defining_class.reflectee.class_eval(str, file, line)
+      rescue Exception => e
+        raise CapabilitiesExceeded, e.message
       end
 
       def step_offsets
@@ -90,10 +109,14 @@ module Ruby
 
         offsets = [0]
         sends.each do |name|
-          offsets << (source[offsets.last..-1] =~ /#{Regexp.escape(name)}/)
+          next_offset = source[offsets.last..-1] =~ /#{Regexp.escape(name)}/
+          break unless next_offset
+          offsets << next_offset
         end
         offsets.shift
         Hash[*sends.zip(offsets).flatten]
+      rescue Exception
+        return {}
       end
 
       private

data/rubymirrors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "rubymirrors"
-  s.version       = "0.0.1"
+  s.version       = "0.0.2"
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Tim Felgentreff"]
   s.email         = ["timfelgentreff@gmail.com"]

metadata

@@ -1,64 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubymirrors
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Tim Felgentreff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
+description: ! '## A mirror API for Ruby
+
 
-description: |
-  ## A mirror API for Ruby
-  
   In various [research][p1] [projects][p2] the advantages of having a [mirror
+
   API][p3] to separate reflection from a language implementation have
+
   been discussed, and "industry grade" implementations exist for
+
   [Java][p4] and [C#][p5]. This project aims at providing a number of
+
   specs and classes that document a mirror API for Ruby. The mirror
+
   implementation that is part of this project will use only those
+
   language facilities that are available across Ruby implementations.
+
   The specs, however, will also test behavior that cannot be provided in
+
   such a manner. The idea here is that in time, all implementations
+
   provide their own implementation of the mirror API, and all
+
   implementations collaborate on this one spec.
-  
+
+
   Why do this, you ask? Because Ruby needs tools, and those tools need
+
   to be written in Ruby. If they are not, then people will be excluded from
+
   tinkering with their tools, thus impeding innovation. You only have to
-  look at Emacs or Smalltalk to see what's possible when programmers can
+
+  look at Emacs or Smalltalk to see what''s possible when programmers can
+
   extend their tools, all tools, in a language they feel comfortable
+
   in. If we have a standard mirror API, all tools that are written **for**
+
   Ruby, **in** Ruby, can be shared across implementations, while at the same time
+
   allowing language implementers to use the facilities of their platform
+
   to provide optimal reflective capabilities without tying them to
+
   internals.
-  
-  [p1]: http://www.cs.virginia.edu/~lorenz/papers/icse03/icse2003.pdf "Pluggable Reflection: Decoupling Meta-Interface and Implementation"
-  [p2]: http://bracha.org/newspeak-spec.pdf "Newspeak Programming Language Draft Specification, Version 0.06, pages 40 onward"
-  [p3]: http://www.hpi.uni-potsdam.de/hirschfeld/events/past/media/100105_Bracha_2010_LinguisticReflectionViaMirrors_HPI.mp4 "Linguistic Reflection Via Mirrors"
-  [p4]: http://bracha.org/mirrors.pdf "Mirrors: Design Principles for Meta-level Facilities of Object-Oriented Programming Languages"
-  [p5]: http://oreilly.com/catalog/progcsharp/chapter/ch18.html "See esp. 18-3, highlighting how C# reflection works on assembly rather than VM objects"
-
-email: 
+
+
+  [p1]: http://www.cs.virginia.edu/~lorenz/papers/icse03/icse2003.pdf "Pluggable Reflection:
+  Decoupling Meta-Interface and Implementation"
+
+  [p2]: http://bracha.org/newspeak-spec.pdf "Newspeak Programming Language Draft Specification,
+  Version 0.06, pages 40 onward"
+
+  [p3]: http://www.hpi.uni-potsdam.de/hirschfeld/events/past/media/100105_Bracha_2010_LinguisticReflectionViaMirrors_HPI.mp4
+  "Linguistic Reflection Via Mirrors"
+
+  [p4]: http://bracha.org/mirrors.pdf "Mirrors: Design Principles for Meta-level Facilities
+  of Object-Oriented Programming Languages"
+
+  [p5]: http://oreilly.com/catalog/progcsharp/chapter/ch18.html "See esp. 18-3, highlighting
+  how C# reflection works on assembly rather than VM objects"
+
+'
+email:
 - timfelgentreff@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - README.md
 - Rakefile
@@ -74,11 +95,14 @@ files:
 - lib/abstract_reflection/thread_mirror.rb
 - lib/maglev/reflection.rb
 - lib/maglev/reflection/class_mirror.rb
+- lib/maglev/reflection/core_ext/class.rb
 - lib/maglev/reflection/core_ext/class_organizer.rb
+- lib/maglev/reflection/core_ext/exception.rb
 - lib/maglev/reflection/core_ext/maglev.rb
 - lib/maglev/reflection/core_ext/method.rb
 - lib/maglev/reflection/core_ext/module.rb
 - lib/maglev/reflection/core_ext/object.rb
+- lib/maglev/reflection/core_ext/proc.rb
 - lib/maglev/reflection/core_ext/thread.rb
 - lib/maglev/reflection/field_mirror.rb
 - lib/maglev/reflection/field_mirror/fixed_instance_variable_mirror.rb
@@ -86,6 +110,7 @@ files:
 - lib/maglev/reflection/mirror.rb
 - lib/maglev/reflection/object_mirror.rb
 - lib/maglev/reflection/stack_frame_mirror.rb
+- lib/maglev/reflection/support/partial_continuation.rb
 - lib/maglev/reflection/thread_mirror.rb
 - lib/rubinius/reflection.rb
 - lib/ruby/reflection.rb
@@ -120,40 +145,29 @@ files:
 - spec/thread_spec.rb
 homepage: 
 licenses: []
-
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Mirror API for Ruby
-test_files: 
+test_files:
 - spec/class_spec.rb
 - spec/field_spec.rb
 - spec/fixtures/class_spec.rb