Merge branch 'bobot/tagset' into 'master'

Imperative TagSet with iterators

See merge request !82

drivers/ocaml64.drv

@@ -302,6 +302,12 @@ module mach.peano.MinMax
   syntax val  min    "min %1 %2" prec 4 3 3
 end
 
+module mach.peano.Int63
+  syntax val  defensive_to_int63    "%1"
+  syntax val  to_int63    "%1"
+  syntax val  of_int63    "%1"
+end
+
 module mach.onetime.OneTime
   syntax type t      "int"
   syntax val  to_int "Z.of_int %1" prec 4 3

src/mlw/ocaml_printer.ml

@@ -92,12 +92,15 @@ module Print = struct
     List.iter (fun s -> Hstr.add h s ()) ocaml_keywords;
     Hstr.mem h
 
+  let char_to_alnumusquote c =
+    match c with '\'' -> "\'" | _ -> char_to_alnumus c
+
   (* iprinter: local names
      aprinter: type variables
      tprinter: toplevel definitions *)
   let iprinter, aprinter, tprinter =
-    let isanitize = sanitizer char_to_alnumus char_to_alnumus in
-    let lsanitize = sanitizer char_to_lalnumus char_to_alnumus in
+    let isanitize = sanitizer char_to_alnumus char_to_alnumusquote in
+    let lsanitize = sanitizer char_to_lalnumus char_to_alnumusquote in
     create_ident_printer ocaml_keywords ~sanitizer:isanitize,
     create_ident_printer ocaml_keywords ~sanitizer:lsanitize,
     create_ident_printer ocaml_keywords ~sanitizer:lsanitize
@@ -719,8 +722,7 @@ module Print = struct
 
   let extract_functor_args info dl =
     let rec extract args = function
-      (* FIXME remove empty args? *)
-      (* | Dmodule (_, []) :: dl -> extract args dl *)
+      | Dmodule (_, []) :: dl -> extract args dl
       | Dmodule (x, dlx) :: dl when is_signature info dlx ->
           extract ((x, dlx) :: args) dl
       | dl -> List.rev args, dl in

stdlib/mach/peano.mlw

@@ -102,10 +102,19 @@ module MinMax
 end
 
 module Int63
+  use int.Int
   use mach.int.Int63
   use Peano
 
+  val defensive_to_int63 (x:t) : int63
+    requires { Int63.in_bounds x.v }
+    ensures { result = x.v }
+
   val partial to_int63 (x:t) : int63
     ensures { result = x.v }
 
+  val of_int63 (x:int63) (low high: t) : t
+    requires { low.v <= x <= high.v }
+    ensures { result.v = x }
+
 end