rubinius-melbourne 1.1.1.1 → 1.2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rubinius/melbourne/extconf.rb +4 -13
  3. data/ext/rubinius/melbourne/melbourne.cpp +3 -8
  4. data/lib/rubinius/melbourne/version.rb +2 -2
  5. data/lib/rubinius/melbourne.rb +2 -22
  6. data/rubinius-melbourne.gemspec +21 -19
  7. metadata +62 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e992b67a225151ca432363d400e7db119b727506
4
- data.tar.gz: 34a70b514b503e149ee7170fc6b12ef1d8f37461
3
+ metadata.gz: bcb4a9b42e4327d5caa4a827b10a5f4323b69560
4
+ data.tar.gz: 363b075c0e5bb41a518f3009d3577031ac1af5d6
5
5
  SHA512:
6
- metadata.gz: 701069f3af143a29b1d5c6cd8a6e4c204b868a72181dad9c6773f3accc798dafefd1ae68b79a4844916a316b6a5c3c8908a87befcbe647e2412a746de199cc47
7
- data.tar.gz: dc80bf6237b4c65515e08ca10d1911ab192e60bccfae9de0baa7c68142f2cc66d8e0ea583636788277e7f58c8db9feeab89fe592547f5b0d731e677032710490
6
+ metadata.gz: 3c498bd1951ab6bdfab7f3d67a3bf7948cb96c310b6e832a4a816c4e934303ff3696aa5a42007888d7976e6f23112ce9c0b56dd9bb7e4e56a9966b88ef34056e
7
+ data.tar.gz: d6a1383c735f122233c8676fa77306138a70c655665264310dfc39563e95feae3bd78abb0b49b8957e4706426cf42ece9f5b5656a30399358110daf55f327bc6
data/ext/rubinius/melbourne/extconf.rb CHANGED
@@ -1,24 +1,14 @@
1
1
  require 'rbconfig'
2
2
 
3
- # Fake out Rubinius::ToolSets for bootstrapping
4
- module Rubinius
5
- module ToolSets
6
- def self.current
7
- @current ||= Module.new
8
- @current.const_set :ToolSet, @current
9
- end
10
- end
11
- end
12
-
13
3
  require File.expand_path("../../../../lib/rubinius/melbourne/version", __FILE__)
14
4
 
15
5
  path = File.expand_path "../namespace.h", __FILE__
16
6
  File.open path, "wb" do |f|
17
- version = Rubinius::ToolSets.current::ToolSet::Melbourne::VERSION
7
+ version = CodeTools::Melbourne::VERSION
18
8
 
19
9
  if ENV["MELBOURNE_SPEC_VERSION"]
20
10
  # Alter the version to not match any possible loaded version
21
- version = version.split(".").map { |x| x + 1 }.join(".")
11
+ version << ".spec"
22
12
  end
23
13
 
24
14
  melbourne = "melbourne_#{version.gsub(/\./, "_")}"
@@ -36,6 +26,7 @@ unless File.exist? "Makefile" and
36
26
 
