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

Commits on Apr 22, 2015

  1. [Truffle] $0 and $PROGRAM_NAME

    @chrisseaton
    chrisseaton committed Apr 22, 2015
    Copy the full SHA
    48fa565 View commit details

Commits on Apr 23, 2015

  1. Merge branch 'master' of github.com:jruby/jruby

    @chrisseaton
    chrisseaton committed Apr 23, 2015
    Copy the full SHA
    a75874b View commit details
Showing with 3 additions and 0 deletions.
  1. +1 −0 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  2. +2 −0 truffle/src/main/ruby/core/shims.rb
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -390,6 +390,7 @@ private void initializeGlobalVariables() {
globals.getOperations().setInstanceVariable(globals, "$:", globals.getInstanceVariable("$LOAD_PATH"));
globals.getOperations().setInstanceVariable(globals, "$\"", globals.getInstanceVariable("$LOADED_FEATURES"));
globals.getOperations().setInstanceVariable(globals, "$,", nilObject);
globals.getOperations().setInstanceVariable(globals, "$0", context.toTruffle(context.getRuntime().getGlobalVariables().get("$0")));

globals.getOperations().setInstanceVariable(globals, "$DEBUG", context.getRuntime().isDebug());

2 changes: 2 additions & 0 deletions truffle/src/main/ruby/core/shims.rb
View file
Original file line number Diff line number Diff line change
@@ -216,3 +216,5 @@ def self.synchronize(object)

end

$PROGRAM_NAME = $0