Skip to content

Commit

Permalink
Fix typo and restore interface type.
Browse files Browse the repository at this point in the history
  • Loading branch information
@headius
headius committed Mar 12, 2015
1 parent 1b00142 commit 20be989
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 37 deletions.
11 changes: 6 additions & 5 deletions core/src/main/java/org/jruby/Ruby.java
View file
Expand Up @@ -55,6 +55,7 @@
import org.jruby.javasupport.JavaSupportImpl;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.parser.StaticScope;
import org.jruby.util.ClassDefiningClassLoader;
import org.objectweb.asm.util.TraceClassVisitor;

import jnr.constants.Constant;
Expand Down Expand Up @@ -143,7 +144,7 @@
import org.jruby.util.SelfFirstJRubyClassLoader;
import org.jruby.util.IOInputStream;
import org.jruby.util.IOOutputStream;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import org.jruby.util.KCode;
import org.jruby.util.SafePropertyAccessor;
import org.jruby.util.cli.Options;
Expand Down Expand Up @@ -762,7 +763,7 @@ private ScriptAndCode precompileCLI(Node scriptNode) {
// IR JIT does not handle all scripts yet, so let those that fail run in interpreter instead
// FIXME: restore error once JIT should handle everything
try {
scriptAndCode = tryCompile(scriptNode, new ClassDefininngJRubyClassLoader(getJRubyClassLoader()));
scriptAndCode = tryCompile(scriptNode, new ClassDefiningJRubyClassLoader(getJRubyClassLoader()));
if (scriptAndCode != null && Options.JIT_LOGGING.load()) {
LOG.info("done compiling target script: " + scriptNode.getPosition().getFile());
}
Expand All @@ -786,7 +787,7 @@ private ScriptAndCode precompileCLI(Node scriptNode) {
* @return an instance of the successfully-compiled Script, or null.
*/
public Script tryCompile(Node node) {
return tryCompile(node, new ClassDefininngJRubyClassLoader(getJRubyClassLoader())).script();
return tryCompile(node, new ClassDefiningJRubyClassLoader(getJRubyClassLoader())).script();
}

private void failForcedCompile(Node scriptNode) throws RaiseException {
Expand All @@ -802,7 +803,7 @@ private void handeCompileError(Node node, Throwable t) {
}
}

private ScriptAndCode tryCompile(Node node, ClassDefininngJRubyClassLoader classLoader) {
private ScriptAndCode tryCompile(Node node, ClassDefiningClassLoader classLoader) {
try {
return Compiler.getInstance().execute(this, node, classLoader);
} catch (NotCompilableException e) {
Expand Down Expand Up @@ -2968,7 +2969,7 @@ public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
// script was not found in cache above, so proceed to compile
Node scriptNode = parseFile(readStream, filename, null);
if (script == null) {
scriptAndCode = tryCompile(scriptNode, new ClassDefininngJRubyClassLoader(jrubyClassLoader));
scriptAndCode = tryCompile(scriptNode, new ClassDefiningJRubyClassLoader(jrubyClassLoader));
if (scriptAndCode != null) script = scriptAndCode.script();
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/anno/InvokerGenerator.java
View file
Expand Up @@ -38,7 +38,7 @@

import org.jruby.RubyModule.MethodClumper;
import org.jruby.internal.runtime.methods.DumpingInvocationMethodFactory;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import org.jruby.util.log.Logger;
import org.jruby.util.log.LoggerFactory;

Expand Down Expand Up @@ -68,7 +68,7 @@ public static void main(String[] args) throws Exception {
br.close();
}

DumpingInvocationMethodFactory dumper = new DumpingInvocationMethodFactory(args[1], new ClassDefininngJRubyClassLoader(ClassLoader.getSystemClassLoader()));
DumpingInvocationMethodFactory dumper = new DumpingInvocationMethodFactory(args[1], new ClassDefiningJRubyClassLoader(ClassLoader.getSystemClassLoader()));

for (String name : classNames) {
MethodClumper clumper = new MethodClumper();
Expand Down
9 changes: 5 additions & 4 deletions core/src/main/java/org/jruby/compiler/util/HandleFactory.java
View file
Expand Up @@ -35,7 +35,8 @@
import java.lang.reflect.Modifier;
import org.jruby.compiler.JITCompiler;
import org.jruby.compiler.impl.SkinnyMethodAdapter;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import static org.jruby.util.CodegenUtils.*;
Expand All @@ -53,7 +54,7 @@ public static class Handle {
public Object invoke(Object receiver, Object... args) { throw fail(); }
}

public static Handle createHandle(ClassDefininngJRubyClassLoader classLoader, Method method) {
public static Handle createHandle(ClassDefiningClassLoader classLoader, Method method) {
String name = createHandleName(method);

Class handleClass;
Expand All @@ -72,9 +73,9 @@ public static Handle createHandle(ClassDefininngJRubyClassLoader classLoader, Me
}
}

public static Class createHandleClass(ClassDefininngJRubyClassLoader classLoader, Method method, String name) {
public static Class createHandleClass(ClassDefiningClassLoader classLoader, Method method, String name) {
byte[] bytes = createHandleBytes(method, name);
return (classLoader != null ? classLoader : new ClassDefininngJRubyClassLoader(ClassDefininngJRubyClassLoader.class.getClassLoader())).defineClass(name, bytes);
return (classLoader != null ? classLoader : new ClassDefiningJRubyClassLoader(ClassDefiningJRubyClassLoader.class.getClassLoader())).defineClass(name, bytes);
}

public static byte[] createHandleBytes(Method method, String name) {
Expand Down
11 changes: 6 additions & 5 deletions core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
View file
Expand Up @@ -38,6 +38,7 @@
import org.jruby.RubyKernel;
import org.jruby.parser.StaticScope;
import org.jruby.runtime.Helpers;
import org.jruby.util.ClassDefiningClassLoader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes;
import org.jruby.RubyModule;
Expand All @@ -60,7 +61,7 @@
import org.jruby.util.CodegenUtils;
import static org.jruby.util.CodegenUtils.*;
import static java.lang.System.*;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Label;
import org.objectweb.asm.util.CheckClassAdapter;
Expand Down Expand Up @@ -174,7 +175,7 @@ public class InvocationMethodFactory extends MethodFactory implements Opcodes {
public static final int BLOCK_INDEX = 6;

/** The classloader to use for code loading */
protected final ClassDefininngJRubyClassLoader classLoader;
protected final ClassDefiningJRubyClassLoader classLoader;

/** An object to sync against when loading classes, to avoid dups */
protected final Object syncObject;
Expand Down Expand Up @@ -204,10 +205,10 @@ public InvocationMethodFactory(ClassLoader classLoader) {
// use the given classloader as our sync, regardless of whether we wrap it
this.syncObject = classLoader;

if (classLoader instanceof ClassDefininngJRubyClassLoader) {
this.classLoader = (ClassDefininngJRubyClassLoader)classLoader;
if (classLoader instanceof ClassDefiningJRubyClassLoader) {
this.classLoader = (ClassDefiningJRubyClassLoader)classLoader;
} else {
this.classLoader = new ClassDefininngJRubyClassLoader(classLoader);
this.classLoader = new ClassDefiningJRubyClassLoader(classLoader);
}
}

Expand Down
8 changes: 3 additions & 5 deletions core/src/main/java/org/jruby/ir/Compiler.java
View file
Expand Up @@ -10,7 +10,6 @@
import org.jruby.ast.executable.Script;
import org.jruby.ast.executable.ScriptAndCode;
import org.jruby.compiler.NotCompilableException;
import org.jruby.ir.interpreter.BeginEndInterpreterContext;
import org.jruby.ir.interpreter.Interpreter;
import org.jruby.ir.operands.IRException;
import org.jruby.ir.runtime.IRBreakJump;
Expand All @@ -22,14 +21,13 @@
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningClassLoader;

import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

public class Compiler extends IRTranslator<ScriptAndCode, ClassDefininngJRubyClassLoader> {
public class Compiler extends IRTranslator<ScriptAndCode, ClassDefiningClassLoader> {

// Compiler is singleton
private Compiler() {}
Expand All @@ -44,7 +42,7 @@ public static Compiler getInstance() {
}

@Override
protected ScriptAndCode execute(final Ruby runtime, final IRScriptBody scope, ClassDefininngJRubyClassLoader classLoader) {
protected ScriptAndCode execute(final Ruby runtime, final IRScriptBody scope, ClassDefiningClassLoader classLoader) {
JVMVisitor visitor;
byte[] bytecode;
Class compiled;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/ir/IRTranslator.java
View file
Expand Up @@ -6,7 +6,7 @@
import org.jruby.ast.RootNode;
import org.jruby.ir.interpreter.InterpreterContext;
import org.jruby.ir.persistence.IRWriter;
import org.jruby.ir.persistence.IRWriterFile;
import org.jruby.ir.persistence.IRWriterStream;
import org.jruby.ir.persistence.util.IRFileExpert;

import java.io.IOException;
Expand All @@ -31,7 +31,7 @@ public R execute(Ruby runtime, ParseResult result, S specificObject) {

if (RubyInstanceConfig.IR_WRITING) {
try {
IRWriter.persist(new IRWriterFile(IRFileExpert.getIRPersistedFile(scope.getFileName())), scope);
IRWriter.persist(new IRWriterStream(IRFileExpert.getIRPersistedFile(scope.getFileName())), scope);
} catch (IOException ex) {
ex.printStackTrace(); // FIXME: Handle errors better
return null;
Expand Down
4 changes: 2 additions & 2 deletions ...rg/jruby/ir/persistence/IRWriterFile.java → .../jruby/ir/persistence/IRWriterStream.java
View file
Expand Up @@ -29,7 +29,7 @@
/**
* Represents a file which is persisted to storage.
*/
public class IRWriterFile implements IRWriterEncoder, IRPersistenceValues {
public class IRWriterStream implements IRWriterEncoder, IRPersistenceValues {
private static final int VERSION = 0;

private final Map<IRScope, Integer> scopeInstructionOffsets = new HashMap<>();
Expand All @@ -41,7 +41,7 @@ public class IRWriterFile implements IRWriterEncoder, IRPersistenceValues {
int headersOffset = -1;
int poolOffset = -1;

public IRWriterFile(File file) throws FileNotFoundException {
public IRWriterStream(File file) throws FileNotFoundException {
this.file = file;
this.analyzer = new IRWriterAnalzer();
}
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/jruby/java/codegen/RealClassGenerator.java
View file
Expand Up @@ -28,7 +28,7 @@
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.runtime.callsite.CacheEntry;
import org.jruby.util.ClassDefiningClassLoader;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import static org.jruby.util.CodegenUtils.*;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Type;
Expand Down Expand Up @@ -456,11 +456,11 @@ public static Class defineRealImplClass(Ruby ruby, String name, Class superClass
// create the class
byte[] bytes = cw.toByteArray();
Class newClass;
ClassDefininngJRubyClassLoader loader;
if (superClass.getClassLoader() instanceof ClassDefininngJRubyClassLoader) {
loader = new ClassDefininngJRubyClassLoader(superClass.getClassLoader());
ClassDefiningJRubyClassLoader loader;
if (superClass.getClassLoader() instanceof ClassDefiningJRubyClassLoader) {
loader = new ClassDefiningJRubyClassLoader(superClass.getClassLoader());
} else {
loader = new ClassDefininngJRubyClassLoader(ruby.getJRubyClassLoader());
loader = new ClassDefiningJRubyClassLoader(ruby.getJRubyClassLoader());
}
try {
newClass = loader.loadClass(name);
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/org/jruby/runtime/MethodFactory.java
View file
Expand Up @@ -45,8 +45,7 @@
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.parser.StaticScope;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.ClassDefininngJRubyClassLoader;
import org.jruby.util.OneShotClassLoader;
import org.jruby.util.ClassDefiningJRubyClassLoader;
import org.jruby.util.cli.Options;
import org.jruby.util.log.Logger;
import org.jruby.util.log.LoggerFactory;
Expand Down Expand Up @@ -81,7 +80,7 @@ public abstract class MethodFactory {
baos.write(buf, 0, bytesRead);
}

ClassDefininngJRubyClassLoader oscl = new ClassDefininngJRubyClassLoader(Ruby.getClassLoader());
ClassDefiningJRubyClassLoader oscl = new ClassDefiningJRubyClassLoader(Ruby.getClassLoader());
Class<?> unloaderClass = oscl.defineClass("org.jruby.util.JDBCDriverUnloader", baos.toByteArray());
unloaderClass.newInstance();
can = true;
Expand Down
4 changes: 2 additions & 2 deletions .../util/ClassDefininngJRubyClassLoader.java → ...y/util/ClassDefiningJRubyClassLoader.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.jruby.util.log.Logger;
import org.jruby.util.log.LoggerFactory;

public class ClassDefininngJRubyClassLoader extends URLClassLoader implements ClassDefiningClassLoader {
public class ClassDefiningJRubyClassLoader extends URLClassLoader implements ClassDefiningClassLoader {

final static ProtectionDomain DEFAULT_DOMAIN;

Expand All @@ -48,7 +48,7 @@ public class ClassDefininngJRubyClassLoader extends URLClassLoader implements Cl
DEFAULT_DOMAIN = defaultDomain;
}

public ClassDefininngJRubyClassLoader(ClassLoader parent) {
public ClassDefiningJRubyClassLoader(ClassLoader parent) {
super(new URL[0], parent);
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/JRubyClassLoader.java
View file
Expand Up @@ -51,7 +51,7 @@
import org.jruby.util.log.Logger;
import org.jruby.util.log.LoggerFactory;

public class JRubyClassLoader extends ClassDefininngJRubyClassLoader {
public class JRubyClassLoader extends ClassDefiningJRubyClassLoader {

private static final Logger LOG = LoggerFactory.getLogger("JRubyClassLoader");

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/OneShotClassLoader.java
View file
Expand Up @@ -10,6 +10,6 @@ public OneShotClassLoader(JRubyClassLoader parent) {
}

public Class<?> defineClass(String name, byte[] bytes) {
return super.defineClass(name, bytes, 0, bytes.length, ClassDefininngJRubyClassLoader.DEFAULT_DOMAIN);
return super.defineClass(name, bytes, 0, bytes.length, ClassDefiningJRubyClassLoader.DEFAULT_DOMAIN);
}
}

0 comments on commit 20be989

Please sign in to comment.