CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-23 08:40:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Generalize PHP $ hack for variables.

Browse Source
This commit is contained in:
Neil Fraser
2015-07-02 19:59:32 -07:00
parent d819db2acf
commit d8a72df17f
7 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/names.js
View File

@@ -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;
};
/**