Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a703b10fcc69
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1937fca0dca
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 18, 2016

  1. Copy the full SHA
    e70ae71 View commit details
  2. Copy the full SHA
    f42874f View commit details
  3. Copy the full SHA
    a1937fc View commit details
Showing with 84 additions and 82 deletions.
  1. +84 −82 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
166 changes: 84 additions & 82 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
Original file line number Diff line number Diff line change
@@ -261,7 +261,6 @@ public class CoreLibrary {
@CompilationFinal private ArrayNodes.MinBlock arrayMinBlock;
@CompilationFinal private ArrayNodes.MaxBlock arrayMaxBlock;

private final DynamicObject rubyInternalMethod;
private final Map<Errno, DynamicObject> errnoClasses = new HashMap<>();

@CompilationFinal private InternalMethod basicObjectSendMethod;
@@ -271,7 +270,9 @@ public class CoreLibrary {

private static final Object systemObject = TruffleOptions.AOT ? null : JavaInterop.asTruffleObject(System.class);

public String getCoreLoadPath() {
private final String coreLoadPath;

private String buildCoreLoadPath() {
String path = context.getOptions().CORE_LOAD_PATH;

while (path.endsWith("/")) {
@@ -289,82 +290,6 @@ public String getCoreLoadPath() {
}
}

public DynamicObject getRuntimeErrorClass() {
return runtimeErrorClass;
}

public DynamicObject getSystemStackErrorClass() {
return systemStackErrorClass;
}

public DynamicObject getArgumentErrorClass() {
return argumentErrorClass;
}

public DynamicObject getIndexErrorClass() {
return indexErrorClass;
}

public DynamicObject getLocalJumpErrorClass() {
return localJumpErrorClass;
}

public DynamicObject getNotImplementedErrorClass() {
return notImplementedErrorClass;
}

public DynamicObject getSyntaxErrorClass() {
return syntaxErrorClass;
}

public DynamicObject getFloatDomainErrorClass() {
return floatDomainErrorClass;
}

public DynamicObject getIOErrorClass() {
return ioErrorClass;
}

public DynamicObject getRangeErrorClass() {
return rangeErrorClass;
}

public DynamicObject getRegexpErrorClass() {
return regexpErrorClass;
}

public DynamicObject getEncodingCompatibilityErrorClass() {
return encodingCompatibilityErrorClass;
}

public DynamicObject getFiberErrorClass() {
return fiberErrorClass;
}

public DynamicObject getThreadErrorClass() {
return threadErrorClass;
}

public DynamicObject getSecurityErrorClass() {
return securityErrorClass;
}

public DynamicObject getSystemCallErrorClass() {
return systemCallErrorClass;
}

public DynamicObject getEagainWaitReadable() {
return eagainWaitReadable;
}

public DynamicObject getEagainWaitWritable() {
return eagainWaitWritable;
}

public DynamicObject getTruffleModule() {
return truffleModule;
}

private enum State {
INITIALIZING,
LOADING_RUBY_CORE,
@@ -400,6 +325,7 @@ public Object execute(VirtualFrame frame) {

public CoreLibrary(RubyContext context) {
this.context = context;
this.coreLoadPath = buildCoreLoadPath();
this.node = new CoreLibraryNode(context);

// Nothing in this constructor can use RubyContext.getCoreLibrary() as we are building it!
@@ -673,10 +599,6 @@ public CoreLibrary(RubyContext context) {
randomizerFactory = Layouts.RANDOMIZER.createRandomizerShape(randomizerClass, randomizerClass);
Layouts.CLASS.setInstanceFactoryUnsafe(randomizerClass, randomizerFactory);

// Interop

rubyInternalMethod = null;

// Include the core modules

includeModules(comparableModule);
@@ -1217,6 +1139,10 @@ public RubyContext getContext() {
return context;
}

public String getCoreLoadPath() {
return coreLoadPath;
}

public DynamicObject getArrayClass() {
return arrayClass;
}
@@ -1501,6 +1427,82 @@ public DynamicObjectFactory getHandleFactory() {
return handleFactory;
}

public DynamicObject getRuntimeErrorClass() {
return runtimeErrorClass;
}

public DynamicObject getSystemStackErrorClass() {
return systemStackErrorClass;
}

public DynamicObject getArgumentErrorClass() {
return argumentErrorClass;
}

public DynamicObject getIndexErrorClass() {
return indexErrorClass;
}

public DynamicObject getLocalJumpErrorClass() {
return localJumpErrorClass;
}

public DynamicObject getNotImplementedErrorClass() {
return notImplementedErrorClass;
}

public DynamicObject getSyntaxErrorClass() {
return syntaxErrorClass;
}

public DynamicObject getFloatDomainErrorClass() {
return floatDomainErrorClass;
}

public DynamicObject getIOErrorClass() {
return ioErrorClass;
}

public DynamicObject getRangeErrorClass() {
return rangeErrorClass;
}

public DynamicObject getRegexpErrorClass() {
return regexpErrorClass;
}

public DynamicObject getEncodingCompatibilityErrorClass() {
return encodingCompatibilityErrorClass;
}

public DynamicObject getFiberErrorClass() {
return fiberErrorClass;
}

public DynamicObject getThreadErrorClass() {
return threadErrorClass;
}

public DynamicObject getSecurityErrorClass() {
return securityErrorClass;
}

public DynamicObject getSystemCallErrorClass() {
return systemCallErrorClass;
}

public DynamicObject getEagainWaitReadable() {
return eagainWaitReadable;
}

public DynamicObject getEagainWaitWritable() {
return eagainWaitWritable;
}

public DynamicObject getTruffleModule() {
return truffleModule;
}

private static final String[] coreFiles = {
"/core/pre.rb",
"/core/lookuptable.rb",