Merge pull request #151 from smalruby/issues/134_control

convert Control methods(wait, repeat, forever) to Blocks.
refs #134

Author: takaokouji

package.json

@@ -57,6 +57,7 @@
     "eslint-config-scratch": "^5.0.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-react": "^7.5.1",
+    "eslint-watch": "^4.0.2",
     "file-loader": "2.0.0",
     "get-float-time-domain-data": "0.1.0",
     "get-user-media-promise": "1.1.4",

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

@@ -0,0 +1,61 @@
+/* global Opal */
+
+/* eslint-disable no-invalid-this */
+const createControlRepeatBlock = function (times, body) {
+    const block = this._createBlock('control_repeat', 'statement');
+    this._addNumberInput(block, 'TIMES', 'math_whole_number', times, 10);
+    this._addSubstack(block, body);
+    return block;
+};
+/* eslint-enable no-invalid-this */
+
+/**
+ * Control converter
+ */
+const ControlConverter = {
+    // eslint-disable-next-line no-unused-vars
+    onSend: function (receiver, name, args, rubyBlockArgs, rubyBlock) {
+        let block;
+        if (this._isSelf(receiver) || receiver === Opal.nil) {
+            switch (name) {
+            case 'sleep':
+                if (args.length === 1 && this._isNumberOrBlock(args[0])) {
+                    block = this._createBlock('control_wait', 'statement');
+                    this._addNumberInput(block, 'DURATION', 'math_positive_number', args[0], 1);
+                }
+                break;
+            case 'repeat':
+                if (args.length === 1 && this._isNumberOrBlock(args[0]) &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0) {
+                    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) {
+            case 'times':
+                if (args.length === 0 &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0 &&
+                    rubyBlock && rubyBlock.length >= 1) {
+                    const waitBlock = this._popWaitBlock(rubyBlock);
+                    if (waitBlock) {
+                        block = createControlRepeatBlock.call(this, receiver, rubyBlock);
+                    }
+                }
+                break;
+            }
+        }
+        return block;
+    }
+};
+
+export default ControlConverter;

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

@@ -5,6 +5,8 @@ import Blockly from 'scratch-blocks';
 import RubyParser from '../ruby-parser';
 import Variable from 'scratch-vm/src/engine/variable';
 
+import ControlConverter from './control';
+
 /**
  * Class for Ruby's self for detecting self.
  */
@@ -26,6 +28,9 @@ class RubyToBlocksConverterError {
 class RubyToBlocksConverter {
     constructor (vm) {
         this.vm = vm;
+        this._converters = [
+            ControlConverter
+        ];
         this.reset();
     }
 
@@ -141,6 +146,19 @@ class RubyToBlocksConverter {
         this.vm.emitWorkspaceUpdate();
     }
 
+    _callConvertersHandler (handlerName) {
+        for (let i = 0; i < this._converters.length; i++) {
+            const converter = this._converters[i];
+            if (converter.hasOwnProperty(handlerName)) {
+                const block = converter[handlerName].apply(this, Array.prototype.slice.call(arguments, 1));
+                if (block) {
+                    return block;
+                }
+            }
+        }
+        return null;
+    }
+
     _saveContext () {
         const includes = [
             'blocks',
@@ -464,6 +482,10 @@ class RubyToBlocksConverter {
         return block;
     }
 
+    _isSelf (block) {
+        return block === Self;
+    }
+
     _isBlock (block) {
         try {
             return block.hasOwnProperty('opcode');
@@ -507,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') {
@@ -553,11 +581,15 @@ class RubyToBlocksConverter {
         let prevBlock = null;
         const blocks = [];
         let terminated = false;
+        let firstBlock;
         node.children.forEach(childNode => {
             const block = this._process(childNode);
             if (!block) {
                 return;
             }
+            if (!firstBlock) {
+                firstBlock = block;
+            }
             switch (this._getBlockType(block)) {
             case 'statement':
                 if (prevBlock) {
@@ -588,6 +620,12 @@ class RubyToBlocksConverter {
                 break;
             }
         });
+        if (blocks.length === 0 && firstBlock) {
+            if (/^value/.test(this._getBlockType(firstBlock))) {
+                firstBlock.topLevel = false;
+            }
+            blocks.push(firstBlock);
+        }
         return blocks;
     }
 
@@ -600,7 +638,10 @@ class RubyToBlocksConverter {
     _onSend (node, rubyBlockArgsNode, rubyBlockNode) {
         const saved = this._saveContext();
 
-        const receiver = this._process(node.children[0]);
+        let receiver = this._process(node.children[0]);
+        if (_.isArray(receiver) && receiver.length === 1) {
+            receiver = receiver[0];
+        }
         const name = node.children[1].toString();
         const args = node.children.slice(2).map(childNode => this._process(childNode));
 
@@ -750,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');
@@ -1143,6 +1175,11 @@ class RubyToBlocksConverter {
                 break;
             }
         }
+
+        if (!block) {
+            block = this._callConvertersHandler('onSend', receiver, name, args, rubyBlockArgs, rubyBlock);
+        }
+
         if (!block) {
             this._restoreContext(saved);