github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

spacebars: fewer special identifiers mid-path

Browse Source
This commit is contained in:
David Greenspan
2013-07-13 17:34:35 -07:00
parent a342232868
commit c50134beaf
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/spacebars/spacebars.js
View File

@@ -62,12 +62,17 @@ Spacebars.parseStacheTag = function (inputString, pos, options) {
return lexer.next();
};
var scanIdentifier = function () {
var scanIdentifier = function (isFirstInPath) {
var tok = scanToken();
// We don't care about overlap with JS keywords. This code
// won't accept "true", "false", or "null" as identifiers however.
if (tok.type() !== 'IDENTIFIER' && tok.type() !== 'KEYWORD')
// We don't care about overlap with JS keywords,
// but accept "true", "false", and "null" as identifiers
// only if not isFirstInPath.
if (! (tok.type() === 'IDENTIFIER' ||
tok.type() === 'KEYWORD' ||
((! isFirstInPath) && (tok.type() === 'BOOLEAN' ||
tok.type() === 'NULL')))) {
expected('IDENTIFIER');
}
var text = tok.text();
advance(text.length);
return text;
@@ -106,7 +111,7 @@ Spacebars.parseStacheTag = function (inputString, pos, options) {
error("Path can't start with empty string");
segments.push(seg);
} else {
var id = scanIdentifier();
var id = scanIdentifier(! segments.length);
if (id === 'this' && ! segments.length) {
// initial `this`
segments.push('');