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: 29ca7db92b06
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2d909947683d
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Aug 20, 2015

  1. [Truffle] Fix a couple FindBugs warnings.

    @eregon
    eregon committed Aug 20, 2015
    Copy the full SHA
    691cee9 View commit details

  2. [Truffle] Fix problems for the OMProcessor detected by FindBugs.

    @eregon
    eregon committed Aug 20, 2015
    Copy the full SHA
    2d90994 View commit details
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/literal/RangeLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,6 @@
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.objects.AllocateObjectNode;
import org.jruby.truffle.nodes.objects.AllocateObjectNodeGen;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.CoreLibrary;
@@ -33,12 +31,10 @@ public abstract class RangeLiteralNode extends RubyNode {
private final boolean excludeEnd;

@Child private CallDispatchHeadNode cmpNode;
@Child private AllocateObjectNode allocateNode;

public RangeLiteralNode(RubyContext context, SourceSection sourceSection, boolean excludeEnd) {
super(context, sourceSection);
this.excludeEnd = excludeEnd;
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
}

@Specialization
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/om/dsl/processor/OMProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import javax.tools.JavaFileObject;
import java.io.FileNotFoundException;

import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
@@ -51,7 +51,7 @@ private void processLayout(TypeElement layoutElement) {

JavaFileObject output = processingEnv.getFiler().createSourceFile(layout.getInterfaceFullName() + "Impl", layoutElement);

try (PrintStream stream = new PrintStream(output.openOutputStream())) {
try (PrintStream stream = new PrintStream(output.openOutputStream(), false, "US-ASCII")) {
generator.generate(stream);
}
} catch (IOException e) {
@@ -60,9 +60,9 @@ private void processLayout(TypeElement layoutElement) {
}

public static void log(String file, String message) {
try (PrintStream stream = new PrintStream(new FileOutputStream(file, true))) {
try (PrintStream stream = new PrintStream(new FileOutputStream(file, true), false, "US-ASCII")) {
stream.println(message);
} catch (FileNotFoundException e) {
} catch (IOException e) {
e.printStackTrace();
}
}
160 changes: 80 additions & 80 deletions truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/NameUtils.java
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
*/
package org.jruby.truffle.om.dsl.processor.layout.model;

import javax.lang.model.type.TypeMirror;
import java.util.Locale;

public abstract class NameUtils {

@@ -51,7 +51,7 @@ public static String asSetter(String name) {
}

private static String asGetterSetter(String name, String getSet) {
return getSet + name.substring(0, 1).toUpperCase() + name.substring(1);
return getSet + name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1);
}

public static String typeWithoutParameters(String type) {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/core/ModuleFields.java
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ public ModuleFields(RubyContext context, DynamicObject lexicalParent, String giv
this.context = context;
this.lexicalParent = lexicalParent;
this.givenBaseName = givenBaseName;
this.unmodifiedAssumption = new CyclicAssumption(name + " is unmodified");
this.unmodifiedAssumption = new CyclicAssumption(String.valueOf(givenBaseName) + " is unmodified");
start = new PrependMarker(this);
}