From 842e458a32af6b25e862c854b65c6bf6aab76309 Mon Sep 17 00:00:00 2001
From: Marc Pouzet <Marc.Pouzet@ens.fr>
Date: Fri, 25 Oct 2024 14:48:27 +0200
Subject: [PATCH 1/5] Test build

---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index fbceb67ec..bddf10299 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,6 @@
 #!/usr/bin/env ocaml
 
+
 #load "unix.cma"
 
 let version = "2.2"
@@ -46,3 +47,4 @@ let () =
 |} x s)
     statements;
   close_out oc;
+

From 8ef6cd26f2b2ed5dd2c68997cc39d5be093146d1 Mon Sep 17 00:00:00 2001
From: Marc Pouzet <Marc.Pouzet@ens.fr>
Date: Thu, 14 Nov 2024 08:28:52 +0100
Subject: [PATCH 2/5] Update

---
 config.ml               |   4 ++++
 src/ctests/good/t_3.zci | Bin 0 -> 309 bytes
 2 files changed, 4 insertions(+)
 create mode 100644 config.ml
 create mode 100644 src/ctests/good/t_3.zci

diff --git a/config.ml b/config.ml
new file mode 100644
index 000000000..2eebcfba7
--- /dev/null
+++ b/config.ml
@@ -0,0 +1,4 @@
+let version = "2024"
+let subversion = "dev"
+let stdlib = "/Users/pouzet/article/paper/lustre/hybrid/zelus_git/github/zelus.2024.git/_build/install/default/share/zelus"
+let date = "2024-10-28-7:22"
diff --git a/src/ctests/good/t_3.zci b/src/ctests/good/t_3.zci
new file mode 100644
index 0000000000000000000000000000000000000000..602ce0c6c71cf36ed741ba906063f78a6439008e
GIT binary patch
literal 309
zcmZvWL23d)5JmrxLcE4{7*S#nyuj~Sh)aWlOCbb7NJfQO29iJy&<=^~US&OAz$|is
zzLBXhE_BGEsL!ja?)U!rwFjaGfIIC*s~OB>)(>pXd%?5#D1J69+s?=1?BQ{7Zx(4r
z$BZj`#8N+zXRhrFmzJ*Zb)W^}5aE@i)pUm56eWsCpUYJ)HCL2TZw#Ep;YsH@J^@YX
zAMjf*w{pWkGw)UGq)X{wK-i;|v?(nNiNs<`sKJHQULUMTeJlD$O5$9u%a2FW(3?cJ
FegP;VVd4M)

literal 0
HcmV?d00001


From ee76c17f204597e34ca8f4be67e2234a5ad66ef3 Mon Sep 17 00:00:00 2001
From: Marc Pouzet <Marc.Pouzet@ens.fr>
Date: Mon, 8 Dec 2025 14:11:37 +0100
Subject: [PATCH 3/5] --

---
 compiler/global/printer.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/global/printer.ml b/compiler/global/printer.ml
index 569348247..4469307e6 100644
--- a/compiler/global/printer.ml
+++ b/compiler/global/printer.ml
@@ -50,7 +50,7 @@ let qualident ff { Lident.qual = m; Lident.id = s } =
   fprintf ff "%s.%s" m (parenthesis s)
 
 let longname ff ln =
-  let ln = Initial.short (currentname ln) in
+  let ln = Initial.short (Modules.currentname ln) in
   match ln with
     | Lident.Name(m) -> shortname ff m
     | Lident.Modname(qual) -> qualident ff qual

From d5a279dd71d5d99883dc5f771055dee0c9fcfec5 Mon Sep 17 00:00:00 2001
From: Marc Pouzet <Marc.Pouzet@ens.fr>
Date: Mon, 8 Dec 2025 14:11:55 +0100
Subject: [PATCH 4/5] --

---
 compiler/typing/typing.ml | 3 ++-
 dune                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/typing/typing.ml b/compiler/typing/typing.ml
index be8a61be2..b11fae4a1 100644
--- a/compiler/typing/typing.ml
+++ b/compiler/typing/typing.ml
@@ -399,7 +399,8 @@ let rec build (names, inames) { eq_desc = desc } =
          block_with_bounded (names, inames) b in
        let esc_names, esc_inames =
          List.fold_left escape (names, inames) esc_list in
-       S.union names (if is_weak then S.diff esc_names bounded else esc_names),
+       S.union names
+         (if is_weak then S.diff esc_names bounded else esc_names),
        S.union inames
          (if is_weak then S.diff esc_inames bounded else esc_inames)
      in
diff --git a/dune b/dune
index 345bfc7d4..f294e4909 100644
--- a/dune
+++ b/dune
@@ -1 +1 @@
-(env (dev (flags (:standard -w +a-4-6-7-9-27-29-32..42-44-45-48-50-60-68-70 -warn-error -a+31))))
\ No newline at end of file
+(env (dev (flags (:standard -w +a-4-6-7-9-26-27-29-32..42-44-45-48-50-60-68-70 -warn-error -a+31))))

From 68e0ff005653c11ef5a07ac78afc25723450f54f Mon Sep 17 00:00:00 2001
From: Marc Pouzet <Marc.Pouzet@ens.fr>
Date: Mon, 8 Dec 2025 14:47:27 +0100
Subject: [PATCH 5/5] Change or in ||.

---
 examples/ltta/ltta.zls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ltta/ltta.zls b/examples/ltta/ltta.zls
index 514d5644a..de7763313 100644
--- a/examples/ltta/ltta.zls
+++ b/examples/ltta/ltta.zls
@@ -169,7 +169,7 @@ let node tb_controller (i, om, mi) = (o, im, pr) where
             and emit im = data(i)+pr in Ready
       | Ready ->
           do n = q -> (last n - 1)
-          until ((n = 1) or preempted) then
+          until ((n = 1) || preempted) then
             do pr = debug "PUBLISH"
             and emit o = m+pr in Wait