Print off the documentation when -[f/W/O]help, also fixed some of the descriptions...

diff --git a/main.c b/main.c
index 2b055d2210f35bf59d556053f366e27c7c12e3d8..f6d9b3163907d2d5d05608e1dfb80a5c7e8c8038 100644 (file)
--- a/main.c
+++ b/main.c
@@ -310,10 +310,10 @@ static bool options_parse(int argc, char **argv) {
                 case 'f':
                     util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
                     if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') {
-                        con_out("Possible flags:\n");
+                        con_out("Possible flags:\n\n");
                         for (itr = 0; itr < COUNT_FLAGS; ++itr) {
                             util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer));
-                            con_out(" -f%s\n", buffer);
+                            con_out(" -f%s:\n%s\n\n", buffer, opts_flag_list[itr].description);
                         }
                         exit(0);
                     }
@@ -334,7 +334,7 @@ static bool options_parse(int argc, char **argv) {
                         con_out("Possible warnings:\n");
                         for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
                             util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer));
-                            con_out(" -W%s\n", buffer);
+                            con_out(" -W%s:\n%s\n\n\n", buffer, opts_warn_list[itr].description);
                         }
                         exit(0);
                     }
@@ -404,7 +404,7 @@ static bool options_parse(int argc, char **argv) {
                             con_out("Possible optimizations:\n");
                             for (itr = 0; itr < COUNT_OPTIMIZATIONS; ++itr) {
                                 util_strtononcmd(opts_opt_list[itr].name, buffer, sizeof(buffer));
-                                con_out(" -O%-20s (-O%u)\n", buffer, opts_opt_oflag[itr]);
+                                con_out(" -O%-20s (-O%u):\n%s\n\n", buffer, opts_opt_oflag[itr], opts_opt_list[itr].description);
                             }
                             exit(0);
                         }

diff --git a/opts.def b/opts.def
index 101a5cf55cdcf5b4a977346b420b4b3eb3367288..7aad708770f978edebdec9698d15162263783696 100644 (file)
--- a/opts.def
+++ b/opts.def
@@ -63,7 +63,7 @@
 
         "Enable some predefined macros. This only works in combination\n"
         "with '-fftepp' and is currently not included by '-std=fteqcc'.\n"
-        "The following macros will be added:\n"
+        "The following macros will be added:\n\n"
         "    __LINE__\n"
         "    __FILE__\n"
         "    __COUNTER__\n"
@@ -71,7 +71,7 @@
         "    __RANDOM__\n"
         "    __RANDOM_LAST__\n"
         "    __DATE__\n"
-        "    __TIME__\n"
+        "    __TIME__\n\n"
         "Note that fteqcc also defines __NULL__ which is not implemented\n"
         "yet.  (See -funtyped-nil about gmqcc's alternative to __NULL__)."
     )
@@ -245,7 +245,7 @@
         "   void vafunc(string...count) {\n"
         "       float i;\n"
         "       for (i = 0; i < count; ++i)\n"
-        "           print(...(i, string), \"\n\");\n"
+        "           print(...(i, string), \"\\n\");\n"
         "   }"
     )