feat(z3): zero-error SMT-LIB2 output + BMC verify blocks for KRaft
Some checks failed
Deploy Landing Page to Storj / deploy (push) Failing after 3s
Some checks failed
Deploy Landing Page to Storj / deploy (push) Failing after 3s
- Declare speckl_len_Int helper for list/sequence lengths - Fix infix = inside => bodies (final pass regex) - Handle prime notation: currentTerm' → currentTerm_post - Handle length() calls: length(log) → (speckl_len_Int log) - Handle min(): (ite (<= a b) a b) instead of unsupported 'min' - Handle subtraction: i-1 → (- i 1) - Declare _post state vars when invariants compare pre/post - Added 3 BMC verify blocks to KRaft spec (TermMonotonicity, CommitSafety, LeaderCompleteness) - Z3 returns clean sat with zero errors for all specs - All 37 tests pass
This commit is contained in:
parent
7e5a8fe2cb
commit
40eef36a10
7 changed files with 75 additions and 16 deletions
2
compiler/node_modules/.vite/vitest/results.json
generated
vendored
2
compiler/node_modules/.vite/vitest/results.json
generated
vendored
|
|
@ -1 +1 @@
|
|||
{"version":"2.1.9","results":[[":__tests__/parser.test.ts",{"duration":33.913234999999986,"failed":false}],[":src/__tests__/compiler.test.ts",{"duration":11.873544000000038,"failed":false}]]}
|
||||
{"version":"2.1.9","results":[[":__tests__/parser.test.ts",{"duration":36.549328,"failed":false}],[":src/__tests__/compiler.test.ts",{"duration":13.904341000000045,"failed":false}]]}
|
||||
|
|
@ -84,6 +84,10 @@ function emitZ3(speck: SpeckNode, options: Z3Options): string {
|
|||
lines.push('(set-logic ALL)');
|
||||
lines.push('(set-option :produce-models true)');
|
||||
|
||||
// Declare Speckl helper functions
|
||||
// speckl_len: length of Array-simulated sequences
|
||||
lines.push('(declare-fun speckl_len_Int ( (Array Int Int) ) Int)');
|
||||
|
||||
// Step 1: Declare sorts for record types
|
||||
const recordTypes = collectRecordTypes(stateNode, actions);
|
||||
for (const [name, fields] of recordTypes) {
|
||||
|
|
@ -100,6 +104,17 @@ function emitZ3(speck: SpeckNode, options: Z3Options): string {
|
|||
emitStateVar(lines, v, allTypeRefs);
|
||||
}
|
||||
|
||||
// Declare _post state variables for invariants that compare pre/post state
|
||||
// (e.g. "currentTerm' >= currentTerm" → "currentTerm_post >= currentTerm")
|
||||
const needsPostVars = invariants.some((inv: InvariantNode) =>
|
||||
inv.statements.some((s: InvariantStatement) => s.type === 'require' && s.expr.includes("'")));
|
||||
if (needsPostVars) {
|
||||
for (const v of stateVars) {
|
||||
const sort = z3Sort(v.typeExpr);
|
||||
lines.push(`(declare-const ${v.name}_post ${sort})`);
|
||||
}
|
||||
}
|
||||
|
||||
// Step 3: Emit invariants as define-fun
|
||||
if (invariants.length > 0) {
|
||||
lines.push('');
|
||||
|
|
@ -395,11 +410,15 @@ function translateExpr(expr: string, stateVars: StateVar[], suffix: string): str
|
|||
// Handle old() wrapper — spec-level, keep inner
|
||||
e = e.replace(/old\(([^()]*(?:\([^()]*\)[^()]*)*)\)/g, '$1');
|
||||
|
||||
// Handle prime notation for post-state: currentTerm' → currentTerm_post (invariant comparison)
|
||||
e = e.replace(/\b(\w+)'/g, '$1_post');
|
||||
|
||||
// Handle -> as implication (after field access cleanup to avoid false matches)
|
||||
e = e.replace(/->/g, '=>');
|
||||
|
||||
// Handle implies(x, y) function call pattern
|
||||
e = e.replace(/implies\s*\(([^,)]+),\s*([^)]+)\)/g, '(=> $1 $2)');
|
||||
// Handle function calls: length(expr), min(a,b), etc.
|
||||
e = e.replace(/\blength\(([^)]+)\)/g, 'len__$1__xx'); // marker, fix later
|
||||
e = e.replace(/\bmin\(([^,)]+),\s*([^)]+)\)/g, 'min__$1__$2__xx');
|
||||
|
||||
// Field access: a.balance → balance (drop qualifier for bound forall vars)
|
||||
// For record fields accessed via dot, translate to Z3-safe names
|
||||
|
|
@ -478,6 +497,19 @@ function translateExpr(expr: string, stateVars: StateVar[], suffix: string): str
|
|||
// Convert infix to prefix
|
||||
e = convertToPrefix(e);
|
||||
|
||||
// Fix length marker: len__args__xx → Z3-compatible form
|
||||
// Use declared speckl_len functions since Z3 arrays don't have built-in length
|
||||
e = e.replace(/len__([^_]\S*?)__xx/g, (_, args) => {
|
||||
// Determine sort from context — default to Int array length
|
||||
return `(speckl_len_Int ${args})`;
|
||||
});
|
||||
e = e.replace(/min__([^_]\S*?)__([^_]\S*?)__xx/g, (_, a, b) => {
|
||||
return `(ite (<= ${a} ${b}) ${a} ${b})`;
|
||||
});
|
||||
|
||||
// Fix i-1 → (- i 1) in SMT-LIB2 (select indices)
|
||||
e = e.replace(/\b(\w+)-(\d+)\b/g, '(- $1 $2)');
|
||||
|
||||
// Restore operators to SMT-LIB2
|
||||
e = e.replace(/__EQ__/g, '=');
|
||||
e = e.replace(/__NE__/g, 'distinct');
|
||||
|
|
@ -487,6 +519,10 @@ function translateExpr(expr: string, stateVars: StateVar[], suffix: string): str
|
|||
// Wrap distinct
|
||||
e = e.replace(/\bdistinct\s+(\S+)\s+(\S+)/g, '(distinct $1 $2)');
|
||||
|
||||
// Fix remaining infix = that escaped convertToPrefix (e.g. inside => bodies)
|
||||
// Match: word = word or word = number, at any depth
|
||||
e = e.replace(/(?<!\(\w+)(?<!\(distinct)(?<!\(select)(?<!\(store)\b(\w+)\s*=\s*(\w+|\d+)\b(?!\s*\))/g, '(= $2 $3)');
|
||||
|
||||
// Restore strings
|
||||
e = restoreStrings(e, strings);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"@type": "prov:Generation",
|
||||
"prov:activity": {
|
||||
"@type": "prov:Activity",
|
||||
"prov:startTime": "2026-05-10T05:38:34.904Z"
|
||||
"prov:startTime": "2026-05-10T06:07:50.697Z"
|
||||
}
|
||||
},
|
||||
"rdfs:label": "RetryHandler",
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
"name": "Scott Scoble",
|
||||
"email": "scott@scoble.me"
|
||||
},
|
||||
"timestamp": "2026-05-10T05:38:34.907Z"
|
||||
"timestamp": "2026-05-10T06:07:50.700Z"
|
||||
},
|
||||
{
|
||||
"subject": "speck:RetryHandler",
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
"name": "Speckl Compiler",
|
||||
"email": "compiler@speckl.scoble.me"
|
||||
},
|
||||
"timestamp": "2026-05-10T05:38:34.907Z"
|
||||
"timestamp": "2026-05-10T06:07:50.700Z"
|
||||
},
|
||||
{
|
||||
"subject": "speck:RetryHandler",
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
"name": "Speckl Compiler",
|
||||
"email": "compiler@speckl.scoble.me"
|
||||
},
|
||||
"timestamp": "2026-05-10T05:38:34.907Z"
|
||||
"timestamp": "2026-05-10T06:07:50.700Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
"spdxVersion": "3.0.1",
|
||||
"dataLicense": "CC0-1.0",
|
||||
"creationInfo": {
|
||||
"created": "2026-05-10T05:38:34.908Z",
|
||||
"created": "2026-05-10T06:07:50.702Z",
|
||||
"createdBy": [
|
||||
"Organization: Speckl",
|
||||
"tool: speckl-compile-0.2.0"
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
"@type": "spdx:Tool",
|
||||
"name": "speckl-compile"
|
||||
},
|
||||
"timestamp": "2026-05-10T05:38:34.909Z",
|
||||
"timestamp": "2026-05-10T06:07:50.702Z",
|
||||
"comment": "Review type: manual"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue