Add ostream formatting for optional

* ridlbe/c++11/templates/cli/hdr/struct_idl_traits_def.erb: * tests/idl4/optional/client.cpp: * tests/idl4/optional/test.idl:
RemedyIT · Jun 11, 2024 · 6b9a431 · 6b9a431
1 parent 56efa85
commit 6b9a431
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ridlbe/c++11/templates/cli/hdr/struct_idl_traits_def.erb b/ridlbe/c++11/templates/cli/hdr/struct_idl_traits_def.erb
@@ -37,8 +37,7 @@ struct formatter<<%= scoped_cxxtype %>, OStrm_>
 % unless _m.optional? || _m.external?
         << "<%= _sep %><%= _m.cxxname %>=" << IDL::traits<<%= _m.scoped_cxxtype %>>::write(val_.<%= _m.cxxname %> ())
 % else
-%# TODO
-%#         << "<%= _sep %><%= _m.cxxname %>=" << (val_.<%= _m.cxxname() %> ().has_value () ? IDL::traits<<%= _m.scoped_cxxtype %>>::write(val_.<%= _m.cxxname %> ().value ()) : "<empty>")
+        << "<%= _sep %><%= _m.cxxname %>="; if (val_.<%= _m.cxxname() %> ().has_value ()) { os_ << IDL::traits<<%= _m.scoped_cxxtype %>>::write(val_.<%= _m.cxxname %> ().value ()); } else { os_ << "std::nullopt"; } os_
 % end
 %     end
 %     _sep = ',' unless _sep

diff --git a/tests/idl4/optional/client.cpp b/tests/idl4/optional/client.cpp
@@ -16,5 +16,8 @@ int main (int /*argc*/, char* /*argv*/[])
   bar mybar;
 
   TAOX11_TEST_INFO << "mybar: " << mybar << std::endl;
+  mybar.z(6);
+  TAOX11_TEST_INFO << "mybar: " << mybar << std::endl;
+
   return retval;
 }
diff --git a/tests/idl4/optional/test.idl b/tests/idl4/optional/test.idl
@@ -8,8 +8,9 @@
 struct bar
 {
   short x;
-  string y;
   @optional short z;
+  long z_long;
   @optional short a;
   @optional string opt_string;
+  string y;
 };