Cleanup: Fix alphabetic ordering.

Some of the color structures cannot be alphabetically ordered.
These can be, so make it so.

diff --git a/level_0/f_color/c/color.c b/level_0/f_color/c/color.c
index d9fe72449f8c778be13001049978f634a5fafd96..ab4eedf9e43e90f07b6d4ac6ce400fd2e98a2d52 100644 (file)
--- a/level_0/f_color/c/color.c
+++ b/level_0/f_color/c/color.c
@@ -76,23 +76,23 @@ extern "C" {
     }
 
     if (F_status_is_error_not(status)) {
-      context->set.reset.before = &context->reset;
-      context->set.reset.after = &context->reset;
-
-      context->set.warning.before = &context->warning;
-      context->set.warning.after = &context->reset;
-
       context->set.error.before = &context->error;
       context->set.error.after = &context->reset;
 
-      context->set.title.before = &context->title;
-      context->set.title.after = &context->reset;
+      context->set.important.before = &context->important;
+      context->set.important.after = &context->reset;
+
+      context->set.normal.before = &context->normal;
+      context->set.normal.after = &context->reset;
+
+      context->set.normal_reset.before = &context->normal_reset;
+      context->set.normal_reset.after = &context->reset;
 
       context->set.notable.before = &context->notable;
       context->set.notable.after = &context->reset;
 
-      context->set.important.before = &context->important;
-      context->set.important.after = &context->reset;
+      context->set.reset.before = &context->reset;
+      context->set.reset.after = &context->reset;
 
       context->set.standout.before = &context->standout;
       context->set.standout.after = &context->reset;
@@ -100,11 +100,11 @@ extern "C" {
       context->set.success.before = &context->success;
       context->set.success.after = &context->reset;
 
-      context->set.normal.before = &context->normal;
-      context->set.normal.after = &context->reset;
+      context->set.title.before = &context->title;
+      context->set.title.after = &context->reset;
 
-      context->set.normal_reset.before = &context->normal_reset;
-      context->set.normal_reset.after = &context->reset;
+      context->set.warning.before = &context->warning;
+      context->set.warning.after = &context->reset;
     }
 
     return status;

diff --git a/level_0/f_color/c/color/common.c b/level_0/f_color/c/color/common.c
index 1a81e3865175d871780af9b2116a14056b3dd350..45ef81394819729f832a160291f1945e6f1fd9ca 100644 (file)
--- a/level_0/f_color/c/color/common.c
+++ b/level_0/f_color/c/color/common.c
@@ -66,18 +66,18 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    status = f_string_dynamic_resize(0, &context->reset);
+    status = f_string_dynamic_resize(0, &context->error);
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->warning);
+      status = f_string_dynamic_resize(0, &context->important);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->error);
+      status = f_string_dynamic_resize(0, &context->normal);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->title);
+      status = f_string_dynamic_resize(0, &context->normal_reset);
     }
 
     if (F_status_is_error_not(status)) {
@@ -85,7 +85,7 @@ extern "C" {
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->important);
+      status = f_string_dynamic_resize(0, &context->reset);
     }
 
     if (F_status_is_error_not(status)) {
@@ -97,11 +97,11 @@ extern "C" {
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->normal);
+      status = f_string_dynamic_resize(0, &context->title);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_resize(0, &context->normal_reset);
+      status = f_string_dynamic_resize(0, &context->warning);
     }
 
     if (F_status_is_error(status)) return status;
@@ -120,18 +120,18 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    status = f_string_dynamic_adjust(0, &context->reset);
+    status = f_string_dynamic_adjust(0, &context->error);
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->warning);
+      status = f_string_dynamic_adjust(0, &context->important);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->error);
+      status = f_string_dynamic_adjust(0, &context->normal);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->title);
+      status = f_string_dynamic_adjust(0, &context->normal_reset);
     }
 
     if (F_status_is_error_not(status)) {
@@ -139,7 +139,7 @@ extern "C" {
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->important);
+      status = f_string_dynamic_adjust(0, &context->reset);
     }
 
     if (F_status_is_error_not(status)) {
@@ -151,11 +151,11 @@ extern "C" {
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->normal);
+      status = f_string_dynamic_adjust(0, &context->title);
     }
 
     if (F_status_is_error_not(status)) {
-      status = f_string_dynamic_adjust(0, &context->normal_reset);
+      status = f_string_dynamic_adjust(0, &context->warning);
     }
 
     if (F_status_is_error(status)) return status;

