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

Commits on Aug 22, 2016

  1. [Truffle] Update Truffle.

    chrisseaton committed Aug 22, 2016
    Copy the full SHA
    0862c40 View commit details
  2. Copy the full SHA
    1838754 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 mx.jruby/suite.py
  2. +1 −1 truffle/pom.rb
  3. +1 −1 truffle/pom.xml
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/language/parser/jruby/Translator.java
2 changes: 1 addition & 1 deletion mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ def mavenLib(mavenDep, sha1):
"suites": [
{
"name": "truffle",
"version": "f2c5947c0f6a48dd71ae86607c36f1a78098ebd8",
"version": "387cbe478688e84d211aa534b7b93d47709cadd9",
"urls": [
{"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => 'f2c5947c0f6a48dd71ae86607c36f1a78098ebd8-SNAPSHOT',
'truffle.version' => '387cbe478688e84d211aa534b7b93d47709cadd9-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>f2c5947c0f6a48dd71ae86607c36f1a78098ebd8-SNAPSHOT</truffle.version>
<truffle.version>387cbe478688e84d211aa534b7b93d47709cadd9-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ private SourceSection translate(Source source, ISourcePosition sourcePosition) {
return parentSourceSection.peek();
}
} else {
return source.createSection("(identifier)", sourcePosition.getLine() + 1);
return source.createSection(sourcePosition.getLine() + 1);
}
}