tla-ts 0.0.3-dev.3cf2ad0 → 0.0.3-dev.3ef4193

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 (84) hide show
  1. package/README.md +16 -2
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/index.cjs +1 -1
  5. package/dist/index.d.cts +158 -8
  6. package/dist/index.d.ts +158 -8
  7. package/dist/index.js +1 -1
  8. package/dist/parallel-worker.cjs +1 -1
  9. package/dist/parallel-worker.js +2 -2
  10. package/dist/parallel.cjs +1 -1
  11. package/dist/parallel.js +2 -2
  12. package/dist/run-cli.cjs +1351 -19
  13. package/dist/run-cli.js +1351 -19
  14. package/dist/transfer.cjs +88 -18
  15. package/dist/transfer.js +88 -18
  16. package/package.json +5 -1
  17. package/src/ast.ts +146 -6
  18. package/src/bags.ts +4 -7
  19. package/src/builtins.ts +29 -11
  20. package/src/bundled-modules.ts +3 -3
  21. package/src/canonical.ts +4 -3
  22. package/src/check.ts +1539 -235
  23. package/src/cli-options.ts +11 -5
  24. package/src/cli.ts +8 -1
  25. package/src/codegen.ts +77 -37
  26. package/src/config.ts +252 -179
  27. package/src/dependencies.ts +2 -2
  28. package/src/environment.ts +524 -140
  29. package/src/errors.ts +224 -3
  30. package/src/evaluate.ts +796 -246
  31. package/src/exit-codes.ts +22 -43
  32. package/src/index.ts +1 -0
  33. package/src/instances.ts +19 -16
  34. package/src/java-overrides.ts +104 -25
  35. package/src/levels.ts +191 -45
  36. package/src/lexer.ts +37 -5
  37. package/src/live-check.ts +828 -0
  38. package/src/liveness.ts +218 -572
  39. package/src/obligation-expression.ts +2 -2
  40. package/src/obligation-source.ts +2 -0
  41. package/src/parallel-worker.ts +13 -4
  42. package/src/parallel.ts +73 -6
  43. package/src/parser.ts +436 -144
  44. package/src/pcal-ast.ts +770 -0
  45. package/src/pcal-parse.ts +1523 -0
  46. package/src/pcal-tokenize.ts +516 -0
  47. package/src/pcal-translate.ts +1230 -0
  48. package/src/pcal-validate.ts +454 -0
  49. package/src/randomization.ts +24 -7
  50. package/src/resolve.ts +1424 -415
  51. package/src/run-cli.ts +1200 -143
  52. package/src/runtime.ts +19 -1
  53. package/src/sany-builtins.ts +147 -0
  54. package/src/sany-generator.ts +3112 -0
  55. package/src/sany-levels.ts +1208 -0
  56. package/src/sany-lexer.ts +545 -0
  57. package/src/sany-linter.ts +122 -0
  58. package/src/sany-modules.ts +1398 -0
  59. package/src/sany-nodes.ts +463 -0
  60. package/src/sany-parse-error.ts +2161 -0
  61. package/src/sany-report.ts +354 -0
  62. package/src/sany-selectors.ts +738 -0
  63. package/src/sany-source.ts +248 -0
  64. package/src/sany-xml.ts +1017 -0
  65. package/src/spec-description.ts +42 -11
  66. package/src/standard-modules.ts +200 -148
  67. package/src/standard-ranges.ts +116 -0
  68. package/src/state-graph.ts +180 -0
  69. package/src/subexpressions.ts +231 -171
  70. package/src/substitution-levels.ts +38 -17
  71. package/src/successors.ts +219 -107
  72. package/src/symmetry.ts +189 -53
  73. package/src/tableau.ts +54 -25
  74. package/src/tlc-ext.ts +42 -29
  75. package/src/tlc-messages.ts +329 -0
  76. package/src/tlc-module.ts +52 -43
  77. package/src/tlc-order.ts +73 -9
  78. package/src/tlc-random.ts +37 -9
  79. package/src/tlc-replay.ts +655 -0
  80. package/src/tlc-summary.ts +20 -5
  81. package/src/tlc-version.ts +18 -0
  82. package/src/transfer.ts +15 -3
  83. package/src/value-sources.ts +29 -0
  84. package/src/values.ts +708 -180
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tla-ts",
3
- "version": "0.0.3-dev.3cf2ad0",
3
+ "version": "0.0.3-dev.3ef4193",
4
4
  "description": "A TLA+ interpreter and model checker in TypeScript, 2× faster than TLC",
