tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (263) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +36 -36
  4. package/dist/deciders.js +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +18 -4
  7. package/dist/index.d.ts +18 -4
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +56 -56
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -44
  16. package/dist/run.js +42 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +97 -92
  20. package/dist/transfer.js +97 -92
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +31 -3
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +146 -93
  29. package/src/check.ts +518 -281
  30. package/src/cli/runtime-invariants.ts +20 -56
  31. package/src/cli/tlc-arguments.ts +2 -2
  32. package/src/cli/tlc-output.ts +18 -4
  33. package/src/cli/tlc.ts +18 -12
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +23 -10
  36. package/src/coverage.ts +255 -18
  37. package/src/dependencies.ts +68 -15
  38. package/src/dfid.ts +101 -36
  39. package/src/environment.ts +155 -66
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +424 -135
  42. package/src/exit-codes.ts +28 -14
  43. package/src/instances.ts +152 -25
  44. package/src/java-hash.ts +14 -0
  45. package/src/java-overrides.ts +2 -2
  46. package/src/levels.ts +675 -236
  47. package/src/lexer.ts +12 -2
  48. package/src/liveness-checker.ts +179 -60
  49. package/src/liveness.ts +55 -10
  50. package/src/obligations/index.ts +1 -1
  51. package/src/obligations/normalize.ts +1 -4
  52. package/src/obligations/printer.ts +5 -5
  53. package/src/obligations/source.ts +2 -0
  54. package/src/parallel-worker.ts +8 -2
  55. package/src/parallel.ts +5 -0
  56. package/src/parser.ts +180 -149
  57. package/src/prover/isabelle/isar/attrib.ts +4 -4
  58. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  59. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  60. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  61. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  62. package/src/prover/isabelle/pure/term.ts +3 -3
  63. package/src/prover/prep/md5.ts +26 -29
  64. package/src/prover/smt/rewrite.ts +2 -7
  65. package/src/prover/smt/simplify.ts +1 -1
  66. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +3 -2
  67. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  68. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  69. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  70. package/src/prover/smt/solver/ast-lt.ts +1 -1
  71. package/src/prover/smt/solver/ast.ts +66 -14
  72. package/src/prover/smt/solver/auf-solver.ts +23 -12
  73. package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
  74. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  75. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  76. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  77. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  78. package/src/prover/smt/solver/bv1-blast.ts +1 -1
  79. package/src/prover/smt/solver/card2bv.ts +35 -18
  80. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  81. package/src/prover/smt/solver/context.ts +84 -15
  82. package/src/prover/smt/solver/ctx-simplify.ts +9 -4
  83. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  84. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  85. package/src/prover/smt/solver/diff-neq.ts +9 -8
  86. package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
  87. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  88. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  89. package/src/prover/smt/solver/elim-uncnstr.ts +31 -28
  90. package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
  91. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  92. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  93. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  94. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  95. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  96. package/src/prover/smt/solver/euf/mam.ts +1 -5
  97. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  98. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  99. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  100. package/src/prover/smt/solver/factor.ts +36 -14
  101. package/src/prover/smt/solver/fd-solver.ts +608 -139
  102. package/src/prover/smt/solver/fix-dl-var.ts +2 -3
  103. package/src/prover/smt/solver/fm-tactic.ts +9 -7
  104. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  105. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  106. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  107. package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -1
  108. package/src/prover/smt/solver/goal.ts +6 -3
  109. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  110. package/src/prover/smt/solver/hashtable.ts +4 -0
  111. package/src/prover/smt/solver/internalizer.ts +1 -1
  112. package/src/prover/smt/solver/lia2pb.ts +1 -1
  113. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  114. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  115. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  116. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  117. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  118. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  119. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  120. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  121. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  122. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  123. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  124. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  125. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  126. package/src/prover/smt/solver/maxcore.ts +2 -1
  127. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  128. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  129. package/src/prover/smt/solver/model-checker.ts +1 -1
  130. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  131. package/src/prover/smt/solver/model-generator.ts +85 -43
  132. package/src/prover/smt/solver/mpf.ts +2 -4
  133. package/src/prover/smt/solver/mus.ts +2 -3
  134. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  135. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  136. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  137. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  138. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  139. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  140. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  141. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  142. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  143. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  144. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  145. package/src/prover/smt/solver/nlqsat.ts +2 -1
  146. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  147. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  148. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  149. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  150. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  151. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  152. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  153. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  154. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  155. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  156. package/src/prover/smt/solver/nnf.ts +6 -2
  157. package/src/prover/smt/solver/normalize-bounds.ts +2 -2
  158. package/src/prover/smt/solver/occf.ts +1 -1
  159. package/src/prover/smt/solver/opt-context.ts +21 -7
  160. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  161. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  162. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  163. package/src/prover/smt/solver/opt-solver.ts +10 -6
  164. package/src/prover/smt/solver/optsmt.ts +1 -1
  165. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  166. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  167. package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
  168. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  169. package/src/prover/smt/solver/probes.ts +88 -23
  170. package/src/prover/smt/solver/proto-model.ts +8 -8
  171. package/src/prover/smt/solver/purify-arith.ts +51 -49
  172. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  173. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  174. package/src/prover/smt/solver/qe-lite.ts +2 -2
  175. package/src/prover/smt/solver/qe.ts +3 -2
  176. package/src/prover/smt/solver/qsat.ts +23 -8
  177. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  178. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  179. package/src/prover/smt/solver/reduce-args.ts +2 -2
  180. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  181. package/src/prover/smt/solver/rewriter.ts +31 -25
  182. package/src/prover/smt/solver/rlimit.ts +7 -3
  183. package/src/prover/smt/solver/sat/config.ts +1 -1
  184. package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
  185. package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
  186. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  187. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  188. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  189. package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
  190. package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
  191. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  192. package/src/prover/smt/solver/sat/solver.ts +27 -47
  193. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  194. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  195. package/src/prover/smt/solver/seq-derive.ts +2 -2
  196. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  197. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  198. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  199. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  200. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  201. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  202. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  203. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  204. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  205. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  206. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  207. package/src/prover/smt/solver/smt-setup.ts +106 -13
  208. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  209. package/src/prover/smt/solver/smtlib-script.ts +718 -213
  210. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  211. package/src/prover/smt/solver/solver.ts +18 -4
  212. package/src/prover/smt/solver/tactic.ts +389 -199
  213. package/src/prover/smt/solver/theory-bv.ts +13 -3
  214. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  215. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  216. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  217. package/src/prover/smt/solver/theory-lra-propagate.ts +12 -3
  218. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  219. package/src/prover/smt/solver/theory-lra.ts +1 -1
  220. package/src/prover/smt/solver/theory-pb.ts +24 -7
  221. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  222. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  223. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  224. package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
  225. package/src/prover/tlapm/cache.ts +8 -8
  226. package/src/prover/zenon/index-table.ts +5 -2
  227. package/src/prover/zenon/isar-case.ts +1 -1
  228. package/src/prover/zenon/isar.ts +2 -2
  229. package/src/prover/zenon/phrase.ts +1 -1
  230. package/src/resolve.ts +1311 -268
  231. package/src/runtime.ts +21 -2
  232. package/src/sany/builtins.ts +10 -10
  233. package/src/sany/generation.ts +5 -15
  234. package/src/sany/generator-def-entries.ts +123 -36
  235. package/src/sany/generator-definitions.ts +5 -3
  236. package/src/sany/generator-expressions.ts +60 -37
  237. package/src/sany/generator-proofs.ts +19 -12
  238. package/src/sany/generator.ts +12 -6
  239. package/src/sany/lexer.ts +15 -7
  240. package/src/sany/modules.ts +4 -2
  241. package/src/sany/nodes.ts +1 -1
  242. package/src/sany/selectors.ts +12 -6
  243. package/src/sany/xml.ts +2 -3
  244. package/src/search.ts +321 -135
  245. package/src/simulate.ts +247 -185
  246. package/src/spec-description.ts +15 -7
  247. package/src/standard-definitions.ts +1 -0
  248. package/src/standard-modules.ts +56 -22
  249. package/src/subexpressions.ts +666 -147
  250. package/src/successors.ts +50 -20
  251. package/src/symmetry.ts +2 -1
  252. package/src/tlc/jar-data.ts +10 -0
  253. package/src/tlc/messages.ts +3 -3
  254. package/src/tlc/order.ts +14 -3
  255. package/src/tlc/random.ts +2 -1
  256. package/src/tlc/replay.ts +147 -46
  257. package/src/tlc/tlc-operators.ts +10 -8
  258. package/src/tlc/tlcext-operators.ts +44 -15
  259. package/src/tlc/trace-spec.ts +9 -22
  260. package/src/trace-liveness.ts +529 -0
  261. package/src/typed-tier.ts +52 -31
  262. package/src/typescript/types.ts +2 -2
  263. package/src/values.ts +150 -79
