tla-ts 0.0.10-dev.68b2c4968 → 0.0.10-dev.6b2a6741a

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 (50) hide show
  1. package/dist/deciders.cjs +1 -1
  2. package/dist/deciders.js +1 -1
  3. package/dist/index.d.cts +1 -0
  4. package/dist/index.d.ts +1 -0
  5. package/dist/prove.cjs +6 -6
  6. package/dist/prove.js +6 -6
  7. package/dist/run.cjs +7 -7
  8. package/dist/run.js +7 -7
  9. package/dist/transfer.cjs +33 -33
  10. package/dist/transfer.js +29 -29
  11. package/package.json +1 -1
  12. package/src/ast.ts +1 -0
  13. package/src/cli/xml-exporter.ts +1 -1
  14. package/src/codegen.ts +3 -3
  15. package/src/environment.ts +40 -33
  16. package/src/instances.ts +4 -4
  17. package/src/java-overrides.ts +2 -2
  18. package/src/levels.ts +4 -4
  19. package/src/obligations/index.ts +1 -1
  20. package/src/obligations/normalize.ts +1 -4
  21. package/src/obligations/printer.ts +5 -5
  22. package/src/parser.ts +35 -106
  23. package/src/prover/isabelle/isar/attrib.ts +4 -4
  24. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  25. package/src/prover/isabelle/pure/term.ts +3 -3
  26. package/src/prover/prep/md5.ts +26 -29
  27. package/src/prover/smt/solver/logic-tactics.ts +2 -2
  28. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  29. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  30. package/src/prover/smt/solver/seq-rewriter.ts +1 -1
  31. package/src/prover/smt/solver/tactic.ts +4 -4
  32. package/src/prover/tlapm/cache.ts +8 -8
  33. package/src/resolve.ts +374 -125
  34. package/src/runtime.ts +1 -1
  35. package/src/sany/builtins.ts +10 -10
  36. package/src/sany/generation.ts +1 -0
  37. package/src/sany/generator-definitions.ts +1 -0
  38. package/src/sany/generator-expressions.ts +6 -3
  39. package/src/sany/generator-proofs.ts +4 -2
  40. package/src/sany/lexer.ts +3 -3
  41. package/src/sany/modules.ts +4 -2
  42. package/src/sany/selectors.ts +5 -1
  43. package/src/sany/xml.ts +2 -3
  44. package/src/subexpressions.ts +102 -18
  45. package/src/symmetry.ts +1 -1
  46. package/src/tlc/jar-data.ts +1 -3
  47. package/src/tlc/messages.ts +3 -3
  48. package/src/tlc/tlc-operators.ts +3 -1
  49. package/src/tlc/trace-spec.ts +3 -2
  50. package/src/values.ts +4 -4
@@ -20,35 +20,32 @@ export const getMd5 = (text: string): string => {
20
20
  const words = Array.from({ length: 16 }, (_value, index) =>
21
21
  view.getUint32(offset + index * 4, true),
22
22
  );
23
- const mixedState = Array.from({ length: 64 }).reduce<number[]>(
24
- ([innerA, innerB, innerC, innerD], _value, index) => {
25
- const round = Math.floor(index / 16);
26
- const mixed =
27
- round === 0
28
- ? (innerB & innerC) | (~innerB & innerD)
29
- : round === 1
30
- ? (innerD & innerB) | (~innerD & innerC)
31
- : round === 2
32
- ? innerB ^ innerC ^ innerD
33
- : innerC ^ (innerB | ~innerD);
34
- const word =
35
- round === 0
36
- ? index
37
- : round === 1
38
- ? (5 * index + 1) % 16
39
- : round === 2
40
- ? (3 * index + 5) % 16
41
- : (7 * index) % 16;
42
- const sum = (innerA + mixed + CONSTANTS[index] + words[word]) | 0;
43
- return [
44
- innerD,
45
- (innerB + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
46
- innerB,
47
- innerC,
48
- ];
49
- },
50
- state,
51
- );
23
+ const mixedState = Array.from({ length: 64 }).reduce<number[]>((state, _value, index) => {
24
+ const round = Math.floor(index / 16);
25
+ const mixed =
26
+ round === 0
27
+ ? (state[1] & state[2]) | (~state[1] & state[3])
28
+ : round === 1
29
+ ? (state[3] & state[1]) | (~state[3] & state[2])
30
+ : round === 2
31
+ ? state[1] ^ state[2] ^ state[3]
32
+ : state[2] ^ (state[1] | ~state[3]);
33
+ const word =
34
+ round === 0
35
+ ? index
36
+ : round === 1
37
+ ? (5 * index + 1) % 16
38
+ : round === 2
39
+ ? (3 * index + 5) % 16
40
+ : (7 * index) % 16;
41
+ const sum = (state[0] + mixed + CONSTANTS[index] + words[word]) | 0;
42
+ return [
43
+ state[3],
44
+ (state[1] + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
45
+ state[1],
46
+ state[2],
47
+ ];
48
+ }, state);
52
49
  state.splice(0, 4, ...state.map((word, index) => (word + mixedState[index]) | 0));
53
50
  }
54
51
  return state
@@ -81,8 +81,8 @@ const getQfnraSolver = (solver: QfnraSolver) =>
81
81
  `${solver.simpleCheck})`,
82
82
  ...(solver.heuristic === undefined ? [] : [`(try-for ${QFNRA_NLSAT} ${solver.heuristic})`]),
83
83
  ...solver.orders.map(
84
- ([strategy, limit]) =>
85
- `(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${strategy}) ${limit})`,
84
+ (order) =>
85
+ `(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${order[0]}) ${order[1]})`,
86
86
  ),
87
87
  `(using-params smt :use_ls true :ls_time ${solver.ls})`,
88
88
  `(and-then (try-for (using-params smt :arith.greatest_error_pivot true) ${solver.smt}) ` +
@@ -90,7 +90,7 @@ export class Preprocess {
90
90
  if (dual.size !== soft.size) soft = this.dualize(dual, fmls);
91
91
  }
92
92
  return {
93
- soft: [...soft].map(([expr, weight]) => ({ expr, weight, value: L_UNDEF })),
93
+ soft: [...soft].map((entry) => ({ expr: entry[0], weight: entry[1], value: L_UNDEF })),
94
94
  lower: lower.value,
95
95
  };
96
96
  }
@@ -271,7 +271,7 @@ const SEQ_VARIANTS = new Map([
271
271
  [OP_INTERNAL_STRING_SUBSTR, OP_SEQ_EXTRACT],
272
272
  ]);
273
273
 
274
- const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map(([variant, op]) => [op, variant]));
274
+ const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map((entry) => [entry[1], entry[0]]));
275
275
 
