cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be backwards compatible for now.

Browse Source
This commit is contained in:
Tom MacWright 2012-12-29 12:40:31 -05:00
parent 4b8256e0f8
commit 0233c523ea
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/carto/parser.js
View File

@ -554,9 +554,19 @@ carto.Parser = function Parser(env) {
save();
var key, op, val;
if (! $('[')) return;
if (key = $(/^[a-zA-Z0-9\-_]+/) || $(this.entities.quoted) || $(this.entities.variable) || $(this.entities.field)) {
if (key = $(/^[a-zA-Z0-9\-_]+/) ||
$(this.entities.quoted) ||
$(this.entities.variable) ||
$(this.entities.field)) {
// TODO: remove at 1.0.0
if (key instanceof tree.Quoted) {
key = new tree.Field(key.toString());
}
if ((op = $(this.entities.comparison)) &&
(val = $(this.entities.quoted) || $(this.entities.variable) || $(this.entities.dimension) || $(this.entities.field))) {
(val = $(this.entities.quoted) ||
$(this.entities.variable) ||
$(this.entities.dimension) ||
$(this.entities.field))) {
if (! $(']')) return;
if (!key.is) key = new tree.Field(key);
return new tree.Filter(key, op, val, memo, env.filename);