@calcit/procs 0.6.29 → 0.7.0-a1

package/lib/calcit-data.mjs

@@ -10,12 +10,12 @@ import { CalcitTuple } from "./js-tuple.mjs";
 import { CalcitCirruQuote, cirru_deep_equal } from "./js-cirru.mjs";
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
-let keywordIdx = 0;
-export class CalcitKeyword {
+let tagIdx = 0;
+export class CalcitTag {
     constructor(x) {
         this.value = x;
-        this.idx = keywordIdx;
-        keywordIdx++;
+        this.idx = tagIdx;
+        tagIdx++;
         this.cachedHash = null;
     }
     toString() {
@@ -96,7 +96,7 @@ export let getStringName = (x) => {
     if (typeof x === "string") {
         return x;
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return x.value;
     }
     if (x instanceof CalcitSymbol) {
@@ -127,35 +127,35 @@ export function findInFields(xs, y) {
         return upper;
     return -1;
 }
-var keywordRegistery = {};
-export let kwd = (content) => {
-    let item = keywordRegistery[content];
+var tagRegistery = {};
+export let tag = (content) => {
+    let item = tagRegistery[content];
     if (item != null) {
         return item;
     }
     else {
-        let v = new CalcitKeyword(content);
-        keywordRegistery[content] = v;
+        let v = new CalcitTag(content);
+        tagRegistery[content] = v;
         return v;
     }
 };
-export let castKwd = (x) => {
-    if (x instanceof CalcitKeyword) {
+export let castTag = (x) => {
+    if (x instanceof CalcitTag) {
         return x;
     }
     if (typeof x === "string") {
-        return kwd(x);
+        return tag(x);
     }
     if (x instanceof CalcitSymbol) {
-        return kwd(x.value);
+        return tag(x.value);
     }
-    throw new Error(`Cannot cast this to keyword: ${x}`);
+    throw new Error(`Cannot cast this to tag: ${x}`);
 };
 export var refsRegistry = new Map();
 let defaultHash_nil = valueHash("nil:");
 let defaultHash_number = valueHash("number:");
 let defaultHash_string = valueHash("string:");
-let defaultHash_keyword = valueHash("keyword:");
+let defaultHash_tag = valueHash("tag:");
 let defaultHash_true = valueHash("bool:true");
 let defaultHash_false = valueHash("bool:false");
 let defaultHash_symbol = valueHash("symbol:");
@@ -187,8 +187,8 @@ export let hashFunction = (x) => {
     if (x[calcit_dirty_hash_key] != null) {
         return x[calcit_dirty_hash_key];
     }
-    if (x instanceof CalcitKeyword) {
-        let h = mergeValueHash(defaultHash_keyword, x.idx);
+    if (x instanceof CalcitTag) {
+        let h = mergeValueHash(defaultHash_tag, x.idx);
         x.cachedHash = h;
         return h;
     }
@@ -216,8 +216,11 @@ export let hashFunction = (x) => {
     }
     if (x instanceof CalcitTuple) {
         let base = defaultHash_tuple;
-        base = mergeValueHash(base, hashFunction(x.fst));
-        base = mergeValueHash(base, hashFunction(x.snd));
+        base = mergeValueHash(base, hashFunction(x.tag));
+        for (let idx = 0; idx < x.extra.length; idx++) {
+            let item = x.extra[idx];
+            base = mergeValueHash(base, hashFunction(item));
+        }
         x.cachedHash = base;
         return base;
     }
@@ -342,7 +345,7 @@ export let toString = (x, escaped, disableJsDataWarning = false) => {
     if (x instanceof CalcitSymbol) {
         return x.toString();
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return x.toString();
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
@@ -387,7 +390,7 @@ export let to_js_data = (x, addColon = false) => {
     if (typeof x === "function") {
         return x;
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         if (addColon) {
             return `:${x.value}`;
         }
@@ -474,8 +477,8 @@ export let _$n__$e_ = (x, y) => {
         // comparing functions by reference
         return x === y;
     }
-    if (x instanceof CalcitKeyword) {
-        if (y instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
+        if (y instanceof CalcitTag) {
             return x === y;
         }
         return false;
@@ -536,7 +539,7 @@ export let _$n__$e_ = (x, y) => {
     }
     if (x instanceof CalcitTuple) {
         if (y instanceof CalcitTuple) {
-            return _$n__$e_(x.fst, y.fst) && _$n__$e_(x.snd, y.snd);
+            return _$n__$e_(x.tag, y.tag) && _$n__$e_(x.get(1), y.get(1));
         }
         return false;
     }

package/lib/calcit.procs.mjs

@@ -1,9 +1,9 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.6.29";
+export const calcit_version = "0.7.0-a1";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
-import { CalcitSymbol, CalcitKeyword, CalcitRef, CalcitRecur, kwd, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, tag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 export * from "./calcit-data.mjs";
 export * from "./js-record.mjs";
@@ -23,53 +23,53 @@ import { to_calcit_data, extract_cirru_edn, CalcitCirruQuote } from "./js-cirru.
 let inNodeJs = typeof process !== "undefined" && ((_a = process === null || process === void 0 ? void 0 : process.release) === null || _a === void 0 ? void 0 : _a.name) === "node";
 export let type_of = (x) => {
     if (typeof x === "string") {
-        return kwd("string");
+        return tag("string");
     }
     if (typeof x === "number") {
-        return kwd("number");
+        return tag("number");
     }
-    if (x instanceof CalcitKeyword) {
-        return kwd("keyword");
+    if (x instanceof CalcitTag) {
+        return tag("tag");
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-        return kwd("list");
+        return tag("list");
     }
     if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
-        return kwd("map");
+        return tag("map");
     }
     if (x == null) {
-        return kwd("nil");
+        return tag("nil");
     }
     if (x instanceof CalcitRef) {
-        return kwd("ref");
+        return tag("ref");
     }
     if (x instanceof CalcitTuple) {
-        return kwd("tuple");
+        return tag("tuple");
     }
     if (x instanceof CalcitSymbol) {
-        return kwd("symbol");
+        return tag("symbol");
     }
     if (x instanceof CalcitSet) {
-        return kwd("set");
+        return tag("set");
     }
     if (x instanceof CalcitRecord) {
-        return kwd("record");
+        return tag("record");
     }
     if (x instanceof CalcitCirruQuote) {
-        return kwd("cirru-quote");
+        return tag("cirru-quote");
     }
     if (x === true || x === false) {
-        return kwd("bool");
+        return tag("bool");
     }
     if (typeof x === "function") {
         if (x.isMacro) {
             // this is faked...
-            return kwd("macro");
+            return tag("macro");
         }
-        return kwd("fn");
+        return tag("fn");
     }
     if (typeof x === "object") {
-        return kwd("js-object");
+        return tag("js-object");
     }
     throw new Error(`Unknown data ${x}`);
 };
@@ -354,8 +354,8 @@ export let add_watch = (a, k, f) => {
     if (!(a instanceof CalcitRef)) {
         throw new Error("Expected ref for add-watch!");
     }
-    if (!(k instanceof CalcitKeyword)) {
-        throw new Error("Expected watcher key in keyword");
+    if (!(k instanceof CalcitTag)) {
+        throw new Error("Expected watcher key in tag");
     }
     if (!(typeof f === "function")) {
         throw new Error("Expected watcher function");
@@ -492,7 +492,7 @@ export let recur = (...xs) => {
     return new CalcitRecur(xs);
 };
 export let _$n_get_calcit_backend = () => {
-    return kwd("js");
+    return tag("js");
 };
 export let not = (x) => {
     return !x;
@@ -670,11 +670,11 @@ export let _$n_merge = (a, b) => {
             for (let idx = 0; idx < pairs.length; idx++) {
                 let [k, v] = pairs[idx];
                 let field;
-                if (k instanceof CalcitKeyword) {
+                if (k instanceof CalcitTag) {
                     field = k;
                 }
                 else {
-                    field = kwd(getStringName(k));
+                    field = tag(getStringName(k));
                 }
                 let position = a.findIndex(field);
                 if (position >= 0) {
@@ -892,18 +892,18 @@ export let get_env = (name, v0) => {
     }
     return v !== null && v !== void 0 ? v : v0;
 };
-export let turn_keyword = (x) => {
+export let turn_tag = (x) => {
     if (typeof x === "string") {
-        return kwd(x);
+        return tag(x);
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return x;
     }
     if (x instanceof CalcitSymbol) {
-        return kwd(x.value);
+        return tag(x.value);
     }
     console.error(x);
-    throw new Error("Unexpected data for keyword");
+    throw new Error("Unexpected data for tag");
 };
 export let turn_symbol = (x) => {
     if (typeof x === "string") {
@@ -912,7 +912,7 @@ export let turn_symbol = (x) => {
     if (x instanceof CalcitSymbol) {
         return x;
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return new CalcitSymbol(x.value);
     }
     console.error(x);
@@ -949,7 +949,7 @@ export let turn_string = (x) => {
     if (typeof x === "string") {
         return x;
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return x.value;
     }
     if (x instanceof CalcitSymbol) {
@@ -971,10 +971,10 @@ export let starts_with_$q_ = (xs, y) => {
     if (typeof xs === "string" && typeof y === "string") {
         return xs.startsWith(y);
     }
-    if (xs instanceof CalcitKeyword && y instanceof CalcitKeyword) {
+    if (xs instanceof CalcitTag && y instanceof CalcitTag) {
         return xs.value.startsWith(y.value);
     }
-    throw new Error("expected strings or keywords");
+    throw new Error("expected strings or tags");
 };
 export let ends_with_$q_ = (xs, y) => {
     return xs.endsWith(y);
@@ -1025,8 +1025,8 @@ export let bool_$q_ = (x) => {
 export let nil_$q_ = (x) => {
     return x == null;
 };
-export let keyword_$q_ = (x) => {
-    return x instanceof CalcitKeyword;
+export let tag_$q_ = (x) => {
+    return x instanceof CalcitTag;
 };
 export let map_$q_ = (x) => {
     return x instanceof CalcitSliceMap || x instanceof CalcitMap;
@@ -1152,7 +1152,7 @@ export let _$n_js_object = (...xs) => {
         if (typeof k === "string") {
             ret[k] = v;
         }
-        else if (k instanceof CalcitKeyword) {
+        else if (k instanceof CalcitTag) {
             ret[turn_string(k)] = v;
         }
         else {
@@ -1161,8 +1161,8 @@ export let _$n_js_object = (...xs) => {
     }
     return ret;
 };
-export let _$o__$o_ = (a, b, ...extra) => {
-    return new CalcitTuple(a, b, extra);
+export let _$o__$o_ = (tag, ...extra) => {
+    return new CalcitTuple(tag, extra);
 };
 // mutable place for core to register
 let calcit_builtin_classes = {
@@ -1192,8 +1192,8 @@ export function invoke_method(p, obj, ...args) {
         klass = calcit_builtin_classes.nil;
     }
     else if (obj instanceof CalcitTuple) {
-        if (obj.fst instanceof CalcitRecord) {
-            klass = obj.fst;
+        if (obj.tag instanceof CalcitRecord) {
+            klass = obj.tag;
         }
         else {
             throw new Error("Method invoking expected a record as class");
@@ -1322,7 +1322,7 @@ export let _$n_str_$o_pad_right = (s, size, pattern) => {
     return s.padEnd(size, pattern);
 };
 export let _$n_get_os = () => {
-    return kwd("js-engine");
+    return tag("js-engine");
 };
 export let _$n_buffer = (...xs) => {
     let buf = new Uint8Array(xs.length);

package/lib/custom-formatter.mjs

@@ -1,4 +1,4 @@
-import { CalcitRef, CalcitSymbol, CalcitKeyword } from "./calcit-data.mjs";
+import { CalcitRef, CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
@@ -21,7 +21,7 @@ export let load_console_formatter_$x_ = () => {
         window["devtoolsFormatters"] = [
             {
                 header: (obj, config) => {
-                    if (obj instanceof CalcitKeyword) {
+                    if (obj instanceof CalcitTag) {
                         return ["div", { style: "color: hsl(240, 80%, 60%)" }, obj.toString()];
                     }
                     if (obj instanceof CalcitSymbol) {
@@ -56,8 +56,10 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitTuple) {
                         let ret = ["div", {}];
                         ret.push(["div", { style: "display: inline-block; color: hsl(300, 100%, 40%); " }, "::"]);
-                        ret.push(["div", { style: "margin-left: 6px; display: inline-block;" }, embedObject(obj.fst)]);
-                        ret.push(["div", { style: "margin-left: 6px; display: inline-block;" }, embedObject(obj.snd)]);
+                        ret.push(["div", { style: "margin-left: 6px; display: inline-block;" }, embedObject(obj.tag)]);
+                        for (let idx = 0; idx < obj.extra.length; idx++) {
+                            ret.push(["div", { style: "margin-left: 6px; display: inline-block;" }, embedObject(obj.extra[idx])]);
+                        }
                         return ret;
                     }
                     if (obj instanceof CalcitRef) {

package/lib/js-cirru.mjs

@@ -4,7 +4,7 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
-import { CalcitKeyword, CalcitSymbol, CalcitRecur, CalcitRef, kwd } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, tag } from "./calcit-data.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
 export class CalcitCirruQuote {
     constructor(value) {
@@ -51,7 +51,7 @@ export let to_cirru_edn = (x) => {
     if (typeof x === "boolean") {
         return x.toString();
     }
-    if (x instanceof CalcitKeyword) {
+    if (x instanceof CalcitTag) {
         return x.toString();
     }
     if (x instanceof CalcitSymbol) {
@@ -123,27 +123,27 @@ export let to_cirru_edn = (x) => {
         return buffer;
     }
     if (x instanceof CalcitTuple) {
-        if (x.fst instanceof CalcitSymbol && x.fst.value === "quote") {
+        if (x.tag instanceof CalcitSymbol && x.tag.value === "quote") {
             // turn `x.snd` with CalcitList into raw Cirru nodes, which is in plain Array
-            return ["quote", toWriterNode(x.snd)];
+            return ["quote", toWriterNode(x.get(1))];
         }
-        else if (x.fst instanceof CalcitRecord) {
-            return ["::", x.fst.name.toString(), to_cirru_edn(x.snd)];
+        else if (x.tag instanceof CalcitRecord) {
+            return ["::", x.tag.name.toString(), to_cirru_edn(x.get(1))];
         }
         else {
-            throw new Error(`Unsupported tag for EDN: ${x.fst}`);
+            throw new Error(`Unsupported tag for EDN: ${x.tag}`);
         }
     }
     console.error(x);
     throw new Error("Unexpected data to to-cirru-edn");
 };
 /** makes sure we got string */
-let extractFieldKwd = (x) => {
+let extractFieldTag = (x) => {
     if (x[0] === ":") {
-        return kwd(x.slice(1));
+        return tag(x.slice(1));
     }
     else {
-        return kwd(x);
+        return tag(x);
     }
 };
 export let extract_cirru_edn = (x) => {
@@ -164,7 +164,7 @@ export let extract_cirru_edn = (x) => {
             return x.slice(1);
         }
         if (x[0] === ":") {
-            return kwd(x.slice(1));
+            return tag(x.slice(1));
         }
         if (x[0] === "'") {
             return new CalcitSymbol(x.slice(1));
@@ -208,7 +208,7 @@ export let extract_cirru_edn = (x) => {
                 }
                 if (pair instanceof Array && pair.length === 2) {
                     if (typeof pair[0] === "string") {
-                        entries.push([extractFieldKwd(pair[0]), extract_cirru_edn(pair[1])]);
+                        entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1])]);
                     }
                     else {
                         throw new Error("Expected string as field");
@@ -227,7 +227,7 @@ export let extract_cirru_edn = (x) => {
                 fields.push(entries[idx][0]);
                 values.push(entries[idx][1]);
             }
-            return new CalcitRecord(extractFieldKwd(name), fields, values);
+            return new CalcitRecord(extractFieldTag(name), fields, values);
         }
         if (x[0] === "[]") {
             return new CalcitSliceList(x.slice(1).map(extract_cirru_edn));
@@ -248,7 +248,7 @@ export let extract_cirru_edn = (x) => {
             if (x.length < 3) {
                 throw new Error("tuple expects at least 2 values");
             }
-            return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]), x.slice(3).map(extract_cirru_edn));
+            return new CalcitTuple(extract_cirru_edn(x[1]), x.slice(2).map(extract_cirru_edn));
         }
     }
     console.error(x);
@@ -270,7 +270,7 @@ export let format_cirru_edn = (data, useInline = true) => {
     if (data instanceof CalcitSymbol) {
         return "\ndo " + to_cirru_edn(data) + "\n";
     }
-    if (data instanceof CalcitKeyword) {
+    if (data instanceof CalcitTag) {
         return "\ndo " + to_cirru_edn(data) + "\n";
     }
     return writeCirruCode([to_cirru_edn(data)], { useInline: useInline });
@@ -282,7 +282,7 @@ export let to_calcit_data = (x, noKeyword = false) => {
         return x;
     if (typeof x === "string") {
         if (!noKeyword && x[0] === ":" && x.slice(1).match(/^[\w\d_\?\!\-]+$/)) {
-            return kwd(x.slice(1));
+            return tag(x.slice(1));
         }
         return x;
     }
@@ -316,7 +316,7 @@ export let to_calcit_data = (x, noKeyword = false) => {
         return x;
     if (x instanceof CalcitRef)
         return x;
-    if (x instanceof CalcitKeyword)
+    if (x instanceof CalcitTag)
         return x;
     if (x instanceof CalcitSymbol)
         return x;

package/lib/js-list.mjs

@@ -305,12 +305,12 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
             let item = xs.get(idx);
             let pair = f(state, item);
             if (pair instanceof CalcitTuple) {
-                if (typeof pair.fst === "boolean") {
-                    if (pair.fst) {
-                        return pair.snd;
+                if (typeof pair.tag === "boolean") {
+                    if (pair.tag) {
+                        return pair.get(1);
                     }
                     else {
-                        state = pair.snd;
+                        state = pair.get(1);
                     }
                 }
             }
@@ -327,12 +327,12 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
             let item = values[idx];
             let pair = f(state, item);
             if (pair instanceof CalcitTuple) {
-                if (typeof pair.fst === "boolean") {
-                    if (pair.fst) {
-                        return pair.snd;
+                if (typeof pair.tag === "boolean") {
+                    if (pair.tag) {
+                        return pair.get(1);
                     }
                     else {
-                        state = pair.snd;
+                        state = pair.get(1);
                     }
                 }
             }
@@ -350,12 +350,12 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
             let pos = i << 1;
             let pair = f(state, new CalcitSliceList([xs.chunk[pos], xs.chunk[pos + 1]]));
             if (pair instanceof CalcitTuple) {
-                if (typeof pair.fst === "boolean") {
-                    if (pair.fst) {
-                        return pair.snd;
+                if (typeof pair.tag === "boolean") {
+                    if (pair.tag) {
+                        return pair.get(1);
                     }
                     else {
-                        state = pair.snd;
+                        state = pair.get(1);
                     }
                 }
             }
@@ -372,12 +372,12 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
             let item = pairs[idx];
             let pair = f(state, new CalcitSliceList(item));
             if (pair instanceof CalcitTuple) {
-                if (typeof pair.fst === "boolean") {
-                    if (pair.fst) {
-                        return pair.snd;
+                if (typeof pair.tag === "boolean") {
+                    if (pair.tag) {
+                        return pair.get(1);
                     }
                     else {
-                        state = pair.snd;
+                        state = pair.get(1);
                     }
                 }
             }
@@ -403,12 +403,12 @@ export let foldr_shortcut = function (xs, acc, v0, f) {
             let item = xs.get(idx);
             let pair = f(state, item);
             if (pair instanceof CalcitTuple) {
-                if (typeof pair.fst === "boolean") {
-                    if (pair.fst) {
-                        return pair.snd;
+                if (typeof pair.tag === "boolean") {
+                    if (pair.tag) {
+                        return pair.get(1);
                     }
                     else {
-                        state = pair.snd;
+                        state = pair.get(1);
                     }
                 }
             }

package/lib/js-primes.mjs

@@ -1,4 +1,4 @@
-import { CalcitKeyword, CalcitSymbol, CalcitRef, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRef, CalcitRecur } from "./calcit-data.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
@@ -14,7 +14,7 @@ export let is_literal = (x) => {
         return true;
     if (typeof x == "number")
         return true;
-    if (x instanceof CalcitKeyword)
+    if (x instanceof CalcitTag)
         return true;
     if (x instanceof CalcitSymbol)
         return true;
@@ -26,7 +26,7 @@ var PseudoTypeIndex;
     PseudoTypeIndex[PseudoTypeIndex["bool"] = 1] = "bool";
     PseudoTypeIndex[PseudoTypeIndex["number"] = 2] = "number";
     PseudoTypeIndex[PseudoTypeIndex["symbol"] = 3] = "symbol";
-    PseudoTypeIndex[PseudoTypeIndex["keyword"] = 4] = "keyword";
+    PseudoTypeIndex[PseudoTypeIndex["tag"] = 4] = "tag";
     PseudoTypeIndex[PseudoTypeIndex["string"] = 5] = "string";
     PseudoTypeIndex[PseudoTypeIndex["ref"] = 6] = "ref";
     PseudoTypeIndex[PseudoTypeIndex["tuple"] = 7] = "tuple";
@@ -49,8 +49,8 @@ let typeAsInt = (x) => {
         return PseudoTypeIndex.number;
     if (x instanceof CalcitSymbol)
         return PseudoTypeIndex.symbol;
-    if (x instanceof CalcitKeyword)
-        return PseudoTypeIndex.keyword;
+    if (x instanceof CalcitTag)
+        return PseudoTypeIndex.tag;
     if (t === "string")
         return PseudoTypeIndex.string;
     if (x instanceof CalcitRef)
@@ -98,7 +98,7 @@ export let _$n_compare = (a, b) => {
                 return rawCompare(a, b);
             case PseudoTypeIndex.number:
                 return rawCompare(a, b);
-            case PseudoTypeIndex.keyword:
+            case PseudoTypeIndex.tag:
                 return rawCompare(a.value, b.value);
             case PseudoTypeIndex.symbol:
                 return rawCompare(a, b);