diff --git a/level_0/f_color/c/color/common.h b/level_0/f_color/c/color/common.h
index f96809013331e4bef15d4fd8b40dba9ce3c75a07..d3103cb1246ce913facc6c91e5145432ef9c5925 100644 (file)
--- a/level_0/f_color/c/color/common.h
+++ b/level_0/f_color/c/color/common.h
@@ -681,29 +681,29 @@ extern "C" {
  *
  * This is intended to be used for printing, such that the printed code is prefixed with the "before" and postfixed with the "after", for each context.
  *
- * reset:        Reset the color context.
- * warning:      Color context associated with "warning".
  * error:        Color context associated with "error".
- * title:        Color context associated with "title".
- * notable:      Color context associated with "notable".
  * important:    Color context associated with "important".
- * standout:     Color context associated with "standout".
- * success:      Color context associated with "success".
  * normal:       Color context associated with "normal".
  * normal_reset: Color context associated with "normal_reset".
+ * notable:      Color context associated with "notable".
+ * reset:        Reset the color context.
+ * standout:     Color context associated with "standout".
+ * success:      Color context associated with "success".
+ * title:        Color context associated with "title".
+ * warning:      Color context associated with "warning".
  */
 #ifndef _di_f_color_set_context_t_
   typedef struct {
-    f_color_set_t reset;
-    f_color_set_t warning;
     f_color_set_t error;
-    f_color_set_t title;
-    f_color_set_t notable;
     f_color_set_t important;
-    f_color_set_t standout;
-    f_color_set_t success;
     f_color_set_t normal;
     f_color_set_t normal_reset;
+    f_color_set_t notable;
+    f_color_set_t reset;
+    f_color_set_t standout;
+    f_color_set_t success;
+    f_color_set_t title;
+    f_color_set_t warning;
   } f_color_set_context_t;
 
   #define f_color_set_context_t_initialize { \
@@ -719,19 +719,19 @@ extern "C" {
     f_color_set_t_initialize \
   }
 
-  #define macro_f_color_set_context_t_initialize(reset, warning, error, title, notable, important, standout, success, normal, normal_reset) { reset, warning, error, title, notable, important, standout, success, normal, normal_reset }
+  #define macro_f_color_set_context_t_initialize(error, important, normal, normal_reset, notable, reset, standout, success, title, warning) { error, important, normal, normal_reset, notable, reset, standout, success, title, warning }
 
   #define macro_f_color_set_context_t_clear(set) \
-    macro_f_color_set_t_clear(set.reset) \
-    macro_f_color_set_t_clear(set.warning) \
     macro_f_color_set_t_clear(set.error) \
-    macro_f_color_set_t_clear(set.title) \
-    macro_f_color_set_t_clear(set.notable) \
     macro_f_color_set_t_clear(set.important) \
+    macro_f_color_set_t_clear(set.normal) \
+    macro_f_color_set_t_clear(set.normal_reset) \
+    macro_f_color_set_t_clear(set.notable) \
+    macro_f_color_set_t_clear(set.reset) \
     macro_f_color_set_t_clear(set.standout) \
     macro_f_color_set_t_clear(set.success) \
-    macro_f_color_set_t_clear(set.normal) \
-    macro_f_color_set_t_clear(set.normal_reset)
+    macro_f_color_set_t_clear(set.title) \
+    macro_f_color_set_t_clear(set.warning)
 
 #endif // _di_f_color_set_context_t_
 
@@ -740,20 +740,21 @@ extern "C" {
  *
  * This is intended to be used for printing, and this provides a management structure for all color context related data.
  *
- * list:         A list of colors, each with their specific color code string.
- * format:       The color code formatting strings.
- * mode:         A code representing the color mode.
- * set:          A collection of color context sets for direct use in color printing.
- * reset:        Reset the color context.
- * warning:      Color context associated with "warning".
+ * list:   A list of colors, each with their specific color code string.
+ * format: The color code formatting strings.
+ * mode:   A code representing the color mode.
+ * set:    A collection of color context sets for direct use in color printing.
+ *
  * error:        Color context associated with "error".
- * title:        Color context associated with "title".
- * notable:      Color context associated with "notable".
  * important:    Color context associated with "important".
- * standout:     Color context associated with "standout".
- * success:      Color context associated with "success".
  * normal:       Color context associated with "normal".
  * normal_reset: Color context associated with "normal_reset".
+ * notable:      Color context associated with "notable".
+ * reset:        Reset the color context.
+ * standout:     Color context associated with "standout".
+ * success:      Color context associated with "success".
+ * title:        Color context associated with "title".
+ * warning:      Color context associated with "warning".
  */
 #ifndef _di_f_color_context_t_
   typedef struct {
@@ -761,16 +762,17 @@ extern "C" {
     f_color_format_t format;
     f_color_mode_t mode;
     f_color_set_context_t set;
-    f_string_dynamic_t reset;
-    f_string_dynamic_t warning;
+
     f_string_dynamic_t error;
-    f_string_dynamic_t title;
-    f_string_dynamic_t notable;
     f_string_dynamic_t important;
-    f_string_dynamic_t standout;
-    f_string_dynamic_t success;
     f_string_dynamic_t normal;
     f_string_dynamic_t normal_reset;
+    f_string_dynamic_t notable;
+    f_string_dynamic_t reset;
+    f_string_dynamic_t standout;
+    f_string_dynamic_t success;
+    f_string_dynamic_t title;
+    f_string_dynamic_t warning;
   } f_color_context_t;
 
   #define f_color_context_t_initialize { \
@@ -795,54 +797,54 @@ extern "C" {
     macro_f_color_format_t_clear(context.format) \
     context.mode = F_color_mode_none_d; \
     macro_f_color_set_context_t_clear(context.set) \
-    macro_f_string_dynamic_t_clear(context.reset) \
-    macro_f_string_dynamic_t_clear(context.warning) \
     macro_f_string_dynamic_t_clear(context.error) \
-    macro_f_string_dynamic_t_clear(context.title) \
-    macro_f_string_dynamic_t_clear(context.notable) \
     macro_f_string_dynamic_t_clear(context.important) \
+    macro_f_string_dynamic_t_clear(context.normal) \
+    macro_f_string_dynamic_t_clear(context.normal_reset) \
+    macro_f_string_dynamic_t_clear(context.notable) \
+    macro_f_string_dynamic_t_clear(context.reset) \
     macro_f_string_dynamic_t_clear(context.standout) \
     macro_f_string_dynamic_t_clear(context.success) \
-    macro_f_string_dynamic_t_clear(context.normal) \
-    macro_f_string_dynamic_t_clear(context.normal_reset)
+    macro_f_string_dynamic_t_clear(context.title) \
+    macro_f_string_dynamic_t_clear(context.warning)
 
   #define macro_f_color_context_t_new(status, context) \
     macro_f_string_dynamic_t_resize(status, context.reset, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.reset, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.warning, F_color_max_size_terminated_d) \
     if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.error, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.title, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.notable, F_color_max_size_terminated_d) \
     if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.important, F_color_max_size_terminated_d) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal, F_color_max_size_terminated_d) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal_reset, F_color_max_size_terminated_d) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.notable, F_color_max_size_terminated_d) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.reset, F_color_max_size_terminated_d) \
     if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.standout, F_color_max_size_terminated_d) \
     if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.success, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal, F_color_max_size_terminated_d) \