5
5
  "keywords": [
6
6
  "formal verification",
@@ -54,6 +54,9 @@
54
54
  "publishConfig": {
55
55
  "access": "public"
56
56
  },
57
+ "dependencies": {
58
+ "fflate": "^0.8.3"
59
+ },
57
60
  "devDependencies": {
58
61
  "@types/node": "^22",
59
62
  "publint": "^0.3.0",
@@ -71,6 +74,7 @@
71
74
  "conformance:sany": "tsx scripts/proof-conformance.ts",
72
75
  "conformance:record": "tsx scripts/record-tlc.ts",
73
76
  "conformance:record-sany": "tsx scripts/record-sany.ts",
77
+ "conformance:record-statechart": "tsx scripts/record-statechart.ts",
74
78
  "conformance:record-tlapm": "tsx scripts/record-tlapm.ts",
75
79
  "conformance:tlapm": "tsx scripts/tlapm-conformance.ts",
76
80
  "publint": "publint",
package/src/ast.ts CHANGED
@@ -33,20 +33,32 @@ export interface StringExpression {
33
33
  location: SourceLocation;
34
34
  }
35
35
 
36
+ // selectorRanges holds the range of each part of a name such as foo!lab, where SANY reports an
37
+ // error in selecting that part.
36
38
  export interface IdentifierExpression {
37
39
  kind: "Identifier";
38
40
  name: string;
41
+ selectorRanges?: SourceRange[];
39
42
  location: SourceLocation;
40
43
  resolution?: LocalResolution;
41
44
  }
42
45
 
46
+ // spelling holds the text of an operator written as a synonym, such as (+) for \oplus, which SANY
47
+ // reports as written.
43
48
  export interface ApplyExpression {
44
49
  kind: "Apply";
45
50
  operator: string;
51
+ spelling?: string;
46
52
  args: Expression[];
47
53
  // The number of args each part of a name like F(x)!l(y) takes, when a part before the last takes
48
54
  // some.
49
55
  argumentCounts?: number[];
56
+ // The range of the parenthesized arguments of a named operator, or of the whole name when its
57
+ // last part takes none, where SANY reports their count.
58
+ argumentsRange?: SourceRange;
59
+ selectorRanges?: SourceRange[];
60
+ // The range of the arguments of each part of a name like F(x)!l(y), for a part that takes some.
61
+ argumentRanges?: (SourceRange | undefined)[];
50
62
  location: SourceLocation;
51
63
  resolution?: LocalResolution;
52
64
  }
@@ -54,13 +66,18 @@ export interface ApplyExpression {
54
66
  export interface OperatorReferenceExpression {
55
67
  kind: "OperatorReference";
56
68
  operator: string;
69
+ spelling?: string;
57
70
  location: SourceLocation;
58
71
  }
59
72
 
73
+ // operator holds the operator, such as SUBSET, that an argument names, which tla-ts reads as a
74
+ // LAMBDA.
60
75
  export interface LambdaExpression {
61
76
  kind: "Lambda";
62
77
  params: string[];
78
+ paramRanges?: SourceRange[];
63
79
  body: Expression;
80
+ operator?: string;
64
81
  location: SourceLocation;
65
82
  }
66
83
 
@@ -68,6 +85,9 @@ export interface JunctionExpression {
68
85
  kind: "And" | "Or";
69
86
  operands: Expression[];
70
87
  isBulleted?: boolean;
88
+ // SANY parses an infix chain such as A /\ B /\ C as (A /\ B) /\ C, whose node of each prefix of
89
+ // two or more operands ends after the parentheses of its last operand.
90
+ prefixEnds?: SourceLocation[];
71
91
  location: SourceLocation;
72
92
  }
73
93
 
@@ -117,7 +137,10 @@ export interface LetExpression {
117
137
  location: SourceLocation;
118
138
  }
119
139
 
120
- export type BoundPattern = { kind: "Name"; name: string } | { kind: "Tuple"; names: string[] };
140
+ // ranges holds the range of each name the pattern binds.
141
+ export type BoundPattern =
142
+ | { kind: "Name"; name: string; ranges?: SourceRange[] }
143
+ | { kind: "Tuple"; names: string[]; ranges?: SourceRange[] };
121
144
 
122
145
  export interface Bound {
123
146
  pattern: BoundPattern;
@@ -135,6 +158,7 @@ export interface UnboundedQuantifierExpression {
135
158
  kind: "UnboundedQuantifier";
136
159
  quantifier: "Forall" | "Exists";
137
160
  names: string[];
161
+ nameRanges?: SourceRange[];
138
162
  isTemporal?: boolean;
139
163
  body: Expression;
140
164
  location: SourceLocation;
@@ -192,6 +216,7 @@ export interface FunctionSetExpression {
192
216
  export interface RecordField {
193
217
  name: string;
194
218
  value: Expression;
219
+ location: SourceLocation;
195
220
  }
196
221
 
197
222
  export interface RecordExpression {
@@ -228,6 +253,14 @@ export interface FunctionApplicationExpression {
228
253
  location: SourceLocation;
229
254
  }
230
255
 
256
+ // SANY parses [e1, ..., en] as a function application without the function, and its semantic
257
+ // checker rejects it.
258
+ export interface BracketExpression {
259
+ kind: "Bracket";
260
+ args: Expression[];
261
+ location: SourceLocation;
262
+ }
263
+
231
264
  export interface FieldAccessExpression {
232
265
  kind: "FieldAccess";
233
266
  record: Expression;
@@ -266,6 +299,7 @@ export interface LabelExpression {
266
299
  kind: "Label";
267
300
  name: string;
268
301
  params: string[];
302
+ paramRanges?: SourceRange[];
269
303
  body: Expression;
270
304
  location: SourceLocation;
271
305
  }
@@ -280,6 +314,8 @@ export type Selector =
280
314
  export interface SubexpressionExpression {
281
315
  kind: "Subexpression";
282
316
  selectors: Selector[];
317
+ selectorRanges?: SourceRange[];
318
+ argumentRanges?: (SourceRange | undefined)[];
283
319
  location: SourceLocation;
284
320
  }
285
321
 
@@ -311,6 +347,7 @@ export type Expression =
311
347
  | ExceptExpression
312
348
  | ExceptAtExpression
313
349
  | FunctionApplicationExpression
350
+ | BracketExpression
314
351
  | FieldAccessExpression
315
352
  | ProductExpression
316
353
  | TemporalExpression
@@ -343,6 +380,8 @@ export interface FunctionDefinition {
343
380
  body: Expression;
344
381
  isLocal: boolean;
345
382
  isRecursive: boolean;
383
+ // Whether the body applies the function, which SANY makes a recursive function definition.
384
+ isSelfReferential?: boolean;
346
385
  location: SourceLocation;
347
386
  }
348
387
 
@@ -363,6 +402,7 @@ export interface Assumption {
363
402
 
364
403
  export interface InstanceSubstitution {
365
404
  name: string;
405
+ nameRange: SourceRange;
366
406
  expression: Expression;
367
407
  }
368
408
 
@@ -384,6 +424,7 @@ export interface NewSymbol {
384
424
  arity: number;
385
425
  level: "Constant" | "Variable" | "State" | "Action" | "Temporal";
386
426
  set: Expression | undefined;
427
+ nameRange?: SourceRange;
387
428
  location: SourceLocation;
388
429
  }
389
430
 
@@ -435,19 +476,27 @@ export type StepBody =
435
476
  | Instance
436
477
  | DefineStep
437
478
  | { kind: "Have"; expression: Expression }
438
- | { kind: "Take"; names: string[]; bounds: Bound[] }
479
+ | { kind: "Take"; names: string[]; nameRanges?: SourceRange[]; bounds: Bound[] }
439
480
  | { kind: "Witness"; expressions: Expression[] }
440
- | { kind: "Pick"; names: string[]; bounds: Bound[]; body: Expression }
481
+ | {
482
+ kind: "Pick";
483
+ names: string[];
484
+ nameRanges?: SourceRange[];
485
+ bounds: Bound[];
486
+ body: Expression;
487
+ }
441
488
  | { kind: "Case"; expression: Expression }
442
489
  | { kind: "Assert"; isSuffices: boolean; statement: Expression | AssumeProve }
443
490
  | { kind: "Qed" };
444
491
 
445
- // head is the range of the step number and its statement, without the proof.
492
+ // head is the range of the step number and its statement, without the proof, and statement is the
493
+ // range of the statement alone.
446
494
  export interface ProofStep {
447
495
  name: string | undefined;
448
496
  token: string;
449
497
  body: StepBody;
450
498
  head: SourceRange;
499
+ statement: SourceRange;
451
500
  proof: Proof | undefined;
452
501
  location: SourceLocation;
453
502
  }
@@ -461,8 +510,7 @@ export interface Theorem {
461
510
 
462
511
  // The units of a module in source order, for consumers that need the order across kinds.
463
512
  export type ModuleUnit =
464
- | { kind: "Constants"; declarations: Declaration[] }
465
- | { kind: "Variables"; declarations: Declaration[] }
513
+ | { kind: "Constants" | "Variables"; declarations: Declaration[]; location: SourceLocation }
466
514
  | { kind: "Recursive"; declarations: Declaration[] }
467
515
  | { kind: "Definition"; definition: Definition }
468
516
  | { kind: "Instance"; instance: Instance }
@@ -486,3 +534,95 @@ export interface Module {
486
534
  uses: UseOrHide[];
487
535
  units: ModuleUnit[];
488
536
  }
537
+
538
+ export const getChildren = (expression: Expression): Expression[] => {
539
+ switch (expression.kind) {
540
+ case "Number":
541
+ case "Decimal":
542
+ case "String":
543
+ case "Identifier":
544
+ case "OperatorReference":
545
+ case "ExceptAt":
546
+ return [];
547
+ case "Apply":
548
+ return expression.args;
549
+ case "Lambda":
550
+ return [expression.body];
551
+ case "And":
552
+ case "Or":
553
+ return expression.operands;
554
+ case "Prime":
555
+ case "Unchanged":
556
+ case "Enabled":
557
+ case "Always":
558
+ case "Eventually":
559
+ return [expression.expression];
560
+ case "If":
561
+ return [expression.condition, expression.consequent, expression.alternative];
562
+ case "Case":
563
+ return [
564
+ ...expression.arms.flatMap((arm) => [arm.condition, arm.body]),
565
+ ...(expression.other ? [expression.other] : []),
566
+ ];
567
+ case "Let":
568
+ return [
569
+ ...expression.definitions.flatMap((definition) =>
570
+ definition.kind === "Function"
571
+ ? [...definition.bounds.map((bound) => bound.set), definition.body]
572
+ : [definition.body],
573
+ ),
574
+ expression.body,
575
+ ];
576
+ case "Forall":
577
+ case "Exists":
578
+ return [...expression.bounds.map((bound) => bound.set), expression.body];
579
+ case "UnboundedQuantifier":
580
+ return [expression.body];
581
+ case "Choose":
582
+ return [...(expression.set ? [expression.set] : []), expression.body];
583
+ case "SetEnumeration":
584
+ case "Tuple":
585
+ return expression.elements;
586
+ case "SetFilter":
587
+ return [expression.bound.set, expression.predicate];
588
+ case "SetMap":
589
+ return [expression.expression, ...expression.bounds.map((bound) => bound.set)];
590
+ case "FunctionConstruction":
591
+ return [...expression.bounds.map((bound) => bound.set), expression.body];
592
+ case "FunctionSet":
593
+ return [expression.domain, expression.range];
594
+ case "Record":
595
+ case "RecordSet":
596
+ return expression.fields.map((field) => field.value);
597
+ case "Except":
598
+ return [
599
+ expression.function,
600
+ ...expression.updates.flatMap((update) => [
601
+ ...update.path.flatMap((step) => (step.kind === "Index" ? step.args : [])),
602
+ update.value,
603
+ ]),
604
+ ];
605
+ case "FunctionApplication":
606
+ return [expression.function, ...expression.args];
607
+ case "Bracket":
608
+ return expression.args;
609
+ case "FieldAccess":
610
+ return [expression.record];
611
+ case "Product":
612
+ return expression.factors;
613
+ case "BoxAction":
614
+ case "AngleAction":
615
+ return [expression.action, expression.subscript];
616
+ case "WeakFairness":
617
+ case "StrongFairness":
618
+ return [expression.subscript, expression.action];
619
+ case "Label":
620
+ return [expression.body];
621
+ case "Subexpression":
622
+ return expression.selectors.flatMap((selector) => ("args" in selector ? selector.args : []));
623
+ }
624
+ };
625
+
626
+ export const isLocallyResolved = (expression: Expression) =>
627
+ (expression.kind === "Identifier" || expression.kind === "Apply") &&
628
+ expression.resolution?.kind === "Local";
package/src/bags.ts CHANGED
@@ -123,7 +123,8 @@ const mergeBags = (bags: FunctionValue[], method: string) =>
123
123
 
124
124
  const EMPTY_BAG = createSortedFunction([], []);
125
125
 
126
- export const BAGS_OPERATORS: Builtin[] = [
126
+ // SubBag compares the counts with the >= of Naturals, which Integers replaces when TLC loads it.
127
+ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Builtin[] => [
127
128
  defineConstant("EmptyBag", EMPTY_BAG),
128
129
  defineOperator("IsABag", 1, (args) => {
129
130
  const functionValue = toFunction(getValue(args, 0, "IsABag"));
@@ -228,12 +229,8 @@ export const BAGS_OPERATORS: Builtin[] = [
228
229
  const functionValue = toFiniteFunction(value);
229
230
  const range = createSet(functionValue.range).elements;
230
231
  const invalid = range.find((count) => typeof count !== "number");
231
- if (invalid !== undefined) {
232
- const isFirst = typeof range[0] !== "number";
233
- throw new TlaEvaluationError(
234
- `The ${isFirst ? "first" : "second"} argument of >= should be an integer, but instead it is:\n${formatValue(isFirst ? range[0] : invalid)}`,
235
- );
236
- }
232
+ // A count that isn't an integer fails the comparison.
233
+ if (invalid !== undefined) builtins.get(">=")?.evaluateBinary?.(range[0], invalid);
237
234
  const counts = functionValue.range.filter((count) => typeof count === "number");
238
235
  if (counts.some((count) => count < 1)) {
239
236
  throw new TlaEvaluationError(
package/src/builtins.ts CHANGED
@@ -2,6 +2,7 @@ import { TlaEvaluationError, TlaModuleError } from "./errors";
2
2
  import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
3
3
  import {
4
4
  formatValue,
5
+ getFunctionClass,
5
6
  getSequenceElements,
6
7
  isEnumerable,
7
8
  isFunctionValue,
@@ -9,6 +10,7 @@ import {
9
10
  toFiniteFunction,
10
11
  MAXIMUM_INTEGER,
11
12
  MINIMUM_INTEGER,
13
+ setTrace,
12
14
  toFiniteSet,
13
15
  type Value,
14
16
  } from "./values";
@@ -243,17 +245,20 @@ const KIND_STRINGS: Record<string, string> = {
243
245
  UnionValue: "a set of the form UNION S",
244
246
  };
245
247
 
246
- // TLC stores a function as a TupleValue or a RecordValue when it has that shape, so the
247
- // shape stands in for how TLC built the value.
248
+ const FUNCTION_CLASSES = {
249
+ lambda: "FcnLambdaValue",
250
+ tuple: "TupleValue",
251
+ record: "RecordValue",
252
+ };
253
+
248
254
  export const getJavaClassName = (value: Value) => {
249
255
  if (typeof value === "number") return "IntValue";
250
256
  if (typeof value === "string") return "StringValue";
251
257
  if (typeof value === "boolean") return "BoolValue";
252
258
  if (value.kind === "SetOperation") return SET_OPERATION_CLASSES[value.operator];
253
259
  if (value.kind !== "Function") return JAVA_CLASSES[value.kind];
254
- const domain = value.domain;
255
- if (domain.every((key, index) => key === index + 1)) return "TupleValue";
256
- return domain.every((key) => typeof key === "string") ? "RecordValue" : "FcnRcdValue";
260
+ const functionClass = getFunctionClass(value);
261
+ return functionClass === undefined ? "FcnRcdValue" : FUNCTION_CLASSES[functionClass];
257
262
  };
258
263
 
259
264
  export const getKindString = (value: Value) => KIND_STRINGS[getJavaClassName(value)];
@@ -270,13 +275,17 @@ export const overrideWithJava = (builtin: Builtin, signature: string): Builtin =
270
275
  const guard =
271
276
  <Arguments extends unknown[]>(compute: (...args: Arguments) => Value) =>
272
277
  (...args: Arguments) => {
278
+ const depth = setTrace.sets?.length ?? 0;
273
279
  try {
274
280
  return compute(...args);
275
281
  } catch (error) {
276
282
  const isWrapped =
277
283
  error instanceof TlaEvaluationError &&
278
284
  (builtin.isLazy === true || !(error instanceof TlaModuleError));
279
- throw isWrapped ? createJavaOverrideError(signature, error.message) : error;
285
+ if (!isWrapped) throw error;
286
+ // The wrapping error replaces a FingerprintException that a set with a source raised.
287
+ if (setTrace.sets) setTrace.sets.length = depth;
288
+ throw createJavaOverrideError(signature, error.message);
280
289
  }
281
290
  };
282
291
  return {
@@ -297,15 +306,16 @@ export const getJavaInteger = (value: Value, signature: string) => {
297
306
  return value;
298
307
  };
299
308
 
300
- export const getIntegersSignature = (method: string, result: string, arity: number) =>
301
- `public static tlc2.value.impl.${result} tlc2.module.Integers.${method}(${Array.from({ length: arity }, () => "tlc2.value.impl.IntValue").join(",")})`;
309
+ export const getJavaSignature = (module: string, method: string, result: string, arity: number) =>
310
+ `public static tlc2.value.impl.${result} tlc2.module.${module}.${method}(${Array.from({ length: arity }, () => "tlc2.value.impl.IntValue").join(",")})`;
302
311
 
303
312
  export const defineArithmetic = (
313
+ module: string,
304
314
  name: string,
305
315
  method: string,
306
316
  compute: (left: number, right: number) => number,
307
317
  ) => {
308
- const signature = getIntegersSignature(method, "IntValue", 2);
318
+ const signature = getJavaSignature(module, method, "IntValue", 2);
309
319
  return defineBinary(name, (left, right) => {
310
320
  const leftNumber = getJavaInteger(left, signature);
311
321
  const rightNumber = getJavaInteger(right, signature);
@@ -324,9 +334,17 @@ const getIntegerArgument = (value: Value, position: string, name: string) => {
324
334
  return value;
325
335
  };
326
336
 
327
- export const defineComparison = (name: string, compare: (left: number, right: number) => boolean) =>
337
+ // The error of an argument that isn't an integer names the operator as TLC's method does.
338
+ export const defineComparison = (
339
+ name: string,
340
+ compare: (left: number, right: number) => boolean,
341
+ errorName = name,
342
+ ) =>
328
343
  defineBinary(name, (left, right) =>
329
- compare(getIntegerArgument(left, "first", name), getIntegerArgument(right, "second", name)),
344
+ compare(
345
+ getIntegerArgument(left, "first", errorName),
346
+ getIntegerArgument(right, "second", errorName),
347
+ ),
330
348
  );
331
349
 
332
350
  export const defineLazyOperator = (
@@ -1,6 +1,6 @@
1
1
  // TLC's Reals.tla, RealTime.tla, and Toolbox.tla, verbatim, so that errors inside them name the same
2
2
  // lines as TLC's errors.
3
- const REALS = `-------------------------------- MODULE Reals -------------------------------
3
+ export const REALS = `-------------------------------- MODULE Reals -------------------------------
4
4
  (***************************************************************************)
5
5
  (* This module provides dummy definitions of the operators that are *)
6
6
  (* defined by the real Reals module. It is expected that any tool that *)
@@ -19,7 +19,7 @@ a / b == CHOOSE m \\in Real : m * b = a
19
19
  Infinity == CHOOSE i : (i \\notin Real) /\\ (\\A r \\in Real : i > r)
20
20
  =============================================================================`;
21
21
 
22
- const REAL_TIME = `----------------------------- MODULE RealTime -------------------------------
22
+ export const REAL_TIME = `----------------------------- MODULE RealTime -------------------------------
23
23
  (***************************************************************************)
24
24
  (* This standard module is described in Chapter 9 of the book "Specifying *)
25
25
  (* Systems". The type of specification described there cannot be handled *)
@@ -47,7 +47,7 @@ RTnow(v) == LET NowNext == /\\ now' \\in {r \\in Real : r > now}
47
47
  /\\ \\A r \\in Real : WF_now(NowNext /\\ (now'>r))
48
48
  =============================================================================`;
49
49
 
50
- const TOOLBOX = `----------------------------- MODULE Toolbox --------------------------------
50
+ export const TOOLBOX = `----------------------------- MODULE Toolbox --------------------------------
51
51
  (***************************************************************************)
52
52
  (* *)
53
53
  (***************************************************************************)
package/src/canonical.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { getValueHash, isSameValue, type Value } from "./values";
1
+ import { getValueHash, isInterchangeableValue, type Value } from "./values";
2
2
 
3
3
  const canonicalizeElements = (elements: Value[], canonicalize: (value: Value) => Value) => {
4
4
  for (let index = 0; index < elements.length; index++) {
@@ -15,11 +15,12 @@ export const createCanonicalizer = () => {
15
15
  const hash = getValueHash(value);
16
16
  const bucket = canonicalValues.get(hash);
17
17
  if (bucket !== undefined && !Array.isArray(bucket)) {
18
- if (bucket === value || isSameValue(bucket, value)) return bucket;
18
+ if (bucket === value || isInterchangeableValue(bucket, value)) return bucket;
19
19
  }
20
20
  if (Array.isArray(bucket)) {
21
21
  for (let index = 0; index < bucket.length; index++) {
22
- if (bucket[index] === value || isSameValue(bucket[index], value)) return bucket[index];
22
+ if (bucket[index] === value || isInterchangeableValue(bucket[index], value))
23
+ return bucket[index];
23
24
  }
24
25
  }
25
26
  if (value.kind === "Set") canonicalizeElements(value.elements, canonicalize);