forever.

Author: takaokouji

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

@@ -30,6 +30,15 @@ const ControlConverter = {
                     block = createControlRepeatBlock.call(this, args[0], rubyBlock);
                 }
                 break;
+            case 'loop':
+            case 'forever':
+                if (args.length === 0 &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0 &&
+                    rubyBlock && (name !== 'loop' || this._popWaitBlock(rubyBlock))) {
+                    block = this._createBlock('control_forever', 'statement');
+                    this._addSubstack(block, rubyBlock);
+                }
+                break;
             }
         } else if (this._isNumberOrBlock(receiver)) {
             switch (name) {

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

@@ -791,15 +791,6 @@ class RubyToBlocksConverter {
                     }
                 }
                 break;
-            case 'loop':
-                if (args.length === 0) {
-                    const waitBlock = this._popWaitBlock(rubyBlock);
-                    if (waitBlock) {
-                        block = this._createBlock('control_forever', 'statement');
-                        this._addSubstack(block, rubyBlock);
-                    }
-                }
-                break;
             case 'touching?':
                 if (args.length === 1 && _.isString(args[0])) {
                     block = this._createBlock('sensing_touchingobject', 'value_boolean');

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

@@ -283,44 +283,109 @@ describe('RubyToBlocksConverter/Control', () => {
         });
     });
 
-    test('control_forever', () => {
-        code = 'loop { bounce_if_on_edge; wait }';
-        expected = [
-            {
-                opcode: 'control_forever',
-                branches: [
-                    {
-                        opcode: 'motion_ifonedgebounce'
-                    }
-                ]
-            }
-        ];
-        convertAndExpectToEqualBlocks(converter, target, code, expected);
+    describe('control_forever', () => {
+        test('loop', () => {
+            code = 'loop { wait }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: []
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
 
-        code = 'loop { bounce_if_on_edge; move(10); wait }';
-        expected = [
-            {
-                opcode: 'control_forever',
-                branches: [
-                    rubyToExpected(converter, target, 'bounce_if_on_edge; move(10)')[0]
-                ]
-            }
-        ];
-        convertAndExpectToEqualBlocks(converter, target, code, expected);
+            code = 'loop { bounce_if_on_edge; wait }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: [
+                        {
+                            opcode: 'motion_ifonedgebounce'
+                        }
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
 
-        [
-            'loop()',
-            'loop(1)'
-        ].forEach(s => {
-            convertAndExpectToEqualRubyStatement(converter, target, s, s);
+            code = 'loop { bounce_if_on_edge; move(10); wait }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: [
+                        rubyToExpected(converter, target, 'bounce_if_on_edge; move(10)')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
         });
 
-        [
-            'loop { bounce_if_on_edge }'
-        ].forEach(s => {
-            expect(converter.targetCodeToBlocks(target, s)).toBeTruthy();
-            const blockId = Object.keys(converter.blocks).filter(id => converter.blocks[id].topLevel)[0];
-            expect(converter.blocks[blockId].opcode).toEqual('ruby_statement_with_block');
+        test('forever', () => {
+            code = 'forever { }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: []
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+
+            code = 'forever { bounce_if_on_edge }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: [
+                        {
+                            opcode: 'motion_ifonedgebounce'
+                        }
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+
+            code = 'forever { bounce_if_on_edge; move(10) }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: [
+                        rubyToExpected(converter, target, 'bounce_if_on_edge; move(10)')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+
+            code = 'forever { wait }';
+            expected = [
+                {
+                    opcode: 'control_forever',
+                    branches: [
+                        rubyToExpected(converter, target, 'wait')[0]
+                    ]
+                }
+            ];
+            convertAndExpectToEqualBlocks(converter, target, code, expected);
+        });
+
+        test('invalid', () => {
+            [
+                'loop()',
+                'loop(1)',
+                'forever()',
+                'forever(1)'
+            ].forEach(s => {
+                convertAndExpectToEqualRubyStatement(converter, target, s, s);
+            });
+
+            [
+                'loop { bounce_if_on_edge }',
+                'loop { |a| bounce_if_on_edge; wait }',
+                'loop(1) { bounce_if_on_edge; wait }',
+                'forever(1) { bounce_if_on_edge }',
+                'forever(1) { |a| bounce_if_on_edge }'
+            ].forEach(s => {
+                expect(converter.targetCodeToBlocks(target, s)).toBeTruthy();
+                const blockId = Object.keys(converter.blocks).filter(id => converter.blocks[id].topLevel)[0];
+                expect(converter.blocks[blockId].opcode).toEqual('ruby_statement_with_block');
+            });
         });
     });