-    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal_reset, F_color_max_size_terminated_d)
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.title, F_color_max_size_terminated_d) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.warning, F_color_max_size_terminated_d)
 
   #define macro_f_color_context_t_delete_simple(context) \
-    macro_f_string_dynamic_t_delete_simple(context.reset) \
-    macro_f_string_dynamic_t_delete_simple(context.warning) \
     macro_f_string_dynamic_t_delete_simple(context.error) \
-    macro_f_string_dynamic_t_delete_simple(context.title) \
-    macro_f_string_dynamic_t_delete_simple(context.notable) \
     macro_f_string_dynamic_t_delete_simple(context.important) \
-    macro_f_string_dynamic_t_delete_simple(context.standout) \
-    macro_f_string_dynamic_t_delete_simple(context.success) \
     macro_f_string_dynamic_t_delete_simple(context.normal) \
     macro_f_string_dynamic_t_delete_simple(context.normal_reset) \
+    macro_f_string_dynamic_t_delete_simple(context.notable) \
+    macro_f_string_dynamic_t_delete_simple(context.reset) \
+    macro_f_string_dynamic_t_delete_simple(context.standout) \
+    macro_f_string_dynamic_t_delete_simple(context.success) \
+    macro_f_string_dynamic_t_delete_simple(context.title) \
+    macro_f_string_dynamic_t_delete_simple(context.warning) \
     macro_f_color_context_t_clear(context)
 
   #define macro_f_color_context_t_destroy_simple(context, size) \
