lemmascript 0.2.0 → 0.3.1

package/tools/dist/lean-emit.js

@@ -51,7 +51,7 @@ function escapeName(name) {
 const PREC = {
     "→": 1, "∨": 2, "∧": 3,
     "=": 4, "≠": 4, "≥": 4, "≤": 4, ">": 4, "<": 4,
-    "+": 5, "-": 5, "*": 6, "/": 6, "%": 6,
+    "+": 5, "-": 5, "++": 5, "arrayConcat": 5, "*": 6, "/": 6, "%": 6,
 };
 function prec(op) { return PREC[op] ?? 10; }
 // ── Method call → Lean syntax ───────────────────────────────
@@ -143,7 +143,8 @@ function emitExpr(e, parentPrec) {
                 return `-${e.expr.value}`;
             return `(-${emitExpr(e.expr)})`;
         case "binop": {
-            const s = `${emitExpr(e.left, prec(e.op))} ${e.op} ${emitExpr(e.right, prec(e.op))}`;
+            const op = e.op === "arrayConcat" ? "++" : e.op;
+            const s = `${emitExpr(e.left, prec(e.op))} ${op} ${emitExpr(e.right, prec(e.op))}`;
             return (parentPrec !== undefined && prec(e.op) < parentPrec) ? `(${s})` : s;
         }
         case "implies": {
@@ -317,6 +318,9 @@ function emitDecl(d) {
                 lines.push(`deriving ${d.deriving.join(", ")}`);
             return lines.join("\n");
         }
+        case "type-alias": {
+            return `abbrev ${d.name} := ${tyToLean(d.target)}`;
+        }
         case "def": {
             const params = d.params.map(p => `(${escapeName(p.name)} : ${tyToLean(p.type)})`).join(" ");
             return `def ${d.name} ${params} : ${tyToLean(d.returnType)} :=\n${emitPureExpr(d.body, 1)}`;

package/tools/dist/lsc.js

@@ -9,7 +9,7 @@ import { existsSync } from "fs";
 import path from "path";
 import { extractModule } from "./extract.js";
 import { resolveModule } from "./resolve.js";
-import { transformModule, transformModuleDafny } from "./transform.js";
+import { transformModuleLean, transformModuleDafny } from "./transform.js";
 import { emitLeanFile } from "./lean-emit.js";
 import { emitDafnyFile } from "./dafny-emit.js";
 import { dafnyGen, dafnyCheckDiff, dafnyVerify, dafnyRegen } from "./dafny-commands.js";
@@ -17,7 +17,7 @@ import { leanGen, leanCheck } from "./lean-commands.js";
 function main() {
     const args = process.argv.slice(2);
     const backendIdx = args.findIndex(a => a.startsWith("--backend="));
-    let backend = "lean";
+    let backend = "dafny";
     if (backendIdx >= 0) {
         const val = args[backendIdx].split("=")[1];
         if (val !== "lean" && val !== "dafny") {
@@ -33,6 +33,12 @@ function main() {
         timeLimit = parseInt(args[timeLimitIdx].split("=")[1]);
         args.splice(timeLimitIdx, 1);
     }
+    const extraFlagsIdx = args.findIndex(a => a.startsWith("--extra-flags="));
+    let extraFlags;
+    if (extraFlagsIdx >= 0) {
+        extraFlags = args[extraFlagsIdx].split("=").slice(1).join("=");
+        args.splice(extraFlagsIdx, 1);
+    }
     const [cmd, filePath] = args;
     if (!cmd || !filePath) {
         console.error("Usage: lsc <gen|check|regen|extract> [--backend=lean|dafny] <file.ts>");
@@ -43,8 +49,25 @@ function main() {
         console.error(`File not found: ${absPath}`);
         process.exit(1);
     }
-    const project = new Project({ compilerOptions: { strict: true, target: ScriptTarget.ESNext, lib: ["lib.esnext.d.ts"] } });
+    // Find nearest tsconfig.json for import resolution; fall back to bare options
+    function findTsConfig(from) {
+        let dir = path.dirname(from);
+        while (true) {
+            const candidate = path.join(dir, "tsconfig.json");
+            if (existsSync(candidate))
+                return candidate;
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                return undefined;
+            dir = parent;
+        }
+    }
+    const tsConfigFilePath = findTsConfig(absPath);
+    const project = tsConfigFilePath
+        ? new Project({ tsConfigFilePath })
+        : new Project({ compilerOptions: { strict: true, target: ScriptTarget.ESNext, lib: ["lib.esnext.d.ts"] } });
     const sourceFile = project.addSourceFileAtPath(absPath);
+    project.resolveSourceFileDependencies();
     // Check //@ backend directive — skip if backend doesn't match
     const backendDirective = sourceFile.getFullText().match(/\/\/@ backend (\w+)/);
     if (backendDirective && backendDirective[1] !== backend) {
@@ -84,7 +107,7 @@ function main() {
             dafnyGen(genPath, dfyPath, text);
             if (!dafnyCheckDiff(genPath, dfyPath))
                 process.exit(1);
-            if (!dafnyVerify(dfyPath, dir, timeLimit))
+            if (!dafnyVerify(dfyPath, dir, timeLimit, extraFlags))
                 process.exit(1);
             return;
         }
@@ -98,7 +121,7 @@ function main() {
     // ── Lean backend ──────────────────────────────────────────
     const specPath = path.join(dir, `${base}.spec.lean`);
     const specImport = existsSync(specPath) ? `«${base}.spec»` : undefined;
-    const { typesFile, defFile } = transformModule(typed, specImport);
+    const { typesFile, defFile } = transformModuleLean(typed, specImport);
     const typesPath = typesFile ? path.join(dir, `${base}.types.lean`) : null;
     const typesText = typesFile ? emitLeanFile(typesFile) : null;
     const defPath = path.join(dir, `${base}.def.lean`);