Use help_entry() in help text of nondet volatile feature

Author: danpoe

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -1799,7 +1799,7 @@ void goto_instrument_parse_optionst::help()
     " --race-check                 add floating-point data race checks\n"
     "\n"
     "Semantic transformations:\n"
-    HELP_NONDET_VOLATILE
+    << HELP_NONDET_VOLATILE <<
     " --unwind <n>                 unwinds the loops <n> times\n"
     " --unwindset L:B,...          unwind loop L with a bound of B\n"
     " --unwindset-file <file>      read unwindset from file\n"

src/goto-instrument/nondet_volatile.h

@@ -28,14 +28,15 @@ class optionst;
   "(" NONDET_VOLATILE_MODEL_OPT "):"
 
 #define HELP_NONDET_VOLATILE \
-  " --" NONDET_VOLATILE_OPT "            makes reads from volatile variables " \
-  "non-deterministic\n" \
-  " --" NONDET_VOLATILE_VARIABLE_OPT " <variable>\n" \
-  "                              makes reads from given volatile variable " \
-  "non-deterministic\n" \
-  " --" NONDET_VOLATILE_MODEL_OPT " <variable>:<model>\n" \
-  "                              models reads from given volatile variable " \
-  "by a call to the given model\n"
+  help_entry( \
+    "--" NONDET_VOLATILE_OPT, \
+    "makes reads from volatile variables non-deterministic") << \
+  help_entry( \
+    "--" NONDET_VOLATILE_VARIABLE_OPT " <variable>", \
+    "makes reads from given volatile variable non-deterministic") << \
+  help_entry( \
+    "--" NONDET_VOLATILE_MODEL_OPT " <variable>:<model>", \
+    "models reads from given volatile variable by a call to the given model")
 // clang-format on
 
 void parse_nondet_volatile_options(const cmdlinet &cmdline, optionst &options);