276
276
  const getPsig = (op: number) => {
277
277
  const sig = SIGS.get(op);
@@ -182,7 +182,7 @@ const isDigit = (code: number) => code >= 48 && code <= 57;
182
182
  const getCount = (bag: Map<number, number>, key: number) => bag.get(key) ?? 0;
183
183
 
184
184
  const isSameBag = (first: Map<number, number>, second: Map<number, number>) =>
185
- first.size === second.size && [...first].every(([key, count]) => second.get(key) === count);
185
+ first.size === second.size && [...first].every((entry) => second.get(entry[0]) === entry[1]);
186
186
 
187
187
  export class SeqRewriter {
188
188
  readonly re: ReRewriter;
@@ -147,9 +147,9 @@ interface NamedTactic {
147
147
 
148
148
  const getDescrs = (module: string, entries: [string, number, TacticParam, boolean?][]) =>
149
149
  new Map(
150
- entries.map(([name, kind, defaultValue, isPorted]) => [
151
- name,
152
- { kind, module, defaultValue, isPorted: isPorted ?? false },
150
+ entries.map((entry) => [
151
+ entry[0],
152
+ { kind: entry[1], module, defaultValue: entry[2], isPorted: entry[3] ?? false },
153
153
  ]),
154
154
  );
155
155
 
@@ -905,7 +905,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
905
905
  "pb2bv",
906
906
  {
907
907
  descrs: new Map([
908
- ...[...REWRITER_DESCRS].filter(([name]) => BOOL_REWRITER_PARAMS.includes(name)),
908
+ ...[...REWRITER_DESCRS].filter((entry) => BOOL_REWRITER_PARAMS.includes(entry[0])),
909
909
  ...getDescrs("", [
910
910
  ["max_memory", PARAM_UINT, UINT_MAX, true],
911
911
  ["pb2bv_all_clauses_limit", PARAM_UINT, 8, true],
@@ -113,12 +113,12 @@ export const loadFingerprints = (table: FingerprintTable, path: string, isSafe:
113
113
  table.clear();
114
114
  (buckets !== undefined && isBlock(buckets) ? buckets.fields : [])
115
115
  .flatMap((bucket) => readBucket(bucket).toReversed())
116
- .forEach(([key, record]) => {
117
- if (typeof key !== "string" || !isBlock(record))
116
+ .forEach((entry) => {
117
+ if (typeof entry[0] !== "string" || !isBlock(entry[1]))
118
118
  throw new TlaProofError("corrupted fingerprint file");
119
119
  table.set(
120
- key,
121
- record.fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
120
+ entry[0],
121
+ entry[1].fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
122
122
  );
123
123
  });
124
124
  };
@@ -226,18 +226,18 @@ export const getKnownResults = (table: FingerprintTable) => {
226
226
  const storedResults = new Map<ProofAttempt, OcamlValue>();
227
227
  const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
228
228
  const results = new Map(
229
- [...table].map(([fingerprint, record]) => {
229
+ [...table].map((entry) => {
230
230
  const attempts = new Map(
231
231
  STORED_PROVERS.flatMap((prover) => {
232
- const stored = record[PROVERS[prover].field];
232
+ const stored = entry[1][PROVERS[prover].field];
233
233
  const result = decodeResult(prover, getField(stored, 0));
234
234
  if (!result) return [];
235
235
  storedResults.set(result, stored);
236
236
  return [[prover, result]];
237
237
  }),
238
238
  );
239
- storedRecords.set(attempts, record);
240
- return [fingerprint, attempts];
239
+ storedRecords.set(attempts, entry[1]);
240
+ return [entry[0], attempts];
241
241
  }),
242
242
  );
243
243
  const save = (path: string) => {