37
27
  incdirs = [
38
28
  RbConfig::CONFIG["arch_hdrdir"],
29
+ RbConfig::CONFIG["rubyarchhdrdir"],
39
30
  RbConfig::CONFIG["topdir"],
40
31
  RbConfig::CONFIG["hdrdir"],
41
32
  RbConfig::CONFIG["rubyhdrdir"],
@@ -75,7 +66,7 @@ unless File.exist? "Makefile" and
75
66
  if RbConfig::CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/
76
67
  # SUN CHAIN
77
68
  cxxflags << " -DCC_SUNWspro"
78
- cxxflags.gsub! /-fPIC/, ""
69
+ cxxflags.gsub!(/-fPIC/, "")
79
70
  cxxflags << " -KPIC"
80
71
  ldsharedxx = "#{cxx} -G -KPIC -lCstd"
81
72
  else
data/ext/rubinius/melbourne/melbourne.cpp CHANGED
@@ -37,17 +37,12 @@ VALUE MELBOURNE_FILE_TO_AST(VALUE self, VALUE fname, VALUE start) {
37
37
  }
38
38
 
39
39
  void Init_melbourne(void) {
40
- VALUE rb_cMelbourne, rb_mToolSets, rb_mToolSet;
40
+ VALUE rb_mCodeTools, rb_cMelbourne;
41
41
 
42
42
  MELBOURNE::init_symbols();
43
43
 
44
- #ifndef RUBINIUS
45
- VALUE rb_mRubinius = rb_const_get(rb_cObject, rb_intern("Rubinius"));
46
- #endif
47
-
48
- rb_mToolSets = rb_const_get(rb_mRubinius, rb_intern("ToolSets"));
49
- rb_mToolSet = rb_funcall(rb_mToolSets, rb_intern("current"), 0);
50
- rb_cMelbourne = rb_define_class_under(rb_mToolSet, "Melbourne", rb_cObject);
44
+ rb_mCodeTools = rb_const_get(rb_cObject, rb_intern("CodeTools"));
45
+ rb_cMelbourne = rb_define_class_under(rb_mCodeTools, "Melbourne", rb_cObject);
51
46
  rb_define_method(rb_cMelbourne, "string_to_ast",
52
47
  RUBY_METHOD_FUNC(MELBOURNE_STRING_TO_AST), 3);
53
48
  rb_define_method(rb_cMelbourne, "file_to_ast",
data/lib/rubinius/melbourne/version.rb CHANGED
@@ -1,5 +1,5 @@
1
- module Rubinius::ToolSets.current::ToolSet
1
+ module CodeTools
2
2
  class Melbourne
3
- VERSION = "1.1.1.1"
3
+ VERSION = "1.2.0.0"
4
4
  end
5
5
  end
data/lib/rubinius/melbourne.rb CHANGED
@@ -1,27 +1,7 @@
1
- require "rubinius/melbourne/melbourne"
2
1
  require "rubinius/melbourne/version"
2
+ require "rubinius/melbourne/melbourne"
3
3
 
4
- class String
5
- def to_ast(name="(eval)", line=1)
6
- Rubinius::ToolSets.get(:runtime)::Melbourne.parse_string self, name, line
7
- end
8
-
9
- def to_sexp(name="(eval)", line=1)
10
- to_ast(name, line).to_sexp
11
- end
12
- end
13
-
14
- class File
15
- def self.to_ast(name, line=1)
16
- Rubinius::ToolSets.get(:runtime)::Melbourne.parse_file name, line
17
- end
18
-
19
- def self.to_sexp(name, line=1)
20
- to_ast(name, line).to_sexp
21
- end
22
- end
23
-
24
- module Rubinius::ToolSets.current::ToolSet
4
+ module CodeTools
25
5
  class Melbourne
26
6
  attr_accessor :transforms
27
7
  attr_accessor :magic_handler
data/rubinius-melbourne.gemspec CHANGED
@@ -1,25 +1,27 @@
1
1
  # -*- encoding: utf-8 -*-
2
- require 'rubinius/toolset'
3
2
  require './lib/rubinius/melbourne/version'
4
3
 
5
- Gem::Specification.new do |gem|
6
- gem.authors = ["Brian Shirai"]
7
- gem.email = ["brixen@gmail.com"]
8
- gem.description = %q{Ruby parser extracted from MRI.}
9
- gem.summary = %q{Rubinius Ruby Parser.}
10
- gem.homepage = "https://github.com/rubinius/rubinius-melbourne"
11
- gem.license = "BSD"
4
+ Gem::Specification.new do |spec|
5
+ spec.authors = ["Brian Shirai"]
6
+ spec.email = ["brixen@gmail.com"]
7
+ spec.description = %q{Ruby parser extracted from MRI.}
8
+ spec.summary = %q{Rubinius Ruby Parser.}
9
+ spec.homepage = "https://github.com/rubinius/rubinius-melbourne"
10
+ spec.license = "BSD"
12
11
 
13
- gem.files = `git ls-files`.split($\)
14
- gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
15
- gem.extensions = ["ext/rubinius/melbourne/extconf.rb"]
16
- gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
17
- gem.name = "rubinius-melbourne"
18
- gem.require_paths = ["lib"]
19
- gem.version = Rubinius::ToolSets.current::ToolSet::Melbourne::VERSION
12
+ spec.files = `git ls-files`.split($\)
13
+ spec.executables = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
14
+ spec.extensions = ["ext/rubinius/melbourne/extconf.rb"]
15
+ spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
16
+ spec.name = "rubinius-melbourne"
17
+ spec.require_paths = ["lib"]
18
+ spec.version = CodeTools::Melbourne::VERSION
20
19
 
21
- gem.add_runtime_dependency "rubinius-toolset", "~> 2.0"
22
-
23
- gem.add_development_dependency "mspec", "~> 1.5"
24
- gem.add_development_dependency "rake", "~> 10.0"
20
+ spec.add_development_dependency "rubinius-processor", "~> 1.0"
21
+ spec.add_development_dependency "rubinius-compiler", "~> 1.0"
22
+ spec.add_development_dependency "rubinius-ast", "~> 1.0"
23
+ spec.add_development_dependency "rubinius-bridge", "~> 1.0"
24
+ spec.add_development_dependency "redcard", "~> 1.0"
25
+ spec.add_development_dependency "mspec", "~> 1.5"
26
+ spec.add_development_dependency "rake", "~> 10.0"
25
27
  end
metadata CHANGED
@@ -1,29 +1,85 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubinius-melbourne
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1.1
4
+ version: 1.2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian Shirai
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-21 00:00:00.000000000 Z
11
+ date: 2014-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: rubinius-toolset
14
+ name: rubinius-processor
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '2.0'
20
- type: :runtime
19
+ version: '1.0'
20
+ type: :development
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '1.0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: rubinius-compiler
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '1.0'
34
+ type: :development
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '1.0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: rubinius-ast
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '1.0'
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '1.0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: rubinius-bridge
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.0'
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '1.0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: redcard
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '1.0'
76
+ type: :development
21
77
  prerelease: false
22
78
  version_requirements: !ruby/object:Gem::Requirement
23
79
  requirements:
24
80
  - - "~>"
25
81
  - !ruby/object:Gem::Version
26
- version: '2.0'
82
+ version: '1.0'
27
83
  - !ruby/object:Gem::Dependency
28
84
  name: mspec
29
85
  requirement: !ruby/object:Gem::Requirement