Merge pull request #4705 from chenglou/new-new-syntax

Author: bobzhang

lib/4.06.1/whole_compiler.ml

@@ -416031,13 +416031,11 @@ end
 module Res_minibuffer : sig 
 #1 "res_minibuffer.mli"
 type t
-val add_char : t -> char -> unit
 val add_string : t -> string -> unit
 val contents : t -> string
 val create : int -> t
 val flush_newline : t -> unit
-val length : t -> int
-val unsafe_get : t -> int -> char
+
 end = struct
 #1 "res_minibuffer.ml"
 type t = {
@@ -416053,11 +416051,6 @@ let create n =
 
 let contents b = Bytes.sub_string b.buffer 0 b.position
 
-let unsafe_get b ofs =
-  Bytes.unsafe_get b.buffer ofs
-
-let length b = b.position
-
 (* Can't be called directly, don't add to the interface *)
 let resize_internal b more =
   let len = b.length in
@@ -416095,6 +416088,7 @@ let flush_newline b =
   done;
   b.position <- !position;
   add_char b '\n'
+
 end
 module Res_doc : sig 
 #1 "res_doc.mli"
@@ -416349,10 +416343,6 @@ let toString ~width doc =
       end
   in
   process ~pos:0 [] [0, Flat, doc];
-
-  let len = MiniBuffer.length buffer in
-  if len > 0 && MiniBuffer.unsafe_get buffer (len - 1) != '\n' then
-    MiniBuffer.add_char buffer '\n';
   MiniBuffer.contents buffer
 
 
@@ -418599,6 +418589,8 @@ and walkExprArgument (_argLabel, expr) t comments =
       let (before, after) = partitionLeadingTrailing comments longident.loc in
       attach t.leading longident.loc before;
       attach t.trailing longident.loc after
+    | Pmod_structure [] ->
+      attach t.inside modExpr.pmod_loc comments
     | Pmod_structure structure ->
       walkStructure structure t comments
     | Pmod_extension extension ->
@@ -418692,6 +418684,8 @@ and walkExprArgument (_argLabel, expr) t comments =
       let (leading, trailing) = partitionLeadingTrailing comments longident.loc in
       attach t.leading longident.loc leading;
       attach t.trailing longident.loc trailing;
+    | Pmty_signature [] ->
+      attach t.inside modType.pmty_loc comments
     | Pmty_signature signature ->
       walkSignature signature t comments
     | Pmty_extension extension ->
@@ -419992,10 +419986,10 @@ let explain t =
     end
   | Expected {context; token = t} ->
     let hint = match context with
-    | Some grammar -> "It signals the start of " ^ (Grammar.toString grammar)
+    | Some grammar -> " It signals the start of " ^ (Grammar.toString grammar)
     | None -> ""
     in
-    "Did you forget a `" ^ (Token.toString t) ^ "` here? " ^ hint
+    "Did you forget a `" ^ (Token.toString t) ^ "` here?" ^ hint
   | Unexpected {token = t; context = breadcrumbs} ->
     let name = (Token.toString t) in
     begin match breadcrumbs with
@@ -420062,15 +420056,24 @@ let make ~startPos ~endPos category = {
 }
 
 let printReport diagnostics src =
+  let rec print diagnostics src =
+    match diagnostics with
+    | [] -> ()
+    | d::rest ->
+      Res_diagnostics_printing_utils.Super_location.super_error_reporter
+        Format.err_formatter
+        ~src
+        ~startPos:d.startPos
+        ~endPos:d.endPos
+        ~msg:(explain d);
+      begin match rest with
+      | [] -> ()
+      | _ -> Format.fprintf Format.err_formatter "@."
+      end;
+      print rest src
+  in
   Format.fprintf Format.err_formatter "@[<v>";
-  List.rev diagnostics |> List.iter (fun d -> 
-    Res_diagnostics_printing_utils.Super_location.super_error_reporter
-      Format.err_formatter
-      ~src
-      ~startPos:d.startPos
-      ~endPos:d.endPos
-      ~msg:(explain d)
-  );
+  print (List.rev diagnostics) src;
   Format.fprintf Format.err_formatter "@]@."
 
 let unexpected token context =
@@ -422257,6 +422260,23 @@ and printModType modType cmtTbl =
       printAttributes ~loc:longident.loc modType.pmty_attributes cmtTbl;
       printLongidentLocation longident cmtTbl
     ]
+  | Pmty_signature [] ->
+    let shouldBreak =
+      modType.pmty_loc.loc_start.pos_lnum < modType.pmty_loc.loc_end.pos_lnum
+    in
+    Doc.breakableGroup ~forceBreak:shouldBreak (
+      Doc.concat [
+        Doc.lbrace;
+        Doc.indent (
+          Doc.concat [
+            Doc.softLine;
+            printCommentsInside cmtTbl modType.pmty_loc;
+          ];
+        );
+        Doc.softLine;
+        Doc.rbrace;
+      ]
+    )
   | Pmty_signature signature ->
     let signatureDoc = Doc.breakableGroup ~forceBreak:true (
       Doc.concat [
@@ -426352,6 +426372,23 @@ and printModExpr modExpr cmtTbl =
   let doc = match modExpr.pmod_desc with
   | Pmod_ident longidentLoc ->
     printLongidentLocation longidentLoc cmtTbl
+  | Pmod_structure [] ->
+    let shouldBreak =
+      modExpr.pmod_loc.loc_start.pos_lnum < modExpr.pmod_loc.loc_end.pos_lnum
+    in
+    Doc.breakableGroup ~forceBreak:shouldBreak (
+      Doc.concat [
+        Doc.lbrace;
+        Doc.indent (
+          Doc.concat [
+            Doc.softLine;
+            printCommentsInside cmtTbl modExpr.pmod_loc;
+          ];
+        );
+        Doc.softLine;
+        Doc.rbrace;
+      ]
+    )
   | Pmod_structure structure ->
     Doc.breakableGroup ~forceBreak:true (
       Doc.concat [
@@ -426644,12 +426681,12 @@ let printImplementation ~width (s: Parsetree.structure) ~comments =
   (* CommentTable.log cmtTbl; *)
   let doc = printStructure s cmtTbl in
   (* Doc.debug doc; *)
-  Doc.toString ~width doc
+  Doc.toString ~width doc ^ "\n"
 
 let printInterface ~width (s: Parsetree.signature) ~comments =
   let cmtTbl = CommentTable.make () in
   CommentTable.walkSignature s cmtTbl comments;
-  Doc.toString ~width (printSignature s cmtTbl)
+  Doc.toString ~width (printSignature s cmtTbl) ^ "\n"
 
 end
 module Res_core : sig