From 7b29600721c7f1c807acfc1822248c399aaa9e81 Mon Sep 17 00:00:00 2001
From: youben11 <ayoub.benaissa@zama.ai>
Date: Thu, 21 Oct 2021 08:52:48 +0100
Subject: [PATCH] refactor: don't use designated initializers

---
 compiler/lib/Support/ClientParameters.cpp | 78 +++++++++++------------
 compiler/lib/Support/Pipeline.cpp         |  3 +-
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/compiler/lib/Support/ClientParameters.cpp b/compiler/lib/Support/ClientParameters.cpp
index 368050a0a..b94e105a1 100644
--- a/compiler/lib/Support/ClientParameters.cpp
+++ b/compiler/lib/Support/ClientParameters.cpp
@@ -28,24 +28,24 @@ llvm::Expected<CircuitGate> gateFromMLIRType(std::string secretKeyID,
       width = type.getIntOrFloatBitWidth();
     }
     return CircuitGate{
-        .encryption = llvm::None,
-        .shape =
-            {
-                .width = width,
-                .size = 0,
-            },
+        /*.encryption = */ llvm::None,
+        /*.shape = */
+        {
+            /*.width = */ width,
+            /*.size = */ 0,
+        },
     };
   }
   if (type.isa<mlir::zamalang::LowLFHE::LweCiphertextType>()) {
     // TODO - Get the width from the LWECiphertextType instead of global
     // precision (could be possible after merge lowlfhe-ciphertext-parameter)
     return CircuitGate{
-        .encryption = llvm::Optional<EncryptionGate>({
-            .secretKeyID = secretKeyID,
-            .variance = variance,
-            .encoding = {.precision = precision},
+        /*.encryption = */ llvm::Optional<EncryptionGate>({
+            /*.secretKeyID = */ secretKeyID,
+            /*.variance = */ variance,
+            /*.encoding = */ {/*.precision = */ precision},
         }),
-        .shape = {.width = precision, .size = 0},
+        /*.shape = */ {/*.width = */ precision, /*.size = */ 0},
     };
   }
   auto tensor = type.dyn_cast_or_null<mlir::RankedTensorType>();
@@ -70,37 +70,37 @@ createClientParametersForV0(V0FHEContext fheContext, llvm::StringRef name,
       v0Curve->getVariance(1, 1 << v0Param.polynomialSize, 64);
   Variance keyswitchVariance = v0Curve->getVariance(1, v0Param.nSmall, 64);
   // Static client parameters from global parameters for v0
-  ClientParameters c{
-      .secretKeys{
-          {"small", {.size = v0Param.nSmall}},
-          {"big", {.size = v0Param.getNBigGlweSize()}},
-      },
-      .bootstrapKeys{
+  ClientParameters c = {};
+  c.secretKeys = {
+      {"small", {/*.size = */ v0Param.nSmall}},
+      {"big", {/*.size = */ v0Param.getNBigGlweSize()}},
+  };
+  c.bootstrapKeys = {
+      {
+          "bsk_v0",
           {
-              "bsk_v0",
-              {
-                  .inputSecretKeyID = "small",
-                  .outputSecretKeyID = "big",
-                  .level = v0Param.brLevel,
-                  .baseLog = v0Param.brLogBase,
-                  .k = v0Param.k,
-                  .variance = encryptionVariance,
-              },
-          },
-      },
-      .keyswitchKeys{
-          {
-              "ksk_v0",
-              {
-                  .inputSecretKeyID = "big",
-                  .outputSecretKeyID = "small",
-                  .level = v0Param.ksLevel,
-                  .baseLog = v0Param.ksLogBase,
-                  .variance = keyswitchVariance,
-              },
+              /*.inputSecretKeyID = */ "small",
+              /*.outputSecretKeyID = */ "big",
+              /*.level = */ v0Param.brLevel,
+              /*.baseLog = */ v0Param.brLogBase,
+              /*.k = */ v0Param.k,
+              /*.variance = */ encryptionVariance,
           },
       },
   };
+  c.keyswitchKeys = {
+      {
+          "ksk_v0",
+          {
+              /*.inputSecretKeyID = */ "big",
+              /*.outputSecretKeyID = */ "small",
+              /*.level = */ v0Param.ksLevel,
+              /*.baseLog = */ v0Param.ksLogBase,
+              /*.variance = */ keyswitchVariance,
+          },
+      },
+  };
+
   // Find the input function
   auto rangeOps = module.getOps<mlir::FuncOp>();
   auto funcOp = llvm::find_if(
@@ -113,7 +113,7 @@ createClientParametersForV0(V0FHEContext fheContext, llvm::StringRef name,
 
   // For the v0 the precision is global
   auto precision = fheContext.constraint.p;
-  Encoding encoding = {.precision = fheContext.constraint.p};
+  Encoding encoding = {/*.precision = */ fheContext.constraint.p};
 
   // Create input and output circuit gate parameters
   auto funcType = (*funcOp).getType();
diff --git a/compiler/lib/Support/Pipeline.cpp b/compiler/lib/Support/Pipeline.cpp
index 166ba8879..69b0e39b3 100644
--- a/compiler/lib/Support/Pipeline.cpp
+++ b/compiler/lib/Support/Pipeline.cpp
@@ -76,7 +76,8 @@ getFHEConstraintsFromHLFHE(mlir::MLIRContext &context, mlir::ModuleOp &module) {
 
   if (oMax2norm.hasValue() && oMaxWidth.hasValue()) {
     ret = llvm::Optional<mlir::zamalang::V0FHEConstraint>(
-        {.norm2 = ceilLog2(oMax2norm.getValue()), .p = oMaxWidth.getValue()});
+        {/*.norm2 = */ ceilLog2(oMax2norm.getValue()),
+         /*.p = */ oMaxWidth.getValue()});
   }
 
   return ret;