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: 14d1d296bda9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b99712982d9e
Choose a head ref
  • 9 commits
  • 12 files changed
  • 1 contributor

Commits on Mar 18, 2015

  1. correct (Java) equals/hashCode semantics for JavaAccessibleObject + m… 

    …inor tweaks

- return concrete types from getValue
- also re-implemented (inherited) toJava conversion
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    d7217ca View commit details

  2. align JavaField's value/static_value conversions and return values + … 

    …test functionality
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    1337fbe View commit details

  3. move (and tune) error logic from CallableSelector into the invoker im… 

    …pl where it's used
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    015d9b4 View commit details

  4. non need to cast intValue to (int)

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    1c5c4a3 View commit details

  5. after several concurrency fixes in Java integration - un-comment a mu… 

    …lti-threaded test
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    ee0113e View commit details

  6. guess name-class hash-map size without internal resizing (currently <… 

    …= 48 elements)
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    03acf55 View commit details

  7. move getArity/getParameterTypes into base class as finals + help used… 

    … methods to JIT
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    ebc2422 View commit details

  8. more base-class sharing between JavaCallable method/constructor impl … 

    …+ minor tweaks
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    0de8bdf View commit details

  9. one JRubyMethod with 2 names is enough to have

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    b997129 View commit details
39 changes: 19 additions & 20 deletions core/src/main/java/org/jruby/RubyObject.java
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@
* RubyObject represents the implementation of the Object class in Ruby. As such,
* it defines very few methods of its own, inheriting most from the included
* Kernel module.
*
*
* Methods that are implemented here, such as "initialize" should be implemented
* with care; reification of Ruby classes into Java classes can produce
* conflicting method names in rare cases. See JRUBY-5906 for an example.
@@ -144,67 +144,67 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObject(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR0_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar0(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR1_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar1(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR2_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar2(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR3_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar3(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR4_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar4(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR5_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar5(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR6_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar6(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR7_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar7(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR8_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar8(runtime, klass);
}
};

public static final ObjectAllocator OBJECT_VAR9_ALLOCATOR = new ObjectAllocator() {
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
return new RubyObjectVar9(runtime, klass);
}
};

public static final ObjectAllocator[] FIELD_ALLOCATORS = {
OBJECT_ALLOCATOR,
OBJECT_VAR0_ALLOCATOR,
@@ -218,7 +218,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
OBJECT_VAR8_ALLOCATOR,
OBJECT_VAR9_ALLOCATOR
};

public static final Class[] FIELD_ALLOCATED_CLASSES = {
RubyObject.class,
RubyObjectVar0.class,
@@ -232,7 +232,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
RubyObjectVar8.class,
RubyObjectVar9.class,
};

/**
* Allocator that inspects all methods for instance variables and chooses
* a concrete class to construct based on that. This allows using
@@ -246,19 +246,19 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
if (Options.DUMP_INSTANCE_VARS.load()) {
System.err.println(klass + ";" + foundVariables);
}

int count = 0;
for (String name : foundVariables) {
klass.getVariableTableManager().getVariableAccessorForVar(name, count);
count++;
if (count >= 10) break;
}

ObjectAllocator allocator = FIELD_ALLOCATORS[count];
Class reified = FIELD_ALLOCATED_CLASSES[count];
klass.setAllocator(allocator);
klass.setReifiedClass(reified);

return allocator.allocate(runtime, klass);
}
};
@@ -513,10 +513,9 @@ private int nonFixnumHashCode(IRubyObject hashValue) {
if (runtime.is1_9()) {
RubyInteger integer = hashValue.convertToInteger();
if (integer instanceof RubyBignum) {
return (int)integer.getBigIntegerValue().intValue();
} else {
return (int)integer.getLongValue();
return integer.getBigIntegerValue().intValue();
}
return (int) integer.getLongValue();
} else {
hashValue = hashValue.callMethod(runtime.getCurrentContext(), "%", RubyFixnum.newFixnum(runtime, 536870923L));
if (hashValue instanceof RubyFixnum) return (int) RubyNumeric.fix2long(hashValue);
Loading