Merge pull request #105 from smalruby/issue/97

変数名として使えない文字を _ にエスケープする

closes #97

Author: takaokouji

src/lib/ruby-generator/index.js

@@ -452,6 +452,9 @@ export default function (Blockly) {
         return null;
     };
 
+    const escapeIdentityRegexp =
+        /[\x00-\x1f\x7f-\x9f !"#$%&'()*+,-./:;<=>?@[\\\]^`{|}~]/g; // eslint-disable-line no-control-regex
+
     Blockly.Ruby.variableName = function (id, type = SCALAR_TYPE) {
         let currVar;
         let prefix;
@@ -472,7 +475,7 @@ export default function (Blockly) {
             }
         }
         if (currVar && currVar.type === type) {
-            return `${prefix}${currVar.name}`;
+            return `${prefix}${currVar.name.replace(escapeIdentityRegexp, '_')}`;
         }
         return null;
     };

test/unit/lib/ruby-generator.test.jsx

@@ -69,6 +69,26 @@ describe('RubyGenerator', () => {
                     id4: {
                         name: 'List2',
                         type: LIST_TYPE
+                    },
+                    id2_1: {
+                        name: 'Avg(Total / Count)',
+                        type: SCALAR_TYPE
+                    },
+                    id2_2: {
+                        name: 'List of Symbols.',
+                        type: LIST_TYPE
+                    },
+                    id2_3: {
+                        name: ' !"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~]',
+                        type: SCALAR_TYPE
+                    },
+                    id2_4: {
+                        name: '平均(合計 / 件数)',
+                        type: SCALAR_TYPE
+                    },
+                    id2_5: {
+                        name: 'シンボル　配列。',
+                        type: LIST_TYPE
                     }
                 },
                 runtime: {
@@ -126,6 +146,26 @@ describe('RubyGenerator', () => {
             expect(Ruby.variableName('id5')).toEqual(null);
             expect(Ruby.listName('id6')).toEqual(null);
         });
+
+        test('escape except alphabet, number and _ to _', () => {
+            expect(Ruby.variableName('id2_1')).toEqual('@Avg_Total___Count_');
+            expect(Ruby.listName('id2_2')).toEqual('@List_of_Symbols_');
+            expect(Ruby.variableName('id2_3')).toEqual('@_________________________________');
+
+            renderedTarget.isStage = true;
+            expect(Ruby.variableName('id2_1')).toEqual('$Avg_Total___Count_');
+            expect(Ruby.listName('id2_2')).toEqual('$List_of_Symbols_');
+            expect(Ruby.variableName('id2_3')).toEqual('$_________________________________');
+        });
+
+        test('do not escape multibyte character like Japanese', () => {
+            expect(Ruby.variableName('id2_4')).toEqual('@平均_合計___件数_');
+            expect(Ruby.listName('id2_5')).toEqual('@シンボル　配列。');
+
+            renderedTarget.isStage = true;
+            expect(Ruby.variableName('id2_4')).toEqual('$平均_合計___件数_');
+            expect(Ruby.listName('id2_5')).toEqual('$シンボル　配列。');
+        });
     });
 
     describe('spriteNew', () => {