Merge pull request #160 from smalruby/issues/134_event1

support converting Ruby to Event blocks.
(refs #134)

Author: takaokouji

src/lib/ruby-generator/event.js

@@ -9,17 +9,17 @@ export default function (Generator) {
         return `${Generator.spriteName()}.when(:flag_clicked) do\n`;
     };
 
-    Generator.event_whenthisspriteclicked = function (block) {
-        block.isStatement = true;
-        return `${Generator.spriteName()}.when(:click) do\n`;
-    };
-
     Generator.event_whenkeypressed = function (block) {
         block.isStatement = true;
         const key = Generator.quote_(Generator.getFieldValue(block, 'KEY_OPTION') || null);
         return `${Generator.spriteName()}.when(:key_pressed, ${key}) do\n`;
     };
 
+    Generator.event_whenthisspriteclicked = function (block) {
+        block.isStatement = true;
+        return `${Generator.spriteName()}.when(:clicked) do\n`;
+    };
+
     Generator.event_whenbackdropswitchesto = function (block) {
         block.isStatement = true;
         const backdrop = Generator.quote_(Generator.getFieldValue(block, 'BACKDROP') || null);
@@ -30,7 +30,7 @@ export default function (Generator) {
         block.isStatement = true;
         const lh = Generator.quote_(Generator.getFieldValue(block, 'WHENGREATERTHANMENU') || null);
         const rh = Generator.valueToCode(block, 'VALUE', Generator.ORDER_NONE) || '0';
-        return `${Generator.spriteName()}.when(:greater_than, ${lh}, ${rh})  do\n`;
+        return `${Generator.spriteName()}.when(:greater_than, ${lh}, ${rh}) do\n`;
     };
 
     Generator.event_whenbroadcastreceived = function (block) {

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

@@ -1,25 +1,85 @@
 /* global Opal */
 import _ from 'lodash';
 
+const KeyOptions = [
+    'space',
+    'left arrow',
+    'right arrow',
+    'down arrow',
+    'up arrow',
+    'any',
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+    '0',
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9'
+];
+
 /**
  * Event converter
  */
 const EventConverter = {
     // 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 'when':
+        if ((this._isSelf(receiver) || receiver === Opal.nil) &&
+            name === 'when' &&
+            args.length >= 1 && args[0].type === 'sym' &&
+            rubyBlockArgs && rubyBlockArgs.length === 0 &&
+            rubyBlock) {
+            switch (args[0].value) {
+            case 'flag_clicked':
+            case 'clicked':
                 if (args.length === 1) {
-                    if (args[0].type === 'sym' && args[0].value === 'flag_clicked' &&
-                        rubyBlockArgs && rubyBlockArgs.length === 0) {
-                        block = this._createBlock('event_whenflagclicked', 'hat');
-                        if (this._isBlock(rubyBlock)) {
-                            rubyBlock.parent = block.id;
-                            block.next = rubyBlock.id;
-                        }
+                    let opcode;
+                    switch (args[0].value) {
+                    case 'flag_clicked':
+                        opcode = 'event_whenflagclicked';
+                        break;
+                    case 'clicked':
+                        opcode = 'event_whenthisspriteclicked';
+                        break;
                     }
+                    block = this._createBlock(opcode, 'hat');
+                    this._setParent(rubyBlock, block);
+                }
+                break;
+            case 'key_pressed':
+                if (args.length === 2 && this._isString(args[1]) && KeyOptions.indexOf(args[1].toString()) >= 0) {
+                    block = this._createBlock('event_whenkeypressed', 'hat');
+                    this._addField(block, 'KEY_OPTION', args[1]);
+                    this._setParent(rubyBlock, block);
                 }
                 break;
             }

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

@@ -603,6 +603,13 @@ class RubyToBlocksConverter {
         return true;
     }
 
+    _setParent (block, parent) {
+        if (this._isBlock(block)) {
+            block.parent = parent.id;
+            parent.next = block.id;
+        }
+    }
+
     _matchRubyExpression (block, regexp) {
         if (!this._isBlock(block) || block.opcode !== 'ruby_expression') {
             return false;