From cb0a882a311d94628b3197c1b9388203b25c92c5 Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Mon, 23 Mar 2020 16:03:36 +0100
Subject: [PATCH] Order warnings alphabetically

---
 include/asm/warning.h |  4 ++--
 src/asm/warning.c     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/asm/warning.h b/include/asm/warning.h
index aaf38475..d6589be7 100644
--- a/include/asm/warning.h
+++ b/include/asm/warning.h
@@ -14,6 +14,7 @@
 extern unsigned int nbErrors;
 
 enum WarningID {
+	WARNING_ASSERT,
 	WARNING_BUILTIN_ARG,
 	WARNING_DIV,
 	WARNING_EMPTY_ENTRY,
@@ -21,10 +22,9 @@ enum WarningID {
 	WARNING_LONG_STR,
 	WARNING_OBSOLETE,
 	WARNING_SHIFT,
-	WARNING_USER,
-	WARNING_ASSERT,
 	WARNING_SHIFT_AMOUNT,
 	WARNING_TRUNCATION,
+	WARNING_USER,
 
 	NB_WARNINGS,
 
diff --git a/src/asm/warning.c b/src/asm/warning.c
index 42c4829e..fe8fb2c7 100644
--- a/src/asm/warning.c
+++ b/src/asm/warning.c
@@ -28,6 +28,7 @@ enum WarningState {
 };
 
 static enum WarningState const defaultWarnings[NB_WARNINGS] = {
+	WARNING_ENABLED,  /* Assertions */
 	WARNING_DISABLED, /* Invalid args to builtins */
 	WARNING_DISABLED, /* Division undefined behavior */
 	WARNING_DISABLED, /* Empty entry in `db`, `dw` or `dl` */
@@ -35,10 +36,9 @@ static enum WarningState const defaultWarnings[NB_WARNINGS] = {
 	WARNING_DISABLED, /* String too long for internal buffers */
 	WARNING_DISABLED, /* Obsolete things */
 	WARNING_DISABLED, /* Shifting undefined behavior */
-	WARNING_ENABLED,  /* User warnings */
-	WARNING_ENABLED,  /* Assertions */
 	WARNING_DISABLED, /* Strange shift amount */
 	WARNING_ENABLED,  /* Implicit truncation loses some bits */
+	WARNING_ENABLED,  /* User warnings */
 };
 
 static enum WarningState warningStates[NB_WARNINGS];
@@ -65,6 +65,7 @@ static enum WarningState warningState(enum WarningID id)
 }
 
 static char const *warningFlags[NB_WARNINGS_ALL] = {
+	"assert",
 	"builtin-args",
 	"div",
 	"empty-entry",
@@ -72,10 +73,9 @@ static char const *warningFlags[NB_WARNINGS_ALL] = {
 	"long-string",
 	"obsolete",
 	"shift",
-	"user",
-	"assert",
 	"shift-amount",
 	"truncation",
+	"user",
 
 	/* Meta warnings */
 	"all",
@@ -111,8 +111,9 @@ static uint8_t const _weverythingCommands[] = {
 	WARNING_LONG_STR,
 	WARNING_OBSOLETE,
 	WARNING_SHIFT,
-	WARNING_USER,
 	WARNING_SHIFT_AMOUNT,
+	/* WARNING_TRUNCATION, */
+	/* WARNING_USER, */
 	META_WARNING_DONE
 };