@creationix/rex 0.4.1 → 0.6.0

package/rex.js

@@ -32,10 +32,9 @@ var OPCODE_IDS = {
   object: "ob",
   mod: "md",
   neg: "ng",
-  range: "rn",
-  size: "sz"
+  range: "rn"
 };
-var KEYWORD_OPCODES = new Set(["boolean", "number", "string", "array", "object", "size"]);
+var KEYWORD_OPCODES = new Set(["boolean", "number", "string", "array", "object"]);
 var BINARY_TO_OPCODE = {
   add: "add",
   sub: "sub",
@@ -491,11 +490,30 @@ function collectLogicalChain(node, op) {
     return [node];
   return [...collectLogicalChain(node.left, op), ...collectLogicalChain(node.right, op)];
 }
+function formatParseError(source, match) {
+  const message = match.message ?? "Parse failed";
+  const pos = match.getRightmostFailurePosition?.();
+  if (typeof pos !== "number" || !Number.isFinite(pos))
+    return message;
+  const safePos = Math.max(0, Math.min(source.length, pos));
+  const lineStart = source.lastIndexOf(`
+`, safePos - 1) + 1;
+  const lineEndIndex = source.indexOf(`
+`, safePos);
+  const lineEnd = lineEndIndex === -1 ? source.length : lineEndIndex;
+  const lineText = source.slice(lineStart, lineEnd);
+  const lineNumber = source.slice(0, lineStart).split(`
+`).length;
+  const columnNumber = safePos - lineStart + 1;
+  const caret = `${" ".repeat(Math.max(0, columnNumber - 1))}^`;
+  return `${message}
+  ${lineText}
+  ${caret}`;
+}
 function parseToIR(source) {
   const match = grammar.match(source);
   if (!match.succeeded()) {
-    const failure = match;
-    throw new Error(failure.message ?? "Parse failed");
+    throw new Error(formatParseError(source, match));
   }
   return semantics(match).toIR();
 }
@@ -841,20 +859,11 @@ function gatherEncodedValueSpans(text) {
   }
   return spans;
 }
-function buildPointerToken(pointerStart, targetStart) {
-  let offset = targetStart - (pointerStart + 1);
+function buildPointerToken(pointerStart, targetStart, occurrenceSize) {
+  const offset = targetStart - pointerStart - occurrenceSize;
   if (offset < 0)
     return;
-  for (let guard = 0;guard < 8; guard += 1) {
-    const prefix = encodeUint(offset);
-    const recalculated = targetStart - (pointerStart + prefix.length + 1);
-    if (recalculated === offset)
-      return `${prefix}^`;
-    offset = recalculated;
-    if (offset < 0)
-      return;
-  }
-  return;
+  return `${encodeUint(offset)}^`;
 }
 function buildDedupeCandidateTable(encoded, minBytes) {
   const spans = gatherEncodedValueSpans(encoded);
@@ -896,7 +905,7 @@ function dedupeLargeEncodedValues(encoded, minBytes = 4) {
         if (current.slice(occurrence.span.start, occurrence.span.end) !== value)
           continue;
         const canonicalCurrentStart = current.length - canonical.offsetFromEnd - canonical.sizeBytes;
-        const pointerToken = buildPointerToken(occurrence.span.start, canonicalCurrentStart);
+        const pointerToken = buildPointerToken(occurrence.span.start, canonicalCurrentStart, occurrence.sizeBytes);
         if (!pointerToken)
           continue;
         if (pointerToken.length >= occurrence.sizeBytes)
@@ -925,831 +934,8 @@ function encodeIR(node, options) {
     activeEncodeOptions = previous;
   }
 }
-function cloneNode(node) {
-  return structuredClone(node);
-}
-function emptyOptimizeEnv() {
-  return { constants: {}, selfCaptures: {} };
-}
-function cloneOptimizeEnv(env) {
-  return {
-    constants: { ...env.constants },
-    selfCaptures: { ...env.selfCaptures }
-  };
-}
-function clearOptimizeEnv(env) {
-  for (const key of Object.keys(env.constants))
-    delete env.constants[key];
-  for (const key of Object.keys(env.selfCaptures))
-    delete env.selfCaptures[key];
-}
-function clearBinding(env, name) {
-  delete env.constants[name];
-  delete env.selfCaptures[name];
-}
-function selfTargetFromNode(node, currentDepth) {
-  if (node.type === "self")
-    return currentDepth;
-  if (node.type === "selfDepth") {
-    const target = currentDepth - (node.depth - 1);
-    if (target >= 1)
-      return target;
-  }
-  return;
-}
-function selfNodeFromTarget(targetDepth, currentDepth) {
-  const relDepth = currentDepth - targetDepth + 1;
-  if (!Number.isInteger(relDepth) || relDepth < 1)
-    return;
-  if (relDepth === 1)
-    return { type: "self" };
-  return { type: "selfDepth", depth: relDepth };
-}
-function dropBindingNames(env, binding) {
-  if (binding.type === "binding:valueIn") {
-    clearBinding(env, binding.value);
-    return;
-  }
-  if (binding.type === "binding:keyValueIn") {
-    clearBinding(env, binding.key);
-    clearBinding(env, binding.value);
-    return;
-  }
-  if (binding.type === "binding:keyOf") {
-    clearBinding(env, binding.key);
-  }
-}
-function optimizeBinding(binding, sourceEnv, currentDepth) {
-  const source = optimizeNode(binding.source, sourceEnv, currentDepth);
-  switch (binding.type) {
-    case "binding:bareIn":
-      return { type: "binding:bareIn", source };
-    case "binding:bareOf":
-      return { type: "binding:bareOf", source };
-    case "binding:valueIn":
-      return { type: "binding:valueIn", value: binding.value, source };
-    case "binding:keyValueIn":
-      return { type: "binding:keyValueIn", key: binding.key, value: binding.value, source };
-    case "binding:keyOf":
-      return { type: "binding:keyOf", key: binding.key, source };
-  }
-}
-function collectReads(node, out) {
-  switch (node.type) {
-    case "identifier":
-      out.add(node.name);
-      return;
-    case "group":
-      collectReads(node.expression, out);
-      return;
-    case "array":
-      for (const item of node.items)
-        collectReads(item, out);
-      return;
-    case "object":
-      for (const entry of node.entries) {
-        collectReads(entry.key, out);
-        collectReads(entry.value, out);
-      }
-      return;
-    case "arrayComprehension":
-      collectReads(node.binding.source, out);
-      collectReads(node.body, out);
-      return;
-    case "whileArrayComprehension":
-      collectReads(node.condition, out);
-      collectReads(node.body, out);
-      return;
-    case "objectComprehension":
-      collectReads(node.binding.source, out);
-      collectReads(node.key, out);
-      collectReads(node.value, out);
-      return;
-    case "whileObjectComprehension":
-      collectReads(node.condition, out);
-      collectReads(node.key, out);
-      collectReads(node.value, out);
-      return;
-    case "unary":
-      collectReads(node.value, out);
-      return;
-    case "binary":
-      collectReads(node.left, out);
-      collectReads(node.right, out);
-      return;
-    case "assign":
-      if (!(node.op === "=" && node.place.type === "identifier"))
-        collectReads(node.place, out);
-      collectReads(node.value, out);
-      return;
-    case "navigation":
-      collectReads(node.target, out);
-      for (const segment of node.segments) {
-        if (segment.type === "dynamic")
-          collectReads(segment.key, out);
-      }
-      return;
-    case "call":
-      collectReads(node.callee, out);
-      for (const arg of node.args)
-        collectReads(arg, out);
-      return;
-    case "conditional":
-      collectReads(node.condition, out);
-      for (const part of node.thenBlock)
-        collectReads(part, out);
-      if (node.elseBranch)
-        collectReadsElse(node.elseBranch, out);
-      return;
-    case "for":
-      collectReads(node.binding.source, out);
-      for (const part of node.body)
-        collectReads(part, out);
-      return;
-    case "range":
-      collectReads(node.from, out);
-      collectReads(node.to, out);
-      return;
-    case "program":
-      for (const part of node.body)
-        collectReads(part, out);
-      return;
-    default:
-      return;
-  }
-}
-function collectReadsElse(elseBranch, out) {
-  if (elseBranch.type === "else") {
-    for (const part of elseBranch.block)
-      collectReads(part, out);
-    return;
-  }
-  collectReads(elseBranch.condition, out);
-  for (const part of elseBranch.thenBlock)
-    collectReads(part, out);
-  if (elseBranch.elseBranch)
-    collectReadsElse(elseBranch.elseBranch, out);
-}
-function isPureNode(node) {
-  switch (node.type) {
-    case "identifier":
-    case "self":
-    case "selfDepth":
-    case "boolean":
-    case "null":
-    case "undefined":
-    case "number":
-    case "string":
-    case "key":
-      return true;
-    case "group":
-      return isPureNode(node.expression);
-    case "array":
-      return node.items.every((item) => isPureNode(item));
-    case "object":
-      return node.entries.every((entry) => isPureNode(entry.key) && isPureNode(entry.value));
-    case "navigation":
-      return isPureNode(node.target) && node.segments.every((segment) => segment.type === "static" || isPureNode(segment.key));
-    case "unary":
-      return node.op !== "delete" && isPureNode(node.value);
-    case "binary":
-      return isPureNode(node.left) && isPureNode(node.right);
-    case "range":
-      return isPureNode(node.from) && isPureNode(node.to);
-    default:
-      return false;
-  }
-}
-function eliminateDeadAssignments(block) {
-  const needed = new Set;
-  const out = [];
-  for (let index = block.length - 1;index >= 0; index -= 1) {
-    const node = block[index];
-    if (node.type === "conditional") {
-      let rewritten = node;
-      if (node.condition.type === "assign" && node.condition.op === "=" && node.condition.place.type === "identifier") {
-        const name = node.condition.place.name;
-        const branchReads = new Set;
-        for (const part of node.thenBlock)
-          collectReads(part, branchReads);
-        if (node.elseBranch)
-          collectReadsElse(node.elseBranch, branchReads);
-        if (!needed.has(name) && !branchReads.has(name)) {
-          rewritten = {
-            type: "conditional",
-            head: node.head,
-            condition: node.condition.value,
-            thenBlock: node.thenBlock,
-            elseBranch: node.elseBranch
-          };
-        }
-      }
-      collectReads(rewritten, needed);
-      out.push(rewritten);
-      continue;
-    }
-    if (node.type === "assign" && node.op === "=" && node.place.type === "identifier") {
-      collectReads(node.value, needed);
-      const name = node.place.name;
-      const canDrop = !needed.has(name) && isPureNode(node.value);
-      needed.delete(name);
-      if (canDrop)
-        continue;
-      out.push(node);
-      continue;
-    }
-    collectReads(node, needed);
-    out.push(node);
-  }
-  out.reverse();
-  return out;
-}
-function hasIdentifierRead(node, name, asPlace = false) {
-  if (node.type === "identifier")
-    return !asPlace && node.name === name;
-  switch (node.type) {
-    case "group":
-      return hasIdentifierRead(node.expression, name);
-    case "array":
-      return node.items.some((item) => hasIdentifierRead(item, name));
-    case "object":
-      return node.entries.some((entry) => hasIdentifierRead(entry.key, name) || hasIdentifierRead(entry.value, name));
-    case "navigation":
-      return hasIdentifierRead(node.target, name) || node.segments.some((segment) => segment.type === "dynamic" && hasIdentifierRead(segment.key, name));
-    case "unary":
-      return hasIdentifierRead(node.value, name, node.op === "delete");
-    case "binary":
-      return hasIdentifierRead(node.left, name) || hasIdentifierRead(node.right, name);
-    case "range":
-      return hasIdentifierRead(node.from, name) || hasIdentifierRead(node.to, name);
-    case "assign":
-      return hasIdentifierRead(node.place, name, true) || hasIdentifierRead(node.value, name);
-    default:
-      return false;
-  }
-}
-function countIdentifierReads(node, name, asPlace = false) {
-  if (node.type === "identifier")
-    return !asPlace && node.name === name ? 1 : 0;
-  switch (node.type) {
-    case "group":
-      return countIdentifierReads(node.expression, name);
-    case "array":
-      return node.items.reduce((sum, item) => sum + countIdentifierReads(item, name), 0);
-    case "object":
-      return node.entries.reduce((sum, entry) => sum + countIdentifierReads(entry.key, name) + countIdentifierReads(entry.value, name), 0);
-    case "navigation":
-      return countIdentifierReads(node.target, name) + node.segments.reduce((sum, segment) => sum + (segment.type === "dynamic" ? countIdentifierReads(segment.key, name) : 0), 0);
-    case "unary":
-      return countIdentifierReads(node.value, name, node.op === "delete");
-    case "binary":
-      return countIdentifierReads(node.left, name) + countIdentifierReads(node.right, name);
-    case "range":
-      return countIdentifierReads(node.from, name) + countIdentifierReads(node.to, name);
-    case "assign":
-      return countIdentifierReads(node.place, name, true) + countIdentifierReads(node.value, name);
-    default:
-      return 0;
-  }
-}
-function replaceIdentifier(node, name, replacement, asPlace = false) {
-  if (node.type === "identifier") {
-    if (!asPlace && node.name === name)
-      return cloneNode(replacement);
-    return node;
-  }
-  switch (node.type) {
-    case "group":
-      return {
-        type: "group",
-        expression: replaceIdentifier(node.expression, name, replacement)
-      };
-    case "array":
-      return { type: "array", items: node.items.map((item) => replaceIdentifier(item, name, replacement)) };
-    case "object":
-      return {
-        type: "object",
-        entries: node.entries.map((entry) => ({
-          key: replaceIdentifier(entry.key, name, replacement),
-          value: replaceIdentifier(entry.value, name, replacement)
-        }))
-      };
-    case "navigation":
-      return {
-        type: "navigation",
-        target: replaceIdentifier(node.target, name, replacement),
-        segments: node.segments.map((segment) => segment.type === "static" ? segment : { type: "dynamic", key: replaceIdentifier(segment.key, name, replacement) })
-      };
-    case "unary":
-      return {
-        type: "unary",
-        op: node.op,
-        value: replaceIdentifier(node.value, name, replacement, node.op === "delete")
-      };
-    case "binary":
-      return {
-        type: "binary",
-        op: node.op,
-        left: replaceIdentifier(node.left, name, replacement),
-        right: replaceIdentifier(node.right, name, replacement)
-      };
-    case "assign":
-      return {
-        type: "assign",
-        op: node.op,
-        place: replaceIdentifier(node.place, name, replacement, true),
-        value: replaceIdentifier(node.value, name, replacement)
-      };
-    case "range":
-      return {
-        type: "range",
-        from: replaceIdentifier(node.from, name, replacement),
-        to: replaceIdentifier(node.to, name, replacement)
-      };
-    default:
-      return node;
-  }
-}
-function isSafeInlineTargetNode(node) {
-  if (isPureNode(node))
-    return true;
-  if (node.type === "assign" && node.op === "=") {
-    return isPureNode(node.place) && isPureNode(node.value);
-  }
-  return false;
-}
-function inlineAdjacentPureAssignments(block) {
-  const out = [...block];
-  let changed = true;
-  while (changed) {
-    changed = false;
-    for (let index = 0;index < out.length - 1; index += 1) {
-      const current = out[index];
-      if (current.type !== "assign" || current.op !== "=" || current.place.type !== "identifier")
-        continue;
-      if (!isPureNode(current.value))
-        continue;
-      const name = current.place.name;
-      if (hasIdentifierRead(current.value, name))
-        continue;
-      const next = out[index + 1];
-      if (!isSafeInlineTargetNode(next))
-        continue;
-      if (countIdentifierReads(next, name) !== 1)
-        continue;
-      out[index + 1] = replaceIdentifier(next, name, current.value);
-      out.splice(index, 1);
-      changed = true;
-      break;
-    }
-  }
-  return out;
-}
-function toNumberNode(value) {
-  let raw;
-  if (Number.isNaN(value))
-    raw = "nan";
-  else if (value === Infinity)
-    raw = "inf";
-  else if (value === -Infinity)
-    raw = "-inf";
-  else
-    raw = String(value);
-  return { type: "number", raw, value };
-}
-function toStringNode(value) {
-  return { type: "string", raw: JSON.stringify(value) };
-}
-function toLiteralNode(value) {
-  if (value === undefined)
-    return { type: "undefined" };
-  if (value === null)
-    return { type: "null" };
-  if (typeof value === "boolean")
-    return { type: "boolean", value };
-  if (typeof value === "number")
-    return toNumberNode(value);
-  if (typeof value === "string")
-    return toStringNode(value);
-  if (Array.isArray(value)) {
-    const items = [];
-    for (const item of value) {
-      const lowered = toLiteralNode(item);
-      if (!lowered)
-        return;
-      items.push(lowered);
-    }
-    return { type: "array", items };
-  }
-  if (value && typeof value === "object") {
-    const entries = [];
-    for (const [key, entryValue] of Object.entries(value)) {
-      const loweredValue = toLiteralNode(entryValue);
-      if (!loweredValue)
-        return;
-      entries.push({ key: { type: "key", name: key }, value: loweredValue });
-    }
-    return { type: "object", entries };
-  }
-  return;
-}
-function constValue(node) {
-  switch (node.type) {
-    case "undefined":
-      return;
-    case "null":
-      return null;
-    case "boolean":
-      return node.value;
-    case "number":
-      return node.value;
-    case "string":
-      return decodeStringLiteral(node.raw);
-    case "key":
-      return node.name;
-    case "array": {
-      const out = [];
-      for (const item of node.items) {
-        const value = constValue(item);
-        if (value === undefined && item.type !== "undefined")
-          return;
-        out.push(value);
-      }
-      return out;
-    }
-    case "object": {
-      const out = {};
-      for (const entry of node.entries) {
-        const key = constValue(entry.key);
-        if (key === undefined && entry.key.type !== "undefined")
-          return;
-        const value = constValue(entry.value);
-        if (value === undefined && entry.value.type !== "undefined")
-          return;
-        out[String(key)] = value;
-      }
-      return out;
-    }
-    default:
-      return;
-  }
-}
-function isDefinedValue(value) {
-  return value !== undefined;
-}
-function foldUnary(op, value) {
-  if (op === "neg") {
-    if (typeof value !== "number")
-      return;
-    return -value;
-  }
-  if (op === "not") {
-    if (typeof value === "boolean")
-      return !value;
-    if (typeof value === "number")
-      return ~value;
-    return;
-  }
-  if (op === "logicalNot") {
-    return value === undefined ? true : undefined;
-  }
-  return;
-}
-function foldBinary(op, left, right) {
-  if (op === "add" || op === "sub" || op === "mul" || op === "div" || op === "mod") {
-    if (typeof left !== "number" || typeof right !== "number")
-      return;
-    if (op === "add")
-      return left + right;
-    if (op === "sub")
-      return left - right;
-    if (op === "mul")
-      return left * right;
-    if (op === "div")
-      return left / right;
-    return left % right;
-  }
-  if (op === "bitAnd" || op === "bitOr" || op === "bitXor") {
-    if (typeof left !== "number" || typeof right !== "number")
-      return;
-    if (op === "bitAnd")
-      return left & right;
-    if (op === "bitOr")
-      return left | right;
-    return left ^ right;
-  }
-  if (op === "eq")
-    return left === right ? left : undefined;
-  if (op === "neq")
-    return left !== right ? left : undefined;
-  if (op === "gt" || op === "gte" || op === "lt" || op === "lte") {
-    if (typeof left !== "number" || typeof right !== "number")
-      return;
-    if (op === "gt")
-      return left > right ? left : undefined;
-    if (op === "gte")
-      return left >= right ? left : undefined;
-    if (op === "lt")
-      return left < right ? left : undefined;
-    return left <= right ? left : undefined;
-  }
-  if (op === "and")
-    return isDefinedValue(left) ? right : undefined;
-  if (op === "or")
-    return isDefinedValue(left) ? left : right;
-  return;
-}
-function optimizeElse(elseBranch, env, currentDepth) {
-  if (!elseBranch)
-    return;
-  if (elseBranch.type === "else") {
-    return { type: "else", block: optimizeBlock(elseBranch.block, cloneOptimizeEnv(env), currentDepth) };
-  }
-  const optimizedCondition = optimizeNode(elseBranch.condition, env, currentDepth);
-  const foldedCondition = constValue(optimizedCondition);
-  if (foldedCondition !== undefined || optimizedCondition.type === "undefined") {
-    const passes = elseBranch.head === "when" ? isDefinedValue(foldedCondition) : !isDefinedValue(foldedCondition);
-    if (passes) {
-      return {
-        type: "else",
-        block: optimizeBlock(elseBranch.thenBlock, cloneOptimizeEnv(env), currentDepth)
-      };
-    }
-    return optimizeElse(elseBranch.elseBranch, env, currentDepth);
-  }
-  return {
-    type: "elseChain",
-    head: elseBranch.head,
-    condition: optimizedCondition,
-    thenBlock: optimizeBlock(elseBranch.thenBlock, cloneOptimizeEnv(env), currentDepth),
-    elseBranch: optimizeElse(elseBranch.elseBranch, cloneOptimizeEnv(env), currentDepth)
-  };
-}
-function optimizeBlock(block, env, currentDepth) {
-  const out = [];
-  for (const node of block) {
-    const optimized = optimizeNode(node, env, currentDepth);
-    out.push(optimized);
-    if (optimized.type === "break" || optimized.type === "continue")
-      break;
-    if (optimized.type === "assign" && optimized.op === "=" && optimized.place.type === "identifier") {
-      const selfTarget = selfTargetFromNode(optimized.value, currentDepth);
-      if (selfTarget !== undefined) {
-        env.selfCaptures[optimized.place.name] = selfTarget;
-        delete env.constants[optimized.place.name];
-        continue;
-      }
-      const folded = constValue(optimized.value);
-      if (folded !== undefined || optimized.value.type === "undefined") {
-        env.constants[optimized.place.name] = cloneNode(optimized.value);
-        delete env.selfCaptures[optimized.place.name];
-      } else {
-        clearBinding(env, optimized.place.name);
-      }
-      continue;
-    }
-    if (optimized.type === "unary" && optimized.op === "delete" && optimized.value.type === "identifier") {
-      clearBinding(env, optimized.value.name);
-      continue;
-    }
-    if (optimized.type === "assign" && optimized.place.type === "identifier") {
-      clearBinding(env, optimized.place.name);
-      continue;
-    }
-    if (optimized.type === "assign" || optimized.type === "for" || optimized.type === "call") {
-      clearOptimizeEnv(env);
-    }
-  }
-  return inlineAdjacentPureAssignments(eliminateDeadAssignments(out));
-}
-function optimizeNode(node, env, currentDepth, asPlace = false) {
-  switch (node.type) {
-    case "program": {
-      const body = optimizeBlock(node.body, cloneOptimizeEnv(env), currentDepth);
-      if (body.length === 0)
-        return { type: "undefined" };
-      if (body.length === 1)
-        return body[0];
-      return { type: "program", body };
-    }
-    case "identifier": {
-      if (asPlace)
-        return node;
-      const selfTarget = env.selfCaptures[node.name];
-      if (selfTarget !== undefined) {
-        const rewritten = selfNodeFromTarget(selfTarget, currentDepth);
-        if (rewritten)
-          return rewritten;
-      }
-      const replacement = env.constants[node.name];
-      return replacement ? cloneNode(replacement) : node;
-    }
-    case "group": {
-      return optimizeNode(node.expression, env, currentDepth);
-    }
-    case "array": {
-      return { type: "array", items: node.items.map((item) => optimizeNode(item, env, currentDepth)) };
-    }
-    case "object": {
-      return {
-        type: "object",
-        entries: node.entries.map((entry) => ({
-          key: optimizeNode(entry.key, env, currentDepth),
-          value: optimizeNode(entry.value, env, currentDepth)
-        }))
-      };
-    }
-    case "unary": {
-      const value = optimizeNode(node.value, env, currentDepth, node.op === "delete");
-      const foldedValue = constValue(value);
-      if (foldedValue !== undefined || value.type === "undefined") {
-        const folded = foldUnary(node.op, foldedValue);
-        const literal = folded === undefined ? undefined : toLiteralNode(folded);
-        if (literal)
-          return literal;
-      }
-      return { type: "unary", op: node.op, value };
-    }
-    case "binary": {
-      const left = optimizeNode(node.left, env, currentDepth);
-      const right = optimizeNode(node.right, env, currentDepth);
-      const leftValue = constValue(left);
-      const rightValue = constValue(right);
-      if ((leftValue !== undefined || left.type === "undefined") && (rightValue !== undefined || right.type === "undefined")) {
-        const folded = foldBinary(node.op, leftValue, rightValue);
-        const literal = folded === undefined ? undefined : toLiteralNode(folded);
-        if (literal)
-          return literal;
-      }
-      return { type: "binary", op: node.op, left, right };
-    }
-    case "range":
-      return {
-        type: "range",
-        from: optimizeNode(node.from, env, currentDepth),
-        to: optimizeNode(node.to, env, currentDepth)
-      };
-    case "navigation": {
-      const target = optimizeNode(node.target, env, currentDepth);
-      const segments = node.segments.map((segment) => segment.type === "static" ? segment : { type: "dynamic", key: optimizeNode(segment.key, env, currentDepth) });
-      const targetValue = constValue(target);
-      if (targetValue !== undefined || target.type === "undefined") {
-        let current = targetValue;
-        let foldable = true;
-        for (const segment of segments) {
-          if (!foldable)
-            break;
-          const key = segment.type === "static" ? segment.key : constValue(segment.key);
-          if (segment.type === "dynamic" && key === undefined && segment.key.type !== "undefined") {
-            foldable = false;
-            break;
-          }
-          if (current === null || current === undefined) {
-            current = undefined;
-            continue;
-          }
-          current = current[String(key)];
-        }
-        if (foldable) {
-          const literal = toLiteralNode(current);
-          if (literal)
-            return literal;
-        }
-      }
-      return {
-        type: "navigation",
-        target,
-        segments
-      };
-    }
-    case "call": {
-      return {
-        type: "call",
-        callee: optimizeNode(node.callee, env, currentDepth),
-        args: node.args.map((arg) => optimizeNode(arg, env, currentDepth))
-      };
-    }
-    case "assign": {
-      return {
-        type: "assign",
-        op: node.op,
-        place: optimizeNode(node.place, env, currentDepth, true),
-        value: optimizeNode(node.value, env, currentDepth)
-      };
-    }
-    case "conditional": {
-      const condition = optimizeNode(node.condition, env, currentDepth);
-      const thenEnv = cloneOptimizeEnv(env);
-      if (condition.type === "assign" && condition.op === "=" && condition.place.type === "identifier") {
-        thenEnv.selfCaptures[condition.place.name] = currentDepth;
-        delete thenEnv.constants[condition.place.name];
-      }
-      const conditionValue = constValue(condition);
-      if (conditionValue !== undefined || condition.type === "undefined") {
-        const passes = node.head === "when" ? isDefinedValue(conditionValue) : !isDefinedValue(conditionValue);
-        if (passes) {
-          const thenBlock2 = optimizeBlock(node.thenBlock, thenEnv, currentDepth);
-          if (thenBlock2.length === 0)
-            return { type: "undefined" };
-          if (thenBlock2.length === 1)
-            return thenBlock2[0];
-          return { type: "program", body: thenBlock2 };
-        }
-        if (!node.elseBranch)
-          return { type: "undefined" };
-        const loweredElse = optimizeElse(node.elseBranch, cloneOptimizeEnv(env), currentDepth);
-        if (!loweredElse)
-          return { type: "undefined" };
-        if (loweredElse.type === "else") {
-          if (loweredElse.block.length === 0)
-            return { type: "undefined" };
-          if (loweredElse.block.length === 1)
-            return loweredElse.block[0];
-          return { type: "program", body: loweredElse.block };
-        }
-        return {
-          type: "conditional",
-          head: loweredElse.head,
-          condition: loweredElse.condition,
-          thenBlock: loweredElse.thenBlock,
-          elseBranch: loweredElse.elseBranch
-        };
-      }
-      const thenBlock = optimizeBlock(node.thenBlock, thenEnv, currentDepth);
-      const elseBranch = optimizeElse(node.elseBranch, cloneOptimizeEnv(env), currentDepth);
-      let finalCondition = condition;
-      if (condition.type === "assign" && condition.op === "=" && condition.place.type === "identifier") {
-        const name = condition.place.name;
-        const reads = new Set;
-        for (const part of thenBlock)
-          collectReads(part, reads);
-        if (elseBranch)
-          collectReadsElse(elseBranch, reads);
-        if (!reads.has(name)) {
-          finalCondition = condition.value;
-        }
-      }
-      return {
-        type: "conditional",
-        head: node.head,
-        condition: finalCondition,
-        thenBlock,
-        elseBranch
-      };
-    }
-    case "for": {
-      const sourceEnv = cloneOptimizeEnv(env);
-      const binding = optimizeBinding(node.binding, sourceEnv, currentDepth);
-      const bodyEnv = cloneOptimizeEnv(env);
-      dropBindingNames(bodyEnv, binding);
-      return {
-        type: "for",
-        binding,
-        body: optimizeBlock(node.body, bodyEnv, currentDepth + 1)
-      };
-    }
-    case "arrayComprehension": {
-      const sourceEnv = cloneOptimizeEnv(env);
-      const binding = optimizeBinding(node.binding, sourceEnv, currentDepth);
-      const bodyEnv = cloneOptimizeEnv(env);
-      dropBindingNames(bodyEnv, binding);
-      return {
-        type: "arrayComprehension",
-        binding,
-        body: optimizeNode(node.body, bodyEnv, currentDepth + 1)
-      };
-    }
-    case "whileArrayComprehension":
-      return {
-        type: "whileArrayComprehension",
-        condition: optimizeNode(node.condition, env, currentDepth),
-        body: optimizeNode(node.body, env, currentDepth + 1)
-      };
-    case "objectComprehension": {
-      const sourceEnv = cloneOptimizeEnv(env);
-      const binding = optimizeBinding(node.binding, sourceEnv, currentDepth);
-      const bodyEnv = cloneOptimizeEnv(env);
-      dropBindingNames(bodyEnv, binding);
-      return {
-        type: "objectComprehension",
-        binding,
-        key: optimizeNode(node.key, bodyEnv, currentDepth + 1),
-        value: optimizeNode(node.value, bodyEnv, currentDepth + 1)
-      };
-    }
-    case "whileObjectComprehension":
-      return {
-        type: "whileObjectComprehension",
-        condition: optimizeNode(node.condition, env, currentDepth),
-        key: optimizeNode(node.key, env, currentDepth + 1),
-        value: optimizeNode(node.value, env, currentDepth + 1)
-      };
-    default:
-      return node;
-  }
-}
 function optimizeIR(node) {
-  return optimizeNode(node, emptyOptimizeEnv(), 1);
+  return node;
 }
 function collectLocalBindings(node, locals) {
   switch (node.type) {
@@ -2509,6 +1695,28 @@ semantics.addOperation("toIR", {
       source: source.toIR()
     };
   },
+  IterBindingComprehension_keyValueIn(key, _comma, value, _in, source) {
+    return {
+      type: "binding:keyValueIn",
+      key: key.sourceString,
+      value: value.sourceString,
+      source: source.toIR()
+    };
+  },
+  IterBindingComprehension_valueIn(value, _in, source) {
+    return {
+      type: "binding:valueIn",
+      value: value.sourceString,
+      source: source.toIR()
+    };
+  },
+  IterBindingComprehension_keyOf(key, _of, source) {
+    return {
+      type: "binding:keyOf",
+      key: key.sourceString,
+      source: source.toIR()
+    };
+  },
   Pair(key, _colon, value) {
     return { key: key.toIR(), value: value.toIR() };
   },
@@ -2572,9 +1780,6 @@ semantics.addOperation("toIR", {
   BooleanKw(_kw) {
     return { type: "identifier", name: "boolean" };
   },
-  SizeKw(_kw) {
-    return { type: "identifier", name: "size" };
-  },
   identifier(_a, _b) {
     return { type: "identifier", name: this.sourceString };
   },
@@ -2597,6 +1802,7 @@ export {
   optimizeIR,
   minifyLocalNamesIR,
   grammar,
+  formatParseError,
   encodeIR,
   domainRefsFromConfig,
   rex_default as default,