Skip to content

Commit 1475b2c

Browse files
adambeynonadambeynon
committedJan 14, 2014
Separate wrapper classes in corelib
·
v1.8.3.rc1lerna-0.0.1-alpha.2
1 parent bf3fe80 commit 1475b2c

File tree

5 files changed

+196
-191
lines changed

5 files changed

+196
-191
lines changed
 

‎opal/corelib/array.rb

-112
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ class Array
66
# Mark all javascript arrays as being valid ruby arrays
77
`def._isArray = true`
88

9-
def self.inherited(klass)
10-
replace = Class.new(Array::Wrapper)
11-
12-
%x{
13-
klass._proto = replace._proto;
14-
klass._proto._klass = klass;
15-
klass._alloc = replace._alloc;
16-
klass.__parent = #{Array::Wrapper};
17-
18-
klass.$allocate = replace.$allocate;
19-
klass.$new = replace.$new;
20-
klass["$[]"] = replace["$[]"];
21-
}
22-
end
23-
249
def self.[](*objects)
2510
objects
2611
end
@@ -1549,100 +1534,3 @@ def zip(*others, &block)
15491534
}
15501535
end
15511536
end
1552-
1553-
class Array::Wrapper
1554-
def self.allocate(array = [])
1555-
obj = super()
1556-
`obj.literal = array`
1557-
obj
1558-
end
1559-
1560-
def self.new(*args, &block)
1561-
obj = allocate
1562-
obj.initialize(*args, &block)
1563-
obj
1564-
end
1565-
1566-
def self.[](*objects)
1567-
allocate(objects)
1568-
end
1569-
1570-
def initialize(*args, &block)
1571-
@literal = Array.new(*args, &block)
1572-
end
1573-
1574-
def method_missing(*args, &block)
1575-
result = @literal.__send__(*args, &block)
1576-
1577-
if `result === #@literal`
1578-
self
1579-
else
1580-
result
1581-
end
1582-
end
1583-
1584-
def initialize_copy(other)
1585-
@literal = `other.literal`.clone
1586-
end
1587-
1588-
def respond_to?(name, *)
1589-
super || @literal.respond_to?(name)
1590-
end
1591-
1592-
def ==(other)
1593-
@literal == other
1594-
end
1595-
1596-
def eql?(other)
1597-
@literal.eql?(other)
1598-
end
1599-
1600-
def to_a
1601-
@literal
1602-
end
1603-
1604-
def to_ary
1605-
self
1606-
end
1607-
1608-
def inspect
1609-
@literal.inspect
1610-
end
1611-
1612-
# wrapped results
1613-
def *(other)
1614-
%x{
1615-
var result = #{@literal * other};
1616-
1617-
if (result._isArray) {
1618-
return #{self.class.allocate(`result`)}
1619-
}
1620-
else {
1621-
return result;
1622-
}
1623-
}
1624-
end
1625-
1626-
def [](index, length = undefined)
1627-
%x{
1628-
var result = #{@literal.slice(index, length)};
1629-
1630-
if (result._isArray && (index._isRange || length !== undefined)) {
1631-
return #{self.class.allocate(`result`)}
1632-
}
1633-
else {
1634-
return result;
1635-
}
1636-
}
1637-
end
1638-
1639-
alias slice []
1640-
1641-
def uniq
1642-
self.class.allocate(@literal.uniq)
1643-
end
1644-
1645-
def flatten(level = undefined)
1646-
self.class.allocate(@literal.flatten(level))
1647-
end
1648-
end

‎opal/corelib/array_wrapper.rb

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
class Array
2+
def self.inherited(klass)
3+
replace = Class.new(Array::Wrapper)
4+
5+
%x{
6+
klass._proto = replace._proto;
7+
klass._proto._klass = klass;
8+
klass._alloc = replace._alloc;
9+
klass.__parent = #{Array::Wrapper};
10+
11+
klass.$allocate = replace.$allocate;
12+
klass.$new = replace.$new;
13+
klass["$[]"] = replace["$[]"];
14+
}
15+
end
16+
end
17+
18+
class Array::Wrapper
19+
def self.allocate(array = [])
20+
obj = super()
21+
`obj.literal = array`
22+
obj
23+
end
24+
25+
def self.new(*args, &block)
26+
obj = allocate
27+
obj.initialize(*args, &block)
28+
obj
29+
end
30+
31+
def self.[](*objects)
32+
allocate(objects)
33+
end
34+
35+
def initialize(*args, &block)
36+
@literal = Array.new(*args, &block)
37+
end
38+
39+
def method_missing(*args, &block)
40+
result = @literal.__send__(*args, &block)
41+
42+
if `result === #@literal`
43+
self
44+
else
45+
result
46+
end
47+
end
48+
49+
def initialize_copy(other)
50+
@literal = `other.literal`.clone
51+
end
52+
53+
def respond_to?(name, *)
54+
super || @literal.respond_to?(name)
55+
end
56+
57+
def ==(other)
58+
@literal == other
59+
end
60+
61+
def eql?(other)
62+
@literal.eql?(other)
63+
end
64+
65+
def to_a
66+
@literal
67+
end
68+
69+
def to_ary
70+
self
71+
end
72+
73+
def inspect
74+
@literal.inspect
75+
end
76+
77+
# wrapped results
78+
def *(other)
79+
%x{
80+
var result = #{@literal * other};
81+
82+
if (result._isArray) {
83+
return #{self.class.allocate(`result`)}
84+
}
85+
else {
86+
return result;
87+
}
88+
}
89+
end
90+
91+
def [](index, length = undefined)
92+
%x{
93+
var result = #{@literal.slice(index, length)};
94+
95+
if (result._isArray && (index._isRange || length !== undefined)) {
96+
return #{self.class.allocate(`result`)}
97+
}
98+
else {
99+
return result;
100+
}
101+
}
102+
end
103+
104+
alias slice []
105+
106+
def uniq
107+
self.class.allocate(@literal.uniq)
108+
end
109+
110+
def flatten(level = undefined)
111+
self.class.allocate(@literal.flatten(level))
112+
end
113+
end

