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: 876f2e576509
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76c950b09356
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 27, 2015

  1. [Truffle] Canonicalize input file name

    @bbelleville
    bbelleville committed Aug 27, 2015

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CEF2BBFE18BD0E67
    Learn about vigilant mode
    Copy the full SHA
    fbaa433 View commit details

  2. Merge pull request #3291 from bbelleville/canonical-filename 

    [Truffle] Canonicalize input file name
    @eregon
    eregon committed Aug 27, 2015
    Copy the full SHA
    76c950b View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
7 changes: 3 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -641,13 +641,12 @@ public Object execute(final org.jruby.ast.RootNode rootNode) {

String inputFile = rootNode.getPosition().getFile();

if (!inputFile.equals("-e")) {
inputFile = new File(inputFile).getAbsolutePath();
}

final Source source;

try {
if (!inputFile.equals("-e")) {
inputFile = new File(inputFile).getCanonicalPath();
}
source = sourceCache.getSource(inputFile);
} catch (IOException e) {
throw new RuntimeException(e);