Controlの命令ブロックの変換処理のいくつかを修正

Author: takaokouji

src/lib/ruby-generator/control.js

@@ -5,48 +5,47 @@
  */
 export default function (Blockly) {
     Blockly.Ruby.control_wait = function (block) {
-        const secs = Blockly.Ruby.valueToCode(block, 'DURATION', Blockly.Ruby.ORDER_NONE) || '0';
+        const secs = Blockly.Ruby.valueToCode(block, 'DURATION', Blockly.Ruby.ORDER_NONE) || 0;
         return `sleep(${secs})\n`;
     };
 
     Blockly.Ruby.control_repeat = function (block) {
-        const times = Blockly.Ruby.valueToCode(block, 'TIMES', Blockly.Ruby.ORDER_NONE) || '0';
-        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '\n';
-
+        const times = Blockly.Ruby.valueToCode(block, 'TIMES', Blockly.Ruby.ORDER_NONE) || 0;
+        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '';
         return `repeat(${times}) do\n${branch}end\n`;
     };
 
     Blockly.Ruby.control_forever = function (block) {
-        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '\n';
+        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '';
         return `forever do\n${branch}end\n`;
     };
 
     Blockly.Ruby.control_if = function (block) {
-        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || 'false';
-        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '\n';
+        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || false;
+        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '';
         return `if ${operator}\n${branch}end\n`;
     };
 
     Blockly.Ruby.control_if_else = function (block) {
-        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || 'false';
-        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '\n';
-        const branch2 = Blockly.Ruby.statementToCode(block, 'SUBSTACK2') || '\n';
+        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || false;
+        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '';
+        const branch2 = Blockly.Ruby.statementToCode(block, 'SUBSTACK2') || '';
         return `if ${operator}\n${branch}else\n${branch2}end\n`;
     };
 
     Blockly.Ruby.control_wait_until = function (block) {
-        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || 'false';
+        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || false;
         return `wait until ${operator}\n`;
     };
 
     Blockly.Ruby.control_repeat_until = function (block) {
-        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || 'false';
-        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '\n';
-        return `until ${operator}\n${branch}end\n`;
+        const operator = Blockly.Ruby.valueToCode(block, 'CONDITION', Blockly.Ruby.ORDER_NONE) || false;
+        const branch = Blockly.Ruby.statementToCode(block, 'SUBSTACK') || '';
+        return `until ${operator}\n${branch}  wait\nend\n`;
     };
 
     Blockly.Ruby.control_stop = function (block) {
-        const target = Blockly.Ruby.quote_(block.getFieldValue('STOP_OPTION') || null);
+        const target = Blockly.Ruby.quote_(block.getFieldValue('STOP_OPTION') || 'all');
         return `stop(${target})\n`;
     };
 
@@ -56,12 +55,12 @@ export default function (Blockly) {
     };
 
     Blockly.Ruby.control_create_clone_of = function (block) {
-        const target = Blockly.Ruby.valueToCode(block, 'CLONE_OPTION', Blockly.Ruby.ORDER_NONE) || null;
+        const target = Blockly.Ruby.valueToCode(block, 'CLONE_OPTION', Blockly.Ruby.ORDER_NONE);
         return `create_clone(${target})\n`;
     };
 
     Blockly.Ruby.control_create_clone_of_menu = function (block) {
-        const target = Blockly.Ruby.quote_(block.getFieldValue('CLONE_OPTION') || null);
+        const target = Blockly.Ruby.quote_(block.getFieldValue('CLONE_OPTION') || '_myself_');
         return [target, Blockly.Ruby.ORDER_ATOMIC];
     };