Skip to content

Commit f7685b4

Browse files
takaokoujitakaokouji
authored
Merge pull request #403 from smalruby/refactor/register-on-send-naming
refactor: rename registerCallMethod* to registerOnSend* for consistency
2 parents 18e6809 + 3096b3a commit f7685b4

25 files changed

+307
-307
lines changed

‎src/lib/ruby-to-blocks-converter/boost.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import _ from 'lodash';
55
*/
66
const BoostConverter = {
77
register: function (converter) {
8-
converter.registerCallMethod('self', 'boost_motor_turn_on_for', 2, params => {
8+
converter.registerOnSend('self', 'boost_motor_turn_on_for', 2, params => {
99
const {args} = params;
1010
if (!converter.isStringOrBlock(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
1111

@@ -19,7 +19,7 @@ const BoostConverter = {
1919
return block;
2020
});
2121

22-
converter.registerCallMethod('self', 'boost_motor_turn_on_for', 1, params => {
22+
converter.registerOnSend('self', 'boost_motor_turn_on_for', 1, params => {
2323
const {args} = params;
2424
if (!converter.isStringOrBlock(args[0])) return null;
2525

@@ -32,7 +32,7 @@ const BoostConverter = {
3232
return block;
3333
});
3434

35-
converter.registerCallMethod('self', 'boost_motor_turn_this_way_for', 2, params => {
35+
converter.registerOnSend('self', 'boost_motor_turn_this_way_for', 2, params => {
3636
const {args} = params;
3737
if (!converter.isStringOrBlock(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
3838

@@ -46,7 +46,7 @@ const BoostConverter = {
4646
return block;
4747
});
4848

49-
converter.registerCallMethod('self', 'boost_motor_turn_off_for', 1, params => {
49+
converter.registerOnSend('self', 'boost_motor_turn_off_for', 1, params => {
5050
const {args} = params;
5151
if (!converter.isStringOrBlock(args[0])) return null;
5252

@@ -59,7 +59,7 @@ const BoostConverter = {
5959
return block;
6060
});
6161

62-
converter.registerCallMethod('self', 'boost_motor_set_power_for', 2, params => {
62+
converter.registerOnSend('self', 'boost_motor_set_power_for', 2, params => {
6363
const {args} = params;
6464
if (!converter.isStringOrBlock(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
6565

@@ -73,7 +73,7 @@ const BoostConverter = {
7373
return block;
7474
});
7575

76-
converter.registerCallMethod('self', 'boost_motor_set_direction_for', 2, params => {
76+
converter.registerOnSend('self', 'boost_motor_set_direction_for', 2, params => {
7777
const {args} = params;
7878
if (!converter.isStringOrBlock(args[0]) || !converter.isStringOrBlock(args[1])) return null;
7979

@@ -91,7 +91,7 @@ const BoostConverter = {
9191
return block;
9292
});
9393

94-
converter.registerCallMethod('self', 'boost_motor_get_position', 1, params => {
94+
converter.registerOnSend('self', 'boost_motor_get_position', 1, params => {
9595
const {args} = params;
9696
if (!converter.isStringOrBlock(args[0])) return null;
9797

@@ -104,7 +104,7 @@ const BoostConverter = {
104104
return block;
105105
});
106106

107-
converter.registerCallMethod('self', 'boost_seeing_color?', 1, params => {
107+
converter.registerOnSend('self', 'boost_seeing_color?', 1, params => {
108108
const {args} = params;
109109
if (!converter.isStringOrBlock(args[0])) return null;
110110

@@ -117,7 +117,7 @@ const BoostConverter = {
117117
return block;
118118
});
119119

120-
converter.registerCallMethod('self', 'boost_get_tilt_angle', 1, params => {
120+
converter.registerOnSend('self', 'boost_get_tilt_angle', 1, params => {
121121
const {args} = params;
122122
if (!converter.isStringOrBlock(args[0])) return null;
123123

@@ -130,7 +130,7 @@ const BoostConverter = {
130130
return block;
131131
});
132132

133-
converter.registerCallMethod('self', 'boost_set_light_color', 1, params => {
133+
converter.registerOnSend('self', 'boost_set_light_color', 1, params => {
134134
const {args} = params;
135135
if (!converter.isNumberOrBlock(args[0])) return null;
136136

@@ -139,7 +139,7 @@ const BoostConverter = {
139139
return block;
140140
});
141141

142-
converter.registerCallMethodWithBlock('self', 'when', 2, 0, params => {
142+
converter.registerOnSendWithBlock('self', 'when', 2, 0, params => {
143143
const {args, rubyBlock} = params;
144144

145145
if (args[0].type !== 'sym' || !converter.isStringOrBlock(args[1])) return null;

‎src/lib/ruby-to-blocks-converter/control.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const ControlConverter = {
2222

2323
register: function (converter) {
2424
// sleep(duration) - control_wait
25-
converter.registerCallMethod('self', 'sleep', 1, params => {
25+
converter.registerOnSend('self', 'sleep', 1, params => {
2626
const {args} = params;
2727
if (!converter._isNumberOrBlock(args[0])) return null;
2828

@@ -32,7 +32,7 @@ const ControlConverter = {
3232
});
3333

3434
// repeat(times) { block } - control_repeat
35-
converter.registerCallMethodWithBlock('self', 'repeat', 1, 0, params => {
35+
converter.registerOnSendWithBlock('self', 'repeat', 1, 0, params => {
3636
const {args, rubyBlock} = params;
3737
if (!converter._isNumberOrBlock(args[0])) return null;
3838

@@ -42,7 +42,7 @@ const ControlConverter = {
4242

4343
// loop { block } and forever { block } - control_forever
4444
['loop', 'forever'].forEach(methodName => {
45-
converter.registerCallMethodWithBlock('self', methodName, 0, 0, params => {
45+
converter.registerOnSendWithBlock('self', methodName, 0, 0, params => {
4646
const {rubyBlock} = params;
4747
if (!rubyBlock) return null;
4848

@@ -54,7 +54,7 @@ const ControlConverter = {
5454
});
5555

5656
// stop(option) - control_stop
57-
converter.registerCallMethod('self', 'stop', 1, params => {
57+
converter.registerOnSend('self', 'stop', 1, params => {
5858
const {args} = params;
5959
if (!converter._isString(args[0]) || StopOptions.indexOf(args[0].toString()) < 0) return null;
6060

@@ -64,7 +64,7 @@ const ControlConverter = {
6464
});
6565

6666
// create_clone(target) - control_create_clone_of
67-
converter.registerCallMethod('self', 'create_clone', 1, params => {
67+
converter.registerOnSend('self', 'create_clone', 1, params => {
6868
const {args} = params;
6969
if (!converter._isString(args[0])) return null;
7070

@@ -78,7 +78,7 @@ const ControlConverter = {
7878
});
7979

8080
// number.times { block } and variable.times { block } - control_repeat
81-
converter.registerCallMethodWithBlock('any', 'times', 0, 0, params => {
81+
converter.registerOnSendWithBlock('any', 'times', 0, 0, params => {
8282
const {receiver, rubyBlock} = params;
8383
if (!rubyBlock || !converter._isNumberOrBlock(receiver)) return null;
8484

@@ -87,20 +87,20 @@ const ControlConverter = {
8787
});
8888

8989
// when_start_as_a_clone { block } (sprite only)
90-
converter.registerCallMethodWithBlock('sprite', 'when_start_as_a_clone', 0, 0, params => {
90+
converter.registerOnSendWithBlock('sprite', 'when_start_as_a_clone', 0, 0, params => {
9191
const {rubyBlock} = params;
9292
const block = converter.createBlock('control_start_as_clone', 'hat');
9393
converter.setParent(rubyBlock, block);
9494
return block;
9595
});
9696

9797
// delete_this_clone method (sprite only)
98-
converter.registerCallMethod('sprite', 'delete_this_clone', 0, () =>
98+
converter.registerOnSend('sprite', 'delete_this_clone', 0, () =>
9999
converter._createBlock('control_delete_this_clone', 'statement')
100100
);
101101

102102
// backward compatibility
103-
converter.registerCallMethodWithBlock('self', 'when', 1, 0, params => {
103+
converter.registerOnSendWithBlock('self', 'when', 1, 0, params => {
104104
const {args} = params;
105105

106106
if (args[0].type !== 'sym') return null;

‎src/lib/ruby-to-blocks-converter/ev3.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ const Ev3SensorMenu = ['1', '2', '3', '4'];
99
*/
1010
const EV3Converter = {
1111
register: function (converter) {
12-
converter.registerCallMethod('self', Ev3, 0, params => {
12+
converter.registerOnSend('self', Ev3, 0, params => {
1313
const {node} = params;
1414

1515
return converter.createRubyExpressionBlock(Ev3, node);
1616
});
1717

18-
converter.registerCallMethod(Ev3, 'motor_turn_this_way_for', 2, params => {
18+
converter.registerOnSend(Ev3, 'motor_turn_this_way_for', 2, params => {
1919
const {receiver, args} = params;
2020

2121
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -32,7 +32,7 @@ const EV3Converter = {
3232
});
3333

3434
// backward compatibility
35-
converter.registerCallMethod('self', 'ev3_motor_turn_this_way_for', 2, params => {
35+
converter.registerOnSend('self', 'ev3_motor_turn_this_way_for', 2, params => {
3636
const {args} = params;
3737

3838
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -48,7 +48,7 @@ const EV3Converter = {
4848
return block;
4949
});
5050

51-
converter.registerCallMethod(Ev3, 'motor_turn_that_way_for', 2, params => {
51+
converter.registerOnSend(Ev3, 'motor_turn_that_way_for', 2, params => {
5252
const {receiver, args} = params;
5353

5454
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -64,7 +64,7 @@ const EV3Converter = {
6464
return block;
6565
});
6666

67-
converter.registerCallMethod(Ev3, 'motor_turn_that_way_for', 2, params => {
67+
converter.registerOnSend(Ev3, 'motor_turn_that_way_for', 2, params => {
6868
const {receiver, args} = params;
6969

7070
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -80,7 +80,7 @@ const EV3Converter = {
8080
return block;
8181
});
8282

83-
converter.registerCallMethod(Ev3, 'motor_turn_that_way_for', 2, params => {
83+
converter.registerOnSend(Ev3, 'motor_turn_that_way_for', 2, params => {
8484
const {receiver, args} = params;
8585

8686
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -98,7 +98,7 @@ const EV3Converter = {
9898

9999

100100
// backward compatibility
101-
converter.registerCallMethod('self', 'ev3_motor_turn_that_way_for', 2, params => {
101+
converter.registerOnSend('self', 'ev3_motor_turn_that_way_for', 2, params => {
102102
const {args} = params;
103103

104104
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -114,7 +114,7 @@ const EV3Converter = {
114114
return block;
115115
});
116116

117-
converter.registerCallMethod(Ev3, 'motor_set_power', 2, params => {
117+
converter.registerOnSend(Ev3, 'motor_set_power', 2, params => {
118118
const {receiver, args} = params;
119119

120120
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -132,7 +132,7 @@ const EV3Converter = {
132132

133133

134134
// backward compatibility
135-
converter.registerCallMethod('self', 'ev3_motor_set_power', 2, params => {
135+
converter.registerOnSend('self', 'ev3_motor_set_power', 2, params => {
136136
const {args} = params;
137137

138138
if (!converter.isString(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -148,7 +148,7 @@ const EV3Converter = {
148148
return block;
149149
});
150150

151-
converter.registerCallMethod(Ev3, 'motor_position', 1, params => {
151+
converter.registerOnSend(Ev3, 'motor_position', 1, params => {
152152
const {receiver, args} = params;
153153

154154
if (!converter.isString(args[0])) return null;
@@ -164,7 +164,7 @@ const EV3Converter = {
164164
});
165165

166166
// backward compatibility
167-
converter.registerCallMethod('self', 'ev3_motor_position', 1, params => {
167+
converter.registerOnSend('self', 'ev3_motor_position', 1, params => {
168168
const {args} = params;
169169

170170
if (!converter.isString(args[0])) return null;
@@ -179,7 +179,7 @@ const EV3Converter = {
179179
return block;
180180
});
181181

182-
converter.registerCallMethod(Ev3, 'button_pressed?', 1, params => {
182+
converter.registerOnSend(Ev3, 'button_pressed?', 1, params => {
183183
const {receiver, args} = params;
184184

185185
if (!converter.isString(args[0])) return null;
@@ -195,7 +195,7 @@ const EV3Converter = {
195195
});
196196

197197
// backward compatibility
198-
converter.registerCallMethod('self', 'ev3_button_pressed?', 1, params => {
198+
converter.registerOnSend('self', 'ev3_button_pressed?', 1, params => {
199199
const {args} = params;
200200

201201
if (!converter.isString(args[0])) return null;
@@ -210,29 +210,29 @@ const EV3Converter = {
210210
return block;
211211
});
212212

213-
converter.registerCallMethod(Ev3, 'distance', 0, params => {
213+
converter.registerOnSend(Ev3, 'distance', 0, params => {
214214
const {receiver} = params;
215215

216216
return converter.changeRubyExpressionBlock(receiver, 'ev3_getDistance', 'value');
217217
});
218218

219219
// backward compatibility
220-
converter.registerCallMethod('self', 'ev3_distance', 0, () =>
220+
converter.registerOnSend('self', 'ev3_distance', 0, () =>
221221
converter.createBlock('ev3_getDistance', 'value')
222222
);
223223

224-
converter.registerCallMethod(Ev3, 'brightness', 0, params => {
224+
converter.registerOnSend(Ev3, 'brightness', 0, params => {
225225
const {receiver} = params;
226226

227227
return converter.changeRubyExpressionBlock(receiver, 'ev3_getBrightness', 'value');
228228
});
229229

230230
// backward compatibility
231-
converter.registerCallMethod('self', 'ev3_brightness', 0, () =>
231+
converter.registerOnSend('self', 'ev3_brightness', 0, () =>
232232
converter.createBlock('ev3_getBrightness', 'value')
233233
);
234234

235-
converter.registerCallMethod(Ev3, 'beep_note', 2, params => {
235+
converter.registerOnSend(Ev3, 'beep_note', 2, params => {
236236
const {receiver, args} = params;
237237

238238
if (!converter.isNumberOrBlock(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -244,7 +244,7 @@ const EV3Converter = {
244244
});
245245

246246
// backward compatibility
247-
converter.registerCallMethod('self', 'ev3_beep_note', 2, params => {
247+
converter.registerOnSend('self', 'ev3_beep_note', 2, params => {
248248
const {args} = params;
249249

250250
if (!converter.isNumberOrBlock(args[0]) || !converter.isNumberOrBlock(args[1])) return null;
@@ -255,7 +255,7 @@ const EV3Converter = {
255255
return block;
256256
});
257257

258-
converter.registerCallMethodWithBlock(Ev3, 'when_button_pressed', 1, 0, params => {
258+
converter.registerOnSendWithBlock(Ev3, 'when_button_pressed', 1, 0, params => {
259259
console.log(Ev3, 'when_button_pressed', 1, 0, params);
260260
const {receiver, args, rubyBlock} = params;
261261

@@ -277,7 +277,7 @@ const EV3Converter = {
277277
return block;
278278
});
279279

280-
converter.registerCallMethodWithBlock(Ev3, 'when_distance_lt', 1, 0, params => {
280+
converter.registerOnSendWithBlock(Ev3, 'when_distance_lt', 1, 0, params => {
281281
const {receiver, args, rubyBlock} = params;
282282

283283
if (!converter.isNumberOrBlock(args[0])) return null;
@@ -288,7 +288,7 @@ const EV3Converter = {
288288
return block;
289289
});
290290

291-
converter.registerCallMethodWithBlock(Ev3, 'when_brightness_lt', 1, 0, params => {
291+
converter.registerOnSendWithBlock(Ev3, 'when_brightness_lt', 1, 0, params => {
292292
const {receiver, args, rubyBlock} = params;
293293

294294
if (!converter.isNumberOrBlock(args[0])) return null;
@@ -300,7 +300,7 @@ const EV3Converter = {
300300
});
301301

302302
// backward compatibility
303-
converter.registerCallMethodWithBlock('self', 'when', 2, 0, params => {
303+
converter.registerOnSendWithBlock('self', 'when', 2, 0, params => {
304304
const {args, rubyBlock} = params;
305305

306306
if (args[0].type !== 'sym') return null;

0 commit comments

Comments
 (0)