From 613fec69d76cf7e5064260fcb5f97901c169e738 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 03:33:02 +0100 Subject: [PATCH 01/53] feat(DDM): Java code generator for dialects --- Strata/DDM/Integration/Java.lean | 7 + Strata/DDM/Integration/Java/Gen.lean | 497 ++++++++++++++++++ StrataMain.lean | 16 + StrataTest/DDM/Integration/Java/TestGen.lean | 340 ++++++++++++ .../DDM/Integration/Java/testdata/README.md | 28 + .../Java/testdata/Simple.dialect.st | 15 + .../Java/testdata/comprehensive.ion | Bin 0 -> 391 bytes Tools/Java/.gitignore | 6 + Tools/Java/regenerate-testdata.sh | 23 + .../com/strata/test/GenerateTestData.java | 37 ++ 10 files changed, 969 insertions(+) create mode 100644 Strata/DDM/Integration/Java.lean create mode 100644 Strata/DDM/Integration/Java/Gen.lean create mode 100644 StrataTest/DDM/Integration/Java/TestGen.lean create mode 100644 StrataTest/DDM/Integration/Java/testdata/README.md create mode 100644 StrataTest/DDM/Integration/Java/testdata/Simple.dialect.st create mode 100644 StrataTest/DDM/Integration/Java/testdata/comprehensive.ion create mode 100644 Tools/Java/.gitignore create mode 100755 Tools/Java/regenerate-testdata.sh create mode 100644 Tools/Java/src/main/java/com/strata/test/GenerateTestData.java diff --git a/Strata/DDM/Integration/Java.lean b/Strata/DDM/Integration/Java.lean new file mode 100644 index 000000000..deb694736 --- /dev/null +++ b/Strata/DDM/Integration/Java.lean @@ -0,0 +1,7 @@ +/- + Copyright Strata Contributors + + SPDX-License-Identifier: Apache-2.0 OR MIT +-/ + +import Strata.DDM.Integration.Java.Gen diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean new file mode 100644 index 000000000..fb4b76db9 --- /dev/null +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -0,0 +1,497 @@ +/- + Copyright Strata Contributors + + SPDX-License-Identifier: Apache-2.0 OR MIT +-/ + +import Strata.DDM.AST + +namespace Strata.Java + +open Strata (Dialect OpDecl ArgDecl ArgDeclKind QualifiedIdent SyntaxCat) + +/-! # Java Code Generator for DDM Dialects + +Generates Java source files from DDM dialect definitions: +- Sealed interfaces for categories with operators +- Non-sealed stub interfaces for abstract categories (e.g., Init.Expr) +- Record classes for operators +- Ion serializer for AST serialization + +All names are disambiguated to avoid collisions with Java reserved words, +base classes (Node, SourceRange), and each other. +-/ + +/-! ## Name Utilities -/ + +def javaReservedWords : Std.HashSet String := Std.HashSet.ofList [ + -- Reserved keywords + "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", + "class", "const", "continue", "default", "do", "double", "else", "enum", + "extends", "final", "finally", "float", "for", "goto", "if", "implements", + "import", "instanceof", "int", "interface", "long", "native", "new", + "package", "private", "protected", "public", "return", "short", "static", + "strictfp", "super", "switch", "synchronized", "this", "throw", "throws", + "transient", "try", "void", "volatile", "while", + -- Contextual keywords (restricted in some contexts) + "exports", "module", "non-sealed", "open", "opens", "permits", "provides", + "record", "sealed", "to", "transitive", "uses", "var", "when", "with", "yield", + -- Literals (cannot be used as identifiers) + "true", "false", "null", + -- Underscore (Java 9+) + "_" +] + +def escapeJavaName (name : String) : String := + -- Remove invalid characters (like ?) + let cleaned := String.ofList (name.toList.filter (fun c => c.isAlphanum || c == '_')) + let cleaned := if cleaned.isEmpty then "field" else cleaned + -- Add suffix if reserved word + if javaReservedWords.contains cleaned then cleaned ++ "_" else cleaned + +def toPascalCase (s : String) : String := + s.splitOn "_" + |>.filter (!·.isEmpty) + |>.map (fun part => match part.toList with + | [] => "" + | c :: cs => .ofList (c.toUpper :: cs)) + |> String.intercalate "" + +/-- Generate unique name by adding suffix if collision detected -/ +partial def disambiguate (base : String) (usedNames : Std.HashSet String) : String × Std.HashSet String := + let rec findUnused (n : Nat) : String := + let suffix := if n == 0 then "" else if n == 1 then "_" else s!"_{n}" + let candidate := base ++ suffix + if usedNames.contains candidate.toLower then findUnused (n + 1) else candidate + let name := findUnused 0 + (name, usedNames.insert name.toLower) + +/-! ## Type Mapping -/ + +inductive JavaType where + | simple (name : String) (boxed : Option String := none) + | array (elem : JavaType) + | optional (elem : JavaType) + | list (elem : JavaType) + deriving Inhabited + +mutual +def JavaType.toJava : JavaType → String + | .simple name _ => name + | .array elem => elem.toJava ++ "[]" + | .optional elem => s!"java.util.Optional<{elem.toJavaBoxed}>" + | .list elem => s!"java.util.List<{elem.toJavaBoxed}>" + +def JavaType.toJavaBoxed : JavaType → String + | .simple _ (some boxed) => boxed + | t => t.toJava +end + +partial def syntaxCatToJavaType (cat : SyntaxCat) : JavaType := + match cat.name with + | ⟨"Init", "Ident"⟩ => .simple "java.lang.String" + | ⟨"Init", "Num"⟩ => .simple "java.math.BigInteger" + | ⟨"Init", "Decimal"⟩ => .simple "java.math.BigDecimal" + | ⟨"Init", "Str"⟩ => .simple "java.lang.String" + | ⟨"Init", "ByteArray"⟩ => .array (.simple "byte" (some "java.lang.Byte")) + | ⟨"Init", "Bool"⟩ => .simple "boolean" (some "java.lang.Boolean") + | ⟨"Init", "Option"⟩ => + match cat.args[0]? with + | some inner => .optional (syntaxCatToJavaType inner) + | none => .optional (.simple "java.lang.Object") + | ⟨"Init", "Seq"⟩ | ⟨"Init", "CommaSepBy"⟩ => + match cat.args[0]? with + | some inner => .list (syntaxCatToJavaType inner) + | none => .list (.simple "java.lang.Object") + | ⟨"Init", "Expr"⟩ => .simple "Expr" + | ⟨"Init", "TypeExpr"⟩ => .simple "TypeExpr" + | ⟨"Init", "Type"⟩ => .simple "Type_" + | ⟨"Init", "TypeP"⟩ => .simple "TypeP" + | ⟨_, name⟩ => .simple (escapeJavaName (toPascalCase name)) + +def argDeclKindToJavaType : ArgDeclKind → JavaType + | .type _ => .simple "Expr" + | .cat c => syntaxCatToJavaType c + +/-- Extract the Java interface name from a SyntaxCat, or none if it maps to a primitive -/ +partial def syntaxCatToInterfaceName (cat : SyntaxCat) : Option String := + match cat.name with + -- Primitives map to Java types, no interface needed + | ⟨"Init", "Ident"⟩ | ⟨"Init", "Num"⟩ | ⟨"Init", "Decimal"⟩ + | ⟨"Init", "Str"⟩ | ⟨"Init", "ByteArray"⟩ | ⟨"Init", "Bool"⟩ => none + -- Containers - recurse into element type + | ⟨"Init", "Option"⟩ | ⟨"Init", "Seq"⟩ | ⟨"Init", "CommaSepBy"⟩ => + cat.args[0]?.bind syntaxCatToInterfaceName + -- Abstract Init categories (extension points for dialects) + | ⟨"Init", "Expr"⟩ => some "Expr" + | ⟨"Init", "TypeExpr"⟩ => some "TypeExpr" + | ⟨"Init", "Type"⟩ => some "Type_" + | ⟨"Init", "TypeP"⟩ => some "TypeP" + -- Other Init types are internal DDM machinery + | ⟨"Init", _⟩ => none + -- Dialect-defined categories + | ⟨_, name⟩ => some (escapeJavaName (toPascalCase name)) + +/-! ## Java Structures -/ + +structure JavaField where + name : String + type : JavaType + +structure JavaRecord where + name : String + operationName : QualifiedIdent + implements : String + fields : Array JavaField + +structure JavaInterface where + name : String + permits : Array String + +structure GeneratedFiles where + sourceRange : String + node : String + interfaces : Array (String × String) -- (filename, content) + records : Array (String × String) + builders : String × String -- (filename, content) + serializer : String + +structure NameAssignments where + categories : Std.HashMap QualifiedIdent String + operators : Std.HashMap (QualifiedIdent × String) String + stubs : Std.HashMap String String + +/-! ## Code Generation -/ + +def argDeclToJavaField (decl : ArgDecl) : JavaField := + { name := escapeJavaName decl.ident + type := argDeclKindToJavaType decl.kind } + +def JavaField.toParam (f : JavaField) : String := + s!"{f.type.toJava} {f.name}" + +def JavaRecord.toJava (package : String) (r : JavaRecord) : String := + let params := String.intercalate ", " (r.fields.toList.map JavaField.toParam) + let opName := s!"{r.operationName.dialect}.{r.operationName.name}" +s!"package {package}; + +public record {r.name}( + SourceRange sourceRange{if r.fields.isEmpty then "" else ",\n " ++ params} +) implements {r.implements} \{ + @Override + public java.lang.String operationName() \{ return \"{opName}\"; } +} +" + +def JavaInterface.toJava (package : String) (i : JavaInterface) : String := + let permits := if i.permits.isEmpty then "" + else " permits " ++ String.intercalate ", " i.permits.toList +s!"package {package}; + +public sealed interface {i.name} extends Node{permits} \{} +" + +def generateSourceRange (package : String) : String := +s!"package {package}; + +public record SourceRange(long start, long stop) \{ + public static final SourceRange NONE = new SourceRange(0, 0); +} +" + +def generateNodeInterface (package : String) (categories : List String) : String := + let permits := if categories.isEmpty then "" + else " permits " ++ String.intercalate ", " categories +s!"package {package}; + +public sealed interface Node{permits} \{ + SourceRange sourceRange(); + java.lang.String operationName(); +} +" + +/-- Generate non-sealed stub interface for a category with no operators -/ +def generateStubInterface (package : String) (name : String) : String × String := + (s!"{name}.java", s!"package {package};\n\npublic non-sealed interface {name} extends Node \{}\n") + +def generateSerializer (package : String) : String := +s!"package {package}; + +import com.amazon.ion.*; +import com.amazon.ion.system.*; + +public class IonSerializer \{ + private final IonSystem ion; + + public IonSerializer(IonSystem ion) \{ + this.ion = ion; + } + + /** Serialize a node as a top-level command (no \"op\" wrapper). */ + public IonValue serializeCommand(Node node) \{ + return serializeNode(node); + } + + /** Serialize a node as an argument (with \"op\" wrapper). */ + public IonValue serialize(Node node) \{ + return wrapOp(serializeNode(node)); + } + + private IonSexp serializeNode(Node node) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(node.operationName())); + sexp.add(serializeSourceRange(node.sourceRange())); + + for (var component : node.getClass().getRecordComponents()) \{ + if (component.getName().equals(\"sourceRange\")) continue; + try \{ + java.lang.Object value = component.getAccessor().invoke(node); + sexp.add(serializeArg(value, component.getType(), component.getGenericType())); + } catch (java.lang.Exception e) \{ + throw new java.lang.RuntimeException(\"Failed to serialize \" + component.getName(), e); + } + } + return sexp; + } + + private IonValue wrapOp(IonValue inner) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"op\")); + sexp.add(inner); + return sexp; + } + + private IonValue serializeSourceRange(SourceRange sr) \{ + if (sr.start() == 0 && sr.stop() == 0) \{ + return ion.newNull(); + } + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newInt(sr.start())); + sexp.add(ion.newInt(sr.stop())); + return sexp; + } + + private IonValue serializeArg(java.lang.Object value, java.lang.Class type, java.lang.reflect.Type genericType) \{ + if (value == null) \{ + return serializeOption(java.util.Optional.empty()); + } + if (value instanceof Node n) \{ + return serialize(n); + } + if (value instanceof java.lang.String s) \{ + return serializeIdent(s); + } + if (value instanceof java.math.BigInteger bi) \{ + return serializeNum(bi); + } + if (value instanceof java.math.BigDecimal bd) \{ + return serializeDecimal(bd); + } + if (value instanceof byte[] bytes) \{ + return serializeBytes(bytes); + } + if (value instanceof java.lang.Boolean b) \{ + return serializeBool(b); + } + if (value instanceof java.util.Optional opt) \{ + return serializeOption(opt); + } + if (value instanceof java.util.List list) \{ + return serializeSeq(list, genericType); + } + throw new java.lang.IllegalArgumentException(\"Unsupported type: \" + type); + } + + private IonValue serializeIdent(java.lang.String s) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"ident\")); + sexp.add(ion.newNull()); + sexp.add(ion.newString(s)); + return sexp; + } + + private IonValue serializeNum(java.math.BigInteger n) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"num\")); + sexp.add(ion.newNull()); + sexp.add(ion.newInt(n)); + return sexp; + } + + private IonValue serializeDecimal(java.math.BigDecimal d) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"decimal\")); + sexp.add(ion.newNull()); + sexp.add(ion.newDecimal(d)); + return sexp; + } + + private IonValue serializeBytes(byte[] bytes) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"bytes\")); + sexp.add(ion.newNull()); + sexp.add(ion.newBlob(bytes)); + return sexp; + } + + private IonValue serializeBool(boolean b) \{ + IonSexp inner = ion.newEmptySexp(); + inner.add(ion.newSymbol(b ? \"Init.boolTrue\" : \"Init.boolFalse\")); + inner.add(ion.newNull()); + return wrapOp(inner); + } + + private IonValue serializeOption(java.util.Optional opt) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"option\")); + sexp.add(ion.newNull()); + if (opt.isPresent()) \{ + sexp.add(serializeArg(opt.get(), opt.get().getClass(), opt.get().getClass())); + } + return sexp; + } + + private IonValue serializeSeq(java.util.List list, java.lang.reflect.Type genericType) \{ + IonSexp sexp = ion.newEmptySexp(); + sexp.add(ion.newSymbol(\"seq\")); + sexp.add(ion.newNull()); + for (java.lang.Object item : list) \{ + sexp.add(serializeArg(item, item.getClass(), item.getClass())); + } + return sexp; + } +} +" + +/-- Assign unique Java names to all generated types -/ +def assignAllNames (d : Dialect) : NameAssignments := + let baseNames : Std.HashSet String := Std.HashSet.ofList ["node", "sourcerange", "ionserializer"] + + -- Collect unique categories and referenced types + let init : Array QualifiedIdent × Std.HashSet String := (#[], {}) + let (cats, refs) := d.declarations.foldl (init := init) fun (cats, refs) decl => + match decl with + | .op op => + let cats := if cats.contains op.category then cats else cats.push op.category + let refs := op.argDecls.toArray.foldl (init := refs) fun refs arg => + match arg.kind with + | .type _ => refs.insert "Expr" + | .cat c => match syntaxCatToInterfaceName c with + | some name => refs.insert name + | none => refs + (cats, refs) + | _ => (cats, refs) + + -- Assign category names + let catInit : Std.HashMap QualifiedIdent String × Std.HashSet String := ({}, baseNames) + let (categoryNames, used) := cats.foldl (init := catInit) fun (map, used) cat => + let base := escapeJavaName (toPascalCase cat.name) + let (name, newUsed) := disambiguate base used + (map.insert cat name, newUsed) + + -- Assign operator names + let opInit : Std.HashMap (QualifiedIdent × String) String × Std.HashSet String := ({}, used) + let (operatorNames, used) := d.declarations.foldl (init := opInit) fun (map, used) decl => + match decl with + | .op op => + let base := escapeJavaName (toPascalCase op.name) + let (name, newUsed) := disambiguate base used + (map.insert (op.category, op.name) name, newUsed) + | _ => (map, used) + + -- Assign stub names (referenced types without operators) + let catNameSet := Std.HashSet.ofList (categoryNames.toList.map Prod.snd) + let stubInit : Std.HashMap String String × Std.HashSet String := ({}, used) + let (stubNames, _) := refs.toList.foldl (init := stubInit) fun (map, used) ref => + if catNameSet.contains ref then (map, used) + else + let (name, newUsed) := disambiguate ref used + (map.insert ref name, newUsed) + + { categories := categoryNames, operators := operatorNames, stubs := stubNames } + +/-- Group operators by their target category -/ +def groupOpsByCategory (d : Dialect) (names : NameAssignments) + : Std.HashMap QualifiedIdent (Array String) := + d.declarations.foldl (init := {}) fun acc decl => + match decl with + | .op op => + let javaName := names.operators.getD (op.category, op.name) "" + match acc[op.category]? with + | some ops => acc.insert op.category (ops.push javaName) + | none => acc.insert op.category #[javaName] + | _ => acc + +def opDeclToJavaRecord (dialectName : String) (names : NameAssignments) (op : OpDecl) + : JavaRecord := + { name := names.operators.getD (op.category, op.name) "" + operationName := ⟨dialectName, op.name⟩ + implements := names.categories.getD op.category "" + fields := op.argDecls.toArray.map argDeclToJavaField } + +def generateBuilders (package : String) (dialectName : String) (d : Dialect) (names : NameAssignments) : String := + let method (op : OpDecl) := + let fields := op.argDecls.toArray.map argDeclToJavaField + let (ps, as) := fields.foldl (init := (#[], #[])) fun (ps, as) f => + match f.type with + | .simple "java.math.BigInteger" _ => (ps.push s!"long {f.name}", as.push s!"java.math.BigInteger.valueOf({f.name})") + | .simple "java.math.BigDecimal" _ => (ps.push s!"double {f.name}", as.push s!"java.math.BigDecimal.valueOf({f.name})") + | t => (ps.push s!"{t.toJava} {f.name}", as.push f.name) + s!" public static {names.categories.getD op.category ""} {op.name}({", ".intercalate ps.toList}) \{ return new {names.operators.getD (op.category, op.name) ""}(SourceRange.NONE{if as.isEmpty then "" else ", " ++ ", ".intercalate as.toList}); }" + let methods := d.declarations.filterMap fun | .op op => some (method op) | _ => none + s!"package {package};\n\npublic class {dialectName} \{\n{"\n".intercalate methods.toList}\n}\n" + +def generateDialect (d : Dialect) (package : String) : GeneratedFiles := + let names := assignAllNames d + let opsByCategory := groupOpsByCategory d names + + -- Categories with operators get sealed interfaces with permits clauses + let sealedInterfaces := opsByCategory.toList.map fun (cat, ops) => + let name := names.categories.getD cat "" + let iface : JavaInterface := { name, permits := ops } + (s!"{name}.java", iface.toJava package) + + -- Stub interfaces for referenced types without operators + let stubInterfaces := names.stubs.toList.map fun (_, name) => + generateStubInterface package name + + -- Generate records for operators + let records := d.declarations.toList.filterMap fun decl => + match decl with + | .op op => + let name := names.operators.getD (op.category, op.name) "" + some (s!"{name}.java", (opDeclToJavaRecord d.name names op).toJava package) + | _ => none + + -- All interface names for Node permits clause + let allInterfaceNames := (sealedInterfaces ++ stubInterfaces).map (·.1.dropRight 5) + + { sourceRange := generateSourceRange package + node := generateNodeInterface package allInterfaceNames + interfaces := sealedInterfaces.toArray ++ stubInterfaces.toArray + records := records.toArray + builders := (s!"{d.name}.java", generateBuilders package d.name d names) + serializer := generateSerializer package } + +/-! ## File Output -/ + +def packageToPath (package : String) : System.FilePath := + let parts := package.splitOn "." + ⟨String.intercalate "/" parts⟩ + +def writeJavaFiles (baseDir : System.FilePath) (package : String) (files : GeneratedFiles) : IO Unit := do + let dir := baseDir / packageToPath package + IO.FS.createDirAll dir + + IO.FS.writeFile (dir / "SourceRange.java") files.sourceRange + IO.FS.writeFile (dir / "Node.java") files.node + IO.FS.writeFile (dir / "IonSerializer.java") files.serializer + IO.FS.writeFile (dir / files.builders.1) files.builders.2 + + for (filename, content) in files.interfaces do + IO.FS.writeFile (dir / filename) content + + for (filename, content) in files.records do + IO.FS.writeFile (dir / filename) content + +end Strata.Java diff --git a/StrataMain.lean b/StrataMain.lean index 54d994a3e..8145fcea5 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -10,6 +10,7 @@ import Strata.DDM.Ion import Strata.Util.IO import Strata.Languages.Python.Python +import Strata.DDM.Integration.Java.Gen import StrataTest.Transform.ProcedureInlining def exitFailure {α} (message : String) : IO α := do @@ -215,7 +216,22 @@ def pyAnalyzeCommand : Command where s := s ++ s!"\n{vcResult.obligation.label}: {Std.format vcResult.result}\n" IO.println s +def javaGenCommand : Command where + name := "javaGen" + args := [ "dialect-file", "package", "output-dir" ] + help := "Generate Java classes from a DDM dialect file." + callback := fun fm v => do + let (ld, pd) ← readFile fm v[0] + match pd with + | .dialect d => + let files := Strata.Java.generateDialect d v[1] + Strata.Java.writeJavaFiles v[2] v[1] files + IO.println s!"Generated Java files for {d.name} in {v[2]}/{Strata.Java.packageToPath v[1]}" + | .program _ => + exitFailure "Expected a dialect file, not a program file." + def commandList : List Command := [ + javaGenCommand, checkCommand, toIonCommand, printCommand, diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean new file mode 100644 index 000000000..943118a7b --- /dev/null +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -0,0 +1,340 @@ +/- + Copyright Strata Contributors + + SPDX-License-Identifier: Apache-2.0 OR MIT +-/ + +import Strata.DDM.Integration.Java +import Strata.DDM.Integration.Lean.Env -- For dialectExt +import Strata.Languages.Boogie.DDMTransform.Parse -- Loads Boogie dialect into env + +namespace Strata.Java.Test + +open Strata.Java + +def check (s sub : String) : Bool := (s.splitOn sub).length > 1 + +-- Test 1: Basic dialect with 2 operators +#eval do + let testDialect : Strata.Dialect := { + name := "Test" + imports := #[] + declarations := #[ + .syncat { name := "Expr", argNames := #[] }, + .op { + name := "literal" + argDecls := .ofArray #[ + { ident := "value", kind := .cat (.atom .none ⟨"Init", "Num"⟩) } + ] + category := ⟨"Test", "Expr"⟩ + syntaxDef := { atoms := #[], prec := 0 } + }, + .op { + name := "add" + argDecls := .ofArray #[ + { ident := "lhs", kind := .cat (.atom .none ⟨"Test", "Expr"⟩) }, + { ident := "rhs", kind := .cat (.atom .none ⟨"Test", "Expr"⟩) } + ] + category := ⟨"Test", "Expr"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + -- Expr interface should be generated (sealed, with operators) + assert! files.interfaces.any (fun i => check i.2 "sealed interface Expr") + assert! files.records.size = 2 + assert! files.records.any (fun r => check r.1 "Literal") + assert! files.records.any (fun r => check r.1 "Add") + pure () + +-- Test 2: Java reserved word escaping +#eval do + let testDialect : Strata.Dialect := { + name := "Reserved" + imports := #[] + declarations := #[ + .syncat { name := "Stmt", argNames := #[] }, + .op { + name := "int" -- lowercase reserved word that stays lowercase after PascalCase? No... + argDecls := .ofArray #[ + { ident := "public", kind := .cat (.atom .none ⟨"Init", "Ident"⟩) } + ] + category := ⟨"Reserved", "Stmt"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + -- Operator "int" -> "Int" (PascalCase, not reserved since Java is case-sensitive) + -- Field "public" -> "public_" (escaped reserved word) + assert! files.records.any (fun r => r.1 == "Int.java") + assert! files.records.any (fun r => check r.2 "public_") + pure () + +-- Test 3: Name collision (operator name matches category name) +#eval do + let testDialect : Strata.Dialect := { + name := "Collision" + imports := #[] + declarations := #[ + .syncat { name := "expr", argNames := #[] }, + .op { + name := "Expr" + argDecls := .ofArray #[] + category := ⟨"Collision", "expr"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + assert! files.interfaces.any (fun i => i.1 == "Expr.java") + assert! files.records.any (fun r => r.1 == "Expr_.java") + pure () + +-- Test 4: Duplicate operator names and reserved word collision +#eval do + let testDialect : Strata.Dialect := { + name := "Dup" + imports := #[] + declarations := #[ + .syncat { name := "A", argNames := #[] }, + .syncat { name := "B", argNames := #[] }, + .op { name := "foo", argDecls := .ofArray #[], category := ⟨"Dup", "A"⟩, syntaxDef := { atoms := #[], prec := 0 } }, + .op { name := "foo", argDecls := .ofArray #[], category := ⟨"Dup", "B"⟩, syntaxDef := { atoms := #[], prec := 0 } }, -- Duplicate + .op { name := "class", argDecls := .ofArray #[], category := ⟨"Dup", "A"⟩, syntaxDef := { atoms := #[], prec := 0 } }, + .op { name := "class_", argDecls := .ofArray #[], category := ⟨"Dup", "B"⟩, syntaxDef := { atoms := #[], prec := 0 } } -- Would clash after escaping + ] + } + let files := generateDialect testDialect "com.test" + let recordNames := files.records.map Prod.fst + -- All should be unique + assert! recordNames.toList.eraseDups.length == recordNames.size + pure () + +-- Test 5: Category name collides with base class +#eval do + let testDialect : Strata.Dialect := { + name := "Base" + imports := #[] + declarations := #[ + .syncat { name := "Node", argNames := #[] }, -- Collides with base class + .op { name := "leaf", argDecls := .ofArray #[], category := ⟨"Base", "Node"⟩, syntaxDef := { atoms := #[], prec := 0 } } + ] + } + let files := generateDialect testDialect "com.test" + let allNames := #["Node.java", "SourceRange.java"] ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst + -- All filenames should be unique + assert! allNames.toList.eraseDups.length == allNames.size + pure () + +-- Test 6: Snake_case to PascalCase conversion +#eval do + let testDialect : Strata.Dialect := { + name := "Snake" + imports := #[] + declarations := #[ + .syncat { name := "my_category", argNames := #[] }, + .op { + name := "my_operator" + argDecls := .ofArray #[] + category := ⟨"Snake", "my_category"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + assert! files.interfaces.any (fun i => i.1 == "MyCategory.java") + assert! files.records.any (fun r => r.1 == "MyOperator.java") + pure () + +-- Test 7: All DDM types map correctly +#eval! do + let testDialect : Strata.Dialect := { + name := "Types" + imports := #[] + declarations := #[ + .syncat { name := "Node", argNames := #[] }, + .op { + name := "allTypes" + argDecls := .ofArray #[ + { ident := "ident", kind := .cat (.atom .none ⟨"Init", "Ident"⟩) }, + { ident := "num", kind := .cat (.atom .none ⟨"Init", "Num"⟩) }, + { ident := "dec", kind := .cat (.atom .none ⟨"Init", "Decimal"⟩) }, + { ident := "str", kind := .cat (.atom .none ⟨"Init", "Str"⟩) }, + { ident := "b", kind := .cat (.atom .none ⟨"Init", "Bool"⟩) }, + { ident := "bytes", kind := .cat (.atom .none ⟨"Init", "ByteArray"⟩) }, + { ident := "opt", kind := .cat ⟨.none, ⟨"Init", "Option"⟩, #[.atom .none ⟨"Init", "Num"⟩]⟩ }, + { ident := "seq", kind := .cat ⟨.none, ⟨"Init", "Seq"⟩, #[.atom .none ⟨"Init", "Ident"⟩]⟩ } + ] + category := ⟨"Types", "Node"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + let record := files.records[0]!.2 + assert! check record "java.lang.String ident" + assert! check record "java.math.BigInteger num" + assert! check record "java.math.BigDecimal dec" + assert! check record "java.lang.String str" + assert! check record "boolean b" + assert! check record "byte[] bytes" + assert! check record "java.util.Optional opt" + assert! check record "java.util.List seq" + pure () + +-- Test 8: FQN usage (no imports that could conflict) +#eval! do + let testDialect : Strata.Dialect := { + name := "FQN" + imports := #[] + declarations := #[ + .syncat { name := "Node", argNames := #[] }, + .op { + name := "test" + argDecls := .ofArray #[] + category := ⟨"FQN", "Node"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + let record := files.records[0]!.2 + assert! !(check record "import java.") + assert! check record "java.lang.String operationName()" + pure () + +-- Test 9: Stub interfaces for referenced-but-empty categories +#eval do + let testDialect : Strata.Dialect := { + name := "Stub" + imports := #[] + declarations := #[ + .syncat { name := "Stmt", argNames := #[] }, + .op { + name := "eval" + argDecls := .ofArray #[ + { ident := "e", kind := .cat (.atom .none ⟨"Init", "Expr"⟩) } -- References Init.Expr + ] + category := ⟨"Stub", "Stmt"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + -- Stmt should be sealed (has operators) + assert! files.interfaces.any (fun i => check i.2 "sealed interface Stmt") + -- Expr should be non-sealed stub (referenced but no operators) + assert! files.interfaces.any (fun i => check i.2 "non-sealed interface Expr") + pure () + +-- Test 10: Real dialect - Boogie +elab "#testBoogie" : command => do + let env ← Lean.getEnv + let state := Strata.dialectExt.getState env + let some boogie := state.loaded.dialects["Boogie"]? + | Lean.logError "Boogie dialect not found" + return + let files := generateDialect boogie "com.strata.boogie" + if files.records.size < 30 then + Lean.logError s!"Expected 30+ records, got {files.records.size}" + if files.interfaces.size < 10 then + Lean.logError s!"Expected 10+ interfaces, got {files.interfaces.size}" + +#testBoogie + +-- Test 11: Generated Java compiles (requires javac) +#eval do + -- Check if javac is available (cross-platform) + let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } + if javacCheck.exitCode != 0 then + IO.println "Test 11 skipped: javac not found" + return + + -- Generate files for a test dialect + let testDialect : Strata.Dialect := { + name := "Compile" + imports := #[] + declarations := #[ + .syncat { name := "MyExpr", argNames := #[] }, + .op { + name := "num" + argDecls := .ofArray #[ + { ident := "value", kind := .cat (.atom .none ⟨"Init", "Num"⟩) } + ] + category := ⟨"Compile", "MyExpr"⟩ + syntaxDef := { atoms := #[], prec := 0 } + }, + .op { + name := "add" + argDecls := .ofArray #[ + { ident := "left", kind := .cat (.atom .none ⟨"Compile", "MyExpr"⟩) }, + { ident := "right", kind := .cat (.atom .none ⟨"Compile", "MyExpr"⟩) } + ] + category := ⟨"Compile", "MyExpr"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + + -- Write to temp directory + let dir := "/tmp/strata-java-test" + IO.FS.createDirAll (dir ++ "/com/test") + IO.FS.writeFile (dir ++ "/com/test/SourceRange.java") files.sourceRange + IO.FS.writeFile (dir ++ "/com/test/Node.java") files.node + for (name, content) in files.interfaces do + IO.FS.writeFile (dir ++ "/com/test/" ++ name) content + for (name, content) in files.records do + IO.FS.writeFile (dir ++ "/com/test/" ++ name) content + + -- Compile all generated files except IonSerializer + let fileNames := #["SourceRange.java", "Node.java"] + ++ files.interfaces.map Prod.fst + ++ files.records.map Prod.fst + let filePaths := fileNames.map (dir ++ "/com/test/" ++ ·) + + let result ← IO.Process.output { + cmd := "javac" + args := #["--enable-preview", "--release", "17"] ++ filePaths + } + + -- Cleanup + IO.FS.removeDirAll dir + + if result.exitCode != 0 then + IO.eprintln s!"javac failed:\n{result.stderr}" + assert! false + pure () + +-- Test 12: Roundtrip - verify Lean can read Java-generated Ion +def simpleDialect : Strata.Dialect := + let cat (d n : String) : Strata.SyntaxCat := ⟨.none, ⟨d, n⟩, #[]⟩ + let seq c : Strata.SyntaxCat := ⟨.none, ⟨"Init", "Seq"⟩, #[c]⟩ + let opt c : Strata.SyntaxCat := ⟨.none, ⟨"Init", "Option"⟩, #[c]⟩ + let arg n c : Strata.ArgDecl := { ident := n, kind := .cat c } + let op n args (c : Strata.QualifiedIdent) : Strata.Decl := + .op { name := n, argDecls := .ofArray args, category := c, syntaxDef := { atoms := #[], prec := 0 } } + { name := "Simple", imports := #[], declarations := #[ + .syncat { name := "Expr", argNames := #[] }, + op "num" #[arg "value" (cat "Init" "Num")] ⟨"Simple", "Expr"⟩, + op "add" #[arg "left" (cat "Simple" "Expr"), arg "right" (cat "Simple" "Expr")] ⟨"Simple", "Expr"⟩, + op "neg" #[arg "inner" (cat "Simple" "Expr")] ⟨"Simple", "Expr"⟩, + .syncat { name := "Stmt", argNames := #[] }, + op "print" #[arg "msg" (cat "Init" "Str")] ⟨"Simple", "Stmt"⟩, + op "assign" #[arg "name" (cat "Init" "Ident"), arg "value" (cat "Simple" "Expr")] ⟨"Simple", "Stmt"⟩, + op "block" #[arg "stmts" (seq (cat "Simple" "Stmt"))] ⟨"Simple", "Stmt"⟩, + op "ifStmt" #[arg "cond" (cat "Init" "Bool"), arg "then" (cat "Simple" "Stmt"), arg "else" (opt (cat "Simple" "Stmt"))] ⟨"Simple", "Stmt"⟩, + op "data" #[arg "bytes" (cat "Init" "ByteArray")] ⟨"Simple", "Stmt"⟩, + op "decimal" #[arg "value" (cat "Init" "Decimal")] ⟨"Simple", "Stmt"⟩ + ]} + +#eval do + let dm := Strata.DialectMap.ofList! [Strata.initDialect, simpleDialect] + let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive.ion" + match Strata.Program.fromIon dm "Simple" ionBytes with + | .error e => IO.eprintln s!"Roundtrip test failed: {e}"; assert! false + | .ok prog => assert! prog.commands.size == 1 + +end Strata.Java.Test diff --git a/StrataTest/DDM/Integration/Java/testdata/README.md b/StrataTest/DDM/Integration/Java/testdata/README.md new file mode 100644 index 000000000..a43d7bab4 --- /dev/null +++ b/StrataTest/DDM/Integration/Java/testdata/README.md @@ -0,0 +1,28 @@ +# Java Roundtrip Test Data + +`comprehensive.ion` is a Java-generated Ion file that tests all DDM types. + +## To regenerate + +From the repository root: + +```bash +cd Tools/Java +./regenerate-testdata.sh +``` + +This will: +1. Generate Java classes from `Simple.dialect.st` +2. Build and run `GenerateTestData.java` to produce `comprehensive.ion` +3. Clean up generated classes +4. Verify the output with Lean + +## What's tested + +The test file covers all DDM types in a single AST: +- Num, Str, Ident +- Bool (true and false) +- Decimal, ByteArray +- Option (some and none) +- Seq (with items and empty) +- Nested operations (3 levels deep) diff --git a/StrataTest/DDM/Integration/Java/testdata/Simple.dialect.st b/StrataTest/DDM/Integration/Java/testdata/Simple.dialect.st new file mode 100644 index 000000000..b4d3e7ea2 --- /dev/null +++ b/StrataTest/DDM/Integration/Java/testdata/Simple.dialect.st @@ -0,0 +1,15 @@ +dialect Simple; + +category Expr; +op num (value : Num) : Simple.Expr => value; +op add (left : Simple.Expr, right : Simple.Expr) : Simple.Expr => left "+" right; +op neg (inner : Simple.Expr) : Simple.Expr => "-" inner; + +category Stmt; +op print (msg : Str) : Simple.Stmt => "print" msg; +op assign (name : Ident, value : Simple.Expr) : Simple.Stmt => name ":=" value; +op block (stmts : Seq Simple.Stmt) : Simple.Stmt => "{" stmts "}"; +op ifStmt (cond : Bool, thenBranch : Simple.Stmt, elseBranch : Option Simple.Stmt) : Simple.Stmt => + "if" cond "then" thenBranch elseBranch; +op data (bytes : ByteArray) : Simple.Stmt => "data" bytes; +op decimal (value : Decimal) : Simple.Stmt => "decimal" value; diff --git a/StrataTest/DDM/Integration/Java/testdata/comprehensive.ion b/StrataTest/DDM/Integration/Java/testdata/comprehensive.ion new file mode 100644 index 0000000000000000000000000000000000000000..6ee448d58f3348a5812e65757b2b9873519ac940 GIT binary patch literal 391 zcmY+8Jx;?w5QSMvU>W}Z8!nIoZ~!D~a{(t_%!;+wV{arVgXKg5Vj)38L6ZU@BnpZY zG(p0G;6U~Wh?;^cz)FcDQLJX)H}5^o7a9BhA#b(#lVpt!d1?fqbVJ)av$z)sRw@fw zIfx^M$1-RRnH@#k^%L$eU!4@paf+{B^Xo@(y+T$RdFiruiv zPKRxdt?ZV^pdXRy zHcrC}0@M!mosl;<10P6poHcX~Hi^D8^c?5^(Q!j)9~U4u$z-1iA@zgt-Qyy>BF%6K u`bc}YY}5+0$gjS@RnRHYcU*%mu7mYVw)C}$TosWG=ppTz<1%wvX6%1m&1 | tail -1) + +echo "" +echo "Done! Regenerated $TESTDATA/comprehensive.ion" diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java new file mode 100644 index 000000000..ef95bcde1 --- /dev/null +++ b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java @@ -0,0 +1,37 @@ +package com.strata.test; + +import static com.strata.simple.Simple.*; +import com.strata.simple.*; +import com.amazon.ion.*; +import com.amazon.ion.system.*; +import java.io.*; +import java.util.*; + +/** Generates comprehensive.ion covering all DDM types. */ +public class GenerateTestData { + public static void main(String[] args) throws Exception { + var ion = IonSystemBuilder.standard().build(); + var serializer = new IonSerializer(ion); + + // AST covering: Num, Str, Ident, Bool, Decimal, ByteArray, Option, Seq, nesting + Node ast = block(List.of( + assign("x", add(num(1), neg(num(2)))), + print("hello"), + ifStmt(true, data(new byte[]{0x01, (byte)0xFF}), Optional.of(decimal(3.14))), + ifStmt(false, block(List.of()), Optional.empty()))); + + IonList program = ion.newEmptyList(); + IonSexp header = ion.newEmptySexp(); + header.add(ion.newSymbol("program")); + header.add(ion.newString("Simple")); + program.add(header); + program.add(serializer.serializeCommand(ast)); + + try (var out = new FileOutputStream(args[0])) { + var writer = IonBinaryWriterBuilder.standard().build(out); + program.writeTo(writer); + writer.close(); + } + System.out.println("Generated: " + args[0]); + } +} From f99ea87665a1fd4b53fe73112d41b9804656493b Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 03:37:13 +0100 Subject: [PATCH 02/53] docs: update module docstring to mention builders --- Strata/DDM/Integration/Java/Gen.lean | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index fb4b76db9..41d34bd30 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -16,7 +16,8 @@ Generates Java source files from DDM dialect definitions: - Sealed interfaces for categories with operators - Non-sealed stub interfaces for abstract categories (e.g., Init.Expr) - Record classes for operators -- Ion serializer for AST serialization +- Static factory methods for ergonomic AST construction +- Ion serializer for Lean interop All names are disambiguated to avoid collisions with Java reserved words, base classes (Node, SourceRange), and each other. From 780c78ea81bfa47e00f0a9296eb16545cb9cd6be Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 03:44:11 +0100 Subject: [PATCH 03/53] test: verify deserialized AST structure --- StrataTest/DDM/Integration/Java/TestGen.lean | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 943118a7b..37c90a666 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -335,6 +335,15 @@ def simpleDialect : Strata.Dialect := let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive.ion" match Strata.Program.fromIon dm "Simple" ionBytes with | .error e => IO.eprintln s!"Roundtrip test failed: {e}"; assert! false - | .ok prog => assert! prog.commands.size == 1 + | .ok prog => + -- Verify structure: 1 block command with 4 statements + assert! prog.commands.size == 1 + let cmd := prog.commands[0]! + assert! cmd.name == (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) + let arg := cmd.args[0]! + if let .seq _ stmts := arg then + assert! stmts.size == 4 + else + assert! false end Strata.Java.Test From e0b2bb55e63c3fee0369677032e0873c77b1e650 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 03:57:05 +0100 Subject: [PATCH 04/53] chore: remove redundant inline comments --- StrataTest/DDM/Integration/Java/TestGen.lean | 23 +++++--------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 37c90a666..f4aaa0c18 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -41,7 +41,6 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 ] } let files := generateDialect testDialect "com.test" - -- Expr interface should be generated (sealed, with operators) assert! files.interfaces.any (fun i => check i.2 "sealed interface Expr") assert! files.records.size = 2 assert! files.records.any (fun r => check r.1 "Literal") @@ -56,7 +55,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 declarations := #[ .syncat { name := "Stmt", argNames := #[] }, .op { - name := "int" -- lowercase reserved word that stays lowercase after PascalCase? No... + name := "int" argDecls := .ofArray #[ { ident := "public", kind := .cat (.atom .none ⟨"Init", "Ident"⟩) } ] @@ -66,8 +65,6 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 ] } let files := generateDialect testDialect "com.test" - -- Operator "int" -> "Int" (PascalCase, not reserved since Java is case-sensitive) - -- Field "public" -> "public_" (escaped reserved word) assert! files.records.any (fun r => r.1 == "Int.java") assert! files.records.any (fun r => check r.2 "public_") pure () @@ -108,7 +105,6 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } let files := generateDialect testDialect "com.test" let recordNames := files.records.map Prod.fst - -- All should be unique assert! recordNames.toList.eraseDups.length == recordNames.size pure () @@ -124,7 +120,6 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } let files := generateDialect testDialect "com.test" let allNames := #["Node.java", "SourceRange.java"] ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst - -- All filenames should be unique assert! allNames.toList.eraseDups.length == allNames.size pure () @@ -223,9 +218,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 ] } let files := generateDialect testDialect "com.test" - -- Stmt should be sealed (has operators) assert! files.interfaces.any (fun i => check i.2 "sealed interface Stmt") - -- Expr should be non-sealed stub (referenced but no operators) assert! files.interfaces.any (fun i => check i.2 "non-sealed interface Expr") pure () @@ -246,13 +239,11 @@ elab "#testBoogie" : command => do -- Test 11: Generated Java compiles (requires javac) #eval do - -- Check if javac is available (cross-platform) let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } if javacCheck.exitCode != 0 then IO.println "Test 11 skipped: javac not found" return - - -- Generate files for a test dialect + let testDialect : Strata.Dialect := { name := "Compile" imports := #[] @@ -288,21 +279,19 @@ elab "#testBoogie" : command => do IO.FS.writeFile (dir ++ "/com/test/" ++ name) content for (name, content) in files.records do IO.FS.writeFile (dir ++ "/com/test/" ++ name) content - - -- Compile all generated files except IonSerializer + let fileNames := #["SourceRange.java", "Node.java"] ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst let filePaths := fileNames.map (dir ++ "/com/test/" ++ ·) - + let result ← IO.Process.output { cmd := "javac" args := #["--enable-preview", "--release", "17"] ++ filePaths } - - -- Cleanup + IO.FS.removeDirAll dir - + if result.exitCode != 0 then IO.eprintln s!"javac failed:\n{result.stderr}" assert! false From da67291ddc60d1e8fa387a0a53af5e8f1dbeb309 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 04:04:49 +0100 Subject: [PATCH 05/53] refactor: use #load_dialect instead of inline dialect definition --- StrataTest/DDM/Integration/Java/TestGen.lean | 46 +++++++------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index f4aaa0c18..af681570e 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -298,41 +298,25 @@ elab "#testBoogie" : command => do pure () -- Test 12: Roundtrip - verify Lean can read Java-generated Ion -def simpleDialect : Strata.Dialect := - let cat (d n : String) : Strata.SyntaxCat := ⟨.none, ⟨d, n⟩, #[]⟩ - let seq c : Strata.SyntaxCat := ⟨.none, ⟨"Init", "Seq"⟩, #[c]⟩ - let opt c : Strata.SyntaxCat := ⟨.none, ⟨"Init", "Option"⟩, #[c]⟩ - let arg n c : Strata.ArgDecl := { ident := n, kind := .cat c } - let op n args (c : Strata.QualifiedIdent) : Strata.Decl := - .op { name := n, argDecls := .ofArray args, category := c, syntaxDef := { atoms := #[], prec := 0 } } - { name := "Simple", imports := #[], declarations := #[ - .syncat { name := "Expr", argNames := #[] }, - op "num" #[arg "value" (cat "Init" "Num")] ⟨"Simple", "Expr"⟩, - op "add" #[arg "left" (cat "Simple" "Expr"), arg "right" (cat "Simple" "Expr")] ⟨"Simple", "Expr"⟩, - op "neg" #[arg "inner" (cat "Simple" "Expr")] ⟨"Simple", "Expr"⟩, - .syncat { name := "Stmt", argNames := #[] }, - op "print" #[arg "msg" (cat "Init" "Str")] ⟨"Simple", "Stmt"⟩, - op "assign" #[arg "name" (cat "Init" "Ident"), arg "value" (cat "Simple" "Expr")] ⟨"Simple", "Stmt"⟩, - op "block" #[arg "stmts" (seq (cat "Simple" "Stmt"))] ⟨"Simple", "Stmt"⟩, - op "ifStmt" #[arg "cond" (cat "Init" "Bool"), arg "then" (cat "Simple" "Stmt"), arg "else" (opt (cat "Simple" "Stmt"))] ⟨"Simple", "Stmt"⟩, - op "data" #[arg "bytes" (cat "Init" "ByteArray")] ⟨"Simple", "Stmt"⟩, - op "decimal" #[arg "value" (cat "Init" "Decimal")] ⟨"Simple", "Stmt"⟩ - ]} +#load_dialect "testdata/Simple.dialect.st" -#eval do - let dm := Strata.DialectMap.ofList! [Strata.initDialect, simpleDialect] +elab "#testRoundtrip" : command => do + let env ← Lean.getEnv + let state := Strata.dialectExt.getState env + let some simple := state.loaded.dialects["Simple"]? + | Lean.logError "Simple dialect not found"; return + let dm := Strata.DialectMap.ofList! [Strata.initDialect, simple] let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive.ion" match Strata.Program.fromIon dm "Simple" ionBytes with - | .error e => IO.eprintln s!"Roundtrip test failed: {e}"; assert! false + | .error e => Lean.logError s!"Roundtrip test failed: {e}" | .ok prog => - -- Verify structure: 1 block command with 4 statements - assert! prog.commands.size == 1 + if prog.commands.size != 1 then Lean.logError "Expected 1 command"; return let cmd := prog.commands[0]! - assert! cmd.name == (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) - let arg := cmd.args[0]! - if let .seq _ stmts := arg then - assert! stmts.size == 4 - else - assert! false + if cmd.name != (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) then Lean.logError "Expected block command"; return + if let .seq _ stmts := cmd.args[0]! then + if stmts.size != 4 then Lean.logError s!"Expected 4 statements, got {stmts.size}" + else Lean.logError "Expected seq argument" + +#testRoundtrip end Strata.Java.Test From 67c170d973c5c4c1740da998d975cd84047e6960 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 04:12:17 +0100 Subject: [PATCH 06/53] fix: correct test 2 title --- StrataTest/DDM/Integration/Java/TestGen.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index af681570e..93a18066f 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -47,7 +47,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 assert! files.records.any (fun r => check r.1 "Add") pure () --- Test 2: Java reserved word escaping +-- Test 2: Reserved word escaping for fields #eval do let testDialect : Strata.Dialect := { name := "Reserved" From 8731075a1c5063f934ae7ba2a925709ae2665eb5 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 04:17:59 +0100 Subject: [PATCH 07/53] test: use Simple dialect for compile test, include builders --- StrataTest/DDM/Integration/Java/TestGen.lean | 52 ++++++-------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 93a18066f..35a3e82d1 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -238,50 +238,33 @@ elab "#testBoogie" : command => do #testBoogie -- Test 11: Generated Java compiles (requires javac) -#eval do +-- Test 12: Roundtrip - verify Lean can read Java-generated Ion +#load_dialect "testdata/Simple.dialect.st" + +elab "#testCompile" : command => do let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } if javacCheck.exitCode != 0 then - IO.println "Test 11 skipped: javac not found" + Lean.logInfo "Test 11 skipped: javac not found" return - let testDialect : Strata.Dialect := { - name := "Compile" - imports := #[] - declarations := #[ - .syncat { name := "MyExpr", argNames := #[] }, - .op { - name := "num" - argDecls := .ofArray #[ - { ident := "value", kind := .cat (.atom .none ⟨"Init", "Num"⟩) } - ] - category := ⟨"Compile", "MyExpr"⟩ - syntaxDef := { atoms := #[], prec := 0 } - }, - .op { - name := "add" - argDecls := .ofArray #[ - { ident := "left", kind := .cat (.atom .none ⟨"Compile", "MyExpr"⟩) }, - { ident := "right", kind := .cat (.atom .none ⟨"Compile", "MyExpr"⟩) } - ] - category := ⟨"Compile", "MyExpr"⟩ - syntaxDef := { atoms := #[], prec := 0 } - } - ] - } - let files := generateDialect testDialect "com.test" - - -- Write to temp directory + let env ← Lean.getEnv + let state := Strata.dialectExt.getState env + let some simple := state.loaded.dialects["Simple"]? + | Lean.logError "Simple dialect not found"; return + let files := generateDialect simple "com.test" + let dir := "/tmp/strata-java-test" IO.FS.createDirAll (dir ++ "/com/test") IO.FS.writeFile (dir ++ "/com/test/SourceRange.java") files.sourceRange IO.FS.writeFile (dir ++ "/com/test/Node.java") files.node + IO.FS.writeFile (dir ++ "/com/test/" ++ files.builders.1) files.builders.2 for (name, content) in files.interfaces do IO.FS.writeFile (dir ++ "/com/test/" ++ name) content for (name, content) in files.records do IO.FS.writeFile (dir ++ "/com/test/" ++ name) content - let fileNames := #["SourceRange.java", "Node.java"] - ++ files.interfaces.map Prod.fst + let fileNames := #["SourceRange.java", "Node.java", files.builders.1] + ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst let filePaths := fileNames.map (dir ++ "/com/test/" ++ ·) @@ -293,12 +276,9 @@ elab "#testBoogie" : command => do IO.FS.removeDirAll dir if result.exitCode != 0 then - IO.eprintln s!"javac failed:\n{result.stderr}" - assert! false - pure () + Lean.logError s!"javac failed:\n{result.stderr}" --- Test 12: Roundtrip - verify Lean can read Java-generated Ion -#load_dialect "testdata/Simple.dialect.st" +#testCompile elab "#testRoundtrip" : command => do let env ← Lean.getEnv From 98c3a4a83a3dc20a1a8ad7d8b1d3f9542726c437 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 04:50:39 +0100 Subject: [PATCH 08/53] fix: disambiguate builders filename to avoid collisions --- Strata/DDM/Integration/Java/Gen.lean | 49 +++++++++++++++------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index 41d34bd30..12b7490ab 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -51,7 +51,7 @@ def escapeJavaName (name : String) : String := if javaReservedWords.contains cleaned then cleaned ++ "_" else cleaned def toPascalCase (s : String) : String := - s.splitOn "_" + s.splitOn "_" |>.filter (!·.isEmpty) |>.map (fun part => match part.toList with | [] => "" @@ -118,7 +118,7 @@ def argDeclKindToJavaType : ArgDeclKind → JavaType partial def syntaxCatToInterfaceName (cat : SyntaxCat) : Option String := match cat.name with -- Primitives map to Java types, no interface needed - | ⟨"Init", "Ident"⟩ | ⟨"Init", "Num"⟩ | ⟨"Init", "Decimal"⟩ + | ⟨"Init", "Ident"⟩ | ⟨"Init", "Num"⟩ | ⟨"Init", "Decimal"⟩ | ⟨"Init", "Str"⟩ | ⟨"Init", "ByteArray"⟩ | ⟨"Init", "Bool"⟩ => none -- Containers - recurse into element type | ⟨"Init", "Option"⟩ | ⟨"Init", "Seq"⟩ | ⟨"Init", "CommaSepBy"⟩ => @@ -161,6 +161,7 @@ structure NameAssignments where categories : Std.HashMap QualifiedIdent String operators : Std.HashMap (QualifiedIdent × String) String stubs : Std.HashMap String String + builders : String /-! ## Code Generation -/ @@ -242,7 +243,7 @@ public class IonSerializer \{ IonSexp sexp = ion.newEmptySexp(); sexp.add(ion.newSymbol(node.operationName())); sexp.add(serializeSourceRange(node.sourceRange())); - + for (var component : node.getClass().getRecordComponents()) \{ if (component.getName().equals(\"sourceRange\")) continue; try \{ @@ -367,7 +368,7 @@ public class IonSerializer \{ /-- Assign unique Java names to all generated types -/ def assignAllNames (d : Dialect) : NameAssignments := let baseNames : Std.HashSet String := Std.HashSet.ofList ["node", "sourcerange", "ionserializer"] - + -- Collect unique categories and referenced types let init : Array QualifiedIdent × Std.HashSet String := (#[], {}) let (cats, refs) := d.declarations.foldl (init := init) fun (cats, refs) decl => @@ -382,14 +383,14 @@ def assignAllNames (d : Dialect) : NameAssignments := | none => refs (cats, refs) | _ => (cats, refs) - + -- Assign category names let catInit : Std.HashMap QualifiedIdent String × Std.HashSet String := ({}, baseNames) let (categoryNames, used) := cats.foldl (init := catInit) fun (map, used) cat => let base := escapeJavaName (toPascalCase cat.name) let (name, newUsed) := disambiguate base used (map.insert cat name, newUsed) - + -- Assign operator names let opInit : Std.HashMap (QualifiedIdent × String) String × Std.HashSet String := ({}, used) let (operatorNames, used) := d.declarations.foldl (init := opInit) fun (map, used) decl => @@ -399,20 +400,22 @@ def assignAllNames (d : Dialect) : NameAssignments := let (name, newUsed) := disambiguate base used (map.insert (op.category, op.name) name, newUsed) | _ => (map, used) - + -- Assign stub names (referenced types without operators) let catNameSet := Std.HashSet.ofList (categoryNames.toList.map Prod.snd) let stubInit : Std.HashMap String String × Std.HashSet String := ({}, used) - let (stubNames, _) := refs.toList.foldl (init := stubInit) fun (map, used) ref => + let (stubNames, used) := refs.toList.foldl (init := stubInit) fun (map, used) ref => if catNameSet.contains ref then (map, used) else let (name, newUsed) := disambiguate ref used (map.insert ref name, newUsed) - - { categories := categoryNames, operators := operatorNames, stubs := stubNames } + + let (buildersName, _) := disambiguate d.name used + + { categories := categoryNames, operators := operatorNames, stubs := stubNames, builders := buildersName } /-- Group operators by their target category -/ -def groupOpsByCategory (d : Dialect) (names : NameAssignments) +def groupOpsByCategory (d : Dialect) (names : NameAssignments) : Std.HashMap QualifiedIdent (Array String) := d.declarations.foldl (init := {}) fun acc decl => match decl with @@ -423,7 +426,7 @@ def groupOpsByCategory (d : Dialect) (names : NameAssignments) | none => acc.insert op.category #[javaName] | _ => acc -def opDeclToJavaRecord (dialectName : String) (names : NameAssignments) (op : OpDecl) +def opDeclToJavaRecord (dialectName : String) (names : NameAssignments) (op : OpDecl) : JavaRecord := { name := names.operators.getD (op.category, op.name) "" operationName := ⟨dialectName, op.name⟩ @@ -431,7 +434,7 @@ def opDeclToJavaRecord (dialectName : String) (names : NameAssignments) (op : Op fields := op.argDecls.toArray.map argDeclToJavaField } def generateBuilders (package : String) (dialectName : String) (d : Dialect) (names : NameAssignments) : String := - let method (op : OpDecl) := + let method (op : OpDecl) := let fields := op.argDecls.toArray.map argDeclToJavaField let (ps, as) := fields.foldl (init := (#[], #[])) fun (ps, as) f => match f.type with @@ -445,33 +448,33 @@ def generateBuilders (package : String) (dialectName : String) (d : Dialect) (na def generateDialect (d : Dialect) (package : String) : GeneratedFiles := let names := assignAllNames d let opsByCategory := groupOpsByCategory d names - + -- Categories with operators get sealed interfaces with permits clauses let sealedInterfaces := opsByCategory.toList.map fun (cat, ops) => let name := names.categories.getD cat "" let iface : JavaInterface := { name, permits := ops } (s!"{name}.java", iface.toJava package) - + -- Stub interfaces for referenced types without operators let stubInterfaces := names.stubs.toList.map fun (_, name) => generateStubInterface package name - + -- Generate records for operators let records := d.declarations.toList.filterMap fun decl => match decl with - | .op op => + | .op op => let name := names.operators.getD (op.category, op.name) "" some (s!"{name}.java", (opDeclToJavaRecord d.name names op).toJava package) | _ => none - + -- All interface names for Node permits clause let allInterfaceNames := (sealedInterfaces ++ stubInterfaces).map (·.1.dropRight 5) - + { sourceRange := generateSourceRange package node := generateNodeInterface package allInterfaceNames interfaces := sealedInterfaces.toArray ++ stubInterfaces.toArray records := records.toArray - builders := (s!"{d.name}.java", generateBuilders package d.name d names) + builders := (s!"{names.builders}.java", generateBuilders package names.builders d names) serializer := generateSerializer package } /-! ## File Output -/ @@ -483,15 +486,15 @@ def packageToPath (package : String) : System.FilePath := def writeJavaFiles (baseDir : System.FilePath) (package : String) (files : GeneratedFiles) : IO Unit := do let dir := baseDir / packageToPath package IO.FS.createDirAll dir - + IO.FS.writeFile (dir / "SourceRange.java") files.sourceRange IO.FS.writeFile (dir / "Node.java") files.node IO.FS.writeFile (dir / "IonSerializer.java") files.serializer IO.FS.writeFile (dir / files.builders.1) files.builders.2 - + for (filename, content) in files.interfaces do IO.FS.writeFile (dir / filename) content - + for (filename, content) in files.records do IO.FS.writeFile (dir / filename) content From b36929acf18fc3c8a6f40145cc813b5d272b8728 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 04:56:12 +0100 Subject: [PATCH 09/53] refactor: use get! and alter for cleaner lookups --- Strata/DDM/Integration/Java/Gen.lean | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index 12b7490ab..75b25a089 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -420,17 +420,15 @@ def groupOpsByCategory (d : Dialect) (names : NameAssignments) d.declarations.foldl (init := {}) fun acc decl => match decl with | .op op => - let javaName := names.operators.getD (op.category, op.name) "" - match acc[op.category]? with - | some ops => acc.insert op.category (ops.push javaName) - | none => acc.insert op.category #[javaName] + let javaName := names.operators[(op.category, op.name)]! + acc.alter op.category (fun ops? => some ((ops?.getD #[]).push javaName)) | _ => acc def opDeclToJavaRecord (dialectName : String) (names : NameAssignments) (op : OpDecl) : JavaRecord := - { name := names.operators.getD (op.category, op.name) "" + { name := names.operators[(op.category, op.name)]! operationName := ⟨dialectName, op.name⟩ - implements := names.categories.getD op.category "" + implements := names.categories[op.category]! fields := op.argDecls.toArray.map argDeclToJavaField } def generateBuilders (package : String) (dialectName : String) (d : Dialect) (names : NameAssignments) : String := @@ -441,7 +439,7 @@ def generateBuilders (package : String) (dialectName : String) (d : Dialect) (na | .simple "java.math.BigInteger" _ => (ps.push s!"long {f.name}", as.push s!"java.math.BigInteger.valueOf({f.name})") | .simple "java.math.BigDecimal" _ => (ps.push s!"double {f.name}", as.push s!"java.math.BigDecimal.valueOf({f.name})") | t => (ps.push s!"{t.toJava} {f.name}", as.push f.name) - s!" public static {names.categories.getD op.category ""} {op.name}({", ".intercalate ps.toList}) \{ return new {names.operators.getD (op.category, op.name) ""}(SourceRange.NONE{if as.isEmpty then "" else ", " ++ ", ".intercalate as.toList}); }" + s!" public static {names.categories[op.category]!} {op.name}({", ".intercalate ps.toList}) \{ return new {names.operators[(op.category, op.name)]!}(SourceRange.NONE{if as.isEmpty then "" else ", " ++ ", ".intercalate as.toList}); }" let methods := d.declarations.filterMap fun | .op op => some (method op) | _ => none s!"package {package};\n\npublic class {dialectName} \{\n{"\n".intercalate methods.toList}\n}\n" @@ -451,7 +449,7 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := -- Categories with operators get sealed interfaces with permits clauses let sealedInterfaces := opsByCategory.toList.map fun (cat, ops) => - let name := names.categories.getD cat "" + let name := names.categories[cat]! let iface : JavaInterface := { name, permits := ops } (s!"{name}.java", iface.toJava package) @@ -463,7 +461,7 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := let records := d.declarations.toList.filterMap fun decl => match decl with | .op op => - let name := names.operators.getD (op.category, op.name) "" + let name := names.operators[(op.category, op.name)]! some (s!"{name}.java", (opDeclToJavaRecord d.name names op).toJava package) | _ => none From 1404ab0658f65e69f1eea454038b801a2c88bba6 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Tue, 23 Dec 2025 16:04:51 +0100 Subject: [PATCH 10/53] fix: escape builder method names for Java reserved words --- Strata/DDM/Integration/Java/Gen.lean | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index 75b25a089..79d3ed59e 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -439,7 +439,8 @@ def generateBuilders (package : String) (dialectName : String) (d : Dialect) (na | .simple "java.math.BigInteger" _ => (ps.push s!"long {f.name}", as.push s!"java.math.BigInteger.valueOf({f.name})") | .simple "java.math.BigDecimal" _ => (ps.push s!"double {f.name}", as.push s!"java.math.BigDecimal.valueOf({f.name})") | t => (ps.push s!"{t.toJava} {f.name}", as.push f.name) - s!" public static {names.categories[op.category]!} {op.name}({", ".intercalate ps.toList}) \{ return new {names.operators[(op.category, op.name)]!}(SourceRange.NONE{if as.isEmpty then "" else ", " ++ ", ".intercalate as.toList}); }" + let methodName := escapeJavaName op.name + s!" public static {names.categories[op.category]!} {methodName}({", ".intercalate ps.toList}) \{ return new {names.operators[(op.category, op.name)]!}(SourceRange.NONE{if as.isEmpty then "" else ", " ++ ", ".intercalate as.toList}); }" let methods := d.declarations.filterMap fun | .op op => some (method op) | _ => none s!"package {package};\n\npublic class {dialectName} \{\n{"\n".intercalate methods.toList}\n}\n" From 4f9e8152176fcbdadd4dc6e00269410fee0fec63 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Wed, 24 Dec 2025 21:51:23 +0100 Subject: [PATCH 11/53] refactor: address PR #292 review comments - Use writeJavaFiles helper in Test 11 (keyboardDrummer) - Document Test 12's dependency on comprehensive.ion (keyboardDrummer) - Fail if javac not found instead of skip (keyboardDrummer) - Use panic! for malformed SyntaxCat (joehendrix) - Add doc comments to GeneratedFiles and NameAssignments (joehendrix) - Collect warnings for unsupported type/function declarations (joehendrix) --- Strata/DDM/Integration/Java/Gen.lean | 17 ++++++++++++++--- StrataTest/DDM/Integration/Java/TestGen.lean | 19 +++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index 79d3ed59e..978b192e8 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -99,11 +99,11 @@ partial def syntaxCatToJavaType (cat : SyntaxCat) : JavaType := | ⟨"Init", "Option"⟩ => match cat.args[0]? with | some inner => .optional (syntaxCatToJavaType inner) - | none => .optional (.simple "java.lang.Object") + | none => panic! "Init.Option requires a type argument" | ⟨"Init", "Seq"⟩ | ⟨"Init", "CommaSepBy"⟩ => match cat.args[0]? with | some inner => .list (syntaxCatToJavaType inner) - | none => .list (.simple "java.lang.Object") + | none => panic! "Init.Seq/CommaSepBy requires a type argument" | ⟨"Init", "Expr"⟩ => .simple "Expr" | ⟨"Init", "TypeExpr"⟩ => .simple "TypeExpr" | ⟨"Init", "Type"⟩ => .simple "Type_" @@ -149,6 +149,7 @@ structure JavaInterface where name : String permits : Array String +/-- All generated Java source files for a dialect. -/ structure GeneratedFiles where sourceRange : String node : String @@ -156,7 +157,9 @@ structure GeneratedFiles where records : Array (String × String) builders : String × String -- (filename, content) serializer : String + warnings : Array String := #[] -- Warnings about unsupported declarations +/-- Mapping from DDM names to disambiguated Java identifiers. -/ structure NameAssignments where categories : Std.HashMap QualifiedIdent String operators : Std.HashMap (QualifiedIdent × String) String @@ -448,6 +451,13 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := let names := assignAllNames d let opsByCategory := groupOpsByCategory d names + -- Collect warnings for unsupported declarations + let warnings := d.declarations.filterMap fun decl => + match decl with + | .type t => some s!"type declaration '{t.name}' is not supported in Java generation" + | .function f => some s!"function declaration '{f.name}' is not supported in Java generation" + | _ => none + -- Categories with operators get sealed interfaces with permits clauses let sealedInterfaces := opsByCategory.toList.map fun (cat, ops) => let name := names.categories[cat]! @@ -474,7 +484,8 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := interfaces := sealedInterfaces.toArray ++ stubInterfaces.toArray records := records.toArray builders := (s!"{names.builders}.java", generateBuilders package names.builders d names) - serializer := generateSerializer package } + serializer := generateSerializer package + warnings := warnings } /-! ## File Output -/ diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 35a3e82d1..52f7c41e6 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -238,13 +238,12 @@ elab "#testBoogie" : command => do #testBoogie -- Test 11: Generated Java compiles (requires javac) --- Test 12: Roundtrip - verify Lean can read Java-generated Ion #load_dialect "testdata/Simple.dialect.st" elab "#testCompile" : command => do let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } if javacCheck.exitCode != 0 then - Lean.logInfo "Test 11 skipped: javac not found" + Lean.logError "Test 11 failed: javac not found (required for CI)" return let env ← Lean.getEnv @@ -253,20 +252,14 @@ elab "#testCompile" : command => do | Lean.logError "Simple dialect not found"; return let files := generateDialect simple "com.test" - let dir := "/tmp/strata-java-test" - IO.FS.createDirAll (dir ++ "/com/test") - IO.FS.writeFile (dir ++ "/com/test/SourceRange.java") files.sourceRange - IO.FS.writeFile (dir ++ "/com/test/Node.java") files.node - IO.FS.writeFile (dir ++ "/com/test/" ++ files.builders.1) files.builders.2 - for (name, content) in files.interfaces do - IO.FS.writeFile (dir ++ "/com/test/" ++ name) content - for (name, content) in files.records do - IO.FS.writeFile (dir ++ "/com/test/" ++ name) content + let dir : System.FilePath := "/tmp/strata-java-test" + writeJavaFiles dir "com.test" files let fileNames := #["SourceRange.java", "Node.java", files.builders.1] ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst - let filePaths := fileNames.map (dir ++ "/com/test/" ++ ·) + let pkgDir := (dir / "com" / "test").toString + let filePaths := fileNames.map fun f => pkgDir ++ "/" ++ f let result ← IO.Process.output { cmd := "javac" @@ -280,6 +273,8 @@ elab "#testCompile" : command => do #testCompile +-- Test 12: Roundtrip - verify Lean can read Java-generated Ion +-- Depends on testdata/comprehensive.ion (generated by Tools/Java/regenerate-testdata.sh) elab "#testRoundtrip" : command => do let env ← Lean.getEnv let state := Strata.dialectExt.getState env From 775600cef142519bb197a52ee66a9dafc031ee3b Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Wed, 24 Dec 2025 21:56:20 +0100 Subject: [PATCH 12/53] fix: support qualified names with dotted identifiers PR #293 added dots to valid identifier characters, which broke qualified name resolution (e.g., 'Simple.Expr' was parsed as one identifier instead of dialect 'Simple' + name 'Expr'). Fix: In translateQualifiedIdent, split dotted identifiers on the first dot to extract dialect and name components. Also strip guillemets that the parser adds around special identifiers. --- Strata/DDM/Elab/Core.lean | 5 ++++- Strata/DDM/Integration/Java/Gen.lean | 3 +++ StrataTest/DDM/Integration/Java/TestGen.lean | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Strata/DDM/Elab/Core.lean b/Strata/DDM/Elab/Core.lean index be85629d8..72971fbb4 100644 --- a/Strata/DDM/Elab/Core.lean +++ b/Strata/DDM/Elab/Core.lean @@ -239,7 +239,10 @@ def translateQualifiedIdent (t : Tree) : MaybeQualifiedIdent := | q`Init.qualifiedIdentImplicit, 1 => Id.run do let .ident _ name := args[0] | return panic! "Expected ident" - .name name + let name := name.stripPrefix "«" |>.stripSuffix "»" + match name.splitOn "." with + | [dialect, rest] => .qid { dialect, name := rest } + | _ => .name name | q`Init.qualifiedIdentExplicit, 2 => Id.run do let .ident _ dialect := args[0] | return panic! "Expected ident" diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index 978b192e8..b5a7abe77 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -494,6 +494,9 @@ def packageToPath (package : String) : System.FilePath := ⟨String.intercalate "/" parts⟩ def writeJavaFiles (baseDir : System.FilePath) (package : String) (files : GeneratedFiles) : IO Unit := do + for warning in files.warnings do + IO.eprintln s!"Warning: {warning}" + let dir := baseDir / packageToPath package IO.FS.createDirAll dir diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 52f7c41e6..c87817dae 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -6,6 +6,7 @@ import Strata.DDM.Integration.Java import Strata.DDM.Integration.Lean.Env -- For dialectExt +import Strata.DDM.Integration.Lean.HashCommands -- For #load_dialect import Strata.Languages.Boogie.DDMTransform.Parse -- Loads Boogie dialect into env namespace Strata.Java.Test @@ -243,7 +244,7 @@ elab "#testBoogie" : command => do elab "#testCompile" : command => do let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } if javacCheck.exitCode != 0 then - Lean.logError "Test 11 failed: javac not found (required for CI)" + Lean.logError "Test 11 failed: javac not found" return let env ← Lean.getEnv From 22d07ed27870d8c0975e28ed35e28b84ff2e2062 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 2 Jan 2026 15:18:47 +0100 Subject: [PATCH 13/53] Add LaurelGrammar.st file --- .../Languages/Laurel/Grammar/LaurelGrammar.st | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Strata/Languages/Laurel/Grammar/LaurelGrammar.st diff --git a/Strata/Languages/Laurel/Grammar/LaurelGrammar.st b/Strata/Languages/Laurel/Grammar/LaurelGrammar.st new file mode 100644 index 000000000..b828d7dc6 --- /dev/null +++ b/Strata/Languages/Laurel/Grammar/LaurelGrammar.st @@ -0,0 +1,19 @@ +dialect Laurel; + + +// Boolean literals +type bool; +fn boolTrue : bool => "true"; +fn boolFalse : bool => "false"; + +category StmtExpr; +op literalBool (b: bool): StmtExpr => b; + +op assert (cond : StmtExpr) : StmtExpr => "assert " cond ";\n"; +op assume (cond : StmtExpr) : StmtExpr => "assume " cond ";\n"; +op block (stmts : Seq StmtExpr) : StmtExpr => @[prec(1000)] "{\n" stmts "}\n"; + +category Procedure; +op procedure (name : Ident, body : StmtExpr) : Procedure => "procedure " name "() " body:0; + +op program (staticProcedures: Seq Procedure): Command => staticProcedures; From cfc4a3a5d9a557c2c9f3aa3cf3b0b6f6d65f538f Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 5 Jan 2026 12:46:53 +0100 Subject: [PATCH 14/53] Add laurelVerify command --- .../Languages/Laurel/Grammar/LaurelGrammar.st | 8 +--- StrataMain.lean | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/Strata/Languages/Laurel/Grammar/LaurelGrammar.st b/Strata/Languages/Laurel/Grammar/LaurelGrammar.st index b828d7dc6..3c638618e 100644 --- a/Strata/Languages/Laurel/Grammar/LaurelGrammar.st +++ b/Strata/Languages/Laurel/Grammar/LaurelGrammar.st @@ -1,13 +1,7 @@ dialect Laurel; - -// Boolean literals -type bool; -fn boolTrue : bool => "true"; -fn boolFalse : bool => "false"; - category StmtExpr; -op literalBool (b: bool): StmtExpr => b; +op literalBool (b: Bool): StmtExpr => b; op assert (cond : StmtExpr) : StmtExpr => "assert " cond ";\n"; op assume (cond : StmtExpr) : StmtExpr => "assume " cond ";\n"; diff --git a/StrataMain.lean b/StrataMain.lean index 4ca5f57e9..cebd47539 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -13,6 +13,10 @@ import Strata.Languages.Python.Python import Strata.DDM.Integration.Java.Gen import StrataTest.Transform.ProcedureInlining +import Strata.Languages.Laurel.Grammar.LaurelGrammar +import Strata.Languages.Laurel.Grammar.ConcreteToAbstractTreeTranslator +import Strata.Languages.Laurel.LaurelToBoogieTranslator + def exitFailure {α} (message : String) : IO α := do IO.eprintln (message ++ "\n\nRun strata --help for additional help.") IO.Process.exit 1 @@ -229,6 +233,44 @@ def javaGenCommand : Command where | .program _ => exitFailure "Expected a dialect file, not a program file." +def readLaurelIon (bytes : ByteArray) : IO Strata.Program := do + -- Create a DialectMap with the Laurel dialect + let laurelDialect : Strata.Dialect := Laurel + let dialectMap := Strata.DialectMap.insert! {} laurelDialect + + -- Parse the Ion bytes to get a Strata.Program + match Strata.Program.fromIon dialectMap "Laurel" bytes with + | .ok p => pure p + | .error msg => exitFailure msg + +def laurelAnalyzeCommand : Command where + name := "laurelAnalyze" + args := [] + help := "Analyze a Laurel Ion program from stdin. Write diagnostics to stdout." + callback := fun _ _ => do + -- Read bytes from stdin + let stdinBytes ← (← IO.getStdin).readToEnd.map String.toUTF8 + + -- Parse Ion format + let strataProgram ← readLaurelIon stdinBytes + + -- Create input context for error reporting + let inputPath : System.FilePath := "" + let inputContext := Strata.Parser.stringInputContext inputPath "" + + -- Convert to Laurel.Program using parseProgram + let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataProgram) + if transErrors.size > 0 then + exitFailure s!"Translation errors: {transErrors}" + + -- Verify the program and get diagnostics + let solverName : String := "z3" + let diagnostics ← Laurel.verifyToDiagnostics solverName laurelProgram + + -- Print diagnostics to stdout + for diag in diagnostics do + IO.println s!"{diag.start.line}:{diag.start.column}-{diag.ending.line}:{diag.ending.column}: {diag.message}" + def commandList : List Command := [ javaGenCommand, checkCommand, @@ -237,6 +279,7 @@ def commandList : List Command := [ diffCommand, pyAnalyzeCommand, pyTranslateCommand, + laurelAnalyzeCommand, ] def commandMap : Std.HashMap String Command := From 705cfb47ecebe36784f7fcc7b52acd23c95475bf Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 5 Jan 2026 15:08:13 +0100 Subject: [PATCH 15/53] Fixes --- Strata/DDM/Ion.lean | 4 ++-- .../Laurel/Grammar/LaurelGrammar.lean | 24 +++---------------- StrataMain.lean | 7 ++---- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index dbee5acac..00601eda0 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -177,7 +177,7 @@ protected def asList (v : Ion SymbolId) : FromIonM { a : Array (Ion SymbolId) // match v with | .mk (.list args) => return .mk args (by simp; omega) - | _ => throw s!"Expected list" + | x => throw s!"Expected list but got {repr x}" protected def asSexp (name : String) (v : Ion SymbolId) : FromIonM ({ a : Array (Ion SymbolId) // a.size > 0 ∧ sizeOf a < sizeOf v}) := match v with @@ -278,7 +278,7 @@ def deserializeValue {α} (bs : ByteArray) (act : Ion SymbolId → FromIonM α) throw s!"Error reading Ion: {msg} (offset = {off})" | .ok a => pure a let .isTrue p := inferInstanceAs (Decidable (a.size = 1)) - | throw s!"Expected single Ion value." + | throw s!"Expected single Ion value. Instead of {repr a}" let entries := a[0] let .isTrue p := inferInstanceAs (Decidable (entries.size = 2)) | throw s!"Expected symbol table and value in dialect." diff --git a/Strata/Languages/Laurel/Grammar/LaurelGrammar.lean b/Strata/Languages/Laurel/Grammar/LaurelGrammar.lean index 860a5b675..81cdc79a3 100644 --- a/Strata/Languages/Laurel/Grammar/LaurelGrammar.lean +++ b/Strata/Languages/Laurel/Grammar/LaurelGrammar.lean @@ -7,25 +7,7 @@ -- Minimal Laurel dialect for AssertFalse example import Strata -#dialect -dialect Laurel; +namespace Strata +namespace Laurel - -// Boolean literals -type bool; -fn boolTrue : bool => "true"; -fn boolFalse : bool => "false"; - -category StmtExpr; -op literalBool (b: bool): StmtExpr => b; - -op assert (cond : StmtExpr) : StmtExpr => "assert " cond ";\n"; -op assume (cond : StmtExpr) : StmtExpr => "assume " cond ";\n"; -op block (stmts : Seq StmtExpr) : StmtExpr => @[prec(1000)] "{\n" stmts "}\n"; - -category Procedure; -op procedure (name : Ident, body : StmtExpr) : Procedure => "procedure " name "() " body:0; - -op program (staticProcedures: Seq Procedure): Command => staticProcedures; - -#end +#load_dialect "./LaurelGrammar.st" diff --git a/StrataMain.lean b/StrataMain.lean index cebd47539..10fe5f833 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -234,12 +234,9 @@ def javaGenCommand : Command where exitFailure "Expected a dialect file, not a program file." def readLaurelIon (bytes : ByteArray) : IO Strata.Program := do - -- Create a DialectMap with the Laurel dialect - let laurelDialect : Strata.Dialect := Laurel - let dialectMap := Strata.DialectMap.insert! {} laurelDialect -- Parse the Ion bytes to get a Strata.Program - match Strata.Program.fromIon dialectMap "Laurel" bytes with + match Strata.Program.fromIon Strata.Laurel.Laurel_map Strata.Laurel.Laurel.name bytes with | .ok p => pure p | .error msg => exitFailure msg @@ -249,7 +246,7 @@ def laurelAnalyzeCommand : Command where help := "Analyze a Laurel Ion program from stdin. Write diagnostics to stdout." callback := fun _ _ => do -- Read bytes from stdin - let stdinBytes ← (← IO.getStdin).readToEnd.map String.toUTF8 + let stdinBytes ← (← IO.getStdin).readBinToEnd -- Parse Ion format let strataProgram ← readLaurelIon stdinBytes From 28c581cfe7e76f387a62e0254ce41723432fae88 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 5 Jan 2026 15:25:02 +0100 Subject: [PATCH 16/53] Fix namespace --- StrataTest/Languages/Laurel/TestExamples.lean | 1 + 1 file changed, 1 insertion(+) diff --git a/StrataTest/Languages/Laurel/TestExamples.lean b/StrataTest/Languages/Laurel/TestExamples.lean index ada029a9b..abef555d4 100644 --- a/StrataTest/Languages/Laurel/TestExamples.lean +++ b/StrataTest/Languages/Laurel/TestExamples.lean @@ -15,6 +15,7 @@ import Strata.Languages.Laurel.LaurelToBoogieTranslator open StrataTest.Util open Strata +namespace Strata namespace Laurel From b73817547ab6169a36208ed4e74efdb72fd8fb38 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 5 Jan 2026 15:27:44 +0100 Subject: [PATCH 17/53] Fix concrete tree converter --- .../Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean index 937f39684..52505a8e2 100644 --- a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean +++ b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean @@ -64,16 +64,16 @@ def translateIdent (arg : Arg) : TransM Identifier := do def translateBool (arg : Arg) : TransM Bool := do match arg with | .expr (.fn _ name) => - if name == q`Laurel.boolTrue then + if name == q`Init.boolTrue then return true - else if name == q`Laurel.boolFalse then + else if name == q`Init.boolFalse then return false else TransM.error s!"translateBool expects boolTrue or boolFalse, got {repr name}" | .op op => - if op.name == q`Laurel.boolTrue then + if op.name == q`Init.boolTrue then return true - else if op.name == q`Laurel.boolFalse then + else if op.name == q`Init.boolFalse then return false else TransM.error s!"translateBool expects boolTrue or boolFalse, got {repr op.name}" From 9e5a509f9ac6f0a44127a28b6e82b77aa2beff51 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Tue, 6 Jan 2026 16:33:47 +0100 Subject: [PATCH 18/53] Add missing files to run regenerate-testdata.sh, and enable including lineoffsets when parsing Ion --- Strata/DDM/Ion.lean | 78 ++++++ StrataTest/DDM/Integration/Java/TestGen.lean | 62 ++++- .../Java/testdata/comprehensive-files.ion | Bin 0 -> 380 bytes Tools/Java/build.gradle.kts | 22 ++ Tools/Java/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + Tools/Java/gradlew | 252 ++++++++++++++++++ Tools/Java/gradlew.bat | 94 +++++++ Tools/Java/regenerate-testdata.sh | 4 +- Tools/Java/settings.gradle.kts | 1 + .../com/strata/test/GenerateTestData.java | 82 +++++- 11 files changed, 594 insertions(+), 8 deletions(-) create mode 100644 StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion create mode 100644 Tools/Java/build.gradle.kts create mode 100644 Tools/Java/gradle/wrapper/gradle-wrapper.jar create mode 100644 Tools/Java/gradle/wrapper/gradle-wrapper.properties create mode 100755 Tools/Java/gradlew create mode 100644 Tools/Java/gradlew.bat create mode 100644 Tools/Java/settings.gradle.kts diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index 00601eda0..e8bc7420e 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -1288,6 +1288,11 @@ instance : FromIon Dialect where end Dialect +structure StrataFile where + program : Program + lineOffsets : Array String.Pos.Raw + deriving Inhabited + namespace Program instance : CachedToIon Program where @@ -1327,5 +1332,78 @@ def fromIon (dialects : DialectMap) (dialect : DialectName) (bytes : ByteArray) if name != dialect then throw s!"{name} program found when {dialect} expected." fromIonFragment frag dialects dialect +/-- Parse line offsets from an Ion list of integers -/ +private def parseLineOffsets (v : Ion SymbolId) : FromIonM (Array String.Pos.Raw) := do + match v with + | .list offsets => + offsets.mapM fun offset => do + match offset.asNat? with + | some n => pure ⟨n⟩ + | none => throw s!"Expected line offset to be a nat, got {repr offset}" + | _ => throw "Expected line offsets to be a list" + +/-- Parse a list of StrataFile from Ion data. + Expected format: A list where each entry is a struct with: + - "program": the program data + - "lineOffsets": array of line offset positions +-/ +def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (List StrataFile) := do + let ctx ← + match Ion.deserialize bytes with + | .error (off, msg) => throw s!"Error reading Ion: {msg} (offset = {off})" + | .ok a => + if p : a.size = 1 then + pure a[0] + else + throw s!"Expected single Ion value" + + let .isTrue p := inferInstanceAs (Decidable (ctx.size = 2)) + | throw "Expected symbol table and value" + + let symbols ← + match SymbolTable.ofLocalSymbolTable ctx[0] with + | .error (p, msg) => throw s!"Error at {p}: {msg}" + | .ok symbols => pure symbols + + let ionCtx : FromIonContext := ⟨symbols⟩ + + -- Parse the main list + let ⟨filesList, _⟩ ← FromIonM.asList ctx[1]! ionCtx + + let tbl := symbols + let programId := tbl.symbolId! "program" + let lineOffsetsId := tbl.symbolId! "lineOffsets" + + filesList.toList.mapM fun fileEntry => do + let fields ← FromIonM.asStruct0 fileEntry ionCtx + + -- Find program data + let some (_, programData) := fields.find? (·.fst == programId) + | throw "Could not find 'program' field" + + -- Find lineOffsets data + let some (_, lineOffsetsData) := fields.find? (·.fst == lineOffsetsId) + | throw "Could not find 'lineOffsets' field" + + -- Parse the program + let ⟨programValues, _⟩ ← FromIonM.asList programData ionCtx + let .isTrue ne := inferInstanceAs (Decidable (programValues.size ≥ 1)) + | throw "Expected program header" + + let hdr ← Ion.Header.fromIon programValues[0] ionCtx + let dialect ← match hdr with + | .program name => pure name + | .dialect _ => throw "Expected program, not dialect" + + let frag : Ion.Fragment := { + symbols := symbols, + values := programValues, + offset := 1 + } + + let program ← fromIonFragment frag dialects dialect + let lineOffsets ← parseLineOffsets lineOffsetsData ionCtx + + pure { program := program, lineOffsets := lineOffsets } end Program diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index c87817dae..a027cc893 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -264,7 +264,7 @@ elab "#testCompile" : command => do let result ← IO.Process.output { cmd := "javac" - args := #["--enable-preview", "--release", "17"] ++ filePaths + args := filePaths -- #["--enable-preview", "--release", "17"] ++ } IO.FS.removeDirAll dir @@ -295,4 +295,64 @@ elab "#testRoundtrip" : command => do #testRoundtrip +-- Test 13: Roundtrip with fromIonFiles - verify Lean can read Java-generated Ion array format +-- Depends on testdata/comprehensive-files.ion (generated by Tools/Java/regenerate-testdata.sh) +elab "#testRoundtripFiles" : command => do + let env ← Lean.getEnv + let state := Strata.dialectExt.getState env + let some simple := state.loaded.dialects["Simple"]? + | Lean.logError "Simple dialect not found"; return + let dm := Strata.DialectMap.ofList! [Strata.initDialect, simple] + let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion" + match Strata.Program.fromIonFiles dm ionBytes with + | .error e => Lean.logError s!"Roundtrip files test failed: {e}" + | .ok files => + if files.length != 2 then + Lean.logError s!"Expected 2 files, got {files.length}" + return + + -- Check first file + let file1 := files[0]! + if file1.program.commands.size != 1 then + Lean.logError s!"File 1: Expected 1 command, got {file1.program.commands.size}" + return + let cmd1 := file1.program.commands[0]! + if cmd1.name != (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) then + Lean.logError "File 1: Expected block command"; return + if let .seq _ stmts := cmd1.args[0]! then + if stmts.size != 2 then + Lean.logError s!"File 1: Expected 2 statements, got {stmts.size}" + return + else + Lean.logError "File 1: Expected seq argument"; return + if file1.lineOffsets.size != 3 then + Lean.logError s!"File 1: Expected 3 line offsets, got {file1.lineOffsets.size}" + return + if file1.lineOffsets[0]!.byteIdx != 0 || file1.lineOffsets[1]!.byteIdx != 15 || file1.lineOffsets[2]!.byteIdx != 30 then + Lean.logError s!"File 1: Line offsets don't match expected values" + return + + -- Check second file + let file2 := files[1]! + if file2.program.commands.size != 1 then + Lean.logError s!"File 2: Expected 1 command, got {file2.program.commands.size}" + return + let cmd2 := file2.program.commands[0]! + if cmd2.name != (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) then + Lean.logError "File 2: Expected block command"; return + if let .seq _ stmts := cmd2.args[0]! then + if stmts.size != 3 then + Lean.logError s!"File 2: Expected 3 statements, got {stmts.size}" + return + else + Lean.logError "File 2: Expected seq argument"; return + if file2.lineOffsets.size != 4 then + Lean.logError s!"File 2: Expected 4 line offsets, got {file2.lineOffsets.size}" + return + if file2.lineOffsets[0]!.byteIdx != 0 || file2.lineOffsets[1]!.byteIdx != 20 || file2.lineOffsets[2]!.byteIdx != 45 || file2.lineOffsets[3]!.byteIdx != 70 then + Lean.logError s!"File 2: Line offsets don't match expected values" + return + +#testRoundtripFiles + end Strata.Java.Test diff --git a/StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion b/StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion new file mode 100644 index 0000000000000000000000000000000000000000..b9eb7fa84d37ca3a85a6faa20ead84b2c9071c7d GIT binary patch literal 380 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/Tools/Java/gradle/wrapper/gradle-wrapper.properties b/Tools/Java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..ca025c83a --- /dev/null +++ b/Tools/Java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Tools/Java/gradlew b/Tools/Java/gradlew new file mode 100755 index 000000000..f5feea6d6 --- /dev/null +++ b/Tools/Java/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Tools/Java/gradlew.bat b/Tools/Java/gradlew.bat new file mode 100644 index 000000000..9d21a2183 --- /dev/null +++ b/Tools/Java/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Tools/Java/regenerate-testdata.sh b/Tools/Java/regenerate-testdata.sh index 0e661d840..d531f3ff9 100755 --- a/Tools/Java/regenerate-testdata.sh +++ b/Tools/Java/regenerate-testdata.sh @@ -11,7 +11,7 @@ echo "=== Generating Java classes from dialect ===" (cd "$STRATA_ROOT" && lake exe strata javaGen "$TESTDATA/Simple.dialect.st" com.strata.simple "$STRATA_ROOT/Tools/Java/src/main/java") echo "=== Building and running test data generator ===" -./gradlew run -PmainClass=com.strata.test.GenerateTestData --args="$TESTDATA/comprehensive.ion" --quiet +./gradlew run --args="$TESTDATA/comprehensive.ion $TESTDATA/comprehensive-files.ion" --quiet echo "=== Cleaning up generated classes ===" rm -rf "$GEN_DIR" @@ -20,4 +20,4 @@ echo "=== Verifying with Lean ===" (cd "$STRATA_ROOT" && lake exe strata print --include "$TESTDATA" "$TESTDATA/comprehensive.ion" 2>&1 | tail -1) echo "" -echo "Done! Regenerated $TESTDATA/comprehensive.ion" +echo "Done! Regenerated $TESTDATA/comprehensive.ion and $TESTDATA/comprehensive-files.ion" diff --git a/Tools/Java/settings.gradle.kts b/Tools/Java/settings.gradle.kts new file mode 100644 index 000000000..336f96f02 --- /dev/null +++ b/Tools/Java/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "strata-java-tools" \ No newline at end of file diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java index ef95bcde1..f157ef91e 100644 --- a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java +++ b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java @@ -12,26 +12,98 @@ public class GenerateTestData { public static void main(String[] args) throws Exception { var ion = IonSystemBuilder.standard().build(); var serializer = new IonSerializer(ion); - + + // Generate comprehensive.ion (single program) + generateSingleProgram(ion, serializer, args[0]); + + // Generate comprehensive-files.ion (array of StrataFile) + if (args.length > 1) { + generateMultipleFiles(ion, serializer, args[1]); + } + } + + private static void generateSingleProgram(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { // AST covering: Num, Str, Ident, Bool, Decimal, ByteArray, Option, Seq, nesting Node ast = block(List.of( assign("x", add(num(1), neg(num(2)))), print("hello"), ifStmt(true, data(new byte[]{0x01, (byte)0xFF}), Optional.of(decimal(3.14))), ifStmt(false, block(List.of()), Optional.empty()))); - + IonList program = ion.newEmptyList(); IonSexp header = ion.newEmptySexp(); header.add(ion.newSymbol("program")); header.add(ion.newString("Simple")); program.add(header); program.add(serializer.serializeCommand(ast)); - - try (var out = new FileOutputStream(args[0])) { + + try (var out = new FileOutputStream(outPath)) { var writer = IonBinaryWriterBuilder.standard().build(out); program.writeTo(writer); writer.close(); } - System.out.println("Generated: " + args[0]); + System.out.println("Generated: " + outPath); + } + + private static void generateMultipleFiles(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { + // Create first program with 2 statements + Node ast1 = block(List.of( + assign("x", num(42)), + print("first file"))); + + IonList program1 = ion.newEmptyList(); + IonSexp header1 = ion.newEmptySexp(); + header1.add(ion.newSymbol("program")); + header1.add(ion.newString("Simple")); + program1.add(header1); + program1.add(serializer.serializeCommand(ast1)); + + // Line offsets for first file (simulating source at positions 0, 15, 30) + IonList lineOffsets1 = ion.newEmptyList(); + lineOffsets1.add(ion.newInt(0)); + lineOffsets1.add(ion.newInt(15)); + lineOffsets1.add(ion.newInt(30)); + + // Create second program with 3 statements + Node ast2 = block(List.of( + assign("y", add(num(1), num(2))), + print("second file"), + ifStmt(true, block(List.of()), Optional.empty()))); + + IonList program2 = ion.newEmptyList(); + IonSexp header2 = ion.newEmptySexp(); + header2.add(ion.newSymbol("program")); + header2.add(ion.newString("Simple")); + program2.add(header2); + program2.add(serializer.serializeCommand(ast2)); + + // Line offsets for second file (simulating source at positions 0, 20, 45, 70) + IonList lineOffsets2 = ion.newEmptyList(); + lineOffsets2.add(ion.newInt(0)); + lineOffsets2.add(ion.newInt(20)); + lineOffsets2.add(ion.newInt(45)); + lineOffsets2.add(ion.newInt(70)); + + // Create array of StrataFile structs + IonList files = ion.newEmptyList(); + + // First file entry + IonStruct file1 = ion.newEmptyStruct(); + file1.put("program", program1); + file1.put("lineOffsets", lineOffsets1); + files.add(file1); + + // Second file entry + IonStruct file2 = ion.newEmptyStruct(); + file2.put("program", program2); + file2.put("lineOffsets", lineOffsets2); + files.add(file2); + + try (var out = new FileOutputStream(outPath)) { + var writer = IonBinaryWriterBuilder.standard().build(out); + files.writeTo(writer); + writer.close(); + } + System.out.println("Generated: " + outPath); } } From 52e1f3fb91332a5ab0331c9b95783ca041e9811e Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Tue, 6 Jan 2026 16:40:37 +0100 Subject: [PATCH 19/53] Added filepaths as well --- Strata/DDM/Ion.lean | 11 ++++++++++- StrataTest/DDM/Integration/Java/TestGen.lean | 6 ++++++ .../main/java/com/strata/test/GenerateTestData.java | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index e8bc7420e..2c35b2828 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -1289,6 +1289,7 @@ instance : FromIon Dialect where end Dialect structure StrataFile where + filePath : String program : Program lineOffsets : Array String.Pos.Raw deriving Inhabited @@ -1371,12 +1372,17 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let ⟨filesList, _⟩ ← FromIonM.asList ctx[1]! ionCtx let tbl := symbols + let filePathId := tbl.symbolId! "filePath" let programId := tbl.symbolId! "program" let lineOffsetsId := tbl.symbolId! "lineOffsets" filesList.toList.mapM fun fileEntry => do let fields ← FromIonM.asStruct0 fileEntry ionCtx + -- Find file path + let some (_, filePathData) := fields.find? (·.fst == filePathId) + | throw "Could not find 'filePath' field" + -- Find program data let some (_, programData) := fields.find? (·.fst == programId) | throw "Could not find 'program' field" @@ -1385,6 +1391,9 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let some (_, lineOffsetsData) := fields.find? (·.fst == lineOffsetsId) | throw "Could not find 'lineOffsets' field" + -- Parse the file path + let filePath ← FromIonM.asString "filePath" filePathData ionCtx + -- Parse the program let ⟨programValues, _⟩ ← FromIonM.asList programData ionCtx let .isTrue ne := inferInstanceAs (Decidable (programValues.size ≥ 1)) @@ -1404,6 +1413,6 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let program ← fromIonFragment frag dialects dialect let lineOffsets ← parseLineOffsets lineOffsetsData ionCtx - pure { program := program, lineOffsets := lineOffsets } + pure { filePath := filePath, program := program, lineOffsets := lineOffsets } end Program diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index a027cc893..cf1b956e1 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -313,6 +313,9 @@ elab "#testRoundtripFiles" : command => do -- Check first file let file1 := files[0]! + if file1.filePath != "file1.st" then + Lean.logError s!"File 1: Expected path 'file1.st', got '{file1.filePath}'" + return if file1.program.commands.size != 1 then Lean.logError s!"File 1: Expected 1 command, got {file1.program.commands.size}" return @@ -334,6 +337,9 @@ elab "#testRoundtripFiles" : command => do -- Check second file let file2 := files[1]! + if file2.filePath != "file2.st" then + Lean.logError s!"File 2: Expected path 'file2.st', got '{file2.filePath}'" + return if file2.program.commands.size != 1 then Lean.logError s!"File 2: Expected 1 command, got {file2.program.commands.size}" return diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java index f157ef91e..c28dc45f9 100644 --- a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java +++ b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java @@ -89,12 +89,14 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize // First file entry IonStruct file1 = ion.newEmptyStruct(); + file1.put("filePath", ion.newString("file1.st")); file1.put("program", program1); file1.put("lineOffsets", lineOffsets1); files.add(file1); // Second file entry IonStruct file2 = ion.newEmptyStruct(); + file2.put("filePath", ion.newString("file2.st")); file2.put("program", program2); file2.put("lineOffsets", lineOffsets2); files.add(file2); From e2f5f476c35feceb440263668fa36bdcb46698e6 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 7 Jan 2026 12:54:54 +0100 Subject: [PATCH 20/53] Consume list of StrataFiles when consuming Laurel over ion --- StrataMain.lean | 58 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/StrataMain.lean b/StrataMain.lean index 10fe5f833..183f8e634 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -240,6 +240,12 @@ def readLaurelIon (bytes : ByteArray) : IO Strata.Program := do | .ok p => pure p | .error msg => exitFailure msg +def readLaurelIonFiles (bytes : ByteArray) : IO (List Strata.StrataFile) := do + -- Parse the Ion bytes to get a list of StrataFiles + match Strata.Program.fromIonFiles Strata.Laurel.Laurel_map bytes with + | .ok files => pure files + | .error msg => exitFailure msg + def laurelAnalyzeCommand : Command where name := "laurelAnalyze" args := [] @@ -248,21 +254,45 @@ def laurelAnalyzeCommand : Command where -- Read bytes from stdin let stdinBytes ← (← IO.getStdin).readBinToEnd - -- Parse Ion format - let strataProgram ← readLaurelIon stdinBytes - - -- Create input context for error reporting - let inputPath : System.FilePath := "" - let inputContext := Strata.Parser.stringInputContext inputPath "" - - -- Convert to Laurel.Program using parseProgram - let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataProgram) - if transErrors.size > 0 then - exitFailure s!"Translation errors: {transErrors}" - - -- Verify the program and get diagnostics + -- Parse Ion format to get list of StrataFiles + let strataFiles ← readLaurelIonFiles stdinBytes + + -- Process each file and combine results + let mut combinedProgram : Laurel.Program := { + staticProcedures := [] + staticFields := [] + types := [] + } + + for strataFile in strataFiles do + -- Create FileMap with the lineOffsets from the StrataFile + let fileMap : Lean.FileMap := { + source := "" -- Empty source as specified + positions := strataFile.lineOffsets + } + + -- Create input context for this file + let inputContext : Strata.Parser.InputContext := { + inputString := "" + fileName := strataFile.filePath + fileMap := fileMap + } + + -- Convert to Laurel.Program using parseProgram + let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataFile.program) + if transErrors.size > 0 then + exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" + + -- Combine with accumulated program + combinedProgram := { + staticProcedures := combinedProgram.staticProcedures ++ laurelProgram.staticProcedures + staticFields := combinedProgram.staticFields ++ laurelProgram.staticFields + types := combinedProgram.types ++ laurelProgram.types + } + + -- Verify the combined program and get diagnostics let solverName : String := "z3" - let diagnostics ← Laurel.verifyToDiagnostics solverName laurelProgram + let diagnostics ← Laurel.verifyToDiagnostics solverName combinedProgram -- Print diagnostics to stdout for diag in diagnostics do From ac9400bb97fe30efa55c63b59037fe00881fb4cc Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 7 Jan 2026 13:03:25 +0100 Subject: [PATCH 21/53] Remove lineOffsets from StrataFile --- Strata/DDM/Ion.lean | 22 +------------------ StrataMain.lean | 5 ++--- StrataTest/DDM/Integration/Java/TestGen.lean | 12 ---------- .../com/strata/test/GenerateTestData.java | 15 ------------- 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index 2c35b2828..ee98da97f 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -1291,7 +1291,6 @@ end Dialect structure StrataFile where filePath : String program : Program - lineOffsets : Array String.Pos.Raw deriving Inhabited namespace Program @@ -1333,20 +1332,10 @@ def fromIon (dialects : DialectMap) (dialect : DialectName) (bytes : ByteArray) if name != dialect then throw s!"{name} program found when {dialect} expected." fromIonFragment frag dialects dialect -/-- Parse line offsets from an Ion list of integers -/ -private def parseLineOffsets (v : Ion SymbolId) : FromIonM (Array String.Pos.Raw) := do - match v with - | .list offsets => - offsets.mapM fun offset => do - match offset.asNat? with - | some n => pure ⟨n⟩ - | none => throw s!"Expected line offset to be a nat, got {repr offset}" - | _ => throw "Expected line offsets to be a list" /-- Parse a list of StrataFile from Ion data. Expected format: A list where each entry is a struct with: - "program": the program data - - "lineOffsets": array of line offset positions -/ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (List StrataFile) := do let ctx ← @@ -1374,24 +1363,16 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let tbl := symbols let filePathId := tbl.symbolId! "filePath" let programId := tbl.symbolId! "program" - let lineOffsetsId := tbl.symbolId! "lineOffsets" filesList.toList.mapM fun fileEntry => do let fields ← FromIonM.asStruct0 fileEntry ionCtx - -- Find file path let some (_, filePathData) := fields.find? (·.fst == filePathId) | throw "Could not find 'filePath' field" - -- Find program data let some (_, programData) := fields.find? (·.fst == programId) | throw "Could not find 'program' field" - -- Find lineOffsets data - let some (_, lineOffsetsData) := fields.find? (·.fst == lineOffsetsId) - | throw "Could not find 'lineOffsets' field" - - -- Parse the file path let filePath ← FromIonM.asString "filePath" filePathData ionCtx -- Parse the program @@ -1411,8 +1392,7 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li } let program ← fromIonFragment frag dialects dialect - let lineOffsets ← parseLineOffsets lineOffsetsData ionCtx - pure { filePath := filePath, program := program, lineOffsets := lineOffsets } + pure { filePath := filePath, program := program } end Program diff --git a/StrataMain.lean b/StrataMain.lean index 183f8e634..9ba972307 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -265,10 +265,9 @@ def laurelAnalyzeCommand : Command where } for strataFile in strataFiles do - -- Create FileMap with the lineOffsets from the StrataFile let fileMap : Lean.FileMap := { - source := "" -- Empty source as specified - positions := strataFile.lineOffsets + source := "" + positions := Array.empty } -- Create input context for this file diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index cf1b956e1..f280e1349 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -328,12 +328,6 @@ elab "#testRoundtripFiles" : command => do return else Lean.logError "File 1: Expected seq argument"; return - if file1.lineOffsets.size != 3 then - Lean.logError s!"File 1: Expected 3 line offsets, got {file1.lineOffsets.size}" - return - if file1.lineOffsets[0]!.byteIdx != 0 || file1.lineOffsets[1]!.byteIdx != 15 || file1.lineOffsets[2]!.byteIdx != 30 then - Lean.logError s!"File 1: Line offsets don't match expected values" - return -- Check second file let file2 := files[1]! @@ -352,12 +346,6 @@ elab "#testRoundtripFiles" : command => do return else Lean.logError "File 2: Expected seq argument"; return - if file2.lineOffsets.size != 4 then - Lean.logError s!"File 2: Expected 4 line offsets, got {file2.lineOffsets.size}" - return - if file2.lineOffsets[0]!.byteIdx != 0 || file2.lineOffsets[1]!.byteIdx != 20 || file2.lineOffsets[2]!.byteIdx != 45 || file2.lineOffsets[3]!.byteIdx != 70 then - Lean.logError s!"File 2: Line offsets don't match expected values" - return #testRoundtripFiles diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java index c28dc45f9..5db8524a3 100644 --- a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java +++ b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java @@ -58,12 +58,6 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize program1.add(header1); program1.add(serializer.serializeCommand(ast1)); - // Line offsets for first file (simulating source at positions 0, 15, 30) - IonList lineOffsets1 = ion.newEmptyList(); - lineOffsets1.add(ion.newInt(0)); - lineOffsets1.add(ion.newInt(15)); - lineOffsets1.add(ion.newInt(30)); - // Create second program with 3 statements Node ast2 = block(List.of( assign("y", add(num(1), num(2))), @@ -77,13 +71,6 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize program2.add(header2); program2.add(serializer.serializeCommand(ast2)); - // Line offsets for second file (simulating source at positions 0, 20, 45, 70) - IonList lineOffsets2 = ion.newEmptyList(); - lineOffsets2.add(ion.newInt(0)); - lineOffsets2.add(ion.newInt(20)); - lineOffsets2.add(ion.newInt(45)); - lineOffsets2.add(ion.newInt(70)); - // Create array of StrataFile structs IonList files = ion.newEmptyList(); @@ -91,14 +78,12 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize IonStruct file1 = ion.newEmptyStruct(); file1.put("filePath", ion.newString("file1.st")); file1.put("program", program1); - file1.put("lineOffsets", lineOffsets1); files.add(file1); // Second file entry IonStruct file2 = ion.newEmptyStruct(); file2.put("filePath", ion.newString("file2.st")); file2.put("program", program2); - file2.put("lineOffsets", lineOffsets2); files.add(file2); try (var out = new FileOutputStream(outPath)) { From 8d10e11aac73d806133f29d658a7cf4d2a35487d Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 7 Jan 2026 14:26:21 +0100 Subject: [PATCH 22/53] Store source code byte offsets in the metadata instead of 2d positions --- Strata/DDM/AST.lean | 6 ++- Strata/DL/Imperative/MetaData.lean | 10 ++-- .../Boogie/DDMTransform/Translate.lean | 4 +- Strata/Languages/Boogie/Verifier.lean | 54 ++++++++++++++++--- .../ConcreteToAbstractTreeTranslator.lean | 4 +- .../Laurel/LaurelToBoogieTranslator.lean | 8 ++- StrataMain.lean | 5 +- StrataVerify.lean | 3 +- 8 files changed, 69 insertions(+), 25 deletions(-) diff --git a/Strata/DDM/AST.lean b/Strata/DDM/AST.lean index 4d01eef46..24b1d5dcb 100644 --- a/Strata/DDM/AST.lean +++ b/Strata/DDM/AST.lean @@ -26,6 +26,7 @@ theorem of_mem_pop {α} {a : α} {as : Array α} : a ∈ as.pop → a ∈ as := end Strata.Array namespace Strata +open Std (ToFormat Format format) abbrev DialectName := String @@ -320,7 +321,10 @@ structure SourceRange where start : String.Pos.Raw /-- One past the end of the range. -/ stop : String.Pos.Raw -deriving BEq, Inhabited, Repr +deriving DecidableEq, Inhabited, Repr + +instance : ToFormat SourceRange where + format fr := f!"{fr.start}-{fr.stop}" namespace SourceRange diff --git a/Strata/DL/Imperative/MetaData.lean b/Strata/DL/Imperative/MetaData.lean index f1f6726ea..aa7ca3ea3 100644 --- a/Strata/DL/Imperative/MetaData.lean +++ b/Strata/DL/Imperative/MetaData.lean @@ -6,6 +6,7 @@ import Strata.DL.Imperative.PureExpr import Strata.DL.Util.DecidableEq +import Strata.DDM.AST import Lean.Data.Position namespace Imperative @@ -67,19 +68,18 @@ instance [Repr P.Ident] : Repr (MetaDataElem.Field P) where inductive Uri where | file (path: String) - deriving DecidableEq + deriving DecidableEq, Repr instance : ToFormat Uri where format fr := match fr with | .file path => path structure FileRange where file: Uri - start: Lean.Position - ending: Lean.Position - deriving DecidableEq + range: Strata.SourceRange + deriving DecidableEq, Repr instance : ToFormat FileRange where - format fr := f!"{fr.file}:{fr.start}-{fr.ending}" + format fr := f!"{fr.file}:{fr.range}" /-- A metadata value, which can be either an expression, a message, or a fileRange -/ inductive MetaDataElem.Value (P : PureExpr) where diff --git a/Strata/Languages/Boogie/DDMTransform/Translate.lean b/Strata/Languages/Boogie/DDMTransform/Translate.lean index 1e0180a8b..28b0b4fdc 100644 --- a/Strata/Languages/Boogie/DDMTransform/Translate.lean +++ b/Strata/Languages/Boogie/DDMTransform/Translate.lean @@ -47,10 +47,8 @@ def TransM.error [Inhabited α] (msg : String) : TransM α := do def SourceRange.toMetaData (ictx : InputContext) (sr : SourceRange) : Imperative.MetaData Boogie.Expression := let file := ictx.fileName - let startPos := ictx.fileMap.toPosition sr.start - let endPos := ictx.fileMap.toPosition sr.stop let uri: Uri := .file file - let fileRangeElt := ⟨ MetaData.fileRange, .fileRange ⟨ uri, startPos, endPos ⟩ ⟩ + let fileRangeElt := ⟨ MetaData.fileRange, .fileRange ⟨ uri, sr.start, sr.stop ⟩ ⟩ #[fileRangeElt] def getOpMetaData (op : Operation) : TransM (Imperative.MetaData Boogie.Expression) := diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index f4b8e02c8..a7a86c0d0 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -17,6 +17,7 @@ import Strata.DL.SMT.CexParser namespace Strata.SMT.Encoder open Strata.SMT.Encoder +open Imperative (Uri) -- Derived from Strata.SMT.Encoder.encode. def encodeBoogie (ctx : Boogie.SMT.Context) (prelude : SolverM Unit) (ts : List Term) : @@ -143,13 +144,17 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (ans : String) open Imperative -def formatPositionMetaData [BEq P.Ident] [ToFormat P.Expr] (md : MetaData P): Option Format := do +def formatPositionMetaData [BEq P.Ident] [ToFormat P.Expr] + (files: Map Imperative.Uri Lean.FileMap) + (md : MetaData P): Option Format := do let fileRangeElem ← md.findElem MetaData.fileRange match fileRangeElem.value with - | .fileRange m => - let baseName := match m.file with + | .fileRange fileRange => + let fileMap := (files.find? fileRange.file).get! + let startPos := fileMap.toPosition fileRange.range.start + let baseName := match fileRange.file with | .file path => (path.splitToList (· == '/')).getLast! - return f!"{baseName}({m.start.line}, {m.start.column})" + return f!"{baseName}({startPos.line}, {startPos.column})" | _ => none structure VCResult where @@ -362,6 +367,34 @@ def verify else panic! s!"DDM Transform Error: {repr errors}" +/-- A diagnostic produced by analyzing a file -/ +structure DiagnosticModel where + fileRange : Imperative.FileRange + message : String + deriving Repr, BEq + +def toDiagnosticModel (vcr : Boogie.VCResult) : Option DiagnosticModel := do + -- Only create a diagnostic if the result is not .unsat (i.e., verification failed) + match vcr.result with + | .unsat => none -- Verification succeeded, no diagnostic + | result => + -- Extract file range from metadata + let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange + match fileRangeElem.value with + | .fileRange fileRange => + let message := match result with + | .sat _ => "assertion does not hold" + | .unknown => "assertion verification result is unknown" + | .err msg => s!"verification error: {msg}" + | _ => "verification failed" + + some { + -- Subtract headerOffset to account for program header we added + fileRange := fileRange + message := message + } + | _ => none + /-- A diagnostic produced by analyzing a file -/ structure Diagnostic where start : Lean.Position @@ -369,7 +402,8 @@ structure Diagnostic where message : String deriving Repr, BEq -def toDiagnostic (vcr : Boogie.VCResult) : Option Diagnostic := do + +def toDiagnostic (files: Map Imperative.Uri Lean.FileMap) (vcr : Boogie.VCResult) : Option Diagnostic := do -- Only create a diagnostic if the result is not .unsat (i.e., verification failed) match vcr.result with | .unsat => none -- Verification succeeded, no diagnostic @@ -377,16 +411,20 @@ def toDiagnostic (vcr : Boogie.VCResult) : Option Diagnostic := do -- Extract file range from metadata let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange match fileRangeElem.value with - | .fileRange range => + | .fileRange fileRange => let message := match result with | .sat _ => "assertion does not hold" | .unknown => "assertion verification result is unknown" | .err msg => s!"verification error: {msg}" | _ => "verification failed" + + let fileMap := (files.find? fileRange.file).get! + let startPos := fileMap.toPosition fileRange.range.start + let endPos := fileMap.toPosition fileRange.range.stop some { -- Subtract headerOffset to account for program header we added - start := { line := range.start.line, column := range.start.column } - ending := { line := range.ending.line, column := range.ending.column } + start := { line := startPos.line, column := startPos.column } + ending := { line := endPos.line, column := endPos.column } message := message } | _ => none diff --git a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean index 52505a8e2..f2663b3f9 100644 --- a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean +++ b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean @@ -34,10 +34,8 @@ def TransM.error [Inhabited α] (msg : String) : TransM α := do def SourceRange.toMetaData (ictx : InputContext) (sr : SourceRange) : Imperative.MetaData Boogie.Expression := let file := ictx.fileName - let startPos := ictx.fileMap.toPosition sr.start - let endPos := ictx.fileMap.toPosition sr.stop let uri : Uri := .file file - let fileRangeElt := ⟨ Imperative.MetaDataElem.Field.label "fileRange", .fileRange ⟨ uri, startPos, endPos ⟩ ⟩ + let fileRangeElt := ⟨ Imperative.MetaDataElem.Field.label "fileRange", .fileRange ⟨ uri, sr.start, sr.stop ⟩ ⟩ #[fileRangeElt] def getArgMetaData (arg : Arg) : TransM (Imperative.MetaData Boogie.Expression) := diff --git a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean index 06921f0b6..4e60706df 100644 --- a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean +++ b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean @@ -82,8 +82,12 @@ def verifyToVcResults (smtsolver : String) (program : Program) EIO.toIO (fun f => IO.Error.userError (toString f)) (Boogie.verify smtsolver boogieProgram options) -def verifyToDiagnostics (smtsolver : String) (program : Program): IO (Array Diagnostic) := do +def verifyToDiagnostics (smtsolver : String) (files: Map Imperative.Uri Lean.FileMap) (program : Program): IO (Array Diagnostic) := do let results <- verifyToVcResults smtsolver program - return results.filterMap toDiagnostic + return results.filterMap (toDiagnostic files) + +def verifyToDiagnosticsModel (smtsolver : String) (program : Program): IO (Array DiagnosticModel) := do + let results <- verifyToVcResults smtsolver program + return results.filterMap toDiagnosticModel end Laurel diff --git a/StrataMain.lean b/StrataMain.lean index 9ba972307..01679c19f 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -291,11 +291,12 @@ def laurelAnalyzeCommand : Command where -- Verify the combined program and get diagnostics let solverName : String := "z3" - let diagnostics ← Laurel.verifyToDiagnostics solverName combinedProgram + + let diagnostics ← Laurel.verifyToDiagnosticsModel solverName combinedProgram -- Print diagnostics to stdout for diag in diagnostics do - IO.println s!"{diag.start.line}:{diag.start.column}-{diag.ending.line}:{diag.ending.column}: {diag.message}" + IO.println s!"{repr diag.fileRange.file}:{diag.fileRange.range.start}-{diag.fileRange.range.stop}: {diag.message}" def commandList : List Command := [ javaGenCommand, diff --git a/StrataVerify.lean b/StrataVerify.lean index 65f71a6a0..3bd5afb05 100644 --- a/StrataVerify.lean +++ b/StrataVerify.lean @@ -58,6 +58,7 @@ def main (args : List String) : IO UInt32 := do | .ok (opts, file) => do let text ← Strata.Util.readInputSource file let inputCtx := Lean.Parser.mkInputContext text (Strata.Util.displayName file) + let files := Map.insert Map.empty (Imperative.Uri.file file) inputCtx.fileMap let dctx := Elab.LoadedDialects.builtin let dctx := dctx.addDialect! Boogie let dctx := dctx.addDialect! C_Simp @@ -87,7 +88,7 @@ def main (args : List String) : IO UInt32 := do else verify "z3" pgm inputCtx opts for vcResult in vcResults do - let posStr := match Boogie.formatPositionMetaData vcResult.obligation.metadata with + let posStr := match Boogie.formatPositionMetaData files vcResult.obligation.metadata with | .none => "" | .some str => s!"{str}" println! f!"{posStr} [{vcResult.obligation.label}]: {vcResult.result}" From e2715f1d6d1ca4332fbbbd2c9784328ecad7a554 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 7 Jan 2026 14:42:18 +0100 Subject: [PATCH 23/53] Fix printed filepath --- StrataMain.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StrataMain.lean b/StrataMain.lean index 01679c19f..904edb2b0 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -296,7 +296,7 @@ def laurelAnalyzeCommand : Command where -- Print diagnostics to stdout for diag in diagnostics do - IO.println s!"{repr diag.fileRange.file}:{diag.fileRange.range.start}-{diag.fileRange.range.stop}: {diag.message}" + IO.println s!"{Std.format diag.fileRange.file}:{diag.fileRange.range.start}-{diag.fileRange.range.stop}: {diag.message}" def commandList : List Command := [ javaGenCommand, From 9e7994dbb1401072f89858782bbe7dc2f1bf3d01 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 7 Jan 2026 17:39:19 +0100 Subject: [PATCH 24/53] Fixes --- StrataMain.lean | 3 ++- .../Java/testdata/comprehensive-files.ion | Bin 380 -> 381 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/StrataMain.lean b/StrataMain.lean index 904edb2b0..f14720f43 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -18,7 +18,7 @@ import Strata.Languages.Laurel.Grammar.ConcreteToAbstractTreeTranslator import Strata.Languages.Laurel.LaurelToBoogieTranslator def exitFailure {α} (message : String) : IO α := do - IO.eprintln (message ++ "\n\nRun strata --help for additional help.") + IO.eprintln ("Exception: " ++ message ++ "\n\nRun strata --help for additional help.") IO.Process.exit 1 namespace Strata @@ -295,6 +295,7 @@ def laurelAnalyzeCommand : Command where let diagnostics ← Laurel.verifyToDiagnosticsModel solverName combinedProgram -- Print diagnostics to stdout + IO.println s!"==== DIAGNOSTICS ====" for diag in diagnostics do IO.println s!"{Std.format diag.fileRange.file}:{diag.fileRange.range.start}-{diag.fileRange.range.stop}: {diag.message}" diff --git a/StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion b/StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion index b9eb7fa84d37ca3a85a6faa20ead84b2c9071c7d..9361a13ce64c5acb074df7aa64b5dc3a36637874 100644 GIT binary patch delta 270 zcmeyv^p{EU0VBh!cZ@xa&G#7F+xIaxccf+Jqy{9GWK0zBnV4Zv|NP#yF0h!PUU5nH zzLO^lx!Zy>a|?1(&+RSb;Xk*dkeC15tU|tX(+c_dj}{8>H&&b}OyD{7sa z4wRc*D9nGZ4=CA{mRVF>q5!hv9%B#0U?Z@>|B(#-3^Mo~$lwi`K;3I#CRd(Y2;|N! z6yZmCVZ_OZ87nD^4vbo|tM-|M=eJu6-v@ z7IL)(XXX~HytQ9 zxloAzTpv)fD=o9AxI`f>GbeTORs}_VMY(&7-Cg_sBboXcWa>MRsT+Vg*T77zOg*;{ z$e&v%!jEh|BQl5S+zgLNWeRg}lds W799rKbGT5PfAV$(MG-|^MK=Ij0Bo-S From c3aec77199b84f49d29b860d1e83417cedcb47c0 Mon Sep 17 00:00:00 2001 From: Fabio Madge Date: Wed, 7 Jan 2026 19:30:53 +0100 Subject: [PATCH 25/53] fix: address PR review comments - Fail on Init.TypeExpr (internal DDM machinery) - Fail on type/function declarations instead of warning - Remove warnings mechanism from GeneratedFiles - Fix cross-dialect category collision (A.Num vs B.Num) - Track QualifiedIdent instead of String for refs - Prefix with dialect name when names collide - Replace gradle with plain javac/java in regenerate script - Add test for cross-dialect name collision --- Strata/DDM/Integration/Java/Gen.lean | 73 ++++++++++---------- StrataTest/DDM/Integration/Java/TestGen.lean | 32 ++++++++- Tools/Java/.gitignore | 6 +- Tools/Java/regenerate-testdata.sh | 17 ++++- 4 files changed, 83 insertions(+), 45 deletions(-) diff --git a/Strata/DDM/Integration/Java/Gen.lean b/Strata/DDM/Integration/Java/Gen.lean index b5a7abe77..fe92c24eb 100644 --- a/Strata/DDM/Integration/Java/Gen.lean +++ b/Strata/DDM/Integration/Java/Gen.lean @@ -105,7 +105,7 @@ partial def syntaxCatToJavaType (cat : SyntaxCat) : JavaType := | some inner => .list (syntaxCatToJavaType inner) | none => panic! "Init.Seq/CommaSepBy requires a type argument" | ⟨"Init", "Expr"⟩ => .simple "Expr" - | ⟨"Init", "TypeExpr"⟩ => .simple "TypeExpr" + | ⟨"Init", "TypeExpr"⟩ => panic! "Init.TypeExpr is internal DDM machinery; use Init.Type or Init.TypeP instead" | ⟨"Init", "Type"⟩ => .simple "Type_" | ⟨"Init", "TypeP"⟩ => .simple "TypeP" | ⟨_, name⟩ => .simple (escapeJavaName (toPascalCase name)) @@ -114,24 +114,23 @@ def argDeclKindToJavaType : ArgDeclKind → JavaType | .type _ => .simple "Expr" | .cat c => syntaxCatToJavaType c -/-- Extract the Java interface name from a SyntaxCat, or none if it maps to a primitive -/ -partial def syntaxCatToInterfaceName (cat : SyntaxCat) : Option String := +/-- Extract the QualifiedIdent for categories that need Java interfaces, or none for primitives -/ +partial def syntaxCatToQualifiedName (cat : SyntaxCat) : Option QualifiedIdent := match cat.name with -- Primitives map to Java types, no interface needed | ⟨"Init", "Ident"⟩ | ⟨"Init", "Num"⟩ | ⟨"Init", "Decimal"⟩ | ⟨"Init", "Str"⟩ | ⟨"Init", "ByteArray"⟩ | ⟨"Init", "Bool"⟩ => none -- Containers - recurse into element type | ⟨"Init", "Option"⟩ | ⟨"Init", "Seq"⟩ | ⟨"Init", "CommaSepBy"⟩ => - cat.args[0]?.bind syntaxCatToInterfaceName + cat.args[0]?.bind syntaxCatToQualifiedName -- Abstract Init categories (extension points for dialects) - | ⟨"Init", "Expr"⟩ => some "Expr" - | ⟨"Init", "TypeExpr"⟩ => some "TypeExpr" - | ⟨"Init", "Type"⟩ => some "Type_" - | ⟨"Init", "TypeP"⟩ => some "TypeP" + | ⟨"Init", "Expr"⟩ => some ⟨"Init", "Expr"⟩ + | ⟨"Init", "Type"⟩ => some ⟨"Init", "Type"⟩ + | ⟨"Init", "TypeP"⟩ => some ⟨"Init", "TypeP"⟩ -- Other Init types are internal DDM machinery | ⟨"Init", _⟩ => none -- Dialect-defined categories - | ⟨_, name⟩ => some (escapeJavaName (toPascalCase name)) + | qid => some qid /-! ## Java Structures -/ @@ -157,13 +156,12 @@ structure GeneratedFiles where records : Array (String × String) builders : String × String -- (filename, content) serializer : String - warnings : Array String := #[] -- Warnings about unsupported declarations /-- Mapping from DDM names to disambiguated Java identifiers. -/ structure NameAssignments where categories : Std.HashMap QualifiedIdent String operators : Std.HashMap (QualifiedIdent × String) String - stubs : Std.HashMap String String + stubs : Std.HashMap QualifiedIdent String builders : String /-! ## Code Generation -/ @@ -373,25 +371,38 @@ def assignAllNames (d : Dialect) : NameAssignments := let baseNames : Std.HashSet String := Std.HashSet.ofList ["node", "sourcerange", "ionserializer"] -- Collect unique categories and referenced types - let init : Array QualifiedIdent × Std.HashSet String := (#[], {}) + let init : Array QualifiedIdent × Std.HashSet QualifiedIdent := (#[], {}) let (cats, refs) := d.declarations.foldl (init := init) fun (cats, refs) decl => match decl with | .op op => let cats := if cats.contains op.category then cats else cats.push op.category let refs := op.argDecls.toArray.foldl (init := refs) fun refs arg => match arg.kind with - | .type _ => refs.insert "Expr" - | .cat c => match syntaxCatToInterfaceName c with - | some name => refs.insert name + | .type _ => refs.insert ⟨"Init", "Expr"⟩ + | .cat c => match syntaxCatToQualifiedName c with + | some qid => refs.insert qid | none => refs (cats, refs) | _ => (cats, refs) + -- All QualifiedIdents that need Java names (categories + refs) + let allQids := cats ++ refs.toArray.filter (!cats.contains ·) + + -- Count name occurrences to detect collisions + let nameCounts : Std.HashMap String Nat := allQids.foldl (init := {}) fun m qid => + m.alter qid.name (fun v => some (v.getD 0 + 1)) + + -- Assign Java names, prefixing with dialect when there's a collision + let assignName (used : Std.HashSet String) (qid : QualifiedIdent) : String × Std.HashSet String := + let base := if nameCounts.getD qid.name 0 > 1 + then escapeJavaName (toPascalCase s!"{qid.dialect}_{qid.name}") + else escapeJavaName (toPascalCase qid.name) + disambiguate base used + -- Assign category names let catInit : Std.HashMap QualifiedIdent String × Std.HashSet String := ({}, baseNames) let (categoryNames, used) := cats.foldl (init := catInit) fun (map, used) cat => - let base := escapeJavaName (toPascalCase cat.name) - let (name, newUsed) := disambiguate base used + let (name, newUsed) := assignName used cat (map.insert cat name, newUsed) -- Assign operator names @@ -404,13 +415,12 @@ def assignAllNames (d : Dialect) : NameAssignments := (map.insert (op.category, op.name) name, newUsed) | _ => (map, used) - -- Assign stub names (referenced types without operators) - let catNameSet := Std.HashSet.ofList (categoryNames.toList.map Prod.snd) - let stubInit : Std.HashMap String String × Std.HashSet String := ({}, used) - let (stubNames, used) := refs.toList.foldl (init := stubInit) fun (map, used) ref => - if catNameSet.contains ref then (map, used) + -- Assign stub names (referenced types not in this dialect's categories) + let stubInit : Std.HashMap QualifiedIdent String × Std.HashSet String := ({}, used) + let (stubNames, used) := refs.toArray.foldl (init := stubInit) fun (map, used) ref => + if categoryNames.contains ref then (map, used) else - let (name, newUsed) := disambiguate ref used + let (name, newUsed) := assignName used ref (map.insert ref name, newUsed) let (buildersName, _) := disambiguate d.name used @@ -451,13 +461,6 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := let names := assignAllNames d let opsByCategory := groupOpsByCategory d names - -- Collect warnings for unsupported declarations - let warnings := d.declarations.filterMap fun decl => - match decl with - | .type t => some s!"type declaration '{t.name}' is not supported in Java generation" - | .function f => some s!"function declaration '{f.name}' is not supported in Java generation" - | _ => none - -- Categories with operators get sealed interfaces with permits clauses let sealedInterfaces := opsByCategory.toList.map fun (cat, ops) => let name := names.categories[cat]! @@ -468,9 +471,11 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := let stubInterfaces := names.stubs.toList.map fun (_, name) => generateStubInterface package name - -- Generate records for operators + -- Generate records for operators (fail on unsupported declarations) let records := d.declarations.toList.filterMap fun decl => match decl with + | .type t => panic! s!"type declaration '{t.name}' is not supported in Java generation" + | .function f => panic! s!"function declaration '{f.name}' is not supported in Java generation" | .op op => let name := names.operators[(op.category, op.name)]! some (s!"{name}.java", (opDeclToJavaRecord d.name names op).toJava package) @@ -484,8 +489,7 @@ def generateDialect (d : Dialect) (package : String) : GeneratedFiles := interfaces := sealedInterfaces.toArray ++ stubInterfaces.toArray records := records.toArray builders := (s!"{names.builders}.java", generateBuilders package names.builders d names) - serializer := generateSerializer package - warnings := warnings } + serializer := generateSerializer package } /-! ## File Output -/ @@ -494,9 +498,6 @@ def packageToPath (package : String) : System.FilePath := ⟨String.intercalate "/" parts⟩ def writeJavaFiles (baseDir : System.FilePath) (package : String) (files : GeneratedFiles) : IO Unit := do - for warning in files.warnings do - IO.eprintln s!"Warning: {warning}" - let dir := baseDir / packageToPath package IO.FS.createDirAll dir diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index c87817dae..64c6a5e3d 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -238,13 +238,39 @@ elab "#testBoogie" : command => do #testBoogie --- Test 11: Generated Java compiles (requires javac) +-- Test 11: Cross-dialect name collision (A.Num vs B.Num) +#eval do + let testDialect : Strata.Dialect := { + name := "A" + imports := #[] + declarations := #[ + .syncat { name := "Num", argNames := #[] }, + .op { + name := "lit" + argDecls := .ofArray #[ + { ident := "a", kind := .cat (.atom .none ⟨"A", "Num"⟩) }, + { ident := "b", kind := .cat (.atom .none ⟨"B", "Num"⟩) } + ] + category := ⟨"A", "Num"⟩ + syntaxDef := { atoms := #[], prec := 0 } + } + ] + } + let files := generateDialect testDialect "com.test" + -- Should have 2 interfaces: one for A.Num, one stub for B.Num + assert! files.interfaces.size = 2 + let names : List String := files.interfaces.toList.map Prod.fst + assert! names.any (fun n => (n.splitOn "A").length > 1) + assert! names.any (fun n => (n.splitOn "B").length > 1) + pure () + +-- Test 12: Generated Java compiles (requires javac) #load_dialect "testdata/Simple.dialect.st" elab "#testCompile" : command => do let javacCheck ← IO.Process.output { cmd := "javac", args := #["--version"] } if javacCheck.exitCode != 0 then - Lean.logError "Test 11 failed: javac not found" + Lean.logError "Test 12 failed: javac not found" return let env ← Lean.getEnv @@ -274,7 +300,7 @@ elab "#testCompile" : command => do #testCompile --- Test 12: Roundtrip - verify Lean can read Java-generated Ion +-- Test 13: Roundtrip - verify Lean can read Java-generated Ion -- Depends on testdata/comprehensive.ion (generated by Tools/Java/regenerate-testdata.sh) elab "#testRoundtrip" : command => do let env ← Lean.getEnv diff --git a/Tools/Java/.gitignore b/Tools/Java/.gitignore index 9474bedc4..ea3c65522 100644 --- a/Tools/Java/.gitignore +++ b/Tools/Java/.gitignore @@ -1,6 +1,6 @@ # Generated during regenerate-testdata.sh (cleaned up after) src/main/java/com/strata/simple/ +*.class -# Gradle -.gradle/ -build/ +# Downloaded dependency +ion-java-*.jar diff --git a/Tools/Java/regenerate-testdata.sh b/Tools/Java/regenerate-testdata.sh index 0e661d840..34dcbc361 100755 --- a/Tools/Java/regenerate-testdata.sh +++ b/Tools/Java/regenerate-testdata.sh @@ -6,15 +6,26 @@ cd "$(dirname "$0")" STRATA_ROOT="$(cd ../.. && pwd)" TESTDATA="$STRATA_ROOT/StrataTest/DDM/Integration/Java/testdata" GEN_DIR="src/main/java/com/strata/simple" +JAR="ion-java-1.11.9.jar" + +# Download ion-java if needed +if [ ! -f "$JAR" ]; then + echo "=== Downloading ion-java ===" + curl -sLO "https://repo1.maven.org/maven2/com/amazon/ion/ion-java/1.11.9/$JAR" +fi echo "=== Generating Java classes from dialect ===" (cd "$STRATA_ROOT" && lake exe strata javaGen "$TESTDATA/Simple.dialect.st" com.strata.simple "$STRATA_ROOT/Tools/Java/src/main/java") -echo "=== Building and running test data generator ===" -./gradlew run -PmainClass=com.strata.test.GenerateTestData --args="$TESTDATA/comprehensive.ion" --quiet +echo "=== Compiling Java ===" +javac -cp "$JAR" $GEN_DIR/*.java src/main/java/com/strata/test/*.java + +echo "=== Generating test data ===" +java -cp "$JAR:src/main/java" com.strata.test.GenerateTestData "$TESTDATA/comprehensive.ion" -echo "=== Cleaning up generated classes ===" +echo "=== Cleaning up ===" rm -rf "$GEN_DIR" +rm -f src/main/java/com/strata/test/*.class echo "=== Verifying with Lean ===" (cd "$STRATA_ROOT" && lake exe strata print --include "$TESTDATA" "$TESTDATA/comprehensive.ion" 2>&1 | tail -1) From 46e0e588841fb03e55550aa827a573fe12ea88bf Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 12:43:19 +0100 Subject: [PATCH 26/53] Refactoring --- Strata/DDM/AST.lean | 15 +++++++ Strata/DDM/Ion.lean | 12 ++---- Strata/DL/Imperative/MetaData.lean | 18 +-------- Strata/Languages/Boogie/Verifier.lean | 40 ++++++------------- .../ConcreteToAbstractTreeTranslator.lean | 4 +- .../Laurel/LaurelToBoogieTranslator.lean | 4 +- StrataMain.lean | 34 +++++----------- StrataTest/Languages/Laurel/TestExamples.lean | 3 -- StrataVerify.lean | 2 +- 9 files changed, 48 insertions(+), 84 deletions(-) diff --git a/Strata/DDM/AST.lean b/Strata/DDM/AST.lean index 24b1d5dcb..4dd3b5dd8 100644 --- a/Strata/DDM/AST.lean +++ b/Strata/DDM/AST.lean @@ -326,6 +326,21 @@ deriving DecidableEq, Inhabited, Repr instance : ToFormat SourceRange where format fr := f!"{fr.start}-{fr.stop}" +inductive Uri where + | file (path: String) + deriving DecidableEq, Repr + +instance : ToFormat Uri where + format fr := match fr with | .file path => path + +structure FileRange where + file: Uri + range: Strata.SourceRange + deriving DecidableEq, Repr + +instance : ToFormat FileRange where + format fr := f!"{fr.file}:{fr.range}" + namespace SourceRange def none : SourceRange := { start := 0, stop := 0 } diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index ee98da97f..1bd70ca56 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -278,7 +278,7 @@ def deserializeValue {α} (bs : ByteArray) (act : Ion SymbolId → FromIonM α) throw s!"Error reading Ion: {msg} (offset = {off})" | .ok a => pure a let .isTrue p := inferInstanceAs (Decidable (a.size = 1)) - | throw s!"Expected single Ion value. Instead of {repr a}" + | throw s!"Expected single Ion value, but got {repr a}." let entries := a[0] let .isTrue p := inferInstanceAs (Decidable (entries.size = 2)) | throw s!"Expected symbol table and value in dialect." @@ -1318,7 +1318,7 @@ def fromIonFragment (f : Ion.Fragment) commands := ← fromIonFragmentCommands f } -def fromIon (dialects : DialectMap) (dialect : DialectName) (bytes : ByteArray) : Except String Strata.Program := do +def fileFromIon (dialects : DialectMap) (dialect : DialectName) (bytes : ByteArray) : Except String Strata.Program := do let (hdr, frag) ← match Strata.Ion.Header.parse bytes with | .error msg => @@ -1333,11 +1333,7 @@ def fromIon (dialects : DialectMap) (dialect : DialectName) (bytes : ByteArray) throw s!"{name} program found when {dialect} expected." fromIonFragment frag dialects dialect -/-- Parse a list of StrataFile from Ion data. - Expected format: A list where each entry is a struct with: - - "program": the program data --/ -def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (List StrataFile) := do +def filesFromIon (dialects : DialectMap) (bytes : ByteArray) : Except String (List StrataFile) := do let ctx ← match Ion.deserialize bytes with | .error (off, msg) => throw s!"Error reading Ion: {msg} (offset = {off})" @@ -1357,7 +1353,6 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let ionCtx : FromIonContext := ⟨symbols⟩ - -- Parse the main list let ⟨filesList, _⟩ ← FromIonM.asList ctx[1]! ionCtx let tbl := symbols @@ -1375,7 +1370,6 @@ def fromIonFiles (dialects : DialectMap) (bytes : ByteArray) : Except String (Li let filePath ← FromIonM.asString "filePath" filePathData ionCtx - -- Parse the program let ⟨programValues, _⟩ ← FromIonM.asList programData ionCtx let .isTrue ne := inferInstanceAs (Decidable (programValues.size ≥ 1)) | throw "Expected program header" diff --git a/Strata/DL/Imperative/MetaData.lean b/Strata/DL/Imperative/MetaData.lean index aa7ca3ea3..b77f9152c 100644 --- a/Strata/DL/Imperative/MetaData.lean +++ b/Strata/DL/Imperative/MetaData.lean @@ -66,21 +66,6 @@ instance [Repr P.Ident] : Repr (MetaDataElem.Field P) where | .label s => f!"MetaDataElem.Field.label {s}" Repr.addAppParen res prec -inductive Uri where - | file (path: String) - deriving DecidableEq, Repr - -instance : ToFormat Uri where - format fr := match fr with | .file path => path - -structure FileRange where - file: Uri - range: Strata.SourceRange - deriving DecidableEq, Repr - -instance : ToFormat FileRange where - format fr := f!"{fr.file}:{fr.range}" - /-- A metadata value, which can be either an expression, a message, or a fileRange -/ inductive MetaDataElem.Value (P : PureExpr) where /-- Metadata value in the form of a structured expression. -/ @@ -88,8 +73,7 @@ inductive MetaDataElem.Value (P : PureExpr) where /-- Metadata value in the form of an arbitrary string. -/ | msg (s : String) /-- Metadata value in the form of a fileRange. -/ - | fileRange (r: FileRange) - + | fileRange (r: Strata.FileRange) instance [ToFormat P.Expr] : ToFormat (MetaDataElem.Value P) where format f := match f with | .expr e => f!"{e}" | .msg s => f!"{s}" | .fileRange r => f!"{r}" diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index a7a86c0d0..08f9aa3cc 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -11,13 +11,14 @@ import Strata.Languages.Boogie.SMTEncoder import Strata.DL.Imperative.MetaData import Strata.DL.Imperative.SMTUtils import Strata.DL.SMT.CexParser +import Strata.DDM.AST --------------------------------------------------------------------- namespace Strata.SMT.Encoder open Strata.SMT.Encoder -open Imperative (Uri) +open Strata -- Derived from Strata.SMT.Encoder.encode. def encodeBoogie (ctx : Boogie.SMT.Context) (prelude : SolverM Unit) (ts : List Term) : @@ -145,7 +146,7 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (ans : String) open Imperative def formatPositionMetaData [BEq P.Ident] [ToFormat P.Expr] - (files: Map Imperative.Uri Lean.FileMap) + (files: Map Strata.Uri Lean.FileMap) (md : MetaData P): Option Format := do let fileRangeElem ← md.findElem MetaData.fileRange match fileRangeElem.value with @@ -369,16 +370,14 @@ def verify /-- A diagnostic produced by analyzing a file -/ structure DiagnosticModel where - fileRange : Imperative.FileRange + fileRange : Strata.FileRange message : String deriving Repr, BEq def toDiagnosticModel (vcr : Boogie.VCResult) : Option DiagnosticModel := do - -- Only create a diagnostic if the result is not .unsat (i.e., verification failed) match vcr.result with | .unsat => none -- Verification succeeded, no diagnostic | result => - -- Extract file range from metadata let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange match fileRangeElem.value with | .fileRange fileRange => @@ -403,31 +402,18 @@ structure Diagnostic where deriving Repr, BEq -def toDiagnostic (files: Map Imperative.Uri Lean.FileMap) (vcr : Boogie.VCResult) : Option Diagnostic := do - -- Only create a diagnostic if the result is not .unsat (i.e., verification failed) - match vcr.result with - | .unsat => none -- Verification succeeded, no diagnostic - | result => - -- Extract file range from metadata - let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange - match fileRangeElem.value with - | .fileRange fileRange => - let message := match result with - | .sat _ => "assertion does not hold" - | .unknown => "assertion verification result is unknown" - | .err msg => s!"verification error: {msg}" - | _ => "verification failed" - - let fileMap := (files.find? fileRange.file).get! - let startPos := fileMap.toPosition fileRange.range.start - let endPos := fileMap.toPosition fileRange.range.stop - some { - -- Subtract headerOffset to account for program header we added +def toDiagnostic (files: Map Strata.Uri Lean.FileMap) (vcr : Boogie.VCResult) : Option Diagnostic := do + let modelOption := toDiagnosticModel vcr + modelOption.map (fun dm => + let fileMap := (files.find? dm.fileRange.file).get! + let startPos := fileMap.toPosition dm.fileRange.range.start + let endPos := fileMap.toPosition dm.fileRange.range.stop + { start := { line := startPos.line, column := startPos.column } ending := { line := endPos.line, column := endPos.column } - message := message + message := dm.message } - | _ => none + ) end Strata diff --git a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean index f2663b3f9..6600ddec9 100644 --- a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean +++ b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean @@ -14,9 +14,9 @@ namespace Laurel open Laurel open Std (ToFormat Format format) -open Strata (QualifiedIdent Arg SourceRange) +open Strata (QualifiedIdent Arg SourceRange Uri FileRange) open Lean.Parser (InputContext) -open Imperative (MetaData Uri FileRange) +open Imperative (MetaData) structure TransState where inputCtx : InputContext diff --git a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean index 4e60706df..6a055ffd8 100644 --- a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean +++ b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean @@ -82,11 +82,11 @@ def verifyToVcResults (smtsolver : String) (program : Program) EIO.toIO (fun f => IO.Error.userError (toString f)) (Boogie.verify smtsolver boogieProgram options) -def verifyToDiagnostics (smtsolver : String) (files: Map Imperative.Uri Lean.FileMap) (program : Program): IO (Array Diagnostic) := do +def verifyToDiagnostics (smtsolver : String) (files: Map Strata.Uri Lean.FileMap) (program : Program): IO (Array Diagnostic) := do let results <- verifyToVcResults smtsolver program return results.filterMap (toDiagnostic files) -def verifyToDiagnosticsModel (smtsolver : String) (program : Program): IO (Array DiagnosticModel) := do +def verifyToDiagnosticModels (smtsolver : String) (program : Program): IO (Array DiagnosticModel) := do let results <- verifyToVcResults smtsolver program return results.filterMap toDiagnosticModel diff --git a/StrataMain.lean b/StrataMain.lean index f14720f43..2e749a9e1 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -177,7 +177,7 @@ def readPythonStrata (path : String) : IO Strata.Program := do let bytes ← Strata.Util.readBinInputSource path if ! bytes.startsWith Ion.binaryVersionMarker then exitFailure s!"pyAnalyze expected Ion file" - match Strata.Program.fromIon Strata.Python.Python_map Strata.Python.Python.name bytes with + match Strata.Program.fileFromIon Strata.Python.Python_map Strata.Python.Python.name bytes with | .ok p => pure p | .error msg => exitFailure msg @@ -233,16 +233,8 @@ def javaGenCommand : Command where | .program _ => exitFailure "Expected a dialect file, not a program file." -def readLaurelIon (bytes : ByteArray) : IO Strata.Program := do - - -- Parse the Ion bytes to get a Strata.Program - match Strata.Program.fromIon Strata.Laurel.Laurel_map Strata.Laurel.Laurel.name bytes with - | .ok p => pure p - | .error msg => exitFailure msg - -def readLaurelIonFiles (bytes : ByteArray) : IO (List Strata.StrataFile) := do - -- Parse the Ion bytes to get a list of StrataFiles - match Strata.Program.fromIonFiles Strata.Laurel.Laurel_map bytes with +def deserializeIonToLaurelFiles (bytes : ByteArray) : IO (List Strata.StrataFile) := do + match Strata.Program.filesFromIon Strata.Laurel.Laurel_map bytes with | .ok files => pure files | .error msg => exitFailure msg @@ -254,10 +246,8 @@ def laurelAnalyzeCommand : Command where -- Read bytes from stdin let stdinBytes ← (← IO.getStdin).readBinToEnd - -- Parse Ion format to get list of StrataFiles - let strataFiles ← readLaurelIonFiles stdinBytes + let strataFiles ← deserializeIonToLaurelFiles stdinBytes - -- Process each file and combine results let mut combinedProgram : Laurel.Program := { staticProcedures := [] staticFields := [] @@ -265,20 +255,18 @@ def laurelAnalyzeCommand : Command where } for strataFile in strataFiles do - let fileMap : Lean.FileMap := { - source := "" - positions := Array.empty - } - -- Create input context for this file - let inputContext : Strata.Parser.InputContext := { + let dummyContext : Strata.Parser.InputContext := { inputString := "" fileName := strataFile.filePath - fileMap := fileMap + fileMap := { + source := "" + positions := Array.empty + } } -- Convert to Laurel.Program using parseProgram - let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataFile.program) + let (laurelProgram, transErrors) := Laurel.TransM.run dummyContext (Laurel.parseProgram strataFile.program) if transErrors.size > 0 then exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" @@ -292,7 +280,7 @@ def laurelAnalyzeCommand : Command where -- Verify the combined program and get diagnostics let solverName : String := "z3" - let diagnostics ← Laurel.verifyToDiagnosticsModel solverName combinedProgram + let diagnostics ← Laurel.verifyToDiagnosticModels solverName combinedProgram -- Print diagnostics to stdout IO.println s!"==== DIAGNOSTICS ====" diff --git a/StrataTest/Languages/Laurel/TestExamples.lean b/StrataTest/Languages/Laurel/TestExamples.lean index abef555d4..6f0c7bbf5 100644 --- a/StrataTest/Languages/Laurel/TestExamples.lean +++ b/StrataTest/Languages/Laurel/TestExamples.lean @@ -20,16 +20,13 @@ namespace Laurel def processLaurelFile (filePath : String) : IO (Array Diagnostic) := do - let laurelDialect : Strata.Dialect := Laurel let (inputContext, strataProgram) ← Strata.Elab.parseStrataProgramFromDialect filePath laurelDialect - -- Convert to Laurel.Program using parseProgram (handles unwrapping the program operation) let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataProgram) if transErrors.size > 0 then throw (IO.userError s!"Translation errors: {transErrors}") - -- Verify the program let diagnostics ← Laurel.verifyToDiagnostics "z3" laurelProgram pure diagnostics diff --git a/StrataVerify.lean b/StrataVerify.lean index 3bd5afb05..87b076058 100644 --- a/StrataVerify.lean +++ b/StrataVerify.lean @@ -58,7 +58,7 @@ def main (args : List String) : IO UInt32 := do | .ok (opts, file) => do let text ← Strata.Util.readInputSource file let inputCtx := Lean.Parser.mkInputContext text (Strata.Util.displayName file) - let files := Map.insert Map.empty (Imperative.Uri.file file) inputCtx.fileMap + let files := Map.insert Map.empty (Strata.Uri.file file) inputCtx.fileMap let dctx := Elab.LoadedDialects.builtin let dctx := dctx.addDialect! Boogie let dctx := dctx.addDialect! C_Simp From 44155c0af78a8e4caff327f75af68b020bf8ba7c Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 12:45:33 +0100 Subject: [PATCH 27/53] Refactoring --- .../Grammar/ConcreteToAbstractTreeTranslator.lean | 12 +++++------- StrataMain.lean | 11 +---------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean index 6600ddec9..a0d33169c 100644 --- a/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean +++ b/Strata/Languages/Laurel/Grammar/ConcreteToAbstractTreeTranslator.lean @@ -19,27 +19,25 @@ open Lean.Parser (InputContext) open Imperative (MetaData) structure TransState where - inputCtx : InputContext + uri : Uri errors : Array String abbrev TransM := StateM TransState -def TransM.run (ictx : InputContext) (m : TransM α) : (α × Array String) := - let (v, s) := StateT.run m { inputCtx := ictx, errors := #[] } +def TransM.run (uri : Uri) (m : TransM α) : (α × Array String) := + let (v, s) := StateT.run m { uri := uri, errors := #[] } (v, s.errors) def TransM.error [Inhabited α] (msg : String) : TransM α := do modify fun s => { s with errors := s.errors.push msg } return panic msg -def SourceRange.toMetaData (ictx : InputContext) (sr : SourceRange) : Imperative.MetaData Boogie.Expression := - let file := ictx.fileName - let uri : Uri := .file file +def SourceRange.toMetaData (uri : Uri) (sr : SourceRange) : Imperative.MetaData Boogie.Expression := let fileRangeElt := ⟨ Imperative.MetaDataElem.Field.label "fileRange", .fileRange ⟨ uri, sr.start, sr.stop ⟩ ⟩ #[fileRangeElt] def getArgMetaData (arg : Arg) : TransM (Imperative.MetaData Boogie.Expression) := - return SourceRange.toMetaData (← get).inputCtx arg.ann + return SourceRange.toMetaData (← get).uri arg.ann def checkOp (op : Strata.Operation) (name : QualifiedIdent) (argc : Nat) : TransM Unit := do diff --git a/StrataMain.lean b/StrataMain.lean index 2e749a9e1..9c388ab60 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -256,17 +256,8 @@ def laurelAnalyzeCommand : Command where for strataFile in strataFiles do - let dummyContext : Strata.Parser.InputContext := { - inputString := "" - fileName := strataFile.filePath - fileMap := { - source := "" - positions := Array.empty - } - } - -- Convert to Laurel.Program using parseProgram - let (laurelProgram, transErrors) := Laurel.TransM.run dummyContext (Laurel.parseProgram strataFile.program) + let (laurelProgram, transErrors) := Laurel.TransM.run (Strata.Uri.file strataFile.filePath) (Laurel.parseProgram strataFile.program) if transErrors.size > 0 then exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" From 7400e34a74663f27b193412cf001d73819f1bb89 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 12:56:11 +0100 Subject: [PATCH 28/53] Cleanup --- StrataMain.lean | 7 +------ .../src/main/java/com/strata/test/GenerateTestData.java | 8 -------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/StrataMain.lean b/StrataMain.lean index 9c388ab60..bc4748c32 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -256,22 +256,17 @@ def laurelAnalyzeCommand : Command where for strataFile in strataFiles do - -- Convert to Laurel.Program using parseProgram let (laurelProgram, transErrors) := Laurel.TransM.run (Strata.Uri.file strataFile.filePath) (Laurel.parseProgram strataFile.program) if transErrors.size > 0 then exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" - -- Combine with accumulated program combinedProgram := { staticProcedures := combinedProgram.staticProcedures ++ laurelProgram.staticProcedures staticFields := combinedProgram.staticFields ++ laurelProgram.staticFields types := combinedProgram.types ++ laurelProgram.types } - -- Verify the combined program and get diagnostics - let solverName : String := "z3" - - let diagnostics ← Laurel.verifyToDiagnosticModels solverName combinedProgram + let diagnostics ← Laurel.verifyToDiagnosticModels "z3" combinedProgram -- Print diagnostics to stdout IO.println s!"==== DIAGNOSTICS ====" diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java index 5db8524a3..372890a6d 100644 --- a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java +++ b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java @@ -12,11 +12,8 @@ public class GenerateTestData { public static void main(String[] args) throws Exception { var ion = IonSystemBuilder.standard().build(); var serializer = new IonSerializer(ion); - - // Generate comprehensive.ion (single program) generateSingleProgram(ion, serializer, args[0]); - // Generate comprehensive-files.ion (array of StrataFile) if (args.length > 1) { generateMultipleFiles(ion, serializer, args[1]); } @@ -46,7 +43,6 @@ private static void generateSingleProgram(IonSystem ion, IonSerializer serialize } private static void generateMultipleFiles(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { - // Create first program with 2 statements Node ast1 = block(List.of( assign("x", num(42)), print("first file"))); @@ -58,7 +54,6 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize program1.add(header1); program1.add(serializer.serializeCommand(ast1)); - // Create second program with 3 statements Node ast2 = block(List.of( assign("y", add(num(1), num(2))), print("second file"), @@ -71,16 +66,13 @@ private static void generateMultipleFiles(IonSystem ion, IonSerializer serialize program2.add(header2); program2.add(serializer.serializeCommand(ast2)); - // Create array of StrataFile structs IonList files = ion.newEmptyList(); - // First file entry IonStruct file1 = ion.newEmptyStruct(); file1.put("filePath", ion.newString("file1.st")); file1.put("program", program1); files.add(file1); - // Second file entry IonStruct file2 = ion.newEmptyStruct(); file2.put("filePath", ion.newString("file2.st")); file2.put("program", program2); From 9c06af78e0d4d4a5367a4da307d72dc5c07c0e98 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 13:00:55 +0100 Subject: [PATCH 29/53] Cleanup --- Strata/Languages/Boogie/Verifier.lean | 3 - Tools/Java/.gitignore | 1 + .../reports/problems/problems-report.html | 663 ------------------ .../GenerateTestData.class.uniqueId0 | Bin 5951 -> 0 bytes .../compileJava/previous-compilation-data.bin | Bin 3332 -> 0 bytes 5 files changed, 1 insertion(+), 666 deletions(-) delete mode 100644 Tools/Java/build/reports/problems/problems-report.html delete mode 100644 Tools/Java/build/tmp/compileJava/compileTransaction/stash-dir/GenerateTestData.class.uniqueId0 delete mode 100644 Tools/Java/build/tmp/compileJava/previous-compilation-data.bin diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index 40cca841a..1599e5559 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -370,7 +370,6 @@ def verify else panic! s!"DDM Transform Error: {repr errors}" -/-- A diagnostic produced by analyzing a file -/ structure DiagnosticModel where fileRange : Strata.FileRange message : String @@ -396,14 +395,12 @@ def toDiagnosticModel (vcr : Boogie.VCResult) : Option DiagnosticModel := do } | _ => none -/-- A diagnostic produced by analyzing a file -/ structure Diagnostic where start : Lean.Position ending : Lean.Position message : String deriving Repr, BEq - def toDiagnostic (files: Map Strata.Uri Lean.FileMap) (vcr : Boogie.VCResult) : Option Diagnostic := do let modelOption := toDiagnosticModel vcr modelOption.map (fun dm => diff --git a/Tools/Java/.gitignore b/Tools/Java/.gitignore index ea3c65522..20e2c280f 100644 --- a/Tools/Java/.gitignore +++ b/Tools/Java/.gitignore @@ -1,6 +1,7 @@ # Generated during regenerate-testdata.sh (cleaned up after) src/main/java/com/strata/simple/ *.class +build/ # Downloaded dependency ion-java-*.jar diff --git a/Tools/Java/build/reports/problems/problems-report.html b/Tools/Java/build/reports/problems/problems-report.html deleted file mode 100644 index dd00c38fd..000000000 --- a/Tools/Java/build/reports/problems/problems-report.html +++ /dev/null @@ -1,663 +0,0 @@ - - - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/Tools/Java/build/tmp/compileJava/compileTransaction/stash-dir/GenerateTestData.class.uniqueId0 b/Tools/Java/build/tmp/compileJava/compileTransaction/stash-dir/GenerateTestData.class.uniqueId0 deleted file mode 100644 index 06253aa9422dd6d559ce15c8565ecdc78716a306..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5951 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 InC{X40W{xUi~s-t From 39482932b7f0ff637f4880f970ab0790955be024 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 13:05:09 +0100 Subject: [PATCH 30/53] Cleanup --- StrataTest/DDM/Integration/Java/TestGen.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index f606772d9..d133b1760 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -290,7 +290,7 @@ elab "#testCompile" : command => do let result ← IO.Process.output { cmd := "javac" - args := filePaths -- #["--enable-preview", "--release", "17"] ++ + args := filePaths } IO.FS.removeDirAll dir From fbe3a2c396e88aa8f52e1dab92d772553f0ed9a0 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 8 Jan 2026 15:27:19 +0100 Subject: [PATCH 31/53] Fixes --- StrataTest/DDM/Integration/Java/TestGen.lean | 4 ++-- StrataTest/Languages/Laurel/TestExamples.lean | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index d133b1760..924995c8f 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -309,7 +309,7 @@ elab "#testRoundtrip" : command => do | Lean.logError "Simple dialect not found"; return let dm := Strata.DialectMap.ofList! [Strata.initDialect, simple] let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive.ion" - match Strata.Program.fromIon dm "Simple" ionBytes with + match Strata.Program.fileFromIon dm "Simple" ionBytes with | .error e => Lean.logError s!"Roundtrip test failed: {e}" | .ok prog => if prog.commands.size != 1 then Lean.logError "Expected 1 command"; return @@ -330,7 +330,7 @@ elab "#testRoundtripFiles" : command => do | Lean.logError "Simple dialect not found"; return let dm := Strata.DialectMap.ofList! [Strata.initDialect, simple] let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive-files.ion" - match Strata.Program.fromIonFiles dm ionBytes with + match Strata.Program.filesFromIon dm ionBytes with | .error e => Lean.logError s!"Roundtrip files test failed: {e}" | .ok files => if files.length != 2 then diff --git a/StrataTest/Languages/Laurel/TestExamples.lean b/StrataTest/Languages/Laurel/TestExamples.lean index cea4b3e56..715e64923 100644 --- a/StrataTest/Languages/Laurel/TestExamples.lean +++ b/StrataTest/Languages/Laurel/TestExamples.lean @@ -23,11 +23,13 @@ def processLaurelFile (filePath : String) : IO (Array Diagnostic) := do let dialects := Strata.Elab.LoadedDialects.ofDialects! #[initDialect, Laurel] let (inputContext, strataProgram) ← parseStrataProgramFromDialect dialects Laurel.name filePath - let (laurelProgram, transErrors) := Laurel.TransM.run inputContext (Laurel.parseProgram strataProgram) + let uri := Strata.Uri.file filePath + let (laurelProgram, transErrors) := Laurel.TransM.run uri (Laurel.parseProgram strataProgram) if transErrors.size > 0 then throw (IO.userError s!"Translation errors: {transErrors}") - let diagnostics ← Laurel.verifyToDiagnostics "z3" laurelProgram + let files := Map.insert Map.empty uri inputContext.fileMap + let diagnostics ← Laurel.verifyToDiagnostics "z3" files laurelProgram pure diagnostics From 122f63d6a3df350e56c3ec34c679b83ee4f8c143 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 9 Jan 2026 10:46:58 +0100 Subject: [PATCH 32/53] Improve error reporting --- Strata/DL/Imperative/SMTUtils.lean | 2 +- Strata/Languages/Boogie/Verifier.lean | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Strata/DL/Imperative/SMTUtils.lean b/Strata/DL/Imperative/SMTUtils.lean index 832238382..671045025 100644 --- a/Strata/DL/Imperative/SMTUtils.lean +++ b/Strata/DL/Imperative/SMTUtils.lean @@ -139,7 +139,7 @@ def solverResult {P : PureExpr} [ToFormat P.Ident] .ok (.sat model) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | other => .error other + | _ => .error s!"solver ans: {ans}" def VC_folder_name: String := "vcs" diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index 1599e5559..c5264be5c 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -143,7 +143,7 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (ans : String) | .error _model_err => (.ok (.sat [])) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error ans + | _ => .error s!"solver result: {ans}" open Imperative From 8ed03a4231f197dcc338e4ed175a643a19abd666 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 9 Jan 2026 11:22:12 +0100 Subject: [PATCH 33/53] Better error handling around solver process --- Strata/DL/Imperative/SMTUtils.lean | 19 ++++++++++--------- Strata/Languages/Boogie/Verifier.lean | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Strata/DL/Imperative/SMTUtils.lean b/Strata/DL/Imperative/SMTUtils.lean index 671045025..1c903f505 100644 --- a/Strata/DL/Imperative/SMTUtils.lean +++ b/Strata/DL/Imperative/SMTUtils.lean @@ -115,7 +115,7 @@ def processModel {P : PureExpr} [ToFormat P.Ident] | none => .error f!"Cannot find model for id: {id}" | some p => .ok p.value -def runSolver (solver : String) (args : Array String) : IO String := do +def runSolver (solver : String) (args : Array String) : IO IO.Process.Output := do let output ← IO.Process.output { cmd := solver args := args @@ -123,15 +123,16 @@ def runSolver (solver : String) (args : Array String) : IO String := do -- dbg_trace f!"runSolver: exitcode: {repr output.exitCode}\n\ -- stderr: {repr output.stderr}\n\ -- stdout: {repr output.stdout}" - return output.stdout + return output def solverResult {P : PureExpr} [ToFormat P.Ident] (typedVarToSMTFn : P.Ident → P.Ty → Except Format (String × Strata.SMT.TermType)) - (vars : List P.TypedIdent) (ans : String) + (vars : List P.TypedIdent) (output : IO.Process.Output) (E : Strata.SMT.EncoderState) : Except Format (Result P.TypedIdent) := do - let pos := (ans.find (fun c => c == '\n' || c == '\r')).byteIdx - let verdict := ans.take pos - let rest := ans.drop pos + let stdout := output.stdout + let pos := (stdout.find (fun c => c == '\n' || c == '\r')).byteIdx + let verdict := stdout.take pos + let rest := stdout.drop pos match verdict with | "sat" => let rawModel ← getModel rest @@ -139,7 +140,7 @@ def solverResult {P : PureExpr} [ToFormat P.Ident] .ok (.sat model) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver ans: {ans}" + | _ => .error s!"solver stdout: {output.stdout}\nstderr:{output.stderr}" def VC_folder_name: String := "vcs" @@ -169,8 +170,8 @@ def dischargeObligation {P : PureExpr} [ToFormat P.Ident] .ok "--produce-models" else return .error f!"Unsupported SMT solver: {smtsolver}" - let solver_out ← runSolver smtsolver #[filename, produce_models] - match solverResult typedVarToSMTFn vars solver_out estate with + let solver_output ← runSolver smtsolver #[filename, produce_models] + match solverResult typedVarToSMTFn vars solver_output estate with | .error e => return .error e | .ok result => return .ok (result, estate) diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index c5264be5c..2fd615b1e 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -115,7 +115,7 @@ instance : ToFormat Result where def VC_folder_name: String := "vcs" -def runSolver (solver : String) (args : Array String) : IO String := do +def runSolver (solver : String) (args : Array String) : IO IO.Process.Output := do let output ← IO.Process.output { cmd := solver args := args @@ -123,14 +123,15 @@ def runSolver (solver : String) (args : Array String) : IO String := do -- dbg_trace f!"runSolver: exitcode: {repr output.exitCode}\n\ -- stderr: {repr output.stderr}\n\ -- stdout: {repr output.stdout}" - return output.stdout + return output -def solverResult (vars : List (IdentT LMonoTy Visibility)) (ans : String) +def solverResult (vars : List (IdentT LMonoTy Visibility)) (output : IO.Process.Output) (ctx : SMT.Context) (E : EncoderState) : Except Format Result := do - let pos := (ans.find (fun c => c == '\n')).byteIdx - let verdict := (ans.take pos).trim - let rest := ans.drop pos + let stdout := output.stdout + let pos := (stdout.find (fun c => c == '\n')).byteIdx + let verdict := (stdout.take pos).trim + let rest := stdout.drop pos match verdict with | "sat" => let rawModel ← getModel rest @@ -143,7 +144,7 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (ans : String) | .error _model_err => (.ok (.sat [])) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver result: {ans}" + | _ => .error s!"solver stdout: {output.stdout}\nstderr:{output.stderr}" open Imperative @@ -226,8 +227,8 @@ def dischargeObligation let _ ← solver.checkSat ids -- Will return unknown for Solver.fileWriter if options.verbose then IO.println s!"Wrote problem to {filename}." let flags := getSolverFlags options smtsolver - let solver_out ← runSolver smtsolver (#[filename] ++ flags) - match solverResult vars solver_out ctx estate with + let output ← runSolver smtsolver (#[filename] ++ flags) + match solverResult vars output ctx estate with | .error e => return .error e | .ok result => return .ok (result, estate) From 7abbc3e8c4541b231492b855be4418ad7db987f2 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 9 Jan 2026 12:35:57 +0100 Subject: [PATCH 34/53] Attempt at getting better debug output --- Strata/DL/Imperative/SMTUtils.lean | 4 +++- Strata/Languages/Boogie/Verifier.lean | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Strata/DL/Imperative/SMTUtils.lean b/Strata/DL/Imperative/SMTUtils.lean index 1c903f505..682e59d94 100644 --- a/Strata/DL/Imperative/SMTUtils.lean +++ b/Strata/DL/Imperative/SMTUtils.lean @@ -140,7 +140,9 @@ def solverResult {P : PureExpr} [ToFormat P.Ident] .ok (.sat model) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver stdout: {output.stdout}\nstderr:{output.stderr}" + | _ => .error s!"solver stdout: {output.stdout} + stderr:{output.stderr} + " def VC_folder_name: String := "vcs" diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index 2fd615b1e..f71fcaf05 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -144,7 +144,9 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (output : IO.Process. | .error _model_err => (.ok (.sat [])) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver stdout: {output.stdout}\nstderr:{output.stderr}" + | _ => .error s!"solver stdout: {output.stdout} + stderr:{output.stderr} + " open Imperative @@ -297,7 +299,7 @@ def verifySingleEnv (smtsolver : String) (pE : Program × Env) (options : Option -- let rand_suffix ← IO.rand 0 0xFFFFFFFF let ans ← IO.toEIO - (fun e => f!"{e}") + (fun e => f!"IO error: {e}") (dischargeObligation options (ProofObligation.getVars obligation) smtsolver (Imperative.smt2_filename obligation.label) From 6197e3c7be506825cae0fc4a78044ff5a76828d5 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 9 Jan 2026 14:32:33 +0100 Subject: [PATCH 35/53] Turns things around --- Strata/DL/Imperative/SMTUtils.lean | 4 +--- Strata/Languages/Boogie/Verifier.lean | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Strata/DL/Imperative/SMTUtils.lean b/Strata/DL/Imperative/SMTUtils.lean index 682e59d94..8373de3ab 100644 --- a/Strata/DL/Imperative/SMTUtils.lean +++ b/Strata/DL/Imperative/SMTUtils.lean @@ -140,9 +140,7 @@ def solverResult {P : PureExpr} [ToFormat P.Ident] .ok (.sat model) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver stdout: {output.stdout} - stderr:{output.stderr} - " + | _ => .error s!"stderr:{output.stderr}\nsolver stdout: {output.stdout}\n" def VC_folder_name: String := "vcs" diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index f71fcaf05..67b893f2c 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -144,9 +144,7 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (output : IO.Process. | .error _model_err => (.ok (.sat [])) | "unsat" => .ok .unsat | "unknown" => .ok .unknown - | _ => .error s!"solver stdout: {output.stdout} - stderr:{output.stderr} - " + | _ => .error s!"stderr:{output.stderr}\nsolver stdout: {output.stdout}\n" open Imperative From 6a865f0427be8ba23082c60e5b1fa3bf3d9a4b76 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 9 Jan 2026 16:10:07 +0100 Subject: [PATCH 36/53] Fix --- StrataTest/Languages/Laurel/Grammar/TestGrammar.lean | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean b/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean index 441fd7aae..a56d3faa0 100644 --- a/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean +++ b/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean @@ -15,7 +15,7 @@ open StrataTest.DDM namespace Laurel def testAssertFalse : IO Unit := do - let laurelDialect: Strata.Dialect := Laurel + let laurelDialect: Strata.Dialect := Strata.Laurel.Laurel let filePath := "StrataTest/Languages/Laurel/Examples/Fundamentals/1. AssertFalse.lr.st" let result ← testGrammarFile laurelDialect filePath @@ -23,4 +23,4 @@ def testAssertFalse : IO Unit := do throw (IO.userError "Test failed: formatted output does not match input") #guard_msgs in -#eval testAssertFalse +#eval! testAssertFalse From 98ca32b26bd3e31a0141fb8c630a9de62fd3f364 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 12 Jan 2026 11:49:54 +0100 Subject: [PATCH 37/53] Update docs Lean version to 4.26.0 --- docs/verso/lean-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/verso/lean-toolchain b/docs/verso/lean-toolchain index 370b26d9c..e59446d59 100644 --- a/docs/verso/lean-toolchain +++ b/docs/verso/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.25.2 +leanprover/lean4:v4.26.0 From a4d6089332d42053d0fdebbdc487af46b7c08fa7 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 12 Jan 2026 12:57:20 +0100 Subject: [PATCH 38/53] Revert toolchain update --- docs/verso/lean-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/verso/lean-toolchain b/docs/verso/lean-toolchain index e59446d59..370b26d9c 100644 --- a/docs/verso/lean-toolchain +++ b/docs/verso/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.26.0 +leanprover/lean4:v4.25.2 From 2104a31946266b9e1bdf79860f1db8994bb06edb Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 12 Jan 2026 13:27:59 +0100 Subject: [PATCH 39/53] Fixes --- Strata/DDM/AST.lean | 13 +++++++++++++ Strata/DL/Imperative/MetaData.lean | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Strata/DDM/AST.lean b/Strata/DDM/AST.lean index 7048ac4d4..76bb528e3 100644 --- a/Strata/DDM/AST.lean +++ b/Strata/DDM/AST.lean @@ -8,6 +8,7 @@ module public import Std.Data.HashMap.Basic public import Strata.DDM.Util.ByteArray public import Strata.DDM.Util.Decimal +public import Lean.Data.Position import Std.Data.HashMap import Strata.DDM.Util.Array @@ -254,6 +255,18 @@ structure FileRange where instance : ToFormat FileRange where format fr := f!"{fr.file}:{fr.range}" +structure File2dRange where + file: Uri + start: Lean.Position + ending: Lean.Position + deriving DecidableEq, Repr + +instance : ToFormat File2dRange where + format fr := + let baseName := match fr.file with + | .file path => (path.splitToList (· == '/')).getLast! + f!"{baseName}({fr.start.line}, {fr.start.column})-({fr.ending.line}, {fr.ending.column})" + namespace SourceRange def none : SourceRange := { start := 0, stop := 0 } diff --git a/Strata/DL/Imperative/MetaData.lean b/Strata/DL/Imperative/MetaData.lean index 391eb1958..e66407e2a 100644 --- a/Strata/DL/Imperative/MetaData.lean +++ b/Strata/DL/Imperative/MetaData.lean @@ -74,9 +74,11 @@ inductive MetaDataElem.Value (P : PureExpr) where | msg (s : String) /-- Metadata value in the form of a fileRange. -/ | fileRange (r: Strata.FileRange) + /-- Metadata value in the form of a fileRange. -/ + | file2dRange (r: Strata.File2dRange) instance [ToFormat P.Expr] : ToFormat (MetaDataElem.Value P) where - format f := match f with | .expr e => f!"{e}" | .msg s => f!"{s}" | .fileRange r => f!"{r}" + format f := match f with | .expr e => f!"{e}" | .msg s => f!"{s}" | .fileRange r => f!"{r}" | .file2dRange r => f!"{r}" instance [Repr P.Expr] : Repr (MetaDataElem.Value P) where reprPrec v prec := @@ -85,6 +87,7 @@ instance [Repr P.Expr] : Repr (MetaDataElem.Value P) where | .expr e => f!"MetaDataElem.Value.expr {reprPrec e prec}" | .msg s => f!"MetaDataElem.Value.msg {s}" | .fileRange fr => f!"MetaDataElem.Value.fileRange {fr}" + | .file2dRange fr => f!"MetaDataElem.Value.file2dRange {fr}" Repr.addAppParen res prec def MetaDataElem.Value.beq [BEq P.Expr] (v1 v2 : MetaDataElem.Value P) := @@ -92,6 +95,7 @@ def MetaDataElem.Value.beq [BEq P.Expr] (v1 v2 : MetaDataElem.Value P) := | .expr e1, .expr e2 => e1 == e2 | .msg m1, .msg m2 => m1 == m2 | .fileRange r1, .fileRange r2 => r1 == r2 + | .file2dRange r1, .file2dRange r2 => r1 == r2 | _, _ => false instance [BEq P.Expr] : BEq (MetaDataElem.Value P) where @@ -171,7 +175,7 @@ def MetaData.formatFileRange? {P} [BEq P.Ident] (md : MetaData P) (includeEnd? : Option Std.Format := do let fileRangeElem ← md.findElem MetaData.fileRange match fileRangeElem.value with - | .fileRange m => + | .file2dRange m => let baseName := match m.file with | .file path => (path.splitToList (· == '/')).getLast! if includeEnd? then From d19710fa4d5e8c4faede463b6c5ac4049b7a8aa0 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Mon, 12 Jan 2026 14:41:00 +0100 Subject: [PATCH 40/53] Fixes --- Strata/Languages/Boogie/DDMTransform/Translate.lean | 4 +++- Strata/Languages/Boogie/Verifier.lean | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Strata/Languages/Boogie/DDMTransform/Translate.lean b/Strata/Languages/Boogie/DDMTransform/Translate.lean index b9a1fb6b5..77c990569 100644 --- a/Strata/Languages/Boogie/DDMTransform/Translate.lean +++ b/Strata/Languages/Boogie/DDMTransform/Translate.lean @@ -47,8 +47,10 @@ def TransM.error [Inhabited α] (msg : String) : TransM α := do def SourceRange.toMetaData (ictx : InputContext) (sr : SourceRange) : Imperative.MetaData Boogie.Expression := let file := ictx.fileName + let startPos := ictx.fileMap.toPosition sr.start + let endPos := ictx.fileMap.toPosition sr.stop let uri: Uri := .file file - let fileRangeElt := ⟨ MetaData.fileRange, .fileRange ⟨ uri, sr.start, sr.stop ⟩ ⟩ + let fileRangeElt := ⟨ MetaData.fileRange, .file2dRange ⟨ uri, startPos, endPos ⟩ ⟩ #[fileRangeElt] def getOpMetaData (op : Operation) : TransM (Imperative.MetaData Boogie.Expression) := diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index 634ace57b..19caf685e 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -159,6 +159,10 @@ def formatPositionMetaData [BEq P.Ident] [ToFormat P.Expr] let baseName := match fileRange.file with | .file path => (path.splitToList (· == '/')).getLast! return f!"{baseName}({startPos.line}, {startPos.column})" + | .file2dRange file2dRange => + let baseName := match file2dRange.file with + | .file path => (path.splitToList (· == '/')).getLast! + return f!"{baseName}({file2dRange.start.line}, {file2dRange.ending.column})" | _ => none structure VCResult where From 285ffc873097db2f8f1be05b7bd6f21ad38873f8 Mon Sep 17 00:00:00 2001 From: Joe Hendrix Date: Mon, 12 Jan 2026 08:21:19 -0800 Subject: [PATCH 41/53] Bump documentation to 4.26.0 --- docs/verso/lake-manifest.json | 10 +++++----- docs/verso/lakefile.toml | 2 +- docs/verso/lean-toolchain | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/verso/lake-manifest.json b/docs/verso/lake-manifest.json index aac17d200..2af892281 100644 --- a/docs/verso/lake-manifest.json +++ b/docs/verso/lake-manifest.json @@ -5,10 +5,10 @@ "type": "git", "subDir": null, "scope": "", - "rev": "8ba8c1ee844cd4a4ef1957801780c6e99e469897", + "rev": "65d9578b16437bcd2631eb2b4c191e3498a68c6b", "name": "verso", "manifestFile": "lake-manifest.json", - "inputRev": "v4.25.1", + "inputRev": "v4.26.0", "inherited": false, "configFile": "lakefile.lean"}, {"type": "path", @@ -22,7 +22,7 @@ "type": "git", "subDir": null, "scope": "", - "rev": "8864a73bf79aad549e34eff972c606343935106d", + "rev": "74835c84b38e4070b8240a063c6417c767e551ae", "name": "plausible", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -32,7 +32,7 @@ "type": "git", "subDir": null, "scope": "", - "rev": "66aefec2852d3e229517694e642659f316576591", + "rev": "38ac5945d744903ffcc473ce1030223991b11cf6", "name": "MD4Lean", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -42,7 +42,7 @@ "type": "git", "subDir": null, "scope": "", - "rev": "7347ddaca36e59238bf1fc210a6bf71dd0bccdd6", + "rev": "eb77622e97e942ba2cfe02f60637705fc2d9481b", "name": "subverso", "manifestFile": "lake-manifest.json", "inputRev": "main", diff --git a/docs/verso/lakefile.toml b/docs/verso/lakefile.toml index 11162158d..c91b6d2ab 100644 --- a/docs/verso/lakefile.toml +++ b/docs/verso/lakefile.toml @@ -8,7 +8,7 @@ path = "../.." [[require]] name = "verso" git = "https://github.com/leanprover/verso" -rev = "v4.25.1" +rev = "v4.26.0" [[lean_lib]] name = "DDMDoc" diff --git a/docs/verso/lean-toolchain b/docs/verso/lean-toolchain index 370b26d9c..e59446d59 100644 --- a/docs/verso/lean-toolchain +++ b/docs/verso/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.25.2 +leanprover/lean4:v4.26.0 From e332bad7186d8523c2b42aea8279adc1017c66c5 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Tue, 13 Jan 2026 10:10:09 +0100 Subject: [PATCH 42/53] Fix merge mistakes --- StrataTest/DDM/Integration/Java/TestGen.lean | 64 -------------------- 1 file changed, 64 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index c598a7bee..045be96b1 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -41,11 +41,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main assert! files.interfaces.any (fun i => check i.2 "sealed interface Expr") assert! files.records.size = 2 assert! files.records.any (fun r => check r.1 "Literal") @@ -69,11 +65,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main assert! files.records.any (fun r => r.1 == "Int.java") assert! files.records.any (fun r => check r.2 "public_") pure () @@ -93,11 +85,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main assert! files.interfaces.any (fun i => i.1 == "Expr.java") assert! files.records.any (fun r => r.1 == "Expr_.java") pure () @@ -116,11 +104,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 .op { name := "class_", argDecls := .ofArray #[], category := ⟨"Dup", "B"⟩, syntaxDef := { atoms := #[], prec := 0 } } -- Would clash after escaping ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main let recordNames := files.records.map Prod.fst assert! recordNames.toList.eraseDups.length == recordNames.size pure () @@ -135,11 +119,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 .op { name := "leaf", argDecls := .ofArray #[], category := ⟨"Base", "Node"⟩, syntaxDef := { atoms := #[], prec := 0 } } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main let allNames := #["Node.java", "SourceRange.java"] ++ files.interfaces.map Prod.fst ++ files.records.map Prod.fst assert! allNames.toList.eraseDups.length == allNames.size pure () @@ -159,11 +139,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main assert! files.interfaces.any (fun i => i.1 == "MyCategory.java") assert! files.records.any (fun r => r.1 == "MyOperator.java") pure () @@ -192,11 +168,7 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main let record := files.records[0]!.2 assert! check record "java.lang.String ident" assert! check record "java.math.BigInteger num" @@ -246,31 +218,11 @@ def check (s sub : String) : Bool := (s.splitOn sub).length > 1 } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main assert! files.interfaces.any (fun i => check i.2 "sealed interface Stmt") assert! files.interfaces.any (fun i => check i.2 "non-sealed interface Expr") pure () -<<<<<<< HEAD --- Test 10: Real dialect - Boogie -elab "#testBoogie" : command => do - let env ← Lean.getEnv - let state := Strata.dialectExt.getState env - let some boogie := state.loaded.dialects["Boogie"]? - | Lean.logError "Boogie dialect not found" - return - let files := generateDialect boogie "com.strata.boogie" - if files.records.size < 30 then - Lean.logError s!"Expected 30+ records, got {files.records.size}" - if files.interfaces.size < 10 then - Lean.logError s!"Expected 10+ interfaces, got {files.interfaces.size}" - -#testBoogie -======= -- Test 10: Boogie dialect returns error (has type/function declarations not yet supported) elab "#testBoogieError" : command => do let env ← Lean.getEnv @@ -284,7 +236,6 @@ elab "#testBoogieError" : command => do | .ok _ => Lean.logError "Expected error for Boogie dialect" #testBoogieError ->>>>>>> origin/main -- Test 11: Cross-dialect name collision (A.Num vs B.Num) #eval do @@ -304,11 +255,7 @@ elab "#testBoogieError" : command => do } ] } -<<<<<<< HEAD - let files := generateDialect testDialect "com.test" -======= let files := (generateDialect testDialect "com.test").toOption.get! ->>>>>>> origin/main -- Should have 2 interfaces: one for A.Num, one stub for B.Num assert! files.interfaces.size = 2 let names : List String := files.interfaces.toList.map Prod.fst @@ -329,11 +276,7 @@ elab "#testCompile" : command => do let state := Strata.dialectExt.getState env let some simple := state.loaded.dialects["Simple"]? | Lean.logError "Simple dialect not found"; return -<<<<<<< HEAD - let files := generateDialect simple "com.test" -======= let files := (generateDialect simple "com.test").toOption.get! ->>>>>>> origin/main let dir : System.FilePath := "/tmp/strata-java-test" writeJavaFiles dir "com.test" files @@ -365,11 +308,7 @@ elab "#testRoundtrip" : command => do | Lean.logError "Simple dialect not found"; return let dm := Strata.DialectMap.ofList! [Strata.initDialect, simple] let ionBytes ← IO.FS.readBinFile "StrataTest/DDM/Integration/Java/testdata/comprehensive.ion" -<<<<<<< HEAD match Strata.Program.fileFromIon dm "Simple" ionBytes with -======= - match Strata.Program.fromIon dm "Simple" ionBytes with ->>>>>>> origin/main | .error e => Lean.logError s!"Roundtrip test failed: {e}" | .ok prog => if prog.commands.size != 1 then Lean.logError "Expected 1 command"; return @@ -381,7 +320,6 @@ elab "#testRoundtrip" : command => do #testRoundtrip -<<<<<<< HEAD -- Test 13: Roundtrip with fromIonFiles - verify Lean can read Java-generated Ion array format -- Depends on testdata/comprehensive-files.ion (generated by Tools/Java/regenerate-testdata.sh) elab "#testRoundtripFiles" : command => do @@ -436,6 +374,4 @@ elab "#testRoundtripFiles" : command => do #testRoundtripFiles -======= ->>>>>>> origin/main end Strata.Java.Test From 5d30ca59ce1e93cc266c87e60951bf134a600f49 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Tue, 13 Jan 2026 10:25:12 +0100 Subject: [PATCH 43/53] Fixes --- .../Integration/Java/regenerate-testdata.sh | 4 +- .../Java/testdata/GenerateTestData.java | 56 +++++++++++- StrataVerify.lean | 1 - Tools/Java/.gitignore | 7 -- Tools/Java/regenerate-testdata.sh | 34 ------- .../com/strata/test/GenerateTestData.java | 88 ------------------- 6 files changed, 56 insertions(+), 134 deletions(-) delete mode 100644 Tools/Java/.gitignore delete mode 100755 Tools/Java/regenerate-testdata.sh delete mode 100644 Tools/Java/src/main/java/com/strata/test/GenerateTestData.java diff --git a/StrataTest/DDM/Integration/Java/regenerate-testdata.sh b/StrataTest/DDM/Integration/Java/regenerate-testdata.sh index d4acc3130..7163658da 100755 --- a/StrataTest/DDM/Integration/Java/regenerate-testdata.sh +++ b/StrataTest/DDM/Integration/Java/regenerate-testdata.sh @@ -21,7 +21,7 @@ echo "=== Compiling Java ===" javac -cp "$JAR" $GEN_DIR/com/strata/simple/*.java $TESTDATA/GenerateTestData.java echo "=== Generating test data ===" -java -cp "$JAR:$GEN_DIR:$TESTDATA" GenerateTestData "$TESTDATA/comprehensive.ion" +java -cp "$JAR:$GEN_DIR:$TESTDATA" GenerateTestData "$TESTDATA/comprehensive.ion" "$TESTDATA/comprehensive-files.ion" echo "=== Cleaning up ===" rm -rf "$GEN_DIR" @@ -31,4 +31,4 @@ echo "=== Verifying with Lean ===" (cd "$STRATA_ROOT" && lake exe strata print --include "$STRATA_ROOT/StrataTest/DDM/Integration/Java/$TESTDATA" "$STRATA_ROOT/StrataTest/DDM/Integration/Java/$TESTDATA/comprehensive.ion" 2>&1 | tail -1) echo "" -echo "Done! Regenerated $TESTDATA/comprehensive.ion" +echo "Done! Regenerated $TESTDATA/comprehensive.ion and $TESTDATA/comprehensive-files.ion" diff --git a/StrataTest/DDM/Integration/Java/testdata/GenerateTestData.java b/StrataTest/DDM/Integration/Java/testdata/GenerateTestData.java index e451b183e..395ac4c74 100644 --- a/StrataTest/DDM/Integration/Java/testdata/GenerateTestData.java +++ b/StrataTest/DDM/Integration/Java/testdata/GenerateTestData.java @@ -10,6 +10,14 @@ public class GenerateTestData { public static void main(String[] args) throws Exception { var ion = IonSystemBuilder.standard().build(); var serializer = new IonSerializer(ion); + generateSingleProgram(ion, serializer, args[0]); + + if (args.length > 1) { + generateMultipleFiles(ion, serializer, args[1]); + } + } + + private static void generateSingleProgram(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { // AST covering: Num, Str, Ident, Bool, Decimal, ByteArray, Option, Seq, nesting Node ast = block(List.of( @@ -25,11 +33,55 @@ public static void main(String[] args) throws Exception { program.add(header); program.add(serializer.serializeCommand(ast)); - try (var out = new FileOutputStream(args[0])) { + try (var out = new FileOutputStream(outPath)) { var writer = IonBinaryWriterBuilder.standard().build(out); program.writeTo(writer); writer.close(); } - System.out.println("Generated: " + args[0]); + System.out.println("Generated: " + outPath); + } + + private static void generateMultipleFiles(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { + Node ast1 = block(List.of( + assign("x", num(42)), + print("first file"))); + + IonList program1 = ion.newEmptyList(); + IonSexp header1 = ion.newEmptySexp(); + header1.add(ion.newSymbol("program")); + header1.add(ion.newString("Simple")); + program1.add(header1); + program1.add(serializer.serializeCommand(ast1)); + + Node ast2 = block(List.of( + assign("y", add(num(1), num(2))), + print("second file"), + ifStmt(true, block(List.of()), Optional.empty()))); + + IonList program2 = ion.newEmptyList(); + IonSexp header2 = ion.newEmptySexp(); + header2.add(ion.newSymbol("program")); + header2.add(ion.newString("Simple")); + program2.add(header2); + program2.add(serializer.serializeCommand(ast2)); + + IonList files = ion.newEmptyList(); + + IonStruct file1 = ion.newEmptyStruct(); + file1.put("filePath", ion.newString("file1.st")); + file1.put("program", program1); + files.add(file1); + + IonStruct file2 = ion.newEmptyStruct(); + file2.put("filePath", ion.newString("file2.st")); + file2.put("program", program2); + files.add(file2); + + try (var out = new FileOutputStream(outPath)) { + var writer = IonBinaryWriterBuilder.standard().build(out); + files.writeTo(writer); + writer.close(); + } + System.out.println("Generated: " + outPath); } } diff --git a/StrataVerify.lean b/StrataVerify.lean index 88e5c75e3..02eea5907 100644 --- a/StrataVerify.lean +++ b/StrataVerify.lean @@ -58,7 +58,6 @@ def main (args : List String) : IO UInt32 := do | .ok (opts, file) => do let text ← Strata.Util.readInputSource file let inputCtx := Lean.Parser.mkInputContext text (Strata.Util.displayName file) - let files := Map.insert Map.empty (Strata.Uri.file file) inputCtx.fileMap let dctx := Elab.LoadedDialects.builtin let dctx := dctx.addDialect! Boogie let dctx := dctx.addDialect! C_Simp diff --git a/Tools/Java/.gitignore b/Tools/Java/.gitignore deleted file mode 100644 index 20e2c280f..000000000 --- a/Tools/Java/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Generated during regenerate-testdata.sh (cleaned up after) -src/main/java/com/strata/simple/ -*.class -build/ - -# Downloaded dependency -ion-java-*.jar diff --git a/Tools/Java/regenerate-testdata.sh b/Tools/Java/regenerate-testdata.sh deleted file mode 100755 index 114501184..000000000 --- a/Tools/Java/regenerate-testdata.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Regenerate Java roundtrip test data -set -e -cd "$(dirname "$0")" - -STRATA_ROOT="$(cd ../.. && pwd)" -TESTDATA="$STRATA_ROOT/StrataTest/DDM/Integration/Java/testdata" -GEN_DIR="src/main/java/com/strata/simple" -JAR="ion-java-1.11.9.jar" - -# Download ion-java if needed -if [ ! -f "$JAR" ]; then - echo "=== Downloading ion-java ===" - curl -sLO "https://repo1.maven.org/maven2/com/amazon/ion/ion-java/1.11.9/$JAR" -fi - -echo "=== Generating Java classes from dialect ===" -(cd "$STRATA_ROOT" && lake exe strata javaGen "$TESTDATA/Simple.dialect.st" com.strata.simple "$STRATA_ROOT/Tools/Java/src/main/java") - -echo "=== Compiling Java ===" -javac -cp "$JAR" $GEN_DIR/*.java src/main/java/com/strata/test/*.java - -echo "=== Generating test data ===" -java -cp "$JAR:src/main/java" com.strata.test.GenerateTestData "$TESTDATA/comprehensive.ion" - -echo "=== Cleaning up ===" -rm -rf "$GEN_DIR" -rm -f src/main/java/com/strata/test/*.class - -echo "=== Verifying with Lean ===" -(cd "$STRATA_ROOT" && lake exe strata print --include "$TESTDATA" "$TESTDATA/comprehensive.ion" 2>&1 | tail -1) - -echo "" -echo "Done! Regenerated $TESTDATA/comprehensive.ion and $TESTDATA/comprehensive-files.ion" diff --git a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java b/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java deleted file mode 100644 index 372890a6d..000000000 --- a/Tools/Java/src/main/java/com/strata/test/GenerateTestData.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.strata.test; - -import static com.strata.simple.Simple.*; -import com.strata.simple.*; -import com.amazon.ion.*; -import com.amazon.ion.system.*; -import java.io.*; -import java.util.*; - -/** Generates comprehensive.ion covering all DDM types. */ -public class GenerateTestData { - public static void main(String[] args) throws Exception { - var ion = IonSystemBuilder.standard().build(); - var serializer = new IonSerializer(ion); - generateSingleProgram(ion, serializer, args[0]); - - if (args.length > 1) { - generateMultipleFiles(ion, serializer, args[1]); - } - } - - private static void generateSingleProgram(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { - // AST covering: Num, Str, Ident, Bool, Decimal, ByteArray, Option, Seq, nesting - Node ast = block(List.of( - assign("x", add(num(1), neg(num(2)))), - print("hello"), - ifStmt(true, data(new byte[]{0x01, (byte)0xFF}), Optional.of(decimal(3.14))), - ifStmt(false, block(List.of()), Optional.empty()))); - - IonList program = ion.newEmptyList(); - IonSexp header = ion.newEmptySexp(); - header.add(ion.newSymbol("program")); - header.add(ion.newString("Simple")); - program.add(header); - program.add(serializer.serializeCommand(ast)); - - try (var out = new FileOutputStream(outPath)) { - var writer = IonBinaryWriterBuilder.standard().build(out); - program.writeTo(writer); - writer.close(); - } - System.out.println("Generated: " + outPath); - } - - private static void generateMultipleFiles(IonSystem ion, IonSerializer serializer, String outPath) throws Exception { - Node ast1 = block(List.of( - assign("x", num(42)), - print("first file"))); - - IonList program1 = ion.newEmptyList(); - IonSexp header1 = ion.newEmptySexp(); - header1.add(ion.newSymbol("program")); - header1.add(ion.newString("Simple")); - program1.add(header1); - program1.add(serializer.serializeCommand(ast1)); - - Node ast2 = block(List.of( - assign("y", add(num(1), num(2))), - print("second file"), - ifStmt(true, block(List.of()), Optional.empty()))); - - IonList program2 = ion.newEmptyList(); - IonSexp header2 = ion.newEmptySexp(); - header2.add(ion.newSymbol("program")); - header2.add(ion.newString("Simple")); - program2.add(header2); - program2.add(serializer.serializeCommand(ast2)); - - IonList files = ion.newEmptyList(); - - IonStruct file1 = ion.newEmptyStruct(); - file1.put("filePath", ion.newString("file1.st")); - file1.put("program", program1); - files.add(file1); - - IonStruct file2 = ion.newEmptyStruct(); - file2.put("filePath", ion.newString("file2.st")); - file2.put("program", program2); - files.add(file2); - - try (var out = new FileOutputStream(outPath)) { - var writer = IonBinaryWriterBuilder.standard().build(out); - files.writeTo(writer); - writer.close(); - } - System.out.println("Generated: " + outPath); - } -} From 9d40949bd2a59208892cc6419e2ca3ea77548297 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 14 Jan 2026 10:02:36 +0100 Subject: [PATCH 44/53] Refactoring --- Strata/DDM/AST.lean | 16 ++++++++-------- Strata/DDM/Ion.lean | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Strata/DDM/AST.lean b/Strata/DDM/AST.lean index 76bb528e3..44137a8ca 100644 --- a/Strata/DDM/AST.lean +++ b/Strata/DDM/AST.lean @@ -237,9 +237,17 @@ structure SourceRange where stop : String.Pos.Raw deriving DecidableEq, Inhabited, Repr +namespace SourceRange + +def none : SourceRange := { start := 0, stop := 0 } + +def isNone (loc : SourceRange) : Bool := loc.start = 0 ∧ loc.stop = 0 + instance : ToFormat SourceRange where format fr := f!"{fr.start}-{fr.stop}" +end SourceRange + inductive Uri where | file (path: String) deriving DecidableEq, Repr @@ -267,14 +275,6 @@ instance : ToFormat File2dRange where | .file path => (path.splitToList (· == '/')).getLast! f!"{baseName}({fr.start.line}, {fr.start.column})-({fr.ending.line}, {fr.ending.column})" -namespace SourceRange - -def none : SourceRange := { start := 0, stop := 0 } - -def isNone (loc : SourceRange) : Bool := loc.start = 0 ∧ loc.stop = 0 - -end SourceRange - abbrev Arg := ArgF SourceRange abbrev Expr := ExprF SourceRange abbrev Operation := OperationF SourceRange diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index e0fcee0e5..bb0ee7095 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -183,7 +183,7 @@ private protected def asList (v : Ion SymbolId) : FromIonM { a : Array (Ion Symb match v with | .mk (.list args) => return .mk args (by simp; omega) - | x => throw s!"Expected list but got {repr x}" + | x => throw s!"Expected list" private protected def asSexp (name : String) (v : Ion SymbolId) : FromIonM ({ a : Array (Ion SymbolId) // a.size > 0 ∧ sizeOf a < sizeOf v}) := match v with From a223c5dc090dca78a6c7a5e395b02de445059f2c Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 14 Jan 2026 11:17:35 +0100 Subject: [PATCH 45/53] Fix merge error --- StrataMain.lean | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/StrataMain.lean b/StrataMain.lean index 0eeb88e64..95746613c 100644 --- a/StrataMain.lean +++ b/StrataMain.lean @@ -259,15 +259,16 @@ def laurelAnalyzeCommand : Command where for strataFile in strataFiles do - let (laurelProgram, transErrors) := Laurel.TransM.run (Strata.Uri.file strataFile.filePath) (Laurel.parseProgram strataFile.program) - if transErrors.size > 0 then - exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" - - combinedProgram := { - staticProcedures := combinedProgram.staticProcedures ++ laurelProgram.staticProcedures - staticFields := combinedProgram.staticFields ++ laurelProgram.staticFields - types := combinedProgram.types ++ laurelProgram.types - } + let transResult := Laurel.TransM.run (Strata.Uri.file strataFile.filePath) (Laurel.parseProgram strataFile.program) + match transResult with + | .error transErrors => exitFailure s!"Translation errors in {strataFile.filePath}: {transErrors}" + | .ok laurelProgram => + + combinedProgram := { + staticProcedures := combinedProgram.staticProcedures ++ laurelProgram.staticProcedures + staticFields := combinedProgram.staticFields ++ laurelProgram.staticFields + types := combinedProgram.types ++ laurelProgram.types + } let diagnostics ← Laurel.verifyToDiagnosticModels "z3" combinedProgram From 84d86e7597595634a75637aff0e0def166bd7b6a Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Wed, 14 Jan 2026 13:55:22 +0100 Subject: [PATCH 46/53] Fix errors --- .../Examples/Fundamentals/T3_ControlFlow.lean | 1 + .../Languages/Laurel/Grammar/TestGrammar.lean | 26 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 StrataTest/Languages/Laurel/Grammar/TestGrammar.lean diff --git a/StrataTest/Languages/Laurel/Examples/Fundamentals/T3_ControlFlow.lean b/StrataTest/Languages/Laurel/Examples/Fundamentals/T3_ControlFlow.lean index f0467c36b..27decdde1 100644 --- a/StrataTest/Languages/Laurel/Examples/Fundamentals/T3_ControlFlow.lean +++ b/StrataTest/Languages/Laurel/Examples/Fundamentals/T3_ControlFlow.lean @@ -10,6 +10,7 @@ import StrataTest.Languages.Laurel.TestExamples open StrataTest.Util open Strata +namespace Strata namespace Laurel def program := r" diff --git a/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean b/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean deleted file mode 100644 index a56d3faa0..000000000 --- a/StrataTest/Languages/Laurel/Grammar/TestGrammar.lean +++ /dev/null @@ -1,26 +0,0 @@ -/- - Copyright Strata Contributors - - SPDX-License-Identifier: Apache-2.0 OR MIT --/ - --- Test the minimal Laurel grammar -import Strata.Languages.Laurel.Grammar.LaurelGrammar -import StrataTest.DDM.TestGrammar -import Strata.DDM.BuiltinDialects.Init - -open Strata -open StrataTest.DDM - -namespace Laurel - -def testAssertFalse : IO Unit := do - let laurelDialect: Strata.Dialect := Strata.Laurel.Laurel - let filePath := "StrataTest/Languages/Laurel/Examples/Fundamentals/1. AssertFalse.lr.st" - let result ← testGrammarFile laurelDialect filePath - - if !result.normalizedMatch then - throw (IO.userError "Test failed: formatted output does not match input") - -#guard_msgs in -#eval! testAssertFalse From 8da23f6de79bb05ba4ebfa199b9dcbbe25107bb2 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 15 Jan 2026 12:06:18 +0100 Subject: [PATCH 47/53] Cleanup --- Strata/DDM/Ion.lean | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index f86a04c7d..9e0427921 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -183,7 +183,7 @@ private protected def asList (v : Ion SymbolId) : FromIonM { a : Array (Ion Symb match v with | .mk (.list args) => return .mk args (by simp; omega) - | x => throw s!"Expected list" + | _ => throw s!"Expected list" private protected def asSexp (name : String) (v : Ion SymbolId) : FromIonM ({ a : Array (Ion SymbolId) // a.size > 0 ∧ sizeOf a < sizeOf v}) := match v with @@ -1455,7 +1455,7 @@ def filesFromIon (dialects : DialectMap) (bytes : ByteArray) : Except String (Li match Ion.deserialize bytes with | .error (off, msg) => throw s!"Error reading Ion: {msg} (offset = {off})" | .ok a => - if p : a.size = 1 then + if a.size = 1 then pure a[0] else throw s!"Expected single Ion value" From 49bac7605c458569db52863e447f977723aa5bc3 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 15 Jan 2026 12:11:43 +0100 Subject: [PATCH 48/53] Fix failing proof by adding ': h' --- Strata/DDM/Ion.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index 9e0427921..f7685b18e 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -1455,7 +1455,7 @@ def filesFromIon (dialects : DialectMap) (bytes : ByteArray) : Except String (Li match Ion.deserialize bytes with | .error (off, msg) => throw s!"Error reading Ion: {msg} (offset = {off})" | .ok a => - if a.size = 1 then + if h : a.size = 1 then pure a[0] else throw s!"Expected single Ion value" From 4b862925e47de9d916a55c9bbf84961ee606ca57 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Thu, 15 Jan 2026 12:27:45 +0100 Subject: [PATCH 49/53] Fix merge mistakes --- Strata/Languages/Boogie/Verifier.lean | 96 ++------------------------- 1 file changed, 5 insertions(+), 91 deletions(-) diff --git a/Strata/Languages/Boogie/Verifier.lean b/Strata/Languages/Boogie/Verifier.lean index c852649d6..9d5a098a7 100644 --- a/Strata/Languages/Boogie/Verifier.lean +++ b/Strata/Languages/Boogie/Verifier.lean @@ -160,55 +160,6 @@ def solverResult (vars : List (IdentT LMonoTy Visibility)) (output : IO.Process. | "unknown" => .ok .unknown | _ => .error s!"stderr:{output.stderr}\nsolver stdout: {output.stdout}\n" -<<<<<<< HEAD -open Imperative - -def formatPositionMetaData [BEq P.Ident] [ToFormat P.Expr] - (files: Map Strata.Uri Lean.FileMap) - (md : MetaData P): Option Format := do - let fileRangeElem ← md.findElem MetaData.fileRange - match fileRangeElem.value with - | .fileRange fileRange => - let fileMap := (files.find? fileRange.file).get! - let startPos := fileMap.toPosition fileRange.range.start - let baseName := match fileRange.file with - | .file path => (path.splitToList (· == '/')).getLast! - return f!"{baseName}({startPos.line}, {startPos.column})" - | .file2dRange file2dRange => - let baseName := match file2dRange.file with - | .file path => (path.splitToList (· == '/')).getLast! - return f!"{baseName}({file2dRange.start.line}, {file2dRange.ending.column})" - | _ => none - -structure VCResult where - obligation : Imperative.ProofObligation Expression - result : Result := .unknown - estate : EncoderState := EncoderState.init - verbose : Bool := true - -def VCResult.formatWithVerbose (r : VCResult) (verbose : Bool) : Format := - f!"Obligation: {r.obligation.label}\n\ - Result: {r.result.formatWithVerbose verbose}" - -instance : ToFormat VCResult where - format r := f!"Obligation: {r.obligation.label}\n\ - Result: {r.result.formatWithVerbose r.verbose}" - -- EState : {repr r.estate.terms} - -abbrev VCResults := Array VCResult - -def VCResults.format (rs : VCResults) : Format := - let rsf := rs.map (fun r => f!"{Format.line}{r}") - Format.joinSep rsf.toList Format.line - -instance : ToFormat VCResults where - format := VCResults.format - -instance : ToString VCResults where - toString rs := toString (VCResults.format rs) - -======= ->>>>>>> origin/main def getSolverPrelude : String → SolverM Unit | "z3" => do -- These options are set by the standard Boogie implementation and are @@ -503,7 +454,6 @@ def verify else panic! s!"DDM Transform Error: {repr errors}" -<<<<<<< HEAD structure DiagnosticModel where fileRange : Strata.FileRange message : String @@ -511,16 +461,16 @@ structure DiagnosticModel where def toDiagnosticModel (vcr : Boogie.VCResult) : Option DiagnosticModel := do match vcr.result with - | .unsat => none -- Verification succeeded, no diagnostic + | .pass => none -- Verification succeeded, no diagnostic | result => let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange match fileRangeElem.value with | .fileRange fileRange => let message := match result with - | .sat _ => "assertion does not hold" - | .unknown => "assertion verification result is unknown" - | .err msg => s!"verification error: {msg}" - | _ => "verification failed" + | .fail => "assertion does not hold" + | .unknown => "assertion could not be proved" + | .implementationError msg => s!"verification error: {msg}" + | _ => panic "impossible" some { -- Subtract headerOffset to account for program header we added @@ -529,18 +479,12 @@ def toDiagnosticModel (vcr : Boogie.VCResult) : Option DiagnosticModel := do } | _ => none -======= ---------------------------------------------------------------------- - -/-- A diagnostic produced by analyzing a file -/ ->>>>>>> origin/main structure Diagnostic where start : Lean.Position ending : Lean.Position message : String deriving Repr, BEq -<<<<<<< HEAD def toDiagnostic (files: Map Strata.Uri Lean.FileMap) (vcr : Boogie.VCResult) : Option Diagnostic := do let modelOption := toDiagnosticModel vcr modelOption.map (fun dm => @@ -551,36 +495,6 @@ def toDiagnostic (files: Map Strata.Uri Lean.FileMap) (vcr : Boogie.VCResult) : start := { line := startPos.line, column := startPos.column } ending := { line := endPos.line, column := endPos.column } message := dm.message -======= -def toDiagnostic (vcr : Boogie.VCResult) : Option Diagnostic := do - -- Only create a diagnostic if verification failed. - match vcr.result with - | .pass => none -- Verification succeeded, no diagnostic - | _ => - -- Extract file range from metadata - let fileRangeElem ← vcr.obligation.metadata.findElem Imperative.MetaData.fileRange - match fileRangeElem.value with - | .fileRange range => - let message := - match vcr.obligation.property with - | .assert => - match vcr.smtResult with - | .sat _ => "assertion does not hold" - | .unknown => "assertion verification result is unknown" - | .err msg => s!"verification error: {msg}" - | _ => "verification failed" - | .cover => - match vcr.smtResult with - | .unsat => "cover failed" - | .unknown => "cover status is unknown" - | .err msg => s!"verification error: {msg}" - | _ => "verification failed" - some { - -- Subtract headerOffset to account for program header we added - start := { line := range.start.line, column := range.start.column } - ending := { line := range.ending.line, column := range.ending.column } - message := message ->>>>>>> origin/main } ) From bafb7d2b8c6525a53ef8ceb1aea1f1585e1ef423 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 16 Jan 2026 12:13:28 +0100 Subject: [PATCH 50/53] Remove repr usage --- Strata/DDM/Ion.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Strata/DDM/Ion.lean b/Strata/DDM/Ion.lean index f7685b18e..ebdc2eee4 100644 --- a/Strata/DDM/Ion.lean +++ b/Strata/DDM/Ion.lean @@ -284,7 +284,7 @@ private def deserializeValue {α} (bs : ByteArray) (act : Ion SymbolId → FromI throw s!"Error reading Ion: {msg} (offset = {off})" | .ok a => pure a let .isTrue p := inferInstanceAs (Decidable (a.size = 1)) - | throw s!"Expected single Ion value, but got {repr a}." + | throw s!"Expected single Ion value, but got {a.size} values." let entries := a[0] let .isTrue p := inferInstanceAs (Decidable (entries.size = 2)) | throw s!"Expected symbol table and value in dialect." From 8e20c05fea1f3495cb02e153263472311a69d14b Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 16 Jan 2026 12:39:37 +0100 Subject: [PATCH 51/53] Fix build error --- Strata/DDM/AST.lean | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strata/DDM/AST.lean b/Strata/DDM/AST.lean index 744acc85c..1077807c3 100644 --- a/Strata/DDM/AST.lean +++ b/Strata/DDM/AST.lean @@ -288,7 +288,7 @@ end SourceRange inductive Uri where | file (path: String) - deriving DecidableEq, Repr + deriving DecidableEq, Repr, Inhabited instance : ToFormat Uri where format fr := match fr with | .file path => path @@ -296,7 +296,7 @@ instance : ToFormat Uri where structure FileRange where file: Uri range: Strata.SourceRange - deriving DecidableEq, Repr + deriving DecidableEq, Repr, Inhabited instance : ToFormat FileRange where format fr := f!"{fr.file}:{fr.range}" From a5b1e4be4f1230758819565a408838a164f09bc4 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 16 Jan 2026 12:50:59 +0100 Subject: [PATCH 52/53] Additional fix --- Strata/Languages/Laurel/LaurelToBoogieTranslator.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean index 5a4843881..2ae0bcaa0 100644 --- a/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean +++ b/Strata/Languages/Laurel/LaurelToBoogieTranslator.lean @@ -89,7 +89,7 @@ def translateExpr (expr : StmtExpr) : Boogie.Expression.Expr := def getNameFromMd (md : Imperative.MetaData Boogie.Expression): String := let fileRange := (Imperative.getFileRange md).get! - s!"({fileRange.start.column},{fileRange.start.line})" + s!"({fileRange.range.start})" /-- Translate Laurel StmtExpr to Boogie Statements From 39d7d719e8c005bfc6fbaf76ed613cf79823c277 Mon Sep 17 00:00:00 2001 From: Remy Willems Date: Fri, 16 Jan 2026 13:27:58 +0100 Subject: [PATCH 53/53] Fix --- StrataTest/DDM/Integration/Java/TestGen.lean | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StrataTest/DDM/Integration/Java/TestGen.lean b/StrataTest/DDM/Integration/Java/TestGen.lean index 9bbb3bc83..eb6cd76e5 100644 --- a/StrataTest/DDM/Integration/Java/TestGen.lean +++ b/StrataTest/DDM/Integration/Java/TestGen.lean @@ -347,7 +347,7 @@ elab "#testRoundtripFiles" : command => do let cmd1 := file1.program.commands[0]! if cmd1.name != (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) then Lean.logError "File 1: Expected block command"; return - if let .seq _ stmts := cmd1.args[0]! then + if let .seq _ _ stmts := cmd1.args[0]! then if stmts.size != 2 then Lean.logError s!"File 1: Expected 2 statements, got {stmts.size}" return @@ -365,7 +365,7 @@ elab "#testRoundtripFiles" : command => do let cmd2 := file2.program.commands[0]! if cmd2.name != (⟨"Simple", "block"⟩ : Strata.QualifiedIdent) then Lean.logError "File 2: Expected block command"; return - if let .seq _ stmts := cmd2.args[0]! then + if let .seq _ _ stmts := cmd2.args[0]! then if stmts.size != 3 then Lean.logError s!"File 2: Expected 3 statements, got {stmts.size}" return