Grr...failed to commit with merge for some reason.

jruby · Apr 6, 2015 · eed14f7 · eed14f7
1 parent c26c3f1
commit eed14f7
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/ThreadContext.java b/core/src/main/java/org/jruby/runtime/ThreadContext.java
@@ -888,28 +888,15 @@ public void preNodeEval(IRubyObject self) {
     public void postNodeEval() {
         popFrame();
     }
-<<<<<<< HEAD
-
-    // XXX: Again, screwy evaling under previous frame's scope
+
     public void preExecuteUnder(IRubyObject executeUnderObj, RubyModule executeUnderClass, Block block) {
         Frame frame = getCurrentFrame();
 
-=======
-
-    public void preExecuteUnder(IRubyObject self, RubyModule executeUnderClass, Block block) {
-        Frame frame = getCurrentFrame();
-
-        pushRubyClass(executeUnderClass);
->>>>>>> origin/jruby-1_7
         DynamicScope scope = getCurrentScope();
         StaticScope sScope = runtime.getStaticScopeFactory().newBlockScope(scope.getStaticScope());
         sScope.setModule(executeUnderClass);
         pushScope(DynamicScope.newDynamicScope(sScope, scope));
-<<<<<<< HEAD
         pushCallFrame(frame.getKlazz(), frame.getName(), executeUnderObj, block);
-=======
-        pushCallFrame(frame.getKlazz(), frame.getName(), self, block);
->>>>>>> origin/jruby-1_7
         getCurrentFrame().setVisibility(getPreviousFrame().getVisibility());
     }