‎opal/corelib/string.rb

-79
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,6 @@ class String
55

66
`def._isString = true`
77

8-
def self.inherited(klass)
9-
replace = Class.new(String::Wrapper)
10-
11-
%x{
12-
klass._proto = replace._proto;
13-
klass._proto._klass = klass;
14-
klass._alloc = replace._alloc;
15-
klass.__parent = #{String::Wrapper};
16-
17-
klass.$allocate = replace.$allocate;
18-
klass.$new = replace.$new;
19-
}
20-
end
21-
228
def self.try_convert(what)
239
what.to_str
2410
rescue
@@ -1158,68 +1144,3 @@ def frozen?
11581144
end
11591145

11601146
Symbol = String
1161-
1162-
class String::Wrapper
1163-
def self.allocate(string = "")
1164-
obj = super()
1165-
`obj.literal = string`
1166-
obj
1167-
end
1168-
1169-
def self.new(*args, &block)
1170-
obj = allocate
1171-
obj.initialize(*args, &block)
1172-
obj
1173-
end
1174-
1175-
def self.[](*objects)
1176-
allocate(objects)
1177-
end
1178-
1179-
def initialize(string = '')
1180-
@literal = string
1181-
end
1182-
1183-
def method_missing(*args, &block)
1184-
result = @literal.__send__(*args, &block)
1185-
1186-
if `result._isString != null`
1187-
if `result == #@literal`
1188-
self
1189-
else
1190-
self.class.allocate(result)
1191-
end
1192-
else
1193-
result
1194-
end
1195-
end
1196-
1197-
def initialize_copy(other)
1198-
@literal = `other.literal`.clone
1199-
end
1200-
1201-
def respond_to?(name, *)
1202-
super || @literal.respond_to?(name)
1203-
end
1204-
1205-
def ==(other)
1206-
@literal == other
1207-
end
1208-
1209-
alias eql? ==
1210-
alias === ==
1211-
1212-
def to_s
1213-
@literal
1214-
end
1215-
1216-
def to_str
1217-
self
1218-
end
1219-
1220-
def inspect
1221-
@literal.inspect
1222-
end
1223-
1224-
# unwrapped results
1225-
end

‎opal/corelib/string_wrapper.rb

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
class String
2+
def self.inherited(klass)
3+
replace = Class.new(String::Wrapper)
4+
5+
%x{
6+
klass._proto = replace._proto;
7+
klass._proto._klass = klass;
8+
klass._alloc = replace._alloc;
9+
klass.__parent = #{String::Wrapper};
10+
11+
klass.$allocate = replace.$allocate;
12+
klass.$new = replace.$new;
13+
}
14+
end
15+
end
16+
17+
class String::Wrapper
18+
def self.allocate(string = "")
19+
obj = super()
20+
`obj.literal = string`
21+
obj
22+
end
23+
24+
def self.new(*args, &block)
25+
obj = allocate
26+
obj.initialize(*args, &block)
27+
obj
28+
end
29+
30+
def self.[](*objects)
31+
allocate(objects)
32+
end
33+
34+
def initialize(string = '')
35+
@literal = string
36+
end
37+
38+
def method_missing(*args, &block)
39+
result = @literal.__send__(*args, &block)
40+
41+
if `result._isString != null`
42+
if `result == #@literal`
43+
self
44+
else
45+
self.class.allocate(result)
46+
end
47+
else
48+
result
49+
end
50+
end
51+
52+
def initialize_copy(other)
53+
@literal = `other.literal`.clone
54+
end
55+
56+
def respond_to?(name, *)
57+
super || @literal.respond_to?(name)
58+
end
59+
60+
def ==(other)
61+
@literal == other
62+
end
63+
64+
alias eql? ==
65+
alias === ==
66+
67+
def to_s
68+
@literal
69+
end
70+
71+
def to_str
72+
self
73+
end
74+
75+
def inspect
76+
@literal.inspect
77+
end
78+
79+
# unwrapped results
80+
end

‎opal/opal.rb

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@
2828
require 'corelib/io'
2929
require 'corelib/main'
3030
require 'corelib/variables'
31+
32+
require 'corelib/string_wrapper'
33+
require 'corelib/array_wrapper'

0 commit comments

Comments
 (0)
Please sign in to comment.