From ddca656096da346eee6bd7e02ff93e490b370a0c Mon Sep 17 00:00:00 2001 From: Johanna Schinabeck Date: Tue, 23 Apr 2024 11:20:28 +0200 Subject: [PATCH 1/2] updated dependencies --- .github/workflows/locked.yml | 2 +- .github/workflows/unlocked.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/locked.yml b/.github/workflows/locked.yml index edd251b66f..18935725ca 100644 --- a/.github/workflows/locked.yml +++ b/.github/workflows/locked.yml @@ -18,7 +18,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-13 ocaml-compiler: - ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file # don't add any other because they won't be used diff --git a/.github/workflows/unlocked.yml b/.github/workflows/unlocked.yml index 907ff14386..5e586ee038 100644 --- a/.github/workflows/unlocked.yml +++ b/.github/workflows/unlocked.yml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-13 ocaml-compiler: - 5.0.x - ocaml-variants.4.14.0+options,ocaml-option-flambda @@ -91,7 +91,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-13 ocaml-compiler: - ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file, downgrade deps step @@ -189,7 +189,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-13 ocaml-compiler: - ocaml-variants.4.14.0+options,ocaml-option-flambda # matches opam lock file From bfbfd88bba5e54da538213e5862753ddda4b63b4 Mon Sep 17 00:00:00 2001 From: Johanna Schinabeck Date: Tue, 23 Apr 2024 22:38:35 +0200 Subject: [PATCH 2/2] fixed html of context gas --- src/framework/constraints.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/constraints.ml b/src/framework/constraints.ml index 1f2bf29f51..2d2fa80f8d 100644 --- a/src/framework/constraints.ml +++ b/src/framework/constraints.ml @@ -518,7 +518,7 @@ struct struct include Lattice.Prod (Base1) (Base2) let printXml f (x,y) = - BatPrintf.fprintf f "\n\n\n%s\n\n%a\nContext Gas Value\n\n%a\n\n" (XmlUtil.escape (Base1.name ())) Base1.printXml x Base2.printXml y + BatPrintf.fprintf f "\n%a\n%a\n" Base1.printXml x Base2.printXml y end module D = Context_Gas_Prod (S.D) (Lattice.Chain (IntConf)) (* Product of S.D and an integer, tracking the context gas value *) module C = Printable.Option (S.C) (NoContext)