-    macro_f_string_dynamic_t_destroy_simple(context.reset) \
-    macro_f_string_dynamic_t_destroy_simple(context.warning, size) \
     macro_f_string_dynamic_t_destroy_simple(context.error, size) \
-    macro_f_string_dynamic_t_destroy_simple(context.title, size) \
-    macro_f_string_dynamic_t_destroy_simple(context.notable, size) \
     macro_f_string_dynamic_t_destroy_simple(context.important, size) \
-    macro_f_string_dynamic_t_destroy_simple(context.standout, size) \
-    macro_f_string_dynamic_t_destroy_simple(context.success, size) \
     macro_f_string_dynamic_t_destroy_simple(context.normal) \
     macro_f_string_dynamic_t_destroy_simple(context.normal_reset) \
+    macro_f_string_dynamic_t_destroy_simple(context.notable, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.reset) \
+    macro_f_string_dynamic_t_destroy_simple(context.standout, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.success, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.title, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.warning, size) \
     macro_f_color_context_t_clear(context)
 #endif // _di_f_color__context_t_
 

diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c
index bae4a16f73579a5dda9071015ce78c4ea2806394..340b5dd586be89ac03ce1d88ab9be99dd5d255b6 100644 (file)
--- a/level_2/fll_program/c/program.c
+++ b/level_2/fll_program/c/program.c
@@ -111,16 +111,16 @@ extern "C" {
 #ifndef _di_fll_program_parameter_process_empty_
   void fll_program_parameter_process_empty(f_color_context_t * const context, f_color_set_t * const sets[]) {
 
-    context->set.reset = f_color_set_empty_s;
-    context->set.warning = f_color_set_empty_s;
     context->set.error = f_color_set_empty_s;
-    context->set.title = f_color_set_empty_s;
-    context->set.notable = f_color_set_empty_s;
     context->set.important = f_color_set_empty_s;
-    context->set.standout = f_color_set_empty_s;
-    context->set.success = f_color_set_empty_s;
     context->set.normal = f_color_set_empty_s;
     context->set.normal_reset = f_color_set_empty_s;
+    context->set.notable = f_color_set_empty_s;
+    context->set.reset = f_color_set_empty_s;
+    context->set.standout = f_color_set_empty_s;
+    context->set.success = f_color_set_empty_s;
+    context->set.title = f_color_set_empty_s;
+    context->set.warning = f_color_set_empty_s;
 
     if (sets) {
       for (f_array_length_t i = 0; sets[i]; ++i) {