tla-ts 0.0.3-dev.07eab97 → 0.0.3-dev.0ad0249
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.
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +160 -46
- package/dist/index.d.ts +160 -46
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +2 -2
- package/dist/parallel.cjs +1 -1
- package/dist/parallel.js +2 -2
- package/dist/run-cli.cjs +1351 -22
- package/dist/run-cli.js +1351 -22
- package/dist/transfer.cjs +83 -33
- package/dist/transfer.js +83 -33
- package/package.json +4 -1
- package/src/ast.ts +42 -5
- package/src/bags.ts +4 -7
- package/src/builtins.ts +29 -17
- package/src/bundled-modules.ts +3 -3
- package/src/canonical.ts +4 -3
- package/src/check.ts +1296 -429
- package/src/cli.ts +8 -1
- package/src/codegen.ts +68 -21
- package/src/config.ts +225 -206
- package/src/environment.ts +388 -115
- package/src/errors.ts +155 -18
- package/src/evaluate.ts +713 -259
- package/src/exit-codes.ts +6 -24
- package/src/fingerprints.ts +1 -2
- package/src/index.ts +1 -0
- package/src/instances.ts +3 -1
- package/src/java-overrides.ts +104 -25
- package/src/levels.ts +37 -27
- package/src/lexer.ts +14 -1
- package/src/live-check.ts +204 -148
- package/src/liveness.ts +191 -122
- package/src/obligation-expression.ts +2 -2
- package/src/obligation-source.ts +2 -0
- package/src/parallel-worker.ts +6 -1
- package/src/parallel.ts +57 -6
- package/src/parser.ts +369 -115
- package/src/pcal-ast.ts +770 -0
- package/src/pcal-parse.ts +1523 -0
- package/src/pcal-tokenize.ts +516 -0
- package/src/pcal-translate.ts +1230 -0
- package/src/pcal-validate.ts +454 -0
- package/src/randomization.ts +24 -7
- package/src/resolve.ts +1332 -453
- package/src/run-cli.ts +1161 -196
- package/src/runtime.ts +16 -0
- package/src/sany-builtins.ts +147 -0
- package/src/sany-generator.ts +3112 -0
- package/src/sany-levels.ts +1208 -0
- package/src/sany-lexer.ts +545 -0
- package/src/sany-linter.ts +122 -0
- package/src/sany-modules.ts +1398 -0
- package/src/sany-nodes.ts +463 -0
- package/src/sany-parse-error.ts +2161 -0
- package/src/sany-report.ts +354 -0
- package/src/sany-selectors.ts +738 -0
- package/src/sany-source.ts +248 -0
- package/src/sany-xml.ts +1017 -0
- package/src/spec-description.ts +25 -5
- package/src/standard-modules.ts +172 -129
- package/src/standard-ranges.ts +116 -0
- package/src/state-graph.ts +29 -6
- package/src/subexpressions.ts +221 -161
- package/src/successors.ts +141 -173
- package/src/symmetry.ts +168 -50
- package/src/tableau.ts +3 -1
- package/src/tlc-ext.ts +13 -17
- package/src/tlc-messages.ts +329 -0
- package/src/tlc-module.ts +49 -21
- package/src/tlc-modules.ts +0 -4
- package/src/tlc-order.ts +55 -9
- package/src/tlc-random.ts +28 -3
- package/src/tlc-replay.ts +655 -0
- package/src/tlc-version.ts +18 -0
- package/src/transfer.ts +15 -3
- package/src/values.ts +664 -317
package/src/exit-codes.ts
CHANGED
|
@@ -26,19 +26,7 @@ export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
|
26
26
|
|
|
27
27
|
export const getExitCode = (error: Error) => exitCodes.get(error);
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
// The exit status of the error code TLC gives an EvalException, which TLC uses only where it
|
|
32
|
-
// doesn't report the error again as a nested expression.
|
|
33
|
-
export const setOwnExitCode = <Thrown extends Error>(error: Thrown, code: number) => {
|
|
34
|
-
ownExitCodes.set(error, code);
|
|
35
|
-
return error;
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
export const getOwnExitCode = (error: unknown) =>
|
|
39
|
-
error instanceof Error ? ownExitCodes.get(error) : undefined;
|
|
40
|
-
|
|
41
|
-
// TLC exits with 255 when it fails to process or evaluate a liveness property.
|
|
29
|
+
// TLC exits with 255 when it fails to process or evaluate a liveness property, in any phase.
|
|
42
30
|
const withErrorExitCode = <Result>(run: () => Result) => {
|
|
43
31
|
try {
|
|
44
32
|
return run();
|
|
@@ -53,17 +41,11 @@ export const withLivenessExitCode = (
|
|
|
53
41
|
const checker = withErrorExitCode(create);
|
|
54
42
|
return (
|
|
55
43
|
checker && {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
} catch (error) {
|
|
62
|
-
throw setExitCode(error, getOwnExitCode(error) ?? EXIT_STATUS.error);
|
|
63
|
-
}
|
|
64
|
-
},
|
|
65
|
-
addState: (index, state, successors) =>
|
|
66
|
-
withErrorExitCode(() => checker.addState(index, state, successors)),
|
|
44
|
+
branches: checker.branches,
|
|
45
|
+
addInitialState: (index, state, tracing) =>
|
|
46
|
+
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
47
|
+
addState: (index, state, successors, tracing) =>
|
|
48
|
+
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
67
49
|
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
68
50
|
getViolatedProperties: (path, cycleStart) =>
|
|
69
51
|
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
package/src/fingerprints.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getValueFingerprint, getValueHash, type Value } from "./values";
|
|
2
2
|
|
|
3
3
|
const EMPTY = 0;
|
|
4
4
|
const INITIAL_CAPACITY = 1 << 12;
|
|
@@ -20,7 +20,6 @@ export const writeStateFingerprint = (state: Value[], fingerprint: Int32Array) =
|
|
|
20
20
|
first = Math.imul(first ^ getValueHash(state[index]), 0x01000193);
|
|
21
21
|
second = Math.imul(second ^ getValueFingerprint(state[index]), 0x5bd1e995);
|
|
22
22
|
}
|
|
23
|
-
assertFingerprintable(state);
|
|
24
23
|
fingerprint[0] = mix(first) || 1;
|
|
25
24
|
fingerprint[1] = mix(second);
|
|
26
25
|
};
|
package/src/index.ts
CHANGED
package/src/instances.ts
CHANGED
|
@@ -183,6 +183,8 @@ export const mapChildren = (
|
|
|
183
183
|
function: plain(expression.function),
|
|
184
184
|
args: expression.args.map(plain),
|
|
185
185
|
};
|
|
186
|
+
case "Bracket":
|
|
187
|
+
return { ...expression, args: expression.args.map(plain) };
|
|
186
188
|
case "FieldAccess":
|
|
187
189
|
return { ...expression, record: plain(expression.record) };
|
|
188
190
|
case "Product":
|
|
@@ -705,7 +707,7 @@ const expandLetInstances = (
|
|
|
705
707
|
const index = position === -1 ? current.length : position;
|
|
706
708
|
return [...current.slice(0, index), ...instantiate(instance, inner), ...current.slice(index)];
|
|
707
709
|
}, mapped.definitions);
|
|
708
|
-
return {
|
|
710
|
+
return { ...mapped, definitions };
|
|
709
711
|
};
|
|
710
712
|
|
|
711
713
|
// A named theorem's statement is linked as its definition.
|
package/src/java-overrides.ts
CHANGED
|
@@ -12,9 +12,20 @@ interface PoolEntry {
|
|
|
12
12
|
interface JavaMethod {
|
|
13
13
|
name: string;
|
|
14
14
|
arity: number;
|
|
15
|
+
// Method#toString, which TLC prints as the signature of an override.
|
|
16
|
+
signature: string;
|
|
15
17
|
code: Uint8Array | undefined;
|
|
16
18
|
}
|
|
17
19
|
|
|
20
|
+
// A public static method of the class named after a module, which TLC reports as it loads the
|
|
21
|
+
// class, with whether it overrides an operator.
|
|
22
|
+
export interface JavaOverride {
|
|
23
|
+
module: string;
|
|
24
|
+
operator: string;
|
|
25
|
+
signature: string;
|
|
26
|
+
isMatched: boolean;
|
|
27
|
+
}
|
|
28
|
+
|
|
18
29
|
interface ObjectReference {
|
|
19
30
|
className: string;
|
|
20
31
|
value: Expression | undefined;
|
|
@@ -44,12 +55,44 @@ const createReader = (bytes: Uint8Array) => {
|
|
|
44
55
|
};
|
|
45
56
|
};
|
|
46
57
|
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
58
|
+
const PRIMITIVE_TYPES = new Map([
|
|
59
|
+
["B", "byte"],
|
|
60
|
+
["C", "char"],
|
|
61
|
+
["D", "double"],
|
|
62
|
+
["F", "float"],
|
|
63
|
+
["I", "int"],
|
|
64
|
+
["J", "long"],
|
|
65
|
+
["S", "short"],
|
|
66
|
+
["Z", "boolean"],
|
|
67
|
+
["V", "void"],
|
|
68
|
+
]);
|
|
69
|
+
|
|
70
|
+
// The modifiers Method#toString prints, in the order of Modifier#toString.
|
|
71
|
+
const METHOD_MODIFIERS: [number, string][] = [
|
|
72
|
+
[0x0001, "public"],
|
|
73
|
+
[0x0004, "protected"],
|
|
74
|
+
[0x0002, "private"],
|
|
75
|
+
[0x0400, "abstract"],
|
|
76
|
+
[0x0008, "static"],
|
|
77
|
+
[0x0010, "final"],
|
|
78
|
+
[0x0020, "synchronized"],
|
|
79
|
+
[0x0100, "native"],
|
|
80
|
+
[0x0800, "strictfp"],
|
|
81
|
+
];
|
|
82
|
+
|
|
83
|
+
const getTypeNames = (descriptor: string) =>
|
|
84
|
+
[...descriptor.matchAll(/(\[*)(?:L([^;]*);|([BCDFIJSZV]))/g)].map(
|
|
85
|
+
(match) =>
|
|
86
|
+
`${match[2]?.replaceAll("/", ".") ?? PRIMITIVE_TYPES.get(match[3])}${"[]".repeat(match[1].length)}`,
|
|
87
|
+
);
|
|
51
88
|
|
|
52
|
-
|
|
89
|
+
const getClassName = (pool: PoolEntry[], index: number) => pool[pool[index].first].text;
|
|
90
|
+
|
|
91
|
+
const getJavaClassName = (pool: PoolEntry[], index: number) =>
|
|
92
|
+
getClassName(pool, index).replaceAll("/", ".");
|
|
93
|
+
|
|
94
|
+
// The public static methods of a class file and their bytecode, in the order of the class file.
|
|
95
|
+
// Class#getDeclaredMethods orders them by where HotSpot allocated the symbols of their names.
|
|
53
96
|
const readMethods = (bytes: Uint8Array) => {
|
|
54
97
|
const reader = createReader(bytes);
|
|
55
98
|
if (reader.readUint32() !== CLASS_MAGIC)
|
|
@@ -80,7 +123,7 @@ const readMethods = (bytes: Uint8Array) => {
|
|
|
80
123
|
}
|
|
81
124
|
}
|
|
82
125
|
reader.readUint16();
|
|
83
|
-
reader.readUint16();
|
|
126
|
+
const className = getJavaClassName(pool, reader.readUint16());
|
|
84
127
|
reader.readUint16();
|
|
85
128
|
reader.readBytes(reader.readUint16() * 2);
|
|
86
129
|
for (let fields = reader.readUint16(); fields > 0; fields--) {
|
|
@@ -95,23 +138,38 @@ const readMethods = (bytes: Uint8Array) => {
|
|
|
95
138
|
const access = reader.readUint16();
|
|
96
139
|
const name = pool[reader.readUint16()].text;
|
|
97
140
|
const descriptor = pool[reader.readUint16()].text;
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
method.code = attribute.subarray(8, 8 + length);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
141
|
+
const parametersEnd = descriptor.indexOf(")");
|
|
142
|
+
const parameters = getTypeNames(descriptor.slice(1, parametersEnd));
|
|
143
|
+
const attributes = Array.from({ length: reader.readUint16() }, () => ({
|
|
144
|
+
name: pool[reader.readUint16()].text,
|
|
145
|
+
reader: createReader(reader.readBytes(reader.readUint32())),
|
|
146
|
+
}));
|
|
107
147
|
const isOverride = (access & ACCESS_PUBLIC) !== 0 && (access & ACCESS_STATIC) !== 0;
|
|
108
|
-
if (isOverride)
|
|
148
|
+
if (!isOverride) continue;
|
|
149
|
+
const code = attributes.find((attribute) => attribute.name === "Code")?.reader;
|
|
150
|
+
// A Code attribute holds max_stack and max_locals before the length of the bytecode.
|
|
151
|
+
code?.readBytes(4);
|
|
152
|
+
const thrown = attributes.find((attribute) => attribute.name === "Exceptions")?.reader;
|
|
153
|
+
const exceptions = thrown
|
|
154
|
+
? Array.from({ length: thrown.readUint16() }, () =>
|
|
155
|
+
getJavaClassName(pool, thrown.readUint16()),
|
|
156
|
+
)
|
|
157
|
+
: [];
|
|
158
|
+
const modifiers = METHOD_MODIFIERS.filter(([flag]) => (access & flag) !== 0).map(
|
|
159
|
+
([, modifier]) => modifier,
|
|
160
|
+
);
|
|
161
|
+
const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
|
|
162
|
+
const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;
|
|
163
|
+
methods.push({
|
|
164
|
+
name,
|
|
165
|
+
arity: parameters.length,
|
|
166
|
+
code: code?.readBytes(code.readUint32()),
|
|
167
|
+
signature: `${modifiers.join(" ")} ${returnType} ${className}.${name}(${parameters.join(",")})${throwsClause}`,
|
|
168
|
+
});
|
|
109
169
|
}
|
|
110
170
|
return { pool, methods };
|
|
111
171
|
};
|
|
112
172
|
|
|
113
|
-
const getClassName = (pool: PoolEntry[], index: number) => pool[pool[index].first].text;
|
|
114
|
-
|
|
115
173
|
const getMember = (pool: PoolEntry[], index: number) => {
|
|
116
174
|
const reference = pool[index];
|
|
117
175
|
const nameAndType = pool[reference.second];
|
|
@@ -220,16 +278,29 @@ const getReturnedLiteral = (
|
|
|
220
278
|
throw unsupported();
|
|
221
279
|
};
|
|
222
280
|
|
|
223
|
-
// TLC loads a class named after each module and replaces
|
|
224
|
-
// with the public static method of the same name and arity.
|
|
225
|
-
|
|
226
|
-
|
|
281
|
+
// TLC loads a class named after each module and replaces each operator of the module that the
|
|
282
|
+
// root module sees with the public static method of the same name and arity. It reports whether
|
|
283
|
+
// each method matched an operator.
|
|
284
|
+
export const overrideDefinitions = (
|
|
285
|
+
module: Module,
|
|
286
|
+
bytes: Uint8Array | undefined,
|
|
287
|
+
isRoot: boolean,
|
|
288
|
+
): { module: Module; overrides: JavaOverride[] } => {
|
|
289
|
+
if (!bytes) return { module, overrides: [] };
|
|
227
290
|
const classFile = readMethods(bytes);
|
|
291
|
+
const arities = new Map(
|
|
292
|
+
module.definitions
|
|
293
|
+
.filter((definition) => isRoot || !definition.isLocal)
|
|
294
|
+
.map((definition) => [
|
|
295
|
+
definition.name,
|
|
296
|
+
definition.kind === "Operator" ? definition.params.length : 0,
|
|
297
|
+
]),
|
|
298
|
+
);
|
|
299
|
+
const isMatched = (method: JavaMethod) => arities.get(method.name) === method.arity;
|
|
228
300
|
const definitions = module.definitions.map((definition): Definition => {
|
|
229
301
|
if (definition.kind !== "Operator") return definition;
|
|
230
302
|
const method = classFile.methods.find(
|
|
231
|
-
(candidate) =>
|
|
232
|
-
candidate.name === definition.name && candidate.arity === definition.params.length,
|
|
303
|
+
(candidate) => candidate.name === definition.name && isMatched(candidate),
|
|
233
304
|
);
|
|
234
305
|
if (!method) return definition;
|
|
235
306
|
return {
|
|
@@ -237,5 +308,13 @@ export const overrideDefinitions = (module: Module, bytes: Uint8Array | undefine
|
|
|
237
308
|
body: getReturnedLiteral(method, classFile.pool, module.name, definition.location),
|
|
238
309
|
};
|
|
239
310
|
});
|
|
240
|
-
return {
|
|
311
|
+
return {
|
|
312
|
+
module: { ...module, definitions },
|
|
313
|
+
overrides: classFile.methods.map((method) => ({
|
|
314
|
+
module: module.name,
|
|
315
|
+
operator: method.name,
|
|
316
|
+
signature: method.signature,
|
|
317
|
+
isMatched: isMatched(method),
|
|
318
|
+
})),
|
|
319
|
+
};
|
|
241
320
|
};
|
package/src/levels.ts
CHANGED
|
@@ -181,8 +181,10 @@ const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
|
181
181
|
|
|
182
182
|
const toFormals = (names: string[]) => names.map((name) => ({ name, arity: 0 }));
|
|
183
183
|
|
|
184
|
+
// The levels of tla2sany.semantic.LevelConstants.
|
|
185
|
+
export const CONSTANT_LEVEL = 0;
|
|
186
|
+
export const VARIABLE_LEVEL = 1;
|
|
184
187
|
export const ACTION_LEVEL = 2;
|
|
185
|
-
|
|
186
188
|
export const TEMPORAL_LEVEL = 3;
|
|
187
189
|
|
|
188
190
|
// SANY reports a level error at the range of the expression it rejects.
|
|
@@ -690,6 +692,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
690
692
|
? toOperand(expression.args[0], scope)
|
|
691
693
|
: { data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
692
694
|
]);
|
|
695
|
+
// SANY's semantic checker rejects the expression without computing its level.
|
|
696
|
+
case "Bracket":
|
|
697
|
+
return createData();
|
|
693
698
|
case "FieldAccess":
|
|
694
699
|
return applyDefined(SELECT_LEVELS, [
|
|
695
700
|
toOperand(expression.record, scope),
|
|
@@ -885,6 +890,7 @@ export const checkModuleLevels = (
|
|
|
885
890
|
module: Module,
|
|
886
891
|
context: LevelContext,
|
|
887
892
|
instances: { location: SourceLocation; check: () => void }[],
|
|
893
|
+
warnings: SanyError[],
|
|
888
894
|
) => {
|
|
889
895
|
const analyzer = createLevelAnalyzer(context);
|
|
890
896
|
const getLevel = (expressions: Expression[]) =>
|
|
@@ -956,31 +962,35 @@ export const checkModuleLevels = (
|
|
|
956
962
|
...(step.proof?.kind === "Steps" && isTemporal() ? checkTemporalGoal(step.proof) : []),
|
|
957
963
|
];
|
|
958
964
|
});
|
|
959
|
-
collectSemanticErrors(
|
|
960
|
-
|
|
961
|
-
.
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
+
const errors = collectSemanticErrors(
|
|
966
|
+
[
|
|
967
|
+
...module.definitions
|
|
968
|
+
.filter((definition) => !definition.name.includes("!"))
|
|
969
|
+
.map((definition) => ({
|
|
970
|
+
location: definition.location,
|
|
971
|
+
check: () => analyzer.analyzeDefinition(definition, new Map()),
|
|
972
|
+
})),
|
|
973
|
+
...module.assumptions.map((assumption) => ({
|
|
974
|
+
location: assumption.location,
|
|
975
|
+
check: () => analyzer.analyze(assumption.expression, new Map()),
|
|
976
|
+
})),
|
|
977
|
+
...module.theorems.map((theorem) => ({
|
|
978
|
+
location: theorem.location,
|
|
979
|
+
check: () => {
|
|
980
|
+
const data =
|
|
981
|
+
theorem.statement.kind === "AssumeProve"
|
|
982
|
+
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
983
|
+
: analyzer.analyze(theorem.statement, new Map());
|
|
984
|
+
const errors = [
|
|
985
|
+
...checkProof(theorem.proof),
|
|
986
|
+
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
987
|
+
];
|
|
988
|
+
if (errors.length > 0) throw createSanyError(errors);
|
|
989
|
+
},
|
|
965
990
|
})),
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
location: theorem.location,
|
|
972
|
-
check: () => {
|
|
973
|
-
const data =
|
|
974
|
-
theorem.statement.kind === "AssumeProve"
|
|
975
|
-
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
976
|
-
: analyzer.analyze(theorem.statement, new Map());
|
|
977
|
-
const errors = [
|
|
978
|
-
...checkProof(theorem.proof),
|
|
979
|
-
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
980
|
-
];
|
|
981
|
-
if (errors.length > 0) throw createSanyError(errors);
|
|
982
|
-
},
|
|
983
|
-
})),
|
|
984
|
-
...instances,
|
|
985
|
-
]);
|
|
991
|
+
...instances,
|
|
992
|
+
],
|
|
993
|
+
warnings,
|
|
994
|
+
);
|
|
995
|
+
if (errors.length > 0) throw createSanyError(errors, false, undefined, warnings);
|
|
986
996
|
};
|
package/src/lexer.ts
CHANGED
|
@@ -335,6 +335,10 @@ const matchStep = (source: string, index: number) => {
|
|
|
335
335
|
);
|
|
336
336
|
};
|
|
337
337
|
|
|
338
|
+
// SANY's lexer reads @ as an identifier, which stands for the value an EXCEPT changes only alone.
|
|
339
|
+
export const readAtAsIdentifier = (token: Token): Token =>
|
|
340
|
+
token.kind === "Operator" && token.text === "@" ? { ...token, kind: "Identifier" } : token;
|
|
341
|
+
|
|
338
342
|
const TAB_SIZE = 8;
|
|
339
343
|
|
|
340
344
|
const getWidthAfter = (width: number, character: string | undefined) =>
|
|
@@ -442,11 +446,14 @@ export const tokenize = (source: string): Token[] => {
|
|
|
442
446
|
const characters: string[] = [];
|
|
443
447
|
advanceOver(1);
|
|
444
448
|
while (source[cursor.index] !== '"') {
|
|
445
|
-
if (cursor.index >= source.length || source[cursor.index]
|
|
449
|
+
if (cursor.index >= source.length || "\n\r".includes(source[cursor.index])) {
|
|
446
450
|
throw createError("Unterminated string");
|
|
447
451
|
}
|
|
448
452
|
if (source[cursor.index] === "\\") {
|
|
449
453
|
const escaped = source[cursor.index + 1];
|
|
454
|
+
if (escaped === undefined || !'ntrf\\"'.includes(escaped)) {
|
|
455
|
+
throw createError("Invalid escape in string");
|
|
456
|
+
}
|
|
450
457
|
characters.push({ n: "\n", t: "\t", r: "\r", f: "\f" }[escaped] ?? escaped);
|
|
451
458
|
advanceOver(2);
|
|
452
459
|
continue;
|
|
@@ -479,6 +486,12 @@ export const tokenize = (source: string): Token[] => {
|
|
|
479
486
|
pushToken(number.includes(".") ? "Decimal" : "Number", number, number.length);
|
|
480
487
|
continue;
|
|
481
488
|
}
|
|
489
|
+
// A word needs a letter to be a name, so SANY reads one without as underscores and numbers.
|
|
490
|
+
const part = /^(_|\d+)/.exec(word)?.[0];
|
|
491
|
+
if (part !== undefined && !/[A-Za-z]/.test(word)) {
|
|
492
|
+
pushToken(part === "_" ? "Operator" : "Number", part, part.length);
|
|
493
|
+
continue;
|
|
494
|
+
}
|
|
482
495
|
if (word.startsWith("WF_") || word.startsWith("SF_")) {
|
|
483
496
|
pushToken("Keyword", word.slice(0, 3), 3);
|
|
484
497
|
continue;
|