Keep original var names

Author: cknitt

compiler/ml/translcore.ml

@@ -1074,7 +1074,12 @@ and transl_stdlib_option_call exp opt_expr info oargs =
   match oargs with
   | (Nolabel, Some _) :: (Nolabel, Some _) :: _ | (Nolabel, Some _) :: [] ->
     let opt_lam = transl_exp opt_expr in
-    let opt_id = Ident.create "__res_option_opt" in
+    let opt_id =
+      match info.callback with
+      | Stdlib_option_inline_lambda {param; _} ->
+        Ident.create (Ident.name param)
+      | _ -> Ident.create "__res_option_value"
+    in
     let opt_var = Lvar opt_id in
     let callback_result =
       bind_option_value ~payload_not_nested:info.payload_not_nested opt_var

tests/tests/src/core/Core_ObjectTests.mjs

@@ -531,8 +531,8 @@ runGetTest({
     ]
   }),
   get: i => {
-    let __res_option_opt = i["a"];
-    return Stdlib_Option.getOr(__res_option_opt !== undefined ? __res_option_opt.concat([
+    let i$1 = i["a"];
+    return Stdlib_Option.getOr(i$1 !== undefined ? i$1.concat([
         4,
         5
       ]) : undefined, []);

tests/tests/src/core/intl/Core_IntlTests.mjs

@@ -57,8 +57,8 @@ try {
   let e$2 = Primitive_exceptions.internalToException(raw_e$2);
   if (e$2.RE_EXN_ID === "JsExn") {
     let e$3 = e$2._1;
-    let __res_option_opt = Stdlib_JsExn.message(e$3);
-    let message = __res_option_opt !== undefined ? __res_option_opt.toLowerCase() : undefined;
+    let __res_option_value = Stdlib_JsExn.message(e$3);
+    let message = __res_option_value !== undefined ? __res_option_value.toLowerCase() : undefined;
     let exit = 0;
     if (message === "invalid key : someinvalidkey") {
       console.log("Caught expected error");

tests/tests/src/option_stdlib_optimization_test.mjs

@@ -7,11 +7,11 @@ import * as Belt_MapString from "@rescript/runtime/lib/es6/Belt_MapString.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 
 function getIncidentCategoryName(incidents, categories, incidentId) {
-  let __res_option_opt = incidentId !== undefined ? Belt_MapString.get(incidents, incidentId) : undefined;
-  let __res_option_opt$1 = __res_option_opt !== undefined ? __res_option_opt.categoryId : undefined;
-  let __res_option_opt$2 = __res_option_opt$1 !== undefined ? Belt_MapString.get(categories, __res_option_opt$1) : undefined;
-  if (__res_option_opt$2 !== undefined) {
-    return __res_option_opt$2.name;
+  let incident = incidentId !== undefined ? Belt_MapString.get(incidents, incidentId) : undefined;
+  let categoryId = incident !== undefined ? incident.categoryId : undefined;
+  let category = categoryId !== undefined ? Belt_MapString.get(categories, categoryId) : undefined;
+  if (category !== undefined) {
+    return category.name;
   }
 
 }