Some fixes for quotes, add bool range, add tree in output

Author: Querela

cql.js

@@ -172,6 +172,7 @@ var CQLBoolean = function () {
     this.left = null;
     this.right = null;
     this._pos = null;
+    this._range = null;
 }
 
 CQLBoolean.prototype = {
@@ -209,6 +210,7 @@ CQLBoolean.prototype = {
         s += ',' + nl + indent(n, c) + ' "s1": ' + this.left.toFQ(n + 1, c, nl);
         s += ',' + nl + indent(n, c) + ' "s2": ' + this.right.toFQ(n + 1, c, nl);
         if (this._pos !== null) s += ',' + nl + indent(n, c) + ' "@pos": ' + this._pos;
+        if (this._range !== null) s += ',' + nl + indent(n, c) + ' "@range": ' + JSON.stringify(this._range);
         var fill = n && c ? ' ' : '';
         s += nl + indent(n - 1, c) + fill + '}';
         return s;
@@ -272,6 +274,8 @@ CQLParser.prototype = {
             for (var key in fq) {
                 if (key == 'op' || key == 's1' || key == 's2')
                     continue;
+                if (key.endsWith("@pos") || key.endsWith("@range"))
+                    continue;
                 var mod = new CQLModifier();
                 mod.name = key;
                 mod.relation = '=';
@@ -333,6 +337,7 @@ CQLParser.prototype = {
             b.op = this.lval;
             this._move();
             b.modifiers = this._parseModifiers();
+            b._range = [b._pos, Math.max(b._pos + b.op.length - 1, Math.max.apply(null, b.modifiers.map(x => ("_range" in x) ? x._range[1]: 0)))];
             b.left = left;
             b.right = this._parseSearchClause(field, relation, modifiers);
             left = b;
@@ -362,6 +367,7 @@ CQLParser.prototype = {
                 var m = new CQLModifier();
                 m._pos = _mpos;
                 m._range = [_mstart, _mend];
+                this._exprStart = null;
                 m.name = name;
                 m.relation = rel;
                 m.value = this.val;
@@ -371,6 +377,7 @@ CQLParser.prototype = {
                 var m = new CQLModifier();
                 m._pos = _mpos;
                 m._range = [_mstart, _mend];
+                this._exprStart = null;
                 m.name = name;
                 m.relation = "";
                 m.value = "";

index.html

@@ -9,23 +9,29 @@
           cp.parse(query);
           var fq = JSON.parse(cp.toFQ());
 
-          function recMods (obj, s) {
+          function recMods (obj, s, lvl) {
+            if (lvl === undefined) lvl = 0;
             if ("term" in obj) {
+              if ("@range" in obj) {
+                let range = obj["@range"];
+                s += '\n' + ("".padStart(range[0] - 1) + "t".padEnd(range[1] - range[0] + 1, "-")).padEnd(query.length + 1 + lvl) + "[term:" + range + "]"
+              }
               Object.entries(obj).filter(x => x[0].endsWith("@range") && x[0].length > 6).map(([_, range]) => {
-                s += '\n' + "".padStart(range[0] - 1) + "m".padEnd(range[1] - range[0] + 1, "-")
+                s += '\n' + ("".padStart(range[0] - 1) + "m".padEnd(range[1] - range[0] + 1, "-")).padEnd(query.length + 1 + lvl + 1) + "[term:mod:" + range + "]"
               })
-              if ("@range" in obj)
-                s += '\n' + "".padStart(obj["@range"][0] - 1) + "t".padEnd(obj["@range"][1] - obj["@range"][0] + 1, "-")
             } else if ("op" in obj) {
-              if ("@pos" in obj)
-                s += '\n' + "r".padEnd(obj.op.length, "-").padStart(obj["@pos"] + obj.op.length - 1)
-              
-              Object.entries(obj).filter(x => x[0].endsWith("@range")).map(([_, range]) => {
-                s += '\n' + "".padStart(range[0] - 1) + "m".padEnd(range[1] - range[0] + 1, "-")
+              if ("@range" in obj) {
+                let range = obj["@range"];
+                s += '\n' + ("".padStart(range[0] - 1) + "o".padEnd(range[1] - range[0] + 1, "-")).padEnd(query.length + 1 + lvl) + "[op:" + range + "]"
+              } else if ("@pos" in obj) {
+                let range = [obj["@pos"], obj["@pos"] + obj.op.length - 1]
+                s += '\n' + ("o".padEnd(obj.op.length, "-").padStart(obj["@pos"] + obj.op.length - 1)).padEnd(query.length + 1 + lvl) + "[op:" + range + "]"
+              }
+              Object.entries(obj).filter(x => x[0].endsWith("@range")  && x[0].length > 6).map(([_, range]) => {
+                s += '\n' + ("".padStart(range[0] - 1) + "m".padEnd(range[1] - range[0] + 1, "-")).padEnd(query.length + 1 + lvl + 1) + "[op:mod:" + range + "]"
               })
-              
-              s = recMods(obj.s1, s);
-              s = recMods(obj.s2, s);
+              s = recMods(obj.s1, s, lvl+1);
+              s = recMods(obj.s2, s, lvl+1);
             }
             return s;
           }