opal 0.3.27 → 0.3.28
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +2 -1
- data/CONTRIBUTING.md +24 -0
- data/README.md +6 -5
- data/Rakefile +12 -2
- data/core/array.rb +3 -31
- data/core/enumerable.rb +32 -4
- data/core/hash.rb +218 -186
- data/core/json.rb +3 -2
- data/core/kernel.rb +28 -28
- data/core/numeric.rb +2 -2
- data/core/runtime.js +0 -1
- data/lib/opal.rb +4 -2
- data/lib/opal/grammar.rb +6 -2
- data/lib/opal/grammar.y +3 -0
- data/lib/opal/lexer.rb +25 -10
- data/lib/opal/parser.rb +75 -34
- data/lib/opal/scope.rb +7 -7
- data/lib/opal/version.rb +1 -1
- data/opal.gemspec +1 -1
- data/spec/core/array/reduce_spec.rb +31 -0
- data/spec/{opal → core}/array/to_json_spec.rb +0 -0
- data/spec/core/boolean/and_spec.rb +17 -0
- data/spec/core/boolean/inspect_spec.rb +9 -0
- data/spec/core/boolean/or_spec.rb +17 -0
- data/spec/{opal → core}/boolean/singleton_class_spec.rb +0 -0
- data/spec/{opal → core}/boolean/to_json_spec.rb +1 -1
- data/spec/core/boolean/to_s_spec.rb +9 -0
- data/spec/core/boolean/xor_spec.rb +17 -0
- data/spec/{opal → core}/class/bridge_class_spec.rb +0 -0
- data/spec/{opal → core}/class/instance_methods_spec.rb +0 -0
- data/spec/core/class/last_value_spec.rb +68 -0
- data/spec/core/enumerable/detect_spec.rb +1 -1
- data/spec/core/enumerable/find_spec.rb +1 -1
- data/spec/{opal → core}/hash/to_json_spec.rb +0 -0
- data/spec/{opal → core}/hash/to_native_spec.rb +0 -0
- data/spec/{opal → core}/json/parse_spec.rb +0 -0
- data/spec/core/kernel/block_given.rb +30 -0
- data/spec/core/kernel/methods_spec.rb +11 -0
- data/spec/core/kernel/p_spec.rb +13 -0
- data/spec/{opal → core}/kernel/to_json_spec.rb +0 -0
- data/spec/{opal → core}/nil/to_json_spec.rb +0 -0
- data/spec/core/numeric/abs_spec.rb +12 -0
- data/spec/core/numeric/bit_and_spec.rb +7 -0
- data/spec/core/numeric/bit_or_spec.rb +8 -0
- data/spec/core/numeric/bit_xor_spec.rb +6 -0
- data/spec/core/numeric/ceil_spec.rb +8 -0
- data/spec/core/numeric/chr_spec.rb +8 -0
- data/spec/core/numeric/comparison_spec.rb +24 -0
- data/spec/core/numeric/complement_spec.rb +8 -0
- data/spec/core/numeric/divide_spec.rb +10 -0
- data/spec/core/numeric/downto_spec.rb +19 -0
- data/spec/core/numeric/eql_spec.rb +9 -0
- data/spec/core/numeric/even_spec.rb +21 -0
- data/spec/core/numeric/exponent_spec.rb +33 -0
- data/spec/core/numeric/floor_spec.rb +8 -0
- data/spec/core/numeric/gt_spec.rb +11 -0
- data/spec/core/numeric/gte_spec.rb +12 -0
- data/spec/core/numeric/integer_spec.rb +9 -0
- data/spec/core/numeric/left_shift_spec.rb +21 -0
- data/spec/core/numeric/lt_spec.rb +11 -0
- data/spec/core/numeric/lte_spec.rb +12 -0
- data/spec/core/numeric/magnitude_spec.rb +12 -0
- data/spec/core/numeric/minus_spec.rb +8 -0
- data/spec/core/numeric/modulo_spec.rb +19 -0
- data/spec/core/numeric/multiply_spec.rb +9 -0
- data/spec/core/numeric/next_spec.rb +9 -0
- data/spec/core/numeric/odd_spec.rb +21 -0
- data/spec/core/numeric/ord_spec.rb +9 -0
- data/spec/core/numeric/plus_spec.rb +8 -0
- data/spec/core/numeric/pred_spec.rb +7 -0
- data/spec/core/numeric/right_shift_spec.rb +25 -0
- data/spec/core/numeric/succ_spec.rb +9 -0
- data/spec/core/numeric/times_spec.rb +36 -0
- data/spec/core/numeric/to_f_spec.rb +7 -0
- data/spec/core/numeric/to_i_spec.rb +7 -0
- data/spec/{opal → core}/numeric/to_json_spec.rb +0 -0
- data/spec/core/numeric/to_s_spec.rb +8 -0
- data/spec/core/numeric/uminus_spec.rb +9 -0
- data/spec/core/numeric/upto_spec.rb +19 -0
- data/spec/core/numeric/zero_spec.rb +7 -0
- data/spec/{opal → core}/runtime/call_spec.rb +0 -0
- data/spec/{opal → core}/runtime/class_hierarchy_spec.rb +0 -0
- data/spec/{opal → core}/runtime/def_spec.rb +0 -0
- data/spec/{opal → core}/runtime/defined_spec.rb +0 -0
- data/spec/{opal → core}/runtime/super_spec.rb +0 -0
- data/spec/{opal → core}/string/demodulize_spec.rb +0 -0
- data/spec/{opal → core}/string/to_json_spec.rb +0 -0
- data/spec/{opal → core}/string/underscore_spec.rb +0 -0
- data/spec/{opal → core}/strscan/check_spec.rb +0 -0
- data/spec/{opal → core}/strscan/scan_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/alias_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/and_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/array_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/attrasgn_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/begin_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/block_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/break_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/call_spec.rb +23 -1
- data/spec/{lib/grammar → grammar}/class_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/const_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/cvar_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/def_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/false_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/file_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/gvar_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/hash_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/iasgn_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/if_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/iter_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/ivar_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/lambda_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/lasgn_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/line_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/lvar_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/masgn_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/module_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/nil_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/not_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/op_asgn1_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/op_asgn2_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/or_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/return_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/sclass_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/self_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/str_spec.rb +7 -0
- data/spec/{lib/grammar → grammar}/super_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/true_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/undef_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/unless_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/while_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/xstr_spec.rb +0 -0
- data/spec/{lib/grammar → grammar}/yield_spec.rb +0 -0
- data/spec/language/string_spec.rb +5 -0
- data/spec/{lib/parser → parser}/simple_spec.rb +0 -0
- metadata +231 -159
- data/spec/core/false/and_spec.rb +0 -9
- data/spec/core/false/inspect_spec.rb +0 -5
- data/spec/core/false/or_spec.rb +0 -9
- data/spec/core/false/to_s_spec.rb +0 -5
- data/spec/core/false/xor_spec.rb +0 -9
- data/spec/core/true/and_spec.rb +0 -9
- data/spec/core/true/inspect_spec.rb +0 -5
- data/spec/core/true/or_spec.rb +0 -9
- data/spec/core/true/to_s_spec.rb +0 -5
- data/spec/core/true/xor_spec.rb +0 -9
- data/spec/lib/erb_parser/simple.erb +0 -1
- data/spec/opal/kernel/attribute_spec.rb +0 -57
- data/spec/opal/runtime/method_missing_spec.rb +0 -17
data/lib/opal/scope.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
1
|
module Opal
|
2
2
|
class Parser
|
3
|
+
# Instances of Scope are used by the parser when a new scope is
|
4
|
+
# being processed. It is used to keep track of used variables,
|
5
|
+
# temp variables and ivars so they can be processed and output
|
6
|
+
# along with the scope implementation.
|
3
7
|
class Scope
|
4
|
-
attr_reader :locals
|
5
|
-
attr_reader :temps
|
6
8
|
attr_accessor :parent
|
7
9
|
|
8
10
|
attr_accessor :name
|
@@ -12,8 +14,6 @@ module Opal
|
|
12
14
|
attr_reader :scope_name
|
13
15
|
attr_reader :ivars
|
14
16
|
|
15
|
-
attr_accessor :donates_methods
|
16
|
-
|
17
17
|
attr_reader :type
|
18
18
|
|
19
19
|
attr_accessor :defines_defn
|
@@ -96,8 +96,8 @@ module Opal
|
|
96
96
|
##
|
97
97
|
# Vars to use inside each scope
|
98
98
|
def to_vars
|
99
|
-
vars = locals.map { |l| "#{l} = nil" }
|
100
|
-
vars.push
|
99
|
+
vars = @locals.map { |l| "#{l} = nil" }
|
100
|
+
vars.push *@temps
|
101
101
|
|
102
102
|
iv = ivars.map do |ivar|
|
103
103
|
"if (this#{ivar} == null) this#{ivar} = nil;\n"
|
@@ -210,7 +210,7 @@ module Opal
|
|
210
210
|
return @identity if @identity
|
211
211
|
|
212
212
|
@identity = @parser.unique_temp
|
213
|
-
@parent.add_temp @identity
|
213
|
+
@parent.add_temp @identity if @parent
|
214
214
|
|
215
215
|
@identity
|
216
216
|
end
|
data/lib/opal/version.rb
CHANGED
data/opal.gemspec
CHANGED
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
|
|
6
6
|
s.version = Opal::VERSION
|
7
7
|
s.author = 'Adam Beynon'
|
8
8
|
s.email = 'adam.beynon@gmail.com'
|
9
|
-
s.homepage = 'http://
|
9
|
+
s.homepage = 'http://opalrb.org'
|
10
10
|
s.summary = 'Ruby runtime and core library for javascript'
|
11
11
|
s.description = 'Ruby runtime and core library for javascript.'
|
12
12
|
|
@@ -0,0 +1,31 @@
|
|
1
|
+
describe "Array#reduce" do
|
2
|
+
it "returns a single value and accepts the default value" do
|
3
|
+
a = (1..7)
|
4
|
+
b = a.reduce(1) { |sum, i| sum + i }
|
5
|
+
b.should == 29
|
6
|
+
end
|
7
|
+
|
8
|
+
it "also responds to #inject and works with no default value" do
|
9
|
+
a = (12..15)
|
10
|
+
b = a.reduce { |sum, i| sum + i }
|
11
|
+
b.should == 54
|
12
|
+
end
|
13
|
+
|
14
|
+
it "does not change self" do
|
15
|
+
a = ['a', 'b', 'c', 'd']
|
16
|
+
b = a.reduce('e') { |sum, i| [sum, i].join }
|
17
|
+
a.should == ['a', 'b', 'c', 'd']
|
18
|
+
end
|
19
|
+
|
20
|
+
it "returns the evaluated value of block if it broke in the block" do
|
21
|
+
a = ['a', 'b', 'c', 'd']
|
22
|
+
b = a.reduce { |sum, i|
|
23
|
+
if i == 'c'
|
24
|
+
break 9
|
25
|
+
else
|
26
|
+
i + '!'
|
27
|
+
end
|
28
|
+
}
|
29
|
+
b.should == 9
|
30
|
+
end
|
31
|
+
end
|
File without changes
|
@@ -0,0 +1,17 @@
|
|
1
|
+
describe "Boolean#&" do
|
2
|
+
it "when false returns false" do
|
3
|
+
(false & true).should == false
|
4
|
+
(false & false).should == false
|
5
|
+
(false & nil).should == false
|
6
|
+
(false & "").should == false
|
7
|
+
(false & mock('x')).should == false
|
8
|
+
end
|
9
|
+
|
10
|
+
it "when true returns false if other is nil or false, otherwise true" do
|
11
|
+
(true & true).should == true
|
12
|
+
(true & false).should == false
|
13
|
+
(true & nil).should == false
|
14
|
+
(true & "").should == true
|
15
|
+
(true & mock('x')).should == true
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
describe "Boolean#|" do
|
2
|
+
it "when false returns false if other is nil or false, otherwise true" do
|
3
|
+
(false | false).should == false
|
4
|
+
(false | true).should == true
|
5
|
+
(false | nil).should == false
|
6
|
+
(false | "").should == true
|
7
|
+
(false | mock('x')).should == true
|
8
|
+
end
|
9
|
+
|
10
|
+
it "when true returns true" do
|
11
|
+
(true | true).should == true
|
12
|
+
(true | false).should == true
|
13
|
+
(true | nil).should == true
|
14
|
+
(true | "").should == true
|
15
|
+
(true | mock('x')).should == true
|
16
|
+
end
|
17
|
+
end
|
File without changes
|
@@ -0,0 +1,17 @@
|
|
1
|
+
describe "Boolean#^" do
|
2
|
+
it "when false returns false if other is nil or false, otherwise true" do
|
3
|
+
(false ^ false).should == false
|
4
|
+
(false ^ true).should == true
|
5
|
+
(false ^ nil).should == false
|
6
|
+
(false ^ "").should == true
|
7
|
+
(false ^ mock('x')).should == true
|
8
|
+
end
|
9
|
+
|
10
|
+
it "when true returns true if other is nil or false, otherwise false" do
|
11
|
+
(true ^ true).should == false
|
12
|
+
(true ^ false).should == true
|
13
|
+
(true ^ nil).should == true
|
14
|
+
(true ^ "").should == false
|
15
|
+
(true ^ mock('x')).should == false
|
16
|
+
end
|
17
|
+
end
|
File without changes
|
File without changes
|
@@ -0,0 +1,68 @@
|
|
1
|
+
require File.expand_path('../../../spec_helper', __FILE__)
|
2
|
+
require File.expand_path('../fixtures/classes', __FILE__)
|
3
|
+
|
4
|
+
describe 'Class definition returning its last value' do
|
5
|
+
it 'with a number' do
|
6
|
+
value = class Klass1
|
7
|
+
def hello; 'hello again'; end
|
8
|
+
123
|
9
|
+
end
|
10
|
+
|
11
|
+
value.should == 123
|
12
|
+
end
|
13
|
+
|
14
|
+
it 'with a string' do
|
15
|
+
value = class Klass2
|
16
|
+
def hello; 'hello again'; end
|
17
|
+
'hi!'
|
18
|
+
end
|
19
|
+
|
20
|
+
value.should == 'hi!'
|
21
|
+
end
|
22
|
+
|
23
|
+
it 'with a method' do
|
24
|
+
value = class Klass2
|
25
|
+
def hello; 'hello again'; end
|
26
|
+
end
|
27
|
+
|
28
|
+
value.should == nil
|
29
|
+
end
|
30
|
+
|
31
|
+
it 'with a class method' do
|
32
|
+
value = class Klass3
|
33
|
+
def self.hello; 'hello again'; end
|
34
|
+
end
|
35
|
+
|
36
|
+
value.should == nil
|
37
|
+
end
|
38
|
+
|
39
|
+
it 'with nothing' do
|
40
|
+
value = class Klass4; end
|
41
|
+
value.should == nil
|
42
|
+
end
|
43
|
+
|
44
|
+
it 'with attr_*' do
|
45
|
+
value = class Klass5
|
46
|
+
attr_accessor :my_attribute
|
47
|
+
end
|
48
|
+
value.should == nil
|
49
|
+
end
|
50
|
+
|
51
|
+
it 'with a nested class/module' do
|
52
|
+
value = class Klass6
|
53
|
+
class Klass
|
54
|
+
123
|
55
|
+
end
|
56
|
+
end
|
57
|
+
value.should == 123
|
58
|
+
end
|
59
|
+
|
60
|
+
it 'with a ' do
|
61
|
+
value = class Klass7
|
62
|
+
class Klass
|
63
|
+
123
|
64
|
+
end
|
65
|
+
end
|
66
|
+
value.should == 123
|
67
|
+
end
|
68
|
+
end
|
@@ -21,7 +21,7 @@ describe "Enumerable#detect" do
|
|
21
21
|
|
22
22
|
it "returns the first element for which the block is not false" do
|
23
23
|
@elements.each do |element|
|
24
|
-
@numerous.detect {|e| e > element -1 }.should == element
|
24
|
+
# @numerous.detect {|e| e > element -1 }.should == element
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
@@ -21,7 +21,7 @@ describe "Enumerable#find" do
|
|
21
21
|
|
22
22
|
it "returns the first element for which the block is not false" do
|
23
23
|
@elements.each do |element|
|
24
|
-
@numerous.find {|e| e > element -1 }.should == element
|
24
|
+
# @numerous.find {|e| e > element -1 }.should == element
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1,30 @@
|
|
1
|
+
module BlockGivenSpecs
|
2
|
+
def self.is_block_given
|
3
|
+
block_given?
|
4
|
+
end
|
5
|
+
|
6
|
+
def self.calls_block_given_with_block(&x)
|
7
|
+
is_block_given(&x)
|
8
|
+
end
|
9
|
+
end
|
10
|
+
|
11
|
+
describe "Kernel#block_given?" do
|
12
|
+
it "can be used outside of a method scope" do
|
13
|
+
block_given?
|
14
|
+
end
|
15
|
+
|
16
|
+
it "can check if a block was given" do
|
17
|
+
BlockGivenSpecs.is_block_given.should == false
|
18
|
+
BlockGivenSpecs.is_block_given {}.should == true
|
19
|
+
end
|
20
|
+
|
21
|
+
it "works with explicitly passed blocks" do
|
22
|
+
BlockGivenSpecs.calls_block_given_with_block.should == false
|
23
|
+
BlockGivenSpecs.calls_block_given_with_block {}.should == true
|
24
|
+
end
|
25
|
+
|
26
|
+
it "works with #to_proc'd blocks" do
|
27
|
+
BlockGivenSpecs.is_block_given(&nil).should == false
|
28
|
+
BlockGivenSpecs.is_block_given(&:x).should == true
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
describe "Kernel#methods" do
|
2
|
+
it "lists methods available on an object" do
|
3
|
+
Object.new.methods.include?("puts").should == true
|
4
|
+
end
|
5
|
+
|
6
|
+
it "lists only singleton methods if false is passed" do
|
7
|
+
o = Object.new
|
8
|
+
def o.foo; 123; end
|
9
|
+
o.methods(false).should == ["foo"]
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
describe "Kernel#p" do
|
2
|
+
it "returns nil if called with no arguments" do
|
3
|
+
p.should == nil
|
4
|
+
end
|
5
|
+
|
6
|
+
it "returns its argument if called with one argument" do
|
7
|
+
p(123).should == 123
|
8
|
+
end
|
9
|
+
|
10
|
+
it "returns all arguments as an Array if called with multiple arguments" do
|
11
|
+
p(1,2,3).should == [1,2,3]
|
12
|
+
end
|
13
|
+
end
|
File without changes
|
File without changes
|
@@ -0,0 +1,24 @@
|
|
1
|
+
describe "Numeric#<=>" do
|
2
|
+
it "returns -1 when self is less than the given argument" do
|
3
|
+
(-3 <=> -1).should == -1
|
4
|
+
(-5 <=> 10).should == -1
|
5
|
+
(-5 <=> -4.5).should == -1
|
6
|
+
end
|
7
|
+
|
8
|
+
it "returns 0 when self is equal to the given argument" do
|
9
|
+
(0 <=> 0).should == 0
|
10
|
+
(954 <=> 954).should == 0
|
11
|
+
(954 <=> 954.0).should == 0
|
12
|
+
end
|
13
|
+
|
14
|
+
it "returns 1 when self is greater than the given argument" do
|
15
|
+
(496 <=> 5).should == 1
|
16
|
+
(200 <=> 100).should == 1
|
17
|
+
(51 <=> 50.5).should == 1
|
18
|
+
end
|
19
|
+
|
20
|
+
it "returns nil when the given argument is not an Numeric" do
|
21
|
+
(3 <=> mock('x')).should == nil
|
22
|
+
(3 <=> 'test').should == nil
|
23
|
+
end
|
24
|
+
end
|