Merge remote branch 'tohava/master'

Conflicts:
	src/boot/fe/ast.ml

diff --cc src/Makefile
Simple merge

diff --cc src/boot/fe/ast.ml
index 357bf1e65c638856620ccc5d3a82caeffdd5d732,3f3d5145f1d73870783cb648c65c52b6a1b17936..79ff2c7c4b6ca67a52b42ade4b0c820daa849518
--- 1/src/boot/fe/ast.ml
--- 2/src/boot/fe/ast.ml
+++ b/src/boot/fe/ast.ml
@@@ -1253,8 -1252,7 +1253,7 @@@ and fmt_stmt_body (ff:Format.formatter
                    fmt_cbb ff;
            end;
            fmt_cbb ff;
- 
 -      | STMT_alt_port at -> 
 +      | STMT_alt_port at ->
            fmt_obox ff;
            fmt ff "alt ";
            fmt_obr ff;
@@@ -1273,8 -1271,7 +1272,7 @@@
                    fmt_cbb ff;
            end;
            fmt_cbb ff;
- 
 -      | STMT_note at -> 
 +      | STMT_note at ->
            begin
              fmt ff "note ";
              fmt_atom ff at;
@@@ -1306,12 -1303,14 +1304,13 @@@ and fmt_ar
  and fmt_tag_arm (ff:Format.formatter) (tag_arm:tag_arm) : unit =
    let (pat, block) = tag_arm.node in
      fmt_arm ff (fun ff -> fmt_pat ff pat) block;
 -    
 +
  and fmt_type_arm (ff:Format.formatter) (type_arm:type_arm) : unit =
-   let (_, slot, block) = type_arm.node in
-     fmt_arm ff (fun ff -> fmt_slot ff slot) block;
- 
- 
+   let ((ident, slot), block) = type_arm.node in
+   let fmt_type_arm_case (ff:Format.formatter) =
+     fmt_slot ff slot; fmt ff " "; fmt_ident ff ident
+   in
+     fmt_arm ff fmt_type_arm_case block;
 -      
  and fmt_port_arm (ff:Format.formatter) (port_arm:port_arm) : unit =
    let (port_case, block) = port_arm.node in
      fmt_arm ff (fun ff -> fmt_port_case ff port_case) block;

diff --cc src/boot/fe/item.ml
Simple merge

diff --cc src/boot/util/common.ml
Simple merge