|
|
@@ -26,40 +26,40 @@ klass.uassertValidNameForUserWrite = function uassertValidNameForUserWrite(varNa
|
|
|
if (!varName)
|
|
|
throw new Error("empty variable names are not allowed; uassert code 16866");
|
|
|
|
|
|
- var firstCharIsValid = (varName[0] >= "a" && varName[0] <= "z") ||
|
|
|
+ var firstCharIsValid = (varName[0] >= "a" && varName[0] <= "z") ||
|
|
|
(varName[0] & "\x80"); // non-ascii
|
|
|
|
|
|
if (!firstCharIsValid)
|
|
|
throw new Error("'" + varName + "' starts with an invalid character for a user variable name; uassert code 16867");
|
|
|
|
|
|
- for (var i = 1, l = varName.length; i < l; i++) {
|
|
|
- var charIsValid = (varName[i] >= 'a' && varName[i] <= 'z') ||
|
|
|
- (varName[i] >= 'A' && varName[i] <= 'Z') ||
|
|
|
- (varName[i] >= '0' && varName[i] <= '9') ||
|
|
|
+ for (var i = 1, l = varName.length; i < l; i++) {
|
|
|
+ var charIsValid = (varName[i] >= 'a' && varName[i] <= 'z') ||
|
|
|
+ (varName[i] >= 'A' && varName[i] <= 'Z') ||
|
|
|
+ (varName[i] >= '0' && varName[i] <= '9') ||
|
|
|
(varName[i] == '_') ||
|
|
|
(varName[i] & '\x80'); // non-ascii
|
|
|
|
|
|
if (!charIsValid)
|
|
|
throw new Error("'" + varName + "' contains an invalid character " +
|
|
|
"for a variable name: '" + varName[i] + "'; uassert code 16868");
|
|
|
- }
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
klass.uassertValidNameForUserRead = function uassertValidNameForUserRead(varName) {
|
|
|
if (!varName)
|
|
|
throw new Error("empty variable names are not allowed; uassert code 16869");
|
|
|
|
|
|
- var firstCharIsValid = (varName[0] >= "a" && varName[0] <= "z") ||
|
|
|
- (varName[0] >= "A" && varName[0] <= "Z") ||
|
|
|
+ var firstCharIsValid = (varName[0] >= "a" && varName[0] <= "z") ||
|
|
|
+ (varName[0] >= "A" && varName[0] <= "Z") ||
|
|
|
(varName[0] & "\x80"); // non-ascii
|
|
|
|
|
|
if (!firstCharIsValid)
|
|
|
throw new Error("'" + varName + "' starts with an invalid character for a variable name; uassert code 16870");
|
|
|
|
|
|
for (var i = 1, l = varName.length; i < l; i++) {
|
|
|
- var charIsValid = (varName[i] >= "a" && varName[i] <= "z") ||
|
|
|
- (varName[i] >= "A" && varName[i] <= "Z") ||
|
|
|
- (varName[i] >= "0" && varName[i] <= "9") ||
|
|
|
+ var charIsValid = (varName[i] >= "a" && varName[i] <= "z") ||
|
|
|
+ (varName[i] >= "A" && varName[i] <= "Z") ||
|
|
|
+ (varName[i] >= "0" && varName[i] <= "9") ||
|
|
|
(varName[i] == "_") ||
|
|
|
(varName[i] & "\x80"); // non-ascii
|
|
|
|