control_repeat

Author: takaokouji

src/lib/ruby-generator/control.js

@@ -10,7 +10,7 @@ export default function (Generator) {
     };
 
     Generator.control_repeat = function (block) {
-        const times = Generator.valueToCode(block, 'TIMES', Generator.ORDER_NONE) || 0;
+        const times = Generator.valueToCode(block, 'TIMES', Generator.ORDER_ATOMIC) || 0;
         const branch = Generator.statementToCode(block, 'SUBSTACK') || '';
         return `${times}.times do\n${branch}${Generator.INDENT}wait\nend\n`;
     };

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

@@ -1,4 +1,5 @@
 /* global Opal */
+
 /**
  * Control converter
  */
@@ -15,6 +16,21 @@ const ControlConverter = {
                 }
                 break;
             }
+        } else if (this._isNumberOrBlock(receiver)) {
+            switch (name) {
+            case 'times':
+                if (args.length === 0 &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0 &&
+                    rubyBlock && rubyBlock.length >= 1) {
+                    const waitBlock = this._popWaitBlock(rubyBlock);
+                    if (waitBlock) {
+                        block = this._createBlock('control_repeat', 'statement');
+                        this._addNumberInput(block, 'TIMES', 'math_whole_number', receiver, 10);
+                        this._addSubstack(block, rubyBlock);
+                    }
+                }
+                break;
+            }
         }
         return block;
     }

src/lib/ruby-to-blocks-converter/index.js

@@ -529,7 +529,13 @@ class RubyToBlocksConverter {
     }
 
     _isFalseOrBooleanBlock (block) {
-        if (block === false || this._getBlockType(block) === 'value_boolean') {
+        if (block === false) {
+            return true;
+        }
+        if (!this._isBlock(block)) {
+            return false;
+        }
+        if (this._getBlockType(block) === 'value_boolean') {
             return true;
         }
         if (block.opcode === 'argument_reporter_string_number') {

test/unit/lib/ruby-to-blocks-converter/control.test.js

@@ -83,6 +83,107 @@ describe('RubyToBlocksConverter/Control', () => {
         });
     });
 
+    describe('control_repeat', () => {
+        test('number', () => {
+            code = '10.times { move(10); wait }';
+            expected = [
+                {
+                    opcode: 'control_repeat',
+                    inputs: [
+                        {
+                            name: 'TIMES',
+                            block: expectedInfo.makeNumber(10, 'math_whole_number')
+                        }
+                    ],
+                    branches: [
+                        rubyToExpected(converter, target, 'move(10)')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+
+            code = '10.times { move(10); bounce_if_on_edge; wait }';
+            expected = [
+                {
+                    opcode: 'control_repeat',
+                    inputs: [
+                        {
+                            name: 'TIMES',
+                            block: expectedInfo.makeNumber(10, 'math_whole_number')
+                        }
+                    ],
+                    branches: [
+                        rubyToExpected(converter, target, 'move(10); bounce_if_on_edge')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('value block', () => {
+            code = 'x.times { move(10); wait }';
+            expected = [
+                {
+                    opcode: 'control_repeat',
+                    inputs: [
+                        {
+                            name: 'TIMES',
+                            block: rubyToExpected(converter, target, 'x')[0],
+                            shadow: expectedInfo.makeNumber(10, 'math_whole_number')
+                        }
+                    ],
+                    branches: [
+                        rubyToExpected(converter, target, 'move(10)')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('boolean block', () => {
+            code = '(touching?("_edge_")).times { move(10); wait }';
+            expected = [
+                {
+                    opcode: 'control_repeat',
+                    inputs: [
+                        {
+                            name: 'TIMES',
+                            block: rubyToExpected(converter, target, 'touching?("_edge_")')[0],
+                            shadow: expectedInfo.makeNumber(10, 'math_whole_number')
+                        }
+                    ],
+                    branches: [
+                        rubyToExpected(converter, target, 'move(10)')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('invalid', () => {
+            [
+                '10.times',
+                '10.times(1)'
+            ].forEach(c => {
+                convertAndExpectToEqualRubyStatement(converter, target, c, c);
+            });
+
+            [
+                '10.times {}',
+                '10.times { wait; move(10) }',
+                '10.times { |i| wait }',
+                '"10".times { wait }'
+            ].forEach(c => {
+                const res = converter.targetCodeToBlocks(target, c);
+                expect(converter.errors).toHaveLength(0);
+                const scriptIds = Object.keys(converter.blocks).filter(id => converter.blocks[id].topLevel);
+                expect(scriptIds).toHaveLength(1);
+                expect(converter.blocks[scriptIds[0]]).toHaveProperty('opcode', 'ruby_statement_with_block');
+                expect(res).toBeTruthy();
+            });
+        });
+    });
+
     test('control_forever', () => {
         code = 'loop { bounce_if_on_edge; wait }';
         expected = [