changelog/2295

+
+author: tomjack
+description: "\\n\\n"
+merge_request: '2295'
+title: "Minify debugger JSON"
+type: performance
+            
\ No newline at end of file

src/bin/expect_tests/get_scope_full_stdlib.ml

@@ -331,7 +331,7 @@ let%expect_test _ =
       File "", line 326, characters 68-78
     (unforged_ticket#238:8-23 -> unforged_ticket)
     Range: File "", line 238, characters 8-23
-    Body Range: File "", line 238, characters 26-40
+    Body Range: File "", line 238, characters 41-91
     Content: : |funtype 's : * . record[amount -> nat ,
                                         ticketer -> address ,
                                         value -> 's({ name: ticketer }, { name: value }, { name: amount })]|
@@ -349,7 +349,7 @@ let%expect_test _ =
     Module definitions:
     (Tezos#7:7-12 -> Tezos)
     Range: File "", line 7, characters 7-12
-    Body Range: File "", line 9, character 2 to line 65, character 20
+    Body Range: File "", line 9, character 2 to line 65, character 264
     Content: Members: Variable definitions:
                       (get_balance#9:6-17 -> get_balance)
                       Range: File "", line 9, characters 6-17
@@ -590,7 +590,7 @@ let%expect_test _ =
 
     (Big_map#77:7-14 -> Big_map)
     Range: File "", line 77, characters 7-14
-    Body Range: File "", line 78, character 2 to line 87, character 87
+    Body Range: File "", line 78, character 12 to line 87, character 87
     Content: Members: Variable definitions:
                       (empty#78:16-21 -> empty)
                       Range: File "", line 78, characters 16-21
@@ -1647,7 +1647,7 @@ let%expect_test _ =
 
                       (Proxy_ticket#522:9-21 -> Proxy_ticket)
                       Range: File "", line 522, characters 9-21
-                      Body Range: File "", line 523, character 4 to line 590, character 7
+                      Body Range: File "", line 523, character 15 to line 590, character 7
                       Content: Members: Variable definitions:
                                         (proxy_transfer_contract#523:19-42 -> proxy_transfer_contract)
                                         Range: File "", line 523, characters 19-42

src/formatter/ligo_formatter.ml

@@ -317,7 +317,8 @@ module Michelson_formatter = struct
           ]
       else json
     in
-    Format.fprintf ppf "%a" Data_encoding.Json.pp json
+    Format.fprintf ppf "%s"
+      (Data_encoding.Json.to_string ~minify:true json)
 
 
   let result_ppformat

src/passes/03-unification/cameligo/cameligo.ml

 module CST = Cst.Cameligo
 module AST = Ast_unified
 
-let compile_expression = Compile.compile_expression
-let compile_program = Compile.compile_program
+
+open Unification_shared.Helpers.Make_unification (Compile)
+let compile_expression = compile_expression
+let compile_program = compile_program
 let decompile_program = Decompile.decompile_program
 let decompile_pattern = Decompile.decompile_pattern
 let decompile_expression = Decompile.decompile_expression

src/passes/03-unification/jsligo/compile.ml

@@ -7,7 +7,7 @@ module I = Cst.Jsligo
 
 let ghost : string I.wrap = I.Wrap.ghost ""
 
-module TODO_unify_in_cst = struct
+module TODO_do_in_parsing = struct
   let conv_attr attr_reg =
     let (key, value), _loc = w_split attr_reg in
     let f = function
@@ -24,9 +24,7 @@ module TODO_unify_in_cst = struct
 
 
   let weird_attr _ = ()
-end
 
-module TODO_do_in_parsing = struct
   let labelize_pattern p =
     match p with
     (* would be better to emit a label/string directly ? *)
@@ -194,7 +192,7 @@ let rec expr : Eq.expr -> Folding.expr =
     in
     return @@ E_call (expr, args)
   | EConstr { value = ctor, arg_opt; _ } ->
-    let element = TODO_unify_in_cst.constructor_element arg_opt in
+    let element = TODO_do_in_parsing.constructor_element arg_opt in
     return @@ E_constructor { constructor = O.Label.of_string ctor.value; element }
   | EArray { value = items; _ } ->
     let items =
@@ -297,7 +295,7 @@ let rec ty_expr : Eq.ty_expr -> Folding.ty_expr =
     match attributes with
     | [] -> return @@ no_attr
     | hd :: tl ->
-      let hd = TODO_unify_in_cst.conv_attr hd in
+      let hd = TODO_do_in_parsing.conv_attr hd in
       return @@ O.T_attr (hd, attr tl)
   in
   match t with
@@ -325,7 +323,7 @@ let rec ty_expr : Eq.ty_expr -> Folding.ty_expr =
       in
       ( TODO_do_in_parsing.labelize (r_fst constr)
       , ty
-      , TODO_unify_in_cst.conv_attrs attributes )
+      , TODO_do_in_parsing.conv_attrs attributes )
     in
     return_attr
       attributes
@@ -343,7 +341,7 @@ let rec ty_expr : Eq.ty_expr -> Folding.ty_expr =
       let destruct I.{ field_name; field_type; attributes; _ } =
         ( TODO_do_in_parsing.labelize (r_fst field_name)
         , Some field_type
-        , TODO_unify_in_cst.conv_attrs attributes )
+        , TODO_do_in_parsing.conv_attrs attributes )
       in
       let lst = List.map ~f:(destruct <@ r_fst) @@ nsepseq_to_list ne_elements in
       O.Non_linear_rows.make lst
@@ -399,7 +397,7 @@ let rec ty_expr : Eq.ty_expr -> Folding.ty_expr =
         in
         ( () (* , t_record_raw ~loc (Non_linear_rows.make lst) *)
         , I.TObject obj
-        , TODO_unify_in_cst.conv_attrs attributes )
+        , TODO_do_in_parsing.conv_attrs attributes )
       in
       let lst = List.map ~f:destruct_obj (nsepseq_to_list t) in
       O.Non_linear_disc_rows.make lst
@@ -425,7 +423,7 @@ let rec pattern : Eq.pattern -> Folding.pattern =
       (match attributes with
       | [] -> return @@ P_var (TODO_do_in_parsing.var variable)
       | hd :: tl ->
-        let attr = TODO_unify_in_cst.conv_attr hd in
+        let attr = TODO_do_in_parsing.conv_attr hd in
         let p = { p with value = { p.value with attributes = tl } } in
         return @@ P_attr (attr, pattern_of_pattern @@ I.PVar p))
     | PObject o ->
@@ -522,7 +520,7 @@ and instruction : Eq.instruction -> Folding.instruction =
   match i with
   | SBlock s -> return @@ O.I_block s.value.inside
   | SExpr (attr, expr) ->
-    TODO_unify_in_cst.weird_attr attr;
+    TODO_do_in_parsing.weird_attr attr;
     return @@ I_expr expr
   | SCond c ->
     let c = c.value in
@@ -582,7 +580,7 @@ and declaration : Eq.declaration -> Folding.declaration =
     match attributes with
     | [] -> return @@ no_attr
     | hd :: tl ->
-      let hd = TODO_unify_in_cst.conv_attr hd in
+      let hd = TODO_do_in_parsing.conv_attr hd in
       return @@ O.D_attr (hd, attr tl)
   in
   match d with

src/passes/15-self_mini_c/self_mini_c.ml

@@ -340,5 +340,7 @@ let all_expression ~raise options e =
   let e = Uncurry.uncurry_expression e in
   let e = all_expression ~raise options e in
   let e = create_contract ~raise e in
-  let e = Check_apply.capture_expression ~raise e in
+  let e = if options.backend.disable_michelson_typechecking
+          then e
+          else Check_apply.capture_expression ~raise e in
   e