From 394c9b7006ce0aba47133063ea1cb2e762c20c31 Mon Sep 17 00:00:00 2001
From: Dan Klishch <danilklishch@gmail.com>
Date: Sat, 20 Jan 2024 20:52:37 -0500
Subject: [PATCH] JSSpecCompiler: Sort token types and operators alphabetically

---
 .../CodeGenerators/JSSpecCompiler/AST/AST.h   | 24 +++++-----
 .../JSSpecCompiler/Parser/Token.h             | 46 +++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/AST/AST.h b/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/AST/AST.h
index 31cd3c0c18..28afd0a52f 100644
--- a/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/AST/AST.h
+++ b/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/AST/AST.h
@@ -235,25 +235,25 @@ protected:
 
 #define ENUMERATE_UNARY_OPERATORS(F) \
     F(Invalid)                       \
-    F(Minus)                         \
-    F(AssertCompletion)
+    F(AssertCompletion)              \
+    F(Minus)
 
 #define ENUMERATE_BINARY_OPERATORS(F) \
     F(Invalid)                        \
-    F(CompareLess)                    \
-    F(CompareGreater)                 \
-    F(CompareNotEqual)                \
-    F(CompareEqual)                   \
+    F(ArraySubscript)                 \
     F(Assignment)                     \
+    F(Comma)                          \
+    F(CompareEqual)                   \
+    F(CompareGreater)                 \
+    F(CompareLess)                    \
+    F(CompareNotEqual)                \
     F(Declaration)                    \
-    F(Plus)                           \
+    F(Division)                       \
+    F(FunctionCall)                   \
+    F(MemberAccess)                   \
     F(Minus)                          \
     F(Multiplication)                 \
-    F(Division)                       \
-    F(Comma)                          \
-    F(MemberAccess)                   \
-    F(FunctionCall)                   \
-    F(ArraySubscript)
+    F(Plus)
 
 #define NAME(name) name,
 #define STRINGIFY(name) #name##sv,
diff --git a/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Token.h b/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Token.h
index 19de25fcd7..0b6a48b552 100644
--- a/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Token.h
+++ b/Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Token.h
@@ -22,33 +22,33 @@ constexpr i32 closing_bracket_precedence = 18;
 //       https://en.cppreference.com/w/cpp/language/operator_precedence (common sense applies).
 #define ENUMERATE_TOKENS(F)                                                          \
     F(Invalid, -1, Invalid, Invalid, Invalid, "")                                    \
-    F(SectionNumber, -1, Invalid, Invalid, Invalid, "section number")                \
-    F(Identifier, -1, Invalid, Invalid, Invalid, "identifier")                       \
-    F(Number, -1, Invalid, Invalid, Invalid, "number")                               \
-    F(String, -1, Invalid, Invalid, Invalid, "string literal")                       \
-    F(Undefined, -1, Invalid, Invalid, Invalid, "constant")                          \
-    F(Word, -1, Invalid, Invalid, Invalid, "word")                                   \
-    F(ParenOpen, -1, Invalid, Invalid, ParenClose, "'('")                            \
-    F(ParenClose, 18, Invalid, Invalid, ParenOpen, "')'")                            \
-    F(BraceOpen, -1, Invalid, Invalid, BraceClose, "'{'")                            \
-    F(BraceClose, 18, Invalid, Invalid, BraceOpen, "'}'")                            \
-    F(Comma, 17, Invalid, Comma, Invalid, "','")                                     \
-    F(MemberAccess, 2, Invalid, MemberAccess, Invalid, "member access operator '.'") \
-    F(Dot, -1, Invalid, Invalid, Invalid, "punctuation mark '.'")                    \
-    F(Colon, -1, Invalid, Invalid, Invalid, "':'")                                   \
-    F(Less, 9, Invalid, CompareLess, Invalid, "less than")                           \
-    F(Greater, 9, Invalid, CompareGreater, Invalid, "greater than")                  \
-    F(NotEquals, 10, Invalid, CompareNotEqual, Invalid, "not equals")                \
-    F(Equals, 10, Invalid, CompareEqual, Invalid, "equals")                          \
-    F(Plus, 6, Invalid, Plus, Invalid, "plus")                                       \
     F(AmbiguousMinus, -2, Invalid, Invalid, Invalid, "minus")                        \
-    F(UnaryMinus, 3, Minus, Invalid, Invalid, "unary minus")                         \
     F(BinaryMinus, 6, Invalid, Minus, Invalid, "binary minus")                       \
-    F(Multiplication, 5, Invalid, Multiplication, Invalid, "multiplication")         \
+    F(BraceClose, 18, Invalid, Invalid, BraceOpen, "'}'")                            \
+    F(BraceOpen, -1, Invalid, Invalid, BraceClose, "'{'")                            \
+    F(Colon, -1, Invalid, Invalid, Invalid, "':'")                                   \
+    F(Comma, 17, Invalid, Comma, Invalid, "','")                                     \
     F(Division, 5, Invalid, Division, Invalid, "division")                           \
-    F(FunctionCall, 2, Invalid, FunctionCall, Invalid, "function call token")        \
+    F(Dot, -1, Invalid, Invalid, Invalid, "punctuation mark '.'")                    \
+    F(Equals, 10, Invalid, CompareEqual, Invalid, "equals")                          \
     F(ExclamationMark, 3, AssertCompletion, Invalid, Invalid, "exclamation mark")    \
-    F(Is, -1, Invalid, Invalid, Invalid, "operator is")
+    F(FunctionCall, 2, Invalid, FunctionCall, Invalid, "function call token")        \
+    F(Greater, 9, Invalid, CompareGreater, Invalid, "greater than")                  \
+    F(Identifier, -1, Invalid, Invalid, Invalid, "identifier")                       \
+    F(Is, -1, Invalid, Invalid, Invalid, "operator is")                              \
+    F(Less, 9, Invalid, CompareLess, Invalid, "less than")                           \
+    F(MemberAccess, 2, Invalid, MemberAccess, Invalid, "member access operator '.'") \
+    F(Multiplication, 5, Invalid, Multiplication, Invalid, "multiplication")         \
+    F(NotEquals, 10, Invalid, CompareNotEqual, Invalid, "not equals")                \
+    F(Number, -1, Invalid, Invalid, Invalid, "number")                               \
+    F(ParenClose, 18, Invalid, Invalid, ParenOpen, "')'")                            \
+    F(ParenOpen, -1, Invalid, Invalid, ParenClose, "'('")                            \
+    F(Plus, 6, Invalid, Plus, Invalid, "plus")                                       \
+    F(SectionNumber, -1, Invalid, Invalid, Invalid, "section number")                \
+    F(String, -1, Invalid, Invalid, Invalid, "string literal")                       \
+    F(UnaryMinus, 3, Minus, Invalid, Invalid, "unary minus")                         \
+    F(Undefined, -1, Invalid, Invalid, Invalid, "constant")                          \
+    F(Word, -1, Invalid, Invalid, Invalid, "word")
 
 enum class TokenType {
 #define ID(name, precedence, unary_name, binary_name, matching_bracket, name_for_diagnostic) name,