Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin' into mcjit
  • Loading branch information
brixen committed Jan 29, 2016
2 parents 0699fba + e517891 commit 9027454ed15ebf14c2ccd581e2229fab823ff43a
@@ -6,4 +6,4 @@ gem "redcard", "~> 1.0"
gem "daedalus-core", "~> 0.1"
gem "rubinius-bridge", "~> 1.0"

gem "rubinius-build_tools", "~> 2.0"
gem "rubinius-code", "~> 3"
@@ -5,7 +5,7 @@ gem "bundler", "~> 1.7"
gem "redcard", "~> 1.0"
gem "daedalus-core", "~> 0.1"

gem "rubinius-build_tools", "~> 2.0"
gem "rubinius-code", "~> 3"
gem "rubinius-developer_tools", "~> 2.0"

gem "rubysl", "~> 2.2"
@@ -4,19 +4,21 @@ GEM
daedalus-core (0.5.0)
rake (10.5.0)
redcard (1.1.0)
rubinius-ast (2.3.2)
rubinius-ast (3.0)
rubinius-bridge (1.1.0)
redcard (~> 1.0)
rubinius-build_tools (2.0.0)
rubinius-ast (~> 2.0)
rubinius-compiler (~> 2.0)
rubinius-melbourne (~> 2.0)
rubinius-processor (~> 2.0)
rubinius-toolset (~> 2.0)
rubinius-compiler (2.3.1)
rubinius-melbourne (2.3.1.0)
rubinius-processor (2.3.0)
rubinius-toolset (2.3.1)
rubinius-code (3.0)
rubinius-ast (~> 3)
rubinius-compiler (~> 3)
rubinius-instructions (~> 3)
rubinius-melbourne (~> 3)
rubinius-processor (~> 3)
rubinius-toolset (~> 3)
rubinius-compiler (3.0)
rubinius-instructions (3.0)
rubinius-melbourne (3.0)
rubinius-processor (3.0)
rubinius-toolset (3.0)

PLATFORMS
ruby
@@ -26,7 +28,7 @@ DEPENDENCIES
rake (~> 10.0)
redcard (~> 1.0)
rubinius-bridge (~> 1.0)
rubinius-build_tools (~> 2.0)
rubinius-code (~> 3)

BUNDLED WITH
1.11.2
13 README
@@ -40,9 +40,16 @@ The following Ruby features are not supported on Rubinius:

4. License

Rubinius uses the MPL-2.0 license. See LICENSE for details. Contributions made
prior to January 3rd, 2016 are licensed under the old BSD 3-clause license. A
copy of this license can be found in the file "BSD_LICENSE".
All source code in this repository is subject to the terms of the Mozilla Public
License, version 2.0 unless stated otherwise. A copy of this license can be
found the file "LICENSE" or at https://www.mozilla.org/MPL/2.0/.

Contributions made prior to January 3rd, 2016 are licensed under the old BSD
3-clause license. A copy of this license can be found in the file "BSD_LICENSE".

In the event a directory contains a "LICENSE", "LICENSE.txt" or "COPYING" file
the license specified in said file applies to the contents of said directory and
all sub directories, overwriting the licenses specified above.

5. Installing Rubinius from Source

@@ -2,12 +2,15 @@

## The Rubinius Language Platform

Rubinius is a modern language platform that supports a number of programming languages.
Rubinius is a modern language platform that supports a number of programming
languages.

Rubinius includes a bytecode virtual machine, generational garbage collector, and just-in-time (JIT) native machine code compiler. Rubinius provides concurrency support via native OS threads with no global interpreter lock.

Rubinius runs on Mac OS X and many Unix/Linux operating systems. Microsoft Windows is not yet supported.
Rubinius includes a bytecode virtual machine, generational garbage collector,
and just-in-time (JIT) native machine code compiler. Rubinius provides
concurrency support via native OS threads with no global interpreter lock.

Rubinius runs on Mac OS X and many Unix/Linux operating systems. Microsoft
Windows is not yet supported.

### Code of Conduct

@@ -35,47 +38,58 @@ The following Ruby features are not supported on Rubinius:
* Refinements
* $SAFE levels


### License

Rubinius uses the MPL-2.0 license. See LICENSE for details. Contributions made
prior to January 3rd, 2016 are licensed under the old BSD 3-clause license. A
copy of this license can be found in the file "BSD_LICENSE".
All source code in this repository is subject to the terms of the Mozilla Public
License, version 2.0 unless stated otherwise. A copy of this license can be
found the file "LICENSE" or at <https://www.mozilla.org/MPL/2.0/>.

