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

Commits on May 2, 2016

  1. [Truffle] Integrate ARGF modifications directly in the source.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    4316b76 View commit details

  2. [Truffle] Remove some omitted code we will not use in exception.rb.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    0f14291 View commit details

  3. [Truffle] Integrate simple changes to exception.rb.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    2fe2629 View commit details

  4. [Truffle] Remove the @Locations variable in exception.rb. 

    * We have an internal Backtrace object instead.
* It's only used in a couple places.
    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    eb668c4 View commit details

  5. [Truffle] Integrate Exception modifications in the source.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    2d80f1a View commit details

  6. [Truffle] Remove dead code in Exception#set_backtrace.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    10ef55f View commit details

  7. [Truffle] Exception#set_backtrace: Only create an exception for error… 

    … cases.
    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    7b92758 View commit details

  8. [Truffle] Remove omits in common/fixnum.rb.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    6c68d8e View commit details

  9. [Truffle] Integrate Fixnum modifications.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    e9de86b View commit details

  10. [Truffle] Add missing license headers.

    @eregon
    eregon committed May 2, 2016
    Copy the full SHA
    222e1e4 View commit details
3 changes: 0 additions & 3 deletions truffle/src/main/ruby/core.rb
View file
Original file line number Diff line number Diff line change
@@ -130,10 +130,8 @@ def self.omit(reason)
Truffle::Boot.require_core 'core/rubinius/common/enumerable'
Truffle::Boot.require_core 'core/rubinius/common/enumerator'
Truffle::Boot.require_core 'core/rubinius/common/argf'
Truffle::Boot.require_core 'core/rubinius/api/shims/argf'
#Truffle::Boot.require_core 'core/rubinius/common/tuple'
Truffle::Boot.require_core 'core/rubinius/common/exception'
Truffle::Boot.require_core 'core/rubinius/api/shims/exception'
Truffle::Boot.require_core 'core/rubinius/common/undefined'
Truffle::Boot.require_core 'core/rubinius/common/type'
Truffle::Boot.require_core 'core/rubinius/common/hash'
@@ -164,7 +162,6 @@ def self.omit(reason)
#Truffle::Boot.require_core 'core/rubinius/common/continuation'
#Truffle::Boot.require_core 'core/rubinius/common/delegated_method'
Truffle::Boot.require_core 'core/rubinius/common/fixnum'
Truffle::Boot.require_core 'core/rubinius/api/shims/fixnum'
Truffle::Boot.require_core 'core/rubinius/common/lru_cache'
Truffle::Boot.require_core 'core/rubinius/api/shims/encoding'
Truffle::Boot.require_core 'core/rubinius/common/encoding'
81 changes: 0 additions & 81 deletions truffle/src/main/ruby/core/rubinius/api/shims/argf.rb
View file

This file was deleted.

79 changes: 0 additions & 79 deletions truffle/src/main/ruby/core/rubinius/api/shims/exception.rb
View file

This file was deleted.

49 changes: 0 additions & 49 deletions truffle/src/main/ruby/core/rubinius/api/shims/fixnum.rb
View file

This file was deleted.

25 changes: 17 additions & 8 deletions truffle/src/main/ruby/core/rubinius/common/argf.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

# Copyright (c) 2007-2015, Evan Phoenix and contributors
# All rights reserved.
#
@@ -38,6 +46,8 @@ module Rubinius
class ARGFClass
include Enumerable

attr_reader :argv

# :internal:
#
# Create a stateless ARGF.
@@ -46,7 +56,8 @@ class ARGFClass
#
# @see #advance!
#
def initialize
def initialize(argv = ARGV, *others)
@argv = argv.equal?(ARGV) ? ARGV : [argv, *others]
@lineno = 0
@advance = true
@init = false
@@ -517,7 +528,7 @@ def advance!

unless @init

if ARGV.empty?
if @argv.empty?
@advance = false
@stream = STDIN
@filename = "-"
@@ -529,12 +540,12 @@ def advance!

File.unlink(@backup_filename) if @backup_filename && $-i == ""

return false if @use_stdin_only || ARGV.empty?
return false if @use_stdin_only || @argv.empty?

@advance = false

file = ARGV.shift
@stream = stream(file)
file = @argv.shift
@stream = stream(file)
@filename = file

if $-i && @stream != STDIN
@@ -555,6 +566,4 @@ def advance!
# The virtual concatenation file of the files given on command line (or
# from $stdin if no files were given.) Usable like an IO.
#
Truffle.omit("We define this in api/shims/argf with an additional argument to the constructor") do
ARGF = Rubinius::ARGFClass.new
end
ARGF = Rubinius::ARGFClass.new(ARGV)
Loading