Include recent changes on main into 2024

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

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

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"

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;
+

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))))
+(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))))

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