Move *InterpreterContext from operands/ to interpreter/

jruby · Oct 20, 2014 · 93820f2 · 93820f2
1 parent ac42880
commit 93820f2
Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMetaClassBody.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMetaClassBody.java
@@ -5,7 +5,7 @@
 
 import org.jruby.RubyModule;
 import org.jruby.ir.*;
-import org.jruby.ir.operands.InterpreterContext;
+import org.jruby.ir.interpreter.InterpreterContext;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.DynamicScope;

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
@@ -8,9 +8,9 @@
 import org.jruby.RubyClass;
 import org.jruby.RubyModule;
 import org.jruby.ir.*;
-import org.jruby.ir.operands.InterpreterContext;
 import org.jruby.ir.representations.CFG;
 import org.jruby.ir.interpreter.Interpreter;
+import org.jruby.ir.interpreter.InterpreterContext;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Arity;

diff --git a/core/src/main/java/org/jruby/ir/IRClosure.java b/core/src/main/java/org/jruby/ir/IRClosure.java
@@ -1,6 +1,8 @@
 package org.jruby.ir;
 
 import org.jruby.ir.instructions.*;
+import org.jruby.ir.interpreter.ClosureInterpreterContext;
+import org.jruby.ir.interpreter.InterpreterContext;
 import org.jruby.ir.operands.*;
 import org.jruby.ir.representations.CFG;
 import org.jruby.ir.transformations.inlining.CloneInfo;

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -5,6 +5,8 @@
 import org.jruby.RubyModule;
 import org.jruby.ir.dataflow.DataFlowProblem;
 import org.jruby.ir.instructions.*;
+import org.jruby.ir.interpreter.ClosureInterpreterContext;
+import org.jruby.ir.interpreter.InterpreterContext;
 import org.jruby.ir.operands.*;
 import org.jruby.ir.operands.Float;
 import org.jruby.ir.passes.CompilerPass;

diff --git a/...r/operands/ClosureInterpreterContext.java → ...nterpreter/ClosureInterpreterContext.java b/...r/operands/ClosureInterpreterContext.java → ...nterpreter/ClosureInterpreterContext.java
@@ -1,4 +1,4 @@
-package org.jruby.ir.operands;
+package org.jruby.ir.interpreter;
 
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.instructions.Instr;

diff --git a/...jruby/ir/operands/InterpreterContext.java → ...by/ir/interpreter/InterpreterContext.java b/...jruby/ir/operands/InterpreterContext.java → ...by/ir/interpreter/InterpreterContext.java
@@ -1,4 +1,4 @@
-package org.jruby.ir.operands;
+package org.jruby.ir.interpreter;
 
 import org.jruby.ir.IRFlags;
 import org.jruby.ir.IRMetaClassBody;

diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -1,10 +1,10 @@
 package org.jruby.runtime;
 
 import org.jruby.EvalType;
-import org.jruby.ir.operands.InterpreterContext;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRFlags;
 import org.jruby.ir.interpreter.Interpreter;
+import org.jruby.ir.interpreter.InterpreterContext;
 import org.jruby.ir.representations.CFG;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.runtime.Block.Type;