Remove any hardcoded references to std::experimental (#47)

freitass · web-flow · commit 8d0b5335a8fb · 2021-04-23T14:39:56.000-04:00
* Remove any hardcoded references to std::experimental

* Update expected generated code
diff --git a/src/it/resources/expected/all_datatypes/cwrapper/dh__all_datatypes.cpp b/src/it/resources/expected/all_datatypes/cwrapper/dh__all_datatypes.cpp
@@ -170,7 +170,7 @@ ::AllDatatypes DjinniAllDatatypes::toCpp(djinni::Handle<DjinniRecordHandle> dh)
 }
 
 djinni::Handle<DjinniOptionalRecordHandle> DjinniAllDatatypes::fromCpp(std::optional<::AllDatatypes> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniAllDatatypes::fromCpp(std::move(* dc)), optional_all_datatypes___delete);
@@ -180,6 +180,6 @@ std::optional<::AllDatatypes>DjinniAllDatatypes::toCpp(djinni::Handle<DjinniOpti
      if (dh) {
         return std::optional<::AllDatatypes>(DjinniAllDatatypes::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), all_datatypes___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/all_datatypes/cwrapper/dh__list_bool.cpp b/src/it/resources/expected/all_datatypes/cwrapper/dh__list_bool.cpp
@@ -72,7 +72,7 @@ std::vector<bool> DjinniListBool::toCpp(djinni::Handle<DjinniObjectHandle> dh) {
 }
 
 djinni::Handle<DjinniOptionalObjectHandle> DjinniListBool::fromCpp(std::optional<std::vector<bool>> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniListBool::fromCpp(std::move(* dc)), optional_list_bool___delete);
@@ -82,6 +82,6 @@ std::optional<std::vector<bool>>DjinniListBool::toCpp(djinni::Handle<DjinniOptio
      if (dh) {
         return std::optional<std::vector<bool>>(DjinniListBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), list_bool___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/all_datatypes/cwrapper/dh__map_int8_t_bool.cpp b/src/it/resources/expected/all_datatypes/cwrapper/dh__map_int8_t_bool.cpp
@@ -80,7 +80,7 @@ std::unordered_map<int8_t, bool> DjinniMapInt8TBool::toCpp(djinni::Handle<Djinni
 }
 
 djinni::Handle<DjinniOptionalObjectHandle> DjinniMapInt8TBool::fromCpp(std::optional<std::unordered_map<int8_t, bool>> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniMapInt8TBool::fromCpp(std::move(* dc)), optional_map_int8_t_bool___delete);
@@ -90,6 +90,6 @@ std::optional<std::unordered_map<int8_t, bool>>DjinniMapInt8TBool::toCpp(djinni:
      if (dh) {
         return std::optional<std::unordered_map<int8_t, bool>>(DjinniMapInt8TBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), map_int8_t_bool___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/all_datatypes/cwrapper/dh__set_bool.cpp b/src/it/resources/expected/all_datatypes/cwrapper/dh__set_bool.cpp
@@ -71,7 +71,7 @@ std::unordered_set<bool> DjinniSetBool::toCpp(djinni::Handle<DjinniObjectHandle>
 }
 
 djinni::Handle<DjinniOptionalObjectHandle> DjinniSetBool::fromCpp(std::optional<std::unordered_set<bool>> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniSetBool::fromCpp(std::move(* dc)), optional_set_bool___delete);
@@ -81,6 +81,6 @@ std::optional<std::unordered_set<bool>>DjinniSetBool::toCpp(djinni::Handle<Djinn
      if (dh) {
         return std::optional<std::unordered_set<bool>>(DjinniSetBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), set_bool___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/my_enum/cwrapper/dh__my_enum.cpp b/src/it/resources/expected/my_enum/cwrapper/dh__my_enum.cpp
@@ -18,7 +18,7 @@ int32_t int32_from_enum_my_enum(::MyEnum e) {
 }
 std::optional<::MyEnum> get_boxed_enum_my_enum_from_int32(int32_t e) {
     if (e == -1) { // to signal null enum
-        return std::experimental::nullopt;
+        return {};
     }
     return std::optional<::MyEnum>(static_cast<::MyEnum>(e));
 }
diff --git a/src/it/resources/expected/my_flags/cwrapper/dh__my_flags.cpp b/src/it/resources/expected/my_flags/cwrapper/dh__my_flags.cpp
@@ -18,7 +18,7 @@ int32_t int32_from_enum_my_flags(::MyFlags e) {
 }
 std::optional<::MyFlags> get_boxed_enum_my_flags_from_int32(int32_t e) {
     if (e == -1) { // to signal null enum
-        return std::experimental::nullopt;
+        return {};
     }
     return std::optional<::MyFlags>(static_cast<::MyFlags>(e));
 }
diff --git a/src/it/resources/expected/my_record/cwrapper/dh__map_string_int32_t.cpp b/src/it/resources/expected/my_record/cwrapper/dh__map_string_int32_t.cpp
@@ -77,7 +77,7 @@ std::unordered_map<std::string, int32_t> DjinniMapStringInt32T::toCpp(djinni::Ha
 }
 
 djinni::Handle<DjinniOptionalObjectHandle> DjinniMapStringInt32T::fromCpp(std::optional<std::unordered_map<std::string, int32_t>> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniMapStringInt32T::fromCpp(std::move(* dc)), optional_map_string_int32_t___delete);
@@ -87,6 +87,6 @@ std::optional<std::unordered_map<std::string, int32_t>>DjinniMapStringInt32T::to
      if (dh) {
         return std::optional<std::unordered_map<std::string, int32_t>>(DjinniMapStringInt32T::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), map_string_int32_t___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/my_record/cwrapper/dh__my_record.cpp b/src/it/resources/expected/my_record/cwrapper/dh__my_record.cpp
@@ -80,7 +80,7 @@ ::MyRecord DjinniMyRecord::toCpp(djinni::Handle<DjinniRecordHandle> dh) {
 }
 
 djinni::Handle<DjinniOptionalRecordHandle> DjinniMyRecord::fromCpp(std::optional<::MyRecord> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniMyRecord::fromCpp(std::move(* dc)), optional_my_record___delete);
@@ -90,6 +90,6 @@ std::optional<::MyRecord>DjinniMyRecord::toCpp(djinni::Handle<DjinniOptionalReco
      if (dh) {
         return std::optional<::MyRecord>(DjinniMyRecord::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), my_record___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/my_record/cwrapper/dh__set_string.cpp b/src/it/resources/expected/my_record/cwrapper/dh__set_string.cpp
@@ -68,7 +68,7 @@ std::unordered_set<std::string> DjinniSetString::toCpp(djinni::Handle<DjinniObje
 }
 
 djinni::Handle<DjinniOptionalObjectHandle> DjinniSetString::fromCpp(std::optional<std::unordered_set<std::string>> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniSetString::fromCpp(std::move(* dc)), optional_set_string___delete);
@@ -78,6 +78,6 @@ std::optional<std::unordered_set<std::string>>DjinniSetString::toCpp(djinni::Han
      if (dh) {
         return std::optional<std::unordered_set<std::string>>(DjinniSetString::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), set_string___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/using_custom_datatypes/cwrapper/dh__custom_datatype.cpp b/src/it/resources/expected/using_custom_datatypes/cwrapper/dh__custom_datatype.cpp
@@ -50,7 +50,7 @@ ::CustomDatatype DjinniCustomDatatype::toCpp(djinni::Handle<DjinniRecordHandle>
 }
 
 djinni::Handle<DjinniOptionalRecordHandle> DjinniCustomDatatype::fromCpp(std::optional<::CustomDatatype> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniCustomDatatype::fromCpp(std::move(* dc)), optional_custom_datatype___delete);
@@ -60,6 +60,6 @@ std::optional<::CustomDatatype>DjinniCustomDatatype::toCpp(djinni::Handle<Djinni
      if (dh) {
         return std::optional<::CustomDatatype>(DjinniCustomDatatype::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), custom_datatype___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/it/resources/expected/using_custom_datatypes/cwrapper/dh__other_record.cpp b/src/it/resources/expected/using_custom_datatypes/cwrapper/dh__other_record.cpp
@@ -51,7 +51,7 @@ ::OtherRecord DjinniOtherRecord::toCpp(djinni::Handle<DjinniRecordHandle> dh) {
 }
 
 djinni::Handle<DjinniOptionalRecordHandle> DjinniOtherRecord::fromCpp(std::optional<::OtherRecord> dc) {
-    if (dc == std::experimental::nullopt) {
+    if (!dc) {
         return nullptr;
     }
     return djinni::optionals::toOptionalHandle(DjinniOtherRecord::fromCpp(std::move(* dc)), optional_other_record___delete);
@@ -61,6 +61,6 @@ std::optional<::OtherRecord>DjinniOtherRecord::toCpp(djinni::Handle<DjinniOption
      if (dh) {
         return std::optional<::OtherRecord>(DjinniOtherRecord::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), other_record___delete)));
     }
-    return std::experimental::nullopt;
+    return {};
 }
 
diff --git a/src/main/scala/djinni/CWrapperGenerator.scala b/src/main/scala/djinni/CWrapperGenerator.scala
@@ -332,7 +332,7 @@ class CWrapperGenerator(spec: Spec) extends Generator(spec) {
 
   def writeOptionalContainerFromCpp(optHandle: String, handle: String, retType: String, djinniWrapper: String, deleteMethod: String, w: IndentWriter): Unit = {
     w.wl("djinni::Handle" + t(optHandle) + " " +  djinniWrapper + "::fromCpp" + p( spec.cppOptionalTemplate + t(retType) + " dc") + " {").nested {
-      w.wl("if (dc == std::experimental::nullopt) {").nested {
+      w.wl("if (!dc) {").nested {
         w.wl("return nullptr;")
       }
       w.wl("}")
@@ -348,7 +348,7 @@ class CWrapperGenerator(spec: Spec) extends Generator(spec) {
         w.wl("return " + spec.cppOptionalTemplate + t(retTypeStr) + p(djinniWrapper + "::toCpp" + p("djinni::optionals::fromOptionalHandle(std::move(dh), " + deleteMethod +")")) + ";")
       }
       w.wl("}")
-      w.wl("return std::experimental::nullopt;")
+      w.wl("return {};")
     }
     w.wl("}")
     w.wl
@@ -1178,7 +1178,7 @@ class CWrapperGenerator(spec: Spec) extends Generator(spec) {
       w.wl(spec.cppOptionalTemplate + t(withCppNs(idCpp.enumType(ident.name))) +
             " get_boxed_enum_" + idCpp.method(ident.name) + "_from_int32" + p("int32_t e") + " {").nested {
         w.wl("if (e == -1) { // to signal null enum").nested {
-          w.wl("return std::experimental::nullopt;")
+          w.wl("return {};")
         }
         w.wl("}")
         w.wl("return " + spec.cppOptionalTemplate + t(withCppNs(idCpp.enumType(ident.name))) +

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ ::AllDatatypes DjinniAllDatatypes::toCpp(djinni::Handle<DjinniRecordHandle> dh)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`djinni::Handle<DjinniOptionalRecordHandle> DjinniAllDatatypes::fromCpp(std::optional<::AllDatatypes> dc) {`
`173`		`- if (dc == std::experimental::nullopt) {`
	`173`	`+ if (!dc) {`
`174`	`174`	`return nullptr;`
`175`	`175`	`}`
`176`	`176`	`return djinni::optionals::toOptionalHandle(DjinniAllDatatypes::fromCpp(std::move(* dc)), optional_all_datatypes___delete);`
`@@ -180,6 +180,6 @@ std::optional<::AllDatatypes>DjinniAllDatatypes::toCpp(djinni::Handle<DjinniOpti`
`180`	`180`	`if (dh) {`
`181`	`181`	`return std::optional<::AllDatatypes>(DjinniAllDatatypes::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), all_datatypes___delete)));`
`182`	`182`	`}`
`183`		`- return std::experimental::nullopt;`
	`183`	`+ return {};`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ std::vector<bool> DjinniListBool::toCpp(djinni::Handle<DjinniObjectHandle> dh) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`djinni::Handle<DjinniOptionalObjectHandle> DjinniListBool::fromCpp(std::optional<std::vector<bool>> dc) {`
`75`		`- if (dc == std::experimental::nullopt) {`
	`75`	`+ if (!dc) {`
`76`	`76`	`return nullptr;`
`77`	`77`	`}`
`78`	`78`	`return djinni::optionals::toOptionalHandle(DjinniListBool::fromCpp(std::move(* dc)), optional_list_bool___delete);`
`@@ -82,6 +82,6 @@ std::optional<std::vector<bool>>DjinniListBool::toCpp(djinni::Handle<DjinniOptio`
`82`	`82`	`if (dh) {`
`83`	`83`	`return std::optional<std::vector<bool>>(DjinniListBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), list_bool___delete)));`
`84`	`84`	`}`
`85`		`- return std::experimental::nullopt;`
	`85`	`+ return {};`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ std::unordered_map<int8_t, bool> DjinniMapInt8TBool::toCpp(djinni::Handle<Djinni`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`djinni::Handle<DjinniOptionalObjectHandle> DjinniMapInt8TBool::fromCpp(std::optional<std::unordered_map<int8_t, bool>> dc) {`
`83`		`- if (dc == std::experimental::nullopt) {`
	`83`	`+ if (!dc) {`
`84`	`84`	`return nullptr;`
`85`	`85`	`}`
`86`	`86`	`return djinni::optionals::toOptionalHandle(DjinniMapInt8TBool::fromCpp(std::move(* dc)), optional_map_int8_t_bool___delete);`
`@@ -90,6 +90,6 @@ std::optional<std::unordered_map<int8_t, bool>>DjinniMapInt8TBool::toCpp(djinni:`
`90`	`90`	`if (dh) {`
`91`	`91`	`return std::optional<std::unordered_map<int8_t, bool>>(DjinniMapInt8TBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), map_int8_t_bool___delete)));`
`92`	`92`	`}`
`93`		`- return std::experimental::nullopt;`
	`93`	`+ return {};`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ std::unordered_set<bool> DjinniSetBool::toCpp(djinni::Handle<DjinniObjectHandle>`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`djinni::Handle<DjinniOptionalObjectHandle> DjinniSetBool::fromCpp(std::optional<std::unordered_set<bool>> dc) {`
`74`		`- if (dc == std::experimental::nullopt) {`
	`74`	`+ if (!dc) {`
`75`	`75`	`return nullptr;`
`76`	`76`	`}`
`77`	`77`	`return djinni::optionals::toOptionalHandle(DjinniSetBool::fromCpp(std::move(* dc)), optional_set_bool___delete);`
`@@ -81,6 +81,6 @@ std::optional<std::unordered_set<bool>>DjinniSetBool::toCpp(djinni::Handle<Djinn`
`81`	`81`	`if (dh) {`
`82`	`82`	`return std::optional<std::unordered_set<bool>>(DjinniSetBool::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), set_bool___delete)));`
`83`	`83`	`}`
`84`		`- return std::experimental::nullopt;`
	`84`	`+ return {};`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ int32_t int32_from_enum_my_enum(::MyEnum e) {`
`18`	`18`	`}`
`19`	`19`	`std::optional<::MyEnum> get_boxed_enum_my_enum_from_int32(int32_t e) {`
`20`	`20`	`if (e == -1) { // to signal null enum`
`21`		`- return std::experimental::nullopt;`
	`21`	`+ return {};`
`22`	`22`	`}`
`23`	`23`	`return std::optional<::MyEnum>(static_cast<::MyEnum>(e));`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ std::unordered_map<std::string, int32_t> DjinniMapStringInt32T::toCpp(djinni::Ha`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`djinni::Handle<DjinniOptionalObjectHandle> DjinniMapStringInt32T::fromCpp(std::optional<std::unordered_map<std::string, int32_t>> dc) {`
`80`		`- if (dc == std::experimental::nullopt) {`
	`80`	`+ if (!dc) {`
`81`	`81`	`return nullptr;`
`82`	`82`	`}`
`83`	`83`	`return djinni::optionals::toOptionalHandle(DjinniMapStringInt32T::fromCpp(std::move(* dc)), optional_map_string_int32_t___delete);`
`@@ -87,6 +87,6 @@ std::optional<std::unordered_map<std::string, int32_t>>DjinniMapStringInt32T::to`
`87`	`87`	`if (dh) {`
`88`	`88`	`return std::optional<std::unordered_map<std::string, int32_t>>(DjinniMapStringInt32T::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), map_string_int32_t___delete)));`
`89`	`89`	`}`
`90`		`- return std::experimental::nullopt;`
	`90`	`+ return {};`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ ::MyRecord DjinniMyRecord::toCpp(djinni::Handle<DjinniRecordHandle> dh) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`djinni::Handle<DjinniOptionalRecordHandle> DjinniMyRecord::fromCpp(std::optional<::MyRecord> dc) {`
`83`		`- if (dc == std::experimental::nullopt) {`
	`83`	`+ if (!dc) {`
`84`	`84`	`return nullptr;`
`85`	`85`	`}`
`86`	`86`	`return djinni::optionals::toOptionalHandle(DjinniMyRecord::fromCpp(std::move(* dc)), optional_my_record___delete);`
`@@ -90,6 +90,6 @@ std::optional<::MyRecord>DjinniMyRecord::toCpp(djinni::Handle<DjinniOptionalReco`
`90`	`90`	`if (dh) {`
`91`	`91`	`return std::optional<::MyRecord>(DjinniMyRecord::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), my_record___delete)));`
`92`	`92`	`}`
`93`		`- return std::experimental::nullopt;`
	`93`	`+ return {};`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ std::unordered_set<std::string> DjinniSetString::toCpp(djinni::Handle<DjinniObje`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`djinni::Handle<DjinniOptionalObjectHandle> DjinniSetString::fromCpp(std::optional<std::unordered_set<std::string>> dc) {`
`71`		`- if (dc == std::experimental::nullopt) {`
	`71`	`+ if (!dc) {`
`72`	`72`	`return nullptr;`
`73`	`73`	`}`
`74`	`74`	`return djinni::optionals::toOptionalHandle(DjinniSetString::fromCpp(std::move(* dc)), optional_set_string___delete);`
`@@ -78,6 +78,6 @@ std::optional<std::unordered_set<std::string>>DjinniSetString::toCpp(djinni::Han`
`78`	`78`	`if (dh) {`
`79`	`79`	`return std::optional<std::unordered_set<std::string>>(DjinniSetString::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), set_string___delete)));`
`80`	`80`	`}`
`81`		`- return std::experimental::nullopt;`
	`81`	`+ return {};`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ ::CustomDatatype DjinniCustomDatatype::toCpp(djinni::Handle<DjinniRecordHandle>`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`djinni::Handle<DjinniOptionalRecordHandle> DjinniCustomDatatype::fromCpp(std::optional<::CustomDatatype> dc) {`
`53`		`- if (dc == std::experimental::nullopt) {`
	`53`	`+ if (!dc) {`
`54`	`54`	`return nullptr;`
`55`	`55`	`}`
`56`	`56`	`return djinni::optionals::toOptionalHandle(DjinniCustomDatatype::fromCpp(std::move(* dc)), optional_custom_datatype___delete);`
`@@ -60,6 +60,6 @@ std::optional<::CustomDatatype>DjinniCustomDatatype::toCpp(djinni::Handle<Djinni`
`60`	`60`	`if (dh) {`
`61`	`61`	`return std::optional<::CustomDatatype>(DjinniCustomDatatype::toCpp(djinni::optionals::fromOptionalHandle(std::move(dh), custom_datatype___delete)));`
`62`	`62`	`}`
`63`		`- return std::experimental::nullopt;`
	`63`	`+ return {};`
`64`	`64`	`}`
`65`	`65`