@@ -1,4 +1,4 @@
1
- import { isConstantLevel } from "./dependencies";
1
+ import { isEvaluatedAtStartup } from "./dependencies";
2
2
  import {
3
3
  isLocallyResolved,
4
4
  type Definition,
@@ -13,7 +13,6 @@ import { substitutionFrames, withSubstitutionFrames } from "./instances";
13
13
  import type { InstanceAction } from "./environment";
14
14
  import { formatRange, TlaError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
15
15
  import {
16
- bindDefinitions,
17
16
  bindOperatorArguments,
18
17
  describeNode,
19
18
  evaluate,
@@ -26,8 +25,9 @@ import {
26
25
  type Scope,
27
26
  } from "./evaluate";
28
27
  import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
29
- import { getLevel } from "./liveness";
28
+ import { bindLetDefinitions, getLevel } from "./liveness";
30
29
  import { createRecord, createSet, createTuple, formatValue, type Value } from "./values";
30
+ import { SELECTION_NAME } from "./resolve";
31
31
  import { LITERAL_KINDS } from "./tlc/replay";
32
32
  import type { TlcVersion } from "./tlc/version";
33
33
 
@@ -148,7 +148,7 @@ const isEvaluable = (expression: Expression, environment: Environment) => {
148
148
  const isStartupValue = (definition: Definition | undefined, environment: Environment) =>
149
149
  definition?.kind === "Operator" &&
150
150
  definition.params.length === 0 &&
151
- isConstantLevel(definition, environment) &&
151
+ isEvaluatedAtStartup(definition, environment) &&
152
152
  isEvaluable(definition.body, environment);
153
153
 
154
154
  const isConstantValue = (definition: Definition | undefined, environment: Environment) =>
@@ -176,7 +176,7 @@ const unwrapBinding = (
176
176
  if (expression.kind === "Let") {
177
177
  return {
178
178
  expression: expression.body,
179
- scope: bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
179
+ scope: bindLetDefinitions(expression, scope, environment),
180
180
  };
181
181
  }
182
182
  const thunk = getThunk(expression, scope);
@@ -268,13 +268,18 @@ const getActions = (
268
268
  case "Let":
269
269
  return getActions(
270
270
  expression.body,
271
- bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
271
+ bindLetDefinitions(expression, scope, environment),
272
272
  closure,
273
273
  environment,
274
274
  instanceActions,
275
275
  );
276
276
  case "Label":
277
277
  return getActions(expression.body, scope, closure, environment, instanceActions);
278
+ case "Selection":
279
+ // TLC's Tool#getActions takes SANY's $Nop as an action of its own.
280
+ return expression.location.range === undefined
281
+ ? getActions(expression.expression, scope, closure, environment, instanceActions)
282
+ : [createSplitAction()];
278
283
  case "Or":
279
284
  return expression.operands.flatMap((operand) =>
280
285
  getActions(operand, scope, closure, environment, instanceActions),
@@ -307,7 +312,9 @@ const getActions = (
307
312
  if (!called) return [createSplitAction()];
308
313
  const args = getArguments(expression);
309
314
  const calledName = isLocallyResolved(expression)
310
- ? called.name
315
+ ? called.name === SELECTION_NAME
316
+ ? "LAMBDA"
317
+ : called.name
311
318
  : (environment.instanceNames.get(getOperatorName(expression) ?? "") ?? called.name);
312
319
  const callAction = (): SpecAction[] => [
313
320
  { name: calledName, location: expression.location, parameters: [], expression, scope },
@@ -526,6 +533,7 @@ export const getSubscriptVariables = (
526
533
  return expression.elements.every((element) => collect(element, innerScope));
527
534
  }
528
535
  if (expression.kind === "Label") return collect(expression.body, innerScope);
536
+ if (expression.kind === "Selection") return collect(expression.expression, innerScope);
529
537
  const unwrapped = unwrapBinding(expression, innerScope, environment);
530
538
  if (unwrapped) return collect(unwrapped.expression, unwrapped.scope);
531
539
  const argument =
@@ -93,6 +93,7 @@ export const STANDARD_LEVELS = new Map(
93
93
  {
94
94
  name: signature[0],
95
95
  level: signature[1],
96
+ isCorrect: true,
96
97
  params: new Set(),
97
98
  constraints: new Map(),
98
99
  argConstraints: new Map(),
@@ -18,6 +18,7 @@ import {
18
18
  overrideWithJava,
19
19
  } from "./builtins";
20
20
  import type { Builtin, BuiltinArgument, Context } from "./evaluate";
21
+ import { prettyPrint } from "./pretty-print";
21
22
  import type { CheckerRuntime } from "./runtime";
22
23
  import { createBagsOperators } from "./bags";
23
24
  import { createIoUtilsOperators, createJsonOperators, type FileSystem } from "./json";
@@ -40,6 +41,7 @@ import {
40
41
  formatValue,
41
42
  getCardinality,
42
43
  getDomain,
44
+ getFunctionClass,
43
45
  getSortedIntersection,
44
46
  someStreamedElement,
45
47
  isElementOf,
@@ -123,6 +125,43 @@ const combineReducible = (
123
125
  return createEnumeratedSet(union);
124
126
  };
125
127
 
128
+ const isIntervalInSortedSet = (interval: IntervalValue, set: SetValue) => {
129
+ const elements = set.elements;
130
+ let low = 0;
131
+ let high = elements.length;
132
+ while (low < high) {
133
+ const middle = (low + high) >> 1;
134
+ const probe = elements[middle];
135
+ if (typeof probe !== "number") return undefined;
136
+ if (probe < interval.low) low = middle + 1;
137
+ else high = middle;
138
+ }
139
+ for (let element = interval.low; element <= interval.high; element++, low++) {
140
+ if (low === elements.length) return false;
141
+ const probe = elements[low];
142
+ if (probe !== element) return typeof probe === "number" ? false : undefined;
143
+ }
144
+ return true;
145
+ };
146
+
147
+ const isIntervalSubset = (left: IntervalValue, right: Value) => {
148
+ const isWithin =
149
+ typeof right === "object" &&
150
+ right.kind === "Interval" &&
151
+ right.low <= left.low &&
152
+ right.high >= left.high;
153
+ if (isWithin) return true;
154
+ const isContained =
155
+ typeof right === "object" && right.kind === "Set"
156
+ ? isIntervalInSortedSet(left, right)
157
+ : undefined;
158
+ if (isContained !== undefined) return isContained;
159
+ for (let element = left.low; element <= left.high; element++) {
160
+ if (!isElementOf(element, right)) return false;
161
+ }
162
+ return true;
163
+ };
164
+
126
165
  const defineShortCircuit = (
127
166
  name: string,
128
167
  compute: (left: boolean, right: () => boolean) => boolean,
@@ -157,6 +196,7 @@ export const CORE_OPERATORS: Builtin[] = [
157
196
  (args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
158
197
  ),
159
198
  defineBinary("\\subseteq", (left, right) => {
199
+ if (typeof left === "object" && left.kind === "Interval") return isIntervalSubset(left, right);
160
200
  if (!isSetValue(left)) {
161
201
  throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
162
202
  }
@@ -167,18 +207,6 @@ export const CORE_OPERATORS: Builtin[] = [
167
207
  right.kind === "Subset" &&
168
208
  isEnumerable(left.base);
169
209
  if (isPowerSets) return isSubsetOf(toFiniteSet(left.base).elements, right.base);
170
- if (typeof left === "object" && left.kind === "Interval") {
171
- const isWithin =
172
- typeof right === "object" &&
173
- right.kind === "Interval" &&
174
- right.low <= left.low &&
175
- right.high >= left.high;
176
- if (isWithin) return true;
177
- for (let element = left.low; element <= left.high; element++) {
178
- if (!isElementOf(element, right)) return false;
179
- }
180
- return true;
181
- }
182
210
  return !someStreamedElement(left, (element) => !isElementOf(element, right));
183
211
  }),
184
212
  ...SET_OPERATORS.map((operator) =>
@@ -313,11 +341,10 @@ const createArithmeticOperators = (module: string) => {
313
341
  }
314
342
  return ((left % right) + right) % right;
315
343
  }),
316
- defineOperator("..", 2, (args) => {
317
- const low = getValue(args, 0, "..");
344
+ defineBinary("..", (low, high) => {
318
345
  // TLC's MethodHandle casts the last argument first.
319
- const high = getJavaInteger(getValue(args, 1, ".."), dotDotSignature);
320
- return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high };
346
+ const highNumber = getJavaInteger(high, dotDotSignature);
347
+ return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high: highNumber };
321
348
  }),
322
349
  ];
323
350
  };
@@ -376,7 +403,7 @@ const INTEGERS_OPERATORS = [
376
403
  const getSequenceArgument = (args: BuiltinArgument[], index: number, message: string) => {
377
404
  const value = getValue(args, index, message);
378
405
  const elements = getSequenceElements(value);
379
- if (!elements) throw new TlaModuleError(`${message}\n${formatValue(value)}`);
406
+ if (!elements) throw new TlaModuleError(`${message}\n${prettyPrint(formatValue(value))}`);
380
407
  return elements;
381
408
  };
382
409
 
@@ -425,12 +452,19 @@ const createSequencesOperators = (version: TlcVersion) =>
425
452
  const left = getSequenceOrString(args, 0, getEvaluatingMessage("s \\o t", "sequence"));
426
453
  if (typeof left !== "string") {
427
454
  const right = getSequenceArgument(args, 1, getEvaluatingMessage("t \\o s", "sequence"));
455
+ const kept =
456
+ left.length === 0
457
+ ? getValue(args, 1, "\\o")
458
+ : right.length === 0
459
+ ? getValue(args, 0, "\\o")
460
+ : undefined;
461
+ if (kept !== undefined && getFunctionClass(kept) === "tuple") return kept;
428
462
  return createTuple([...left, ...right]);
429
463
  }
430
464
  const right = getValue(args, 1, "\\o");
431
465
  if (typeof right !== "string") {
432
466
  throw new TlaModuleError(
433
- `${getEvaluatingMessage("t \\o s", "string")}\n${formatValue(right)}`,
467
+ `${getEvaluatingMessage("t \\o s", "string")}\n${prettyPrint(formatValue(right))}`,
434
468
  );
435
469
  }
436
470
  return rankString(left + right);
@@ -470,7 +504,7 @@ const createSequencesOperators = (version: TlcVersion) =>
470
504
  : undefined;
471
505
  if (outOfDomain) {
472
506
  throw new TlaModuleError(
473
- `The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${formatValue(getValue(args, 0, "SubSeq"))}\n, but instead it is\n${outOfDomain.value}`,
507
+ `The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${prettyPrint(formatValue(getValue(args, 0, "SubSeq")))}\n, but instead it is\n${outOfDomain.value}`,
474
508
  );
475
509
  }
476
510
  return sliceSequence(sequence, start - 1, end);
@@ -503,7 +537,7 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
503
537
  (typeof set === "object" && (set.kind === "InfiniteSet" || set.kind === "SequenceSet"))
504
538
  ) {
505
539
  throw new TlaModuleError(
506
- `Attempted to compute cardinality of the value\n${formatValue(set)}`,
540
+ `Attempted to compute cardinality of the value\n${prettyPrint(formatValue(set))}`,
507
541
  );
508
542
  }
509
543
  return getCardinality(set, version);
@@ -516,7 +550,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
516
550
  const relation = getValue(args, 0, "Warshall");
517
551
  if (!isSetValue(relation) || isOverriddenSet(relation)) {
518
552
  throw new TlaModuleError(
519
- `Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${formatValue(relation)}`,
553
+ `Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${prettyPrint(formatValue(relation))}`,
520
554
  );
521
555
  }
522
556
  // TLC sizes the relation, which normalizes it.
@@ -536,7 +570,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
536
570
  const ends = getSequenceElements(edge);
537
571
  if (ends?.length !== 2) {
538
572
  throw new TlaModuleError(
539
- `Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${formatValue(edge)}`,
573
+ `Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${prettyPrint(formatValue(edge))}`,
540
574
  );
541
575
  }
542
576
  return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];