拡張のブロック(Music, Pen, Video)をRubyに変換します #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

takaokouji merged 6 commits into smalruby:develop from t-kazu:feature/rubygenerator-for-extension-blocks

Dec 7, 2018

Collaborator

t-kazu commented Dec 4, 2018

refs #135


          音楽のブロックをRubyに変換できるようにしました

7a1f0e9

takaokouji reviewed

View reviewed changes

takaokouji left a comment

一通り確認しました。お手数ですが、修正をお願いします。

src/lib/ruby-generator/music.js Outdated Show resolved Hide resolved

src/lib/ruby-generator/music.js Outdated

+                  };
+                  Generator.music_menu_INSTRUMENT = function (block) {
+                      const instrument = Generator.quote_(Generator.getFieldValue(block, 'INSTRUMENT') || '1');

takaokouji Dec 4, 2018

instrumentは数値がいいと思います。

Suggested change

      
                    const instrument = Generator.quote_(Generator.getFieldValue(block, 'INSTRUMENT') || '1');
          
                    const instrument = Generator.getFieldValue(block, 'INSTRUMENT') || 1;

Collaborator Author

t-kazu Dec 5, 2018 •

edited

Loading

こういうブロックなので数値ではなく文字列にしました。
case文で"(1)ピアノ"と返す方が良かったりしますか？　数値でよければ数値で良いとは思います!!

takaokouji Dec 5, 2018

数値でいいです。
Ruby -> Blocksにするときに、数値で決めうちだと楽だからです。ユーザーがタイプするのも数値だと楽だしね。


          ペンのブロックをRubyに変換できるようにしました

362ae47

takaokouji reviewed

View reviewed changes

takaokouji left a comment

一通り確認しました。

src/lib/ruby-generator/pen.js Outdated Show resolved Hide resolved

src/lib/ruby-generator/pen.js Outdated Show resolved Hide resolved

src/lib/ruby-generator/pen.js Outdated Show resolved Hide resolved

src/lib/ruby-generator/pen.js Outdated Show resolved Hide resolved

src/lib/ruby-generator/pen.js Outdated Show resolved Hide resolved

t-kazu added 2 commits

December 5, 2018 13:50


          変換後のRubyを修正しました

2c02e55


          ビデオモーションセンサーのブロックをRubyに変換しました

770d9fa

takaokouji commented Dec 5, 2018

videoまでやったらいったんマージしようかね。
videoのレビューは今晩やる予定。

takaokouji reviewed

View reviewed changes

takaokouji left a comment

一通り確認しました。対応をよろしくお願いします。

src/lib/ruby-generator/video.js Outdated

+                  Generator.videoSensing_whenMotionGreaterThan = function (block) {
+                      block.isStatement = true;
+                      const rh = Generator.valueToCode(block, 'REFERENCE', Generator.ORDER_NONE) || 0;
+                      return `${Generator.spriteName()}.when(:greater_than, self.video_motion, ${rh}) do\n`;

takaokouji Dec 6, 2018

内部で video_motion の値を参照するようにします。whenに渡す第1引数の名称を変更します。

Suggested change

      
                    return `${Generator.spriteName()}.when(:greater_than, self.video_motion, ${rh}) do\n`;
          
                    return `${Generator.spriteName()}.when(:video_motion_greater_than, ${rh}) do\n`;

src/lib/ruby-generator/video.js Outdated

+                      const subject = Generator.getFieldValue(block, 'SUBJECT') || 'wwww';
+                      if (subject === 'Stage') {
+                          return ['stage', Generator.ORDER_ATOMIC];
+                      } else if(subject === 'this sprite') {

takaokouji Dec 6, 2018

Suggested change

      
                    } else if(subject === 'this sprite') {
          
                    } else if (subject === 'this sprite') {

src/lib/ruby-generator/video.js Outdated

+                      if (subject === 'Stage') {
+                          return ['stage', Generator.ORDER_ATOMIC];
+                      } else if(subject === 'this sprite') {
+                          return ['self', Generator.ORDER_ATOMIC];

takaokouji Dec 6, 2018

値の参照なので self は不要です。

Suggested change

      
                        return ['self', Generator.ORDER_ATOMIC];
          
                        return ['', Generator.ORDER_ATOMIC];

src/lib/ruby-generator/video.js Outdated

+                  Generator.videoSensing_menu_SUBJECT = function (block) {
+                      const subject = Generator.getFieldValue(block, 'SUBJECT') || 'wwww';
+                      if (subject === 'Stage') {
+                          return ['stage', Generator.ORDER_ATOMIC];

takaokouji Dec 6, 2018

Suggested change

      
                        return ['stage', Generator.ORDER_ATOMIC];
          
                        return ['stage.', Generator.ORDER_ATOMIC];

src/lib/ruby-generator/video.js Outdated

+                      } else if(subject === 'this sprite') {
+                          return ['self', Generator.ORDER_ATOMIC];
+                      }
+                      return [subject, Generator.ORDER_ATOMIC];

takaokouji Dec 6, 2018

Suggested change

      
                    return [subject, Generator.ORDER_ATOMIC];
          
                    return [`${subject}.`, Generator.ORDER_ATOMIC];

src/lib/ruby-generator/video.js Outdated

+                  Generator.videoSensing_videoOn = function (block) {
+                      const attribute = Generator.valueToCode(block, 'ATTRIBUTE', Generator.ORDER_NONE);
+                      const subject = Generator.valueToCode(block, 'SUBJECT', Generator.ORDER_NONE);
+                      return [`${subject}.video_${attribute}`,  Generator.ORDER_ATOMIC];

takaokouji Dec 6, 2018

Suggested change

      
                    return [`${subject}.video_${attribute}`,  Generator.ORDER_ATOMIC];
          
                    return [`${subject}video_${attribute}`,  Generator.ORDER_ATOMIC];

takaokouji reviewed

View reviewed changes

src/lib/ruby-generator/video.js Outdated

+                  Generator.videoSensing_videoToggle = function (block) {
+                      const video_state = Generator.valueToCode(block, 'VIDEO_STATE', Generator.ORDER_NONE);
+                      return `turn_video(${video_state})\n`;

takaokouji Dec 6, 2018

video関連は、なるべく video_なんたら というメソッド名にしたいと考えて、リネームしました。

Suggested change

      
                    return `turn_video(${video_state})\n`;
          
                    return `video_turn(${video_state})\n`;


          変換後のRubyコードを修正しました

7fbf5b2

t-kazu commented

View reviewed changes

src/lib/ruby-generator/music.js Outdated

+                  };
+                  Generator.music_menu_DRUM = function (block) {
+                      const drum = Generator.quote_(Generator.getFieldValue(block, 'DRUM') || '1');

Collaborator Author

t-kazu Dec 7, 2018

ここも数値の方がよろしいでしょうか？

takaokouji Dec 7, 2018

はい、数値でお願いします。


          eslintのエラーを解消しました

0608aeb

t-kazu changed the title ~~[WIP] 拡張のブロックをRubyに変換します~~ 拡張のブロックをRubyに変換します

takaokouji changed the title ~~拡張のブロックをRubyに変換します~~ 拡張のブロック(Music, Pen, Video)をRubyに変換します

takaokouji merged commit 318fa77 into smalruby:develop

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet