Generalize PHP $ hack for variables.

core/names.js

@@ -31,16 +31,17 @@ goog.provide('Blockly.Names');
  * Class for a database of entity names (variables, functions, etc).
  * @param {string} reservedWords A comma-separated string of words that are
  *     illegal for use as names in a language (e.g. 'new,if,this,...').
+ * @param {string=} opt_variablePrefix Some languages need a '$' or a namespace
+ *     before all variable names.
  * @constructor
- * @param namesPrependDollar boolean indicating whether the languages requires dollar signs ($) before a variable
  */
-Blockly.Names = function(reservedWords, namesPrependDollar) {
-  this.prependDollar = namesPrependDollar || false;
+Blockly.Names = function(reservedWords, opt_variablePrefix) {
+  this.variablePrefix_ = opt_variablePrefix || '';
   this.reservedDict_ = Object.create(null);
   if (reservedWords) {
     var splitWords = reservedWords.split(',');
-    for (var x = 0; x < splitWords.length; x++) {
-      this.reservedDict_[splitWords[x]] = true;
+    for (var i = 0; i < splitWords.length; i++) {
+      this.reservedDict_[splitWords[i]] = true;
     }
   }
   this.reset();
@@ -72,12 +73,13 @@ Blockly.Names.prototype.reset = function() {
  */
 Blockly.Names.prototype.getName = function(name, type) {
   var normalized = name.toLowerCase() + '_' + type;
-  var prepend = type=='VARIABLE' && this.prependDollar ? '$' : '';
+  var prefix = (type == Blockly.Variables.NAME_TYPE) ?
+      this.variablePrefix_ : '';
   if (normalized in this.db_) {
-    return prepend + this.db_[normalized];
+    return prefix + this.db_[normalized];
   }
   var safeName = this.getDistinctName(name, type);
-  this.db_[normalized] = type=='VARIABLE' && this.prependDollar ? safeName.substr(1) : safeName;
+  this.db_[normalized] = safeName.substr(prefix.length);
   return safeName;
 };
 
@@ -101,8 +103,9 @@ Blockly.Names.prototype.getDistinctName = function(name, type) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  var prepend = type=='VARIABLE' && this.prependDollar ? '$' : '';
-  return prepend + safeName;
+  var prefix = (type == Blockly.Variables.NAME_TYPE) ?
+      this.variablePrefix_ : '';
+  return prefix + safeName;
 };
 
 /**

generators/dart.js

@@ -91,9 +91,9 @@ Blockly.Dart.init = function(workspace) {
 
   var defvars = [];
   var variables = Blockly.Variables.allVariables(workspace);
-  for (var x = 0; x < variables.length; x++) {
-    defvars[x] = 'var ' +
-        Blockly.Dart.variableDB_.getName(variables[x],
+  for (var i = 0; i < variables.length; i++) {
+    defvars[i] = 'var ' +
+        Blockly.Dart.variableDB_.getName(variables[i],
         Blockly.Variables.NAME_TYPE) + ';';
   }
   Blockly.Dart.definitions_['variables'] = defvars.join('\n');

generators/javascript.js

@@ -123,9 +123,9 @@ Blockly.JavaScript.init = function(workspace) {
 
   var defvars = [];
   var variables = Blockly.Variables.allVariables(workspace);
-  for (var x = 0; x < variables.length; x++) {
-    defvars[x] = 'var ' +
-        Blockly.JavaScript.variableDB_.getName(variables[x],
+  for (var i = 0; i < variables.length; i++) {
+    defvars[i] = 'var ' +
+        Blockly.JavaScript.variableDB_.getName(variables[i],
         Blockly.Variables.NAME_TYPE) + ';';
   }
   Blockly.JavaScript.definitions_['variables'] = defvars.join('\n');

generators/php.js

@@ -96,15 +96,15 @@ Blockly.PHP.init = function(workspace) {
 
   if (!Blockly.PHP.variableDB_) {
     Blockly.PHP.variableDB_ =
-        new Blockly.Names(Blockly.PHP.RESERVED_WORDS_, true);
+        new Blockly.Names(Blockly.PHP.RESERVED_WORDS_, '$');
   } else {
     Blockly.PHP.variableDB_.reset();
   }
 
   var defvars = [];
   var variables = Blockly.Variables.allVariables(workspace);
-  for (var x = 0; x < variables.length; x++) {
-    defvars[x] = Blockly.PHP.variableDB_.getName(variables[x],
+  for (var i = 0; i < variables.length; i++) {
+    defvars[i] = Blockly.PHP.variableDB_.getName(variables[i],
         Blockly.Variables.NAME_TYPE) + ';';
   }
   Blockly.PHP.definitions_['variables'] = defvars.join('\n');

generators/python.js

@@ -104,8 +104,8 @@ Blockly.Python.init = function(workspace) {
 
   var defvars = [];
   var variables = Blockly.Variables.allVariables(workspace);
-  for (var x = 0; x < variables.length; x++) {
-    defvars[x] = Blockly.Python.variableDB_.getName(variables[x],
+  for (var i = 0; i < variables.length; i++) {
+    defvars[i] = Blockly.Python.variableDB_.getName(variables[i],
         Blockly.Variables.NAME_TYPE) + ' = None';
   }
   Blockly.Python.definitions_['variables'] = defvars.join('\n');