Merge pull request #258 from stonesaw/wedo

wedo2のRubyからブロックを追加

Author: takaokouji

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

@@ -11,7 +11,7 @@ const Wedo2Converter = {
         if ((this._isSelf(receiver) || receiver === Opal.nil) && !rubyBlock) {
             switch (name) {
             case 'wedo2_turn_motor_on_for':
-                if (args.length === 2 && this._isString(args[0]) && this._isNumberOrBlock(args[1])) {
+                if (args.length === 2 && this._isStringOrBlock(args[0]) && this._isNumberOrBlock(args[1])) {
                     block = this._createBlock('wedo2_motorOnFor', 'statement');
                     this._addInput(
                         block,
@@ -22,7 +22,7 @@ const Wedo2Converter = {
                 }
                 break;
             case 'wedo2_trun_motor_on':
-                if (args.length === 1 && this._isString(args[0])) {
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
                     block = this._createBlock('wedo2_motorOn', 'statement');
                     this._addInput(
                         block,
@@ -32,7 +32,7 @@ const Wedo2Converter = {
                 }
                 break;
             case 'wedo2_trun_motor_off':
-                if (args.length === 1 && this._isString(args[0])) {
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
                     block = this._createBlock('wedo2_motorOff', 'statement');
                     this._addInput(
                         block,
@@ -42,7 +42,7 @@ const Wedo2Converter = {
                 }
                 break;
             case 'wedo2_set_motor_power':
-                if (args.length === 2 && this._isString(args[0]) && this._isNumberOrBlock(args[1])) {
+                if (args.length === 2 && this._isStringOrBlock(args[0]) && this._isNumberOrBlock(args[1])) {
                     block = this._createBlock('wedo2_startMotorPower', 'statement');
                     this._addInput(
                         block,
@@ -53,7 +53,7 @@ const Wedo2Converter = {
                 }
                 break;
             case 'wedo2_set_motor_direction':
-                if (args.length === 2 && this._isString(args[0]) && this._isString(args[1])){
+                if (args.length === 2 && this._isStringOrBlock(args[0]) && this._isStringOrBlock(args[1])){
                     block = this._createBlock('wedo2_setMotorDirection', 'statement');
                     this._addInput(
                         block,
@@ -73,6 +73,61 @@ const Wedo2Converter = {
                     this._addNumberInput(block, 'HUE', 'math_number', args[0], 50);
                 }
                 break;
+            case 'wedo2_distance':
+                if (args.length === 0) {
+                    block = this._createBlock('wedo2_getDistance', 'value');
+                }
+                break;
+            case 'wedo2_tilted':
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
+                    block = this._createBlock('wedo2_isTilted', 'value');
+                    this._addInput(
+                        block,
+                        'TILT_DIRECTION_ANY',
+                        this._createFieldBlock('wedo2_menu_TILT_DIRECTION_ANY', 'TILT_DIRECTION_ANY', args[0])
+                    );
+                }
+                break;
+            case 'wedo2_tilt_angle':
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
+                    block = this._createBlock('wedo2_getTiltAngle', 'value');
+                    this._addInput(
+                        block,
+                        'TILT_DIRECTION',
+                        this._createFieldBlock('wedo2_menu_TILT_DIRECTION', 'TILT_DIRECTION', args[0])
+                    );
+                }
+                break;
+            }
+        } else if ((this._isSelf(receiver) || receiver === Opal.nil) &&
+                    name === 'when' &&
+                    args.length >= 1 && args[0].type === 'sym' &&
+                    rubyBlockArgs && rubyBlockArgs.length === 0 &&
+                    rubyBlock) {
+            switch (name) {
+            case 'wedo2_when_tilted':
+                if (args.length === 1 && this._isStringOrBlock(args[0])) {
+                    block = this._createBlock('wedo2_whenTilted', 'hat');
+                    this._addInput(
+                        block,
+                        'TILT_DIRECTION_ANY',
+                        this._createFieldBlock('wedo2_menu_TILT_DIRECTION_ANY', 'TILT_DIRECTION_ANY', args[0])
+                    );
+                    this._setParent(rubyBlock, block);
+                }
+                break;
+            case 'wedo2_when_distance':
+                if (args.length === 2 && this._isStringOrBlock(args[0]) && this._isNumberOrBlock(args[1])) {
+                    block = this._createBlock('wedo2_whenDistance', 'hat');
+                    this._addInput(
+                        block,
+                        'OP',
+                        this._createFieldBlock('wedo2_menu_OP', 'OP', args[0])
+                    );
+                    this._addNumberInput(block, 'REFERENCE', 'math_number', args[1], 50);
+                    this._setParent(rubyBlock, block);
+                }
+                break;
             }
         }
         return block;