fix: print comments again

flake.nix

@@ -11,7 +11,7 @@
     melange-compiler-libs = {
       # this changes rarely, and it's better than having to rely on nix's poor
       # support for submodules
-      url = "github:melange-re/melange-compiler-libs";
+      url = "github:melange-re/melange-compiler-libs/anmonteiro/mel-as-variants";
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };

jscomp/core/js_dump.ml

@@ -795,9 +795,9 @@ and expression_desc cxt ~(level : int) x : cxt =
         in
         ( Js_op.Lit L.tag,
           {
-            (Option.value
-               (Option.map E.as_value as_value.as_modifier)
-               ~default:tag)
+            (match as_value.as_modifier with
+            | Some modifier -> E.as_value modifier
+            | None -> tag)
             with
             comment = Some as_value.name;
           } )
@@ -824,9 +824,9 @@ and expression_desc cxt ~(level : int) x : cxt =
           in
           ( Js_op.Lit L.tag,
             {
-              (Option.value
-                 (Option.map E.as_value as_value.as_modifier)
-                 ~default:tag)
+              (match as_value.as_modifier with
+              | Some modifier -> E.as_value modifier
+              | None -> tag)
               with
               comment = Some as_value.name;
             } )

jscomp/core/js_exp_make.ml

@@ -305,9 +305,14 @@ let true_ : t = make_expression (Bool true)
 let false_ : t = make_expression (Bool false)
 let bool v = if v then true_ else false_
 
-let as_value = function
-  | Lambda.String s -> str s (* ~delim:DStarJ *)
-  | Int i -> small_int i
+let as_value ?comment modifier =
+  {
+    (match modifier with
+    | Lambda.String s -> str s (* ~delim:DStarJ *)
+    | Int i -> small_int i)
+    with
+    comment;
+  }
 
 let array_index ?loc ?comment (e0 : t) (e1 : t) : t =
   match (e0.expression_desc, e1.expression_desc) with

jscomp/core/js_exp_make.mli

@@ -175,7 +175,7 @@ val assign_by_int : ?loc:Location.t -> ?comment:string -> t -> int32 -> t -> t
 
 val assign_by_exp : t -> t -> t -> t
 val assign : ?loc:Location.t -> ?comment:string -> t -> t -> t
-val as_value : Import.Lambda.as_modifier -> t
+val as_value : ?comment:string -> Import.Lambda.as_modifier -> t
 val triple_equal : ?loc:Location.t -> ?comment:string -> t -> t -> t
 (* TODO: reduce [triple_equal] use *)
 

jscomp/core/js_stmt_make.ml

@@ -131,8 +131,7 @@ let int_switch ?(comment : string option)
 
 let string_switch ?(comment : string option)
     ?(declaration : (J.property * Ident.t) option) ?(default : J.block option)
-    (e : J.expression) (clauses : (Lambda.as_modifier * J.case_clause) list) : t
-    =
+    (e : J.expression) (clauses : J.string_clause list) : t =
   match e.expression_desc with
   | Str (_, txt) | Unicode txt -> (
       let continuation =

jscomp/core/lam_compile.ml

@@ -665,13 +665,7 @@ and compile_cases cxt (switch_exp : E.t) table default ~get_cstr_name =
         (fun i ->
           match get_cstr_name i with
           | Some { name; as_modifier = Some modifier } ->
-              {
-                (match modifier with
-                | Int modifier -> E.small_int modifier
-                | String s -> E.str s)
-                with
-                comment = Some name;
-              }
+              E.as_value ~comment:name modifier
           | Some { name; as_modifier = None } ->
               { (E.small_int i) with comment = Some name }
           | None -> E.small_int i)
@@ -757,7 +751,13 @@ and compile_switch (switch_arg : Lam.t) (sw : Lam.lambda_switch)
   | EffectCall _ | Assign _ -> Js_output.make (compile_whole lambda_cxt)
 
 and compile_string_cases ~get_cstr_name cxt switch_exp table default =
-  compile_general_cases ~get_cstr_name E.as_value E.string_equal cxt
+  compile_general_cases ~get_cstr_name
+    (fun as_value ->
+      let comment =
+        get_cstr_name as_value |> Option.map (fun x -> x.Lambda.name)
+      in
+      E.as_value ?comment as_value)
+    E.string_equal cxt
     (fun ?default ?declaration e clauses ->
       S.string_switch ?default ?declaration e clauses)
     switch_exp table default

test/blackbox-tests/complex-constant-inline.t

@@ -43,7 +43,7 @@
     message = "b";
   } else {
     let tmp = 12345;
-    message = typeof tmp === "number" || tmp.TAG === /* Vacations */0 ? "a" : "b";
+    message = /* tag */typeof tmp === "number" || typeof tmp === "string" || tmp.TAG === /* Vacations */0 ? "a" : "b";
   }
   
   const Test1 = {

test/blackbox-tests/mel-as-inline-records.t

@@ -42,7 +42,8 @@ Test `@mel.as` in inline records / record extensions
     renamed: "Corentin"
   };
   
-  const user2 = /* User */{
+  const user2 = {
+    TAG: /* User */0,
     renamed: "Corentin"
   };
   

test/blackbox-tests/stdout.t

@@ -8,7 +8,8 @@
   
   const Stdlib__Format = require("melange/format.js");
   
-  Stdlib__Format.eprintf(/* Format */{
+  Stdlib__Format.eprintf({
+        TAG: /* Format */0,
         _0: {
           TAG: /* String_literal */11,
           _0: "hello, world",

test/blackbox-tests/unicode-format-strings.t

@@ -23,7 +23,8 @@
   const Curry = require("melange.js/curry.js");
   const Stdlib__Format = require("melange/format.js");
   
-  console.log(Curry._1(Stdlib__Format.sprintf(/* Format */{
+  console.log(Curry._1(Stdlib__Format.sprintf({
+                TAG: /* Format */0,
                 _0: {
                   TAG: /* String_literal */11,
                   _0: "你 ",