Contributions made prior to January 3rd, 2016 are licensed under the old BSD
3-clause license. A copy of this license can be found in the file "BSD_LICENSE".

In the event a directory contains a "LICENSE", "LICENSE.txt" or "COPYING" file
the license specified in said file applies to the contents of said directory and
all sub directories, overwriting the licenses specified above.

### Installing Rubinius from Source

To install Rubinius, use the following steps:

1. Ensure that MRI 2.0+, rubygems, rake, git and LLVM are installed
1. git clone git://github.com/rubinius/rubinius.git
1. cd rubinius
1. bundle
1. ./configure --prefix=/path/to/install/dir
1. rake

When the install process finishes, follow the directions printed to the terminal to add the Rubinius executable (bin) directory to your PATH. For more information see the documentation for [Build Requirements](http://rubinius.com/doc/en/getting-started/requirements/) and [Building Rubinius](http://rubinius.com/doc/en/getting-started/building/).

2. git clone git://github.com/rubinius/rubinius.git
3. cd rubinius
4. bundle
5. ./configure --prefix=/path/to/install/dir
6. rake

When the install process finishes, follow the directions printed to the terminal
to add the Rubinius executable (bin) directory to your PATH. For more
information see the documentation for
[Build Requirements](http://rubinius.com/doc/en/getting-started/requirements/)
and [Building Rubinius](http://rubinius.com/doc/en/getting-started/building/).

### Using RubyGems

Rubinius comes with RubyGems built-in. To install a gem, run the following:

$ rbx -S gem install <gem_name>


### Documentation

The Rubinius documentation is available at the [Rubinius website](http://rubinius.com).

The Rubinius documentation is available at the [Rubinius
website](http://rubinius.com).

### Issues & Support

Please [file tickets](http://github.com/rubinius/rubinius/issues) for bugs or problems.

For additional help, visit the [Rubinius Gitter chat room](https://gitter.im/rubinius/rubinius).
Please [file tickets](http://github.com/rubinius/rubinius/issues) for bugs or
problems.

For additional help, visit the
[Rubinius Gitter chat room](https://gitter.im/rubinius/rubinius).

### Contributing

The Rubinius team welcomes contributions. For more information, read the
[CONTRIBUTING](https://github.com/rubinius/rubinius/blob/master/CONTRIBUTING.md) file and see the documentation [about contributing](http://rubinius.com/doc/en/contributing/).
[CONTRIBUTING](https://github.com/rubinius/rubinius/blob/master/CONTRIBUTING.md)
file and see the documentation
[about contributing](http://rubinius.com/doc/en/contributing/).
@@ -162,7 +162,7 @@ class Configure
@vendored_libdir = File.join(root, "/vendor")

# Ruby compatibility version
@ruby_version = "2.2.0"
@ruby_version = "2.2.2"
@ruby_libversion = @ruby_version.split(/\./)[0..1].join.to_i

# Configure settings
@@ -9,17 +9,18 @@ rake-10.5.0.gem
rb-readline-0.5.3.gem
rdoc-4.2.1.gem
redcard-1.1.0.gem
rubinius-ast-2.3.2.gem
rubinius-ast-3.0.gem
rubinius-bridge-1.1.0.gem
rubinius-build_tools-2.0.0.gem
rubinius-compiler-2.3.1.gem
rubinius-code-3.0.gem
rubinius-compiler-3.0.gem
rubinius-coverage-2.0.3.gem
rubinius-debugger-2.2.1.gem
rubinius-developer_tools-2.0.0.gem
rubinius-melbourne-2.3.1.0.gem
rubinius-processor-2.3.0.gem
rubinius-instructions-3.0.gem
rubinius-melbourne-3.0.gem
rubinius-processor-3.0.gem
rubinius-profiler-2.0.2.gem
rubinius-toolset-2.3.1.gem
rubinius-toolset-3.0.gem
rubysl-2.2.0.gem
rubysl-abbrev-2.0.4.gem
rubysl-base64-2.0.0.gem
@@ -70,9 +71,9 @@ rubysl-net-smtp-2.0.1.gem
rubysl-net-telnet-2.0.0.gem
rubysl-nkf-2.0.1.gem
rubysl-observer-2.0.0.gem
rubysl-open-uri-2.0.0.gem
rubysl-open3-2.0.0.gem
rubysl-openssl-2.8.0.gem
rubysl-open-uri-2.0.0.gem
rubysl-optparse-2.0.1.gem
rubysl-ostruct-2.1.0.gem
rubysl-pathname-2.1.0.gem
@@ -1144,9 +1144,8 @@ def product(*args)
outer_lambda.call([])

if block_given?
block_result = self
result.each { |v| block_result << yield(v) }
block_result
result.each { |v| yield(v) }
self
else
result
end
@@ -53,7 +53,10 @@ def collect
def count(item = undefined)
seq = 0
if !undefined.equal?(item)
each { |element| seq += 1 if item == element }
each do
element = Rubinius.single_block_arg
seq += 1 if item == element
end
elsif block_given?
each { |element| seq += 1 if yield(element) }
else
@@ -140,7 +143,8 @@ def slice_before(pattern = undefined, &block)

Enumerator.new do |yielder|
accumulator = nil
each do |element|
each do
element = Rubinius.single_block_arg
start_new = block.yield(element)
if start_new
yielder.yield accumulator if accumulator
@@ -164,7 +168,8 @@ def slice_after(pattern = undefined, &block)

Enumerator.new do |yielder|
accumulator = nil
each do |element|
each do
element = Rubinius.single_block_arg
end_chunk = block.yield(element)
accumulator ||= []
if end_chunk
@@ -350,7 +355,7 @@ def sort_by
sort_values = map do
element = Rubinius.single_block_arg
SortedElement.new(element, yield(element))
end
end.to_a

# Now sort the tuple according to the sort by value
sort_values.sort!
@@ -131,13 +131,13 @@ def load_compiler
$LOAD_PATH.unshift dir
end

require_compiled "rubinius/toolset"
require_compiled "rubinius/code/toolset"

Rubinius::ToolSets.create :runtime do
require_compiled "rubinius/melbourne"
require_compiled "rubinius/processor"
require_compiled "rubinius/compiler"
require_compiled "rubinius/ast"
require_compiled "rubinius/code/melbourne"
require_compiled "rubinius/code/processor"
require_compiled "rubinius/code/compiler"
require_compiled "rubinius/code/ast"
end
rescue Object => e
raise LoadError, "Unable to load the bytecode compiler", e
@@ -0,0 +1,54 @@
RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
Weirich and others. You can redistribute it and/or modify it under
either the terms of the MIT license (see the file MIT.txt), or the
conditions below:

1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the
original copyright notices and associated disclaimers.

2. You may modify your copy of the software in any way, provided that
you do at least ONE of the following:

a. place your modifications in the Public Domain or otherwise
make them Freely Available, such as by posting said
modifications to Usenet or an equivalent medium, or by allowing
the author to include your modifications in the software.

b. use the modified software only within your corporation or
organization.

c. give non-standard executables non-standard names, with
instructions on where to get the original software distribution.

d. make other distribution arrangements with the author.

3. You may distribute the software in object code or executable
form, provided that you do at least ONE of the following:

a. distribute the executables and library files of the software,
together with instructions (in the manual page or equivalent)
on where to get the original distribution.

b. accompany the distribution with the machine-readable source of
the software.

c. give non-standard executables non-standard names, with
instructions on where to get the original software distribution.

d. make other distribution arrangements with the author.

4. You may modify and include the part of the software into any other
software (possibly commercial).

5. The scripts and library files supplied as input to or produced as
output from the software do not automatically fall under the
copyright of the software, but belong to whomever generated them,
and may be sold commercially, and may be aggregated with this
software.

6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.

@@ -0,0 +1,21 @@
Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.
Portions copyright (c) Engine Yard and Andre Arko

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -22,7 +22,7 @@ namespace :gems do

task :melbourne do
prefix = "#{BUILD_CONFIG[:build_prefix]}#{BUILD_CONFIG[:runtimedir]}"
path = Dir["#{prefix}/gems/rubinius-melbourne-*/ext/rubinius/melbourne"].first
path = Dir["#{prefix}/gems/rubinius-melbourne-*/ext/rubinius/code/melbourne"].first
Dir.chdir path do
begin
ENV["RBX_RUN_COMPILED"] = "1"
@@ -223,13 +223,13 @@ namespace :compiler do

task :load => ['compiler:generate'] do
require "rubinius/bridge"
require "rubinius/toolset"
require "rubinius/code/toolset"

Rubinius::ToolSets.create :build do
require "rubinius/melbourne"
require "rubinius/processor"
require "rubinius/compiler"
require "rubinius/ast"
require "rubinius/code/melbourne"
require "rubinius/code/processor"
require "rubinius/code/compiler"
require "rubinius/code/ast"
end

require File.expand_path("../../kernel/signature", __FILE__)
Loading

0 comments on commit 9027454

Please sign in to comment.