pabst-checker 0.12.1 → 0.13.0

package/README.md

@@ -10,8 +10,9 @@ non-zero provided the second argument is an integer. Can you spot the error?
 
 ```ts
 /**
- * @ensures{nonzero} forall (x: bigint) (y: number),
+ * @ensures{nonzero} forall (x: bigint) (y: number) {
  *   Number.isInteger(y) ==> foo(x, y) !== 0
+ * }
  */
 export function foo(x: bigint, y: number): number {
   return Number(x % 2n) + (y % 2) + 1;
@@ -144,14 +145,16 @@ spelling of an equation is a plain `Object.is` call).
 
 ```ts
 /**
- * @ensures{guarded} forall (x: int),
+ * @ensures{guarded} forall (x: int) {
  *   isPrime(x) ∧ x > 2 → isOdd(x)
+ * }
  */
 ```
 
-- **Quantifier:** `forall` / `∀`, one-or-more binder groups, then a comma, then
-  the body. Lean-style grouping `(x y: int)` is supported. Existential `∃` /
-  `exists` is intentionally rejected (PBT cannot soundly confirm existence).
+- **Quantifier:** `forall` / `∀`, one-or-more binder groups, then the body
+  in braces: `forall (x: int) { ... }`. Lean-style grouping `(x y: int)` is
+  supported. Existential `∃` / `exists` is intentionally rejected (PBT
+  cannot soundly confirm existence).
 - **Domains:** `int`, `nat`, `number`, `boolean`, `string`, `bigint`.
   A numeric domain (`int`, `nat`, `number`, `bigint`) may be constrained to
   an interval: `forall (x: int ∈ [1, 30])` (ASCII fallback: `in`). Each

package/dist/prefix-parser.js

@@ -27,12 +27,21 @@ export function parsePrefix(formula) {
     if (binders.length === 0) {
         throw new PabstError(`expected at least one binder group '(x: domain)' after forall`);
     }
-    const comma = toks[i];
-    if (!comma || comma.text !== ",") {
-        const at = comma?.start ?? formula.length;
-        throw new PabstError(`expected ',' separating binders from body, got: ${formula.slice(at, at + 60)}`);
+    const open = toks[i];
+    if (open && open.text === ",") {
+        throw new PabstError(`since pabst 0.13.0 the property body goes in braces instead of after ` +
+            `a comma: forall (x: int) { ... }`);
     }
-    const body = formula.slice(comma.end).trim();
+    if (!open || open.text !== "{") {
+        const at = open?.start ?? formula.length;
+        throw new PabstError(`expected '{' to open the property body, got: ${formula.slice(at, at + 60)}`);
+    }
+    const close = braceExtent(toks, i, formula);
+    const after = toks[close + 1];
+    if (after) {
+        throw new PabstError(`unexpected text after the property body's closing '}': ${formula.slice(after.start, after.start + 60)}`);
+    }
+    const body = formula.slice(open.end, toks[close].start).trim();
     if (body.length === 0)
         throw new PabstError(`property body is empty`);
     return { binders, body };
@@ -99,6 +108,25 @@ function groupExtent(toks, open, formula, unterminatedSlash) {
         : "";
     throw new PabstError(`unbalanced parentheses in binder group: ${formula.slice(toks[open].start)}${hint}`);
 }
+/** Index of the '}' matching the '{' at toks[open]. Only genuine brace
+ * tokens take part in the count: scanTokens packages string, regex, and
+ * template text into single tokens and rescans a substitution-closing '}'
+ * into a TemplateMiddle/TemplateTail, so every OpenBraceToken in the
+ * stream has a real CloseBraceToken partner. */
+function braceExtent(toks, open, formula) {
+    let depth = 0;
+    for (let j = open; j < toks.length; j++) {
+        const kind = toks[j].kind;
+        if (kind === ts.SyntaxKind.OpenBraceToken)
+            depth++;
+        else if (kind === ts.SyntaxKind.CloseBraceToken) {
+            depth--;
+            if (depth === 0)
+                return j;
+        }
+    }
+    throw new PabstError(`unbalanced braces in property body: ${formula.slice(toks[open].start)}`);
+}
 /** Index of the token closing a plausible two-endpoint interval starting at
  * toks[at], or -1 when none starts there — the group scan then proceeds as
  * usual and the guard text reaches parseRange for the precise complaint. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pabst-checker",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Property-based testing from @ensures annotations, powered by fast-check.",
   "repository": {
     "type": "git",