Merge pull request #153 from smalruby/issues/134_control2

convert Control blocks to Ruby.
refs 134

Author: takaokouji

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

@@ -1,4 +1,5 @@
 /* global Opal */
+import _ from 'lodash';
 
 /* eslint-disable no-invalid-this */
 const createControlRepeatBlock = function (times, body) {
@@ -39,6 +40,43 @@ const ControlConverter = {
                     this._addSubstack(block, rubyBlock);
                 }
                 break;
+            case 'stop':
+                if (args.length === 1 &&
+                    _.isString(args[0]) && ['all', 'this script', 'other scripts in sprite'].indexOf(args[0]) >= 0) {
+                    block = this._createBlock('control_stop', 'statement');
+                    this._addField(block, 'STOP_OPTION', args[0]);
+                }
+                break;
+            case 'create_clone':
+                if (args.length === 1 && _.isString(args[0])) {
+                    block = this._createBlock('control_create_clone_of', 'statement');
+                    const optionBlock = this._createBlock('control_create_clone_of_menu', 'value', {
+                        shadow: true
+                    });
+                    this._addField(optionBlock, 'CLONE_OPTION', args[0]);
+                    this._addInput(block, 'CLONE_OPTION', optionBlock, optionBlock);
+                }
+                break;
+            case 'delete_this_clone':
+                if (args.length === 0) {
+                    block = this._createBlock('control_delete_this_clone', 'statement');
+                }
+                break;
+            case 'when':
+                if (args.length === 1 &&
+                    _.isString(args[0]) && args[0] === 'start_as_a_clone' &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0 &&
+                    rubyBlock) {
+                    block = this._createBlock('control_start_as_clone', 'hat', {
+                        topLevel: true
+                    });
+
+                    if (this._isBlock(rubyBlock[0])) {
+                        rubyBlock[0].parent = block.id;
+                        block.next = rubyBlock[0].id;
+                    }
+                }
+                break;
             }
         } else if (this._isNumberOrBlock(receiver)) {
             switch (name) {
@@ -55,6 +93,32 @@ const ControlConverter = {
             }
         }
         return block;
+    },
+
+    onIf: function (cond, statement, elseStatement) {
+        const block = this._createBlock('control_if', 'statement');
+        if (cond !== false) {
+            this._addInput(block, 'CONDITION', cond);
+        }
+        this._addSubstack(block, statement);
+        if (elseStatement) {
+            block.opcode = 'control_if_else';
+            this._addSubstack(block, elseStatement, 2);
+        }
+        return block;
+    },
+
+    onUntil: function (cond, statement) {
+        const block = this._createBlock('control_repeat_until', 'statement');
+        if (cond !== false) {
+            this._addInput(block, 'CONDITION', cond);
+        }
+        if (statement.length === 1 && this._popWaitBlock(statement)) {
+            block.opcode = 'control_wait_until';
+        } else {
+            this._addSubstack(block, statement);
+        }
+        return block;
     }
 };
 

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

@@ -310,6 +310,17 @@ class RubyToBlocksConverter {
         return block;
     }
 
+    _addField (block, name, value) {
+        if (!this._isBlock(block)) {
+            return;
+        }
+        block.fields[name] = {
+            name: name,
+            value: value
+        };
+        return block.fields[name];
+    }
+
     _addInput (block, name, inputBlock, shadowBlock) {
         if (!name) {
             name = inputBlock.id;
@@ -468,6 +479,20 @@ class RubyToBlocksConverter {
         return null;
     }
 
+    _processCondition (node) {
+        let cond = this._process(node.children[0]);
+        if (_.isArray(cond) && cond.length === 1) {
+            cond = cond[0];
+        }
+        if (!this._isFalseOrBooleanBlock(cond)) {
+            throw new RubyToBlocksConverterError(
+                node,
+                `condition is not boolean: ${this._getSource(node.children[0])}`
+            );
+        }
+        return cond;
+    }
+
     _getBlockType (block) {
         return this._context.blockTypes[block.id];
     }
@@ -1225,28 +1250,45 @@ class RubyToBlocksConverter {
         this._checkNumChildren(node, 3);
 
         const saved = this._saveContext();
-        let cond = this._process(node.children[0]);
-        if (!this._isFalseOrBooleanBlock(cond)) {
-            this._restoreContext(saved);
-            cond = this._createRubyExpressionBlock(this._getSource(node.children[0]));
-        }
+
+        const cond = this._processCondition(node);
         let statement = this._process(node.children[1]);
         if (!_.isArray(statement)) {
             statement = [statement];
         }
-        let elseStatement = this._process(node.children[2]);
-        if (!_.isArray(elseStatement)) {
-            elseStatement = [elseStatement];
+        let elseStatement;
+        if (node.$loc().$else() !== Opal.nil) {
+            elseStatement = this._process(node.children[2]);
+            if (!_.isArray(elseStatement)) {
+                elseStatement = [elseStatement];
+            }
         }
 
-        const block = this._createBlock('control_if', 'statement');
-        if (cond !== false) {
-            this._addInput(block, 'CONDITION', cond);
+        let block = this._callConvertersHandler('onIf', cond, statement, elseStatement);
+        if (!block) {
+            this._restoreContext(saved);
+
+            block = this._createRubyStatementBlock(this._getSource(node));
+        }
+        return block;
+    }
+
+    _onUntil (node) {
+        this._checkNumChildren(node, 2);
+
+        const saved = this._saveContext();
+
+        const cond = this._processCondition(node);
+        let statement = this._process(node.children[1]);
+        if (!_.isArray(statement)) {
+            statement = [statement];
         }
-        this._addSubstack(block, statement);
-        if (this._isBlock(elseStatement[0])) {
-            block.opcode = 'control_if_else';
-            this._addSubstack(block, elseStatement, 2);
+
+        let block = this._callConvertersHandler('onUntil', cond, statement);
+        if (!block) {
+            this._restoreContext(saved);
+
+            block = this._createRubyStatementBlock(this._getSource(node));
         }
         return block;
     }