- New const enum declaration syntax.

- New enum associated value syntax.

test/test_suite/any/generic_interface_stage.c3t

@@ -1,7 +1,7 @@
 import std;
 fn int foo() => 0;
 alias FooFn = fn int();
-enum Bar : const FooFn
+const enum Bar : FooFn
 {
   FOO = fn () => (int)(iptr)ExclusiveRange{int}.typeid,
   BAR = &foo,

test/test_suite/attributes/format_check_error.c3

@@ -3,9 +3,9 @@ import std;
 const VERSION = "2.0";
 enum Subcommand : (String name, String desc, String[] args)
 {
-	FOO = {"oekfe", "foek", { "foke", "foekfe"}},
-	BAR = {"foek", "foek", { "foekf", "foekfe"}},
-	BAZ = {"Foekfef", "foek", { "foke", "foekfe" }}
+	FOO {"oekfe", "foek", { "foke", "foekfe"}},
+	BAR {"foek", "foek", { "foekf", "foekfe"}},
+	BAZ {"Foekfef", "foek", { "foke", "foekfe" }}
 }
 macro void help (String program_name, bool to_stderr = false)
 {

test/test_suite/compile_time/compile_time_array_bug.c3t

@@ -1,10 +1,10 @@
 // #target: macos-x64
 module test;
 enum TokenType: char (char token) {
-  ERROR = 0,
-  INCP = '>',
-  DECP = '>',
-  LOOPS = '[',
+  ERROR { 0   },
+  INCP  { '>' },
+  DECP  { '>' },
+  LOOPS { '[' },
 }
 
 macro populate_token_table() {

test/test_suite/compile_time/comptime_array_folding.c3t

@@ -25,7 +25,7 @@ struct ThisOtherStruct @TaggedAttr(VALUE_STRUCT)
 
 enum Example : int (String str) @TaggedAttr(VALUE_STRUCT)
 {
-   FOO = FOO_STR,
+   FOO {FOO_STR},
 }
 
 const int[2][1] BAR = { { 1, 2} };

test/test_suite/compile_time_introspection/membersof_enum.c3t

@@ -4,8 +4,8 @@ import std;
 
 enum Foo : (String x, int val)
 {
-	ABC = { "Hello", 3 },
-	DEF = { "World", -100 },
+	ABC { "Hello", 3 },
+	DEF { "World", -100 },
 }
 
 fn int main()

test/test_suite/compile_time_introspection/membersof_enum2.c3

@@ -3,8 +3,8 @@ import std;
 
 enum Foo : (String x, int val)
 {
-	ABC = { "Hello", 3 },
-	DEF = { "World", -100 },
+	ABC { "Hello", 3 },
+	DEF { "World", -100 },
 }
 
 fn int main()

test/test_suite/enumerations/const_enum.c3

@@ -1,6 +1,6 @@
 import std::io;
 
-enum MyEnum : const inline CInt
+const enum MyEnum : inline CInt
 {
 	FOO = 1,
 	BAR = 5,

test/test_suite/enumerations/const_enum_inline.c3t

@@ -1,6 +1,6 @@
 // #target: macos-x64
 module test;
-enum Foo : const inline String
+const enum Foo : inline String
 {
 	HELO = "Helo"
 }

test/test_suite/enumerations/const_enum_inline_member.c3t

@@ -5,7 +5,7 @@ struct Bar
     uint x, y, z;
 }
 
-enum Foo : const inline Bar
+const enum Foo : inline Bar
 {
     X = {1, 0, 0},
     Y = {0, 1, 0},

test/test_suite/enumerations/const_enum_methods.c3t

@@ -1,7 +1,7 @@
 // #target: macos-x64
 module test;
 
-enum Enum : const int
+const enum Enum : int
 {
     E0, E1
 }

test/test_suite/enumerations/const_enum_self_ref.c3

@@ -1,4 +1,4 @@
-enum MyEnum : const
+const enum MyEnum
 {
     VAL1 = VAL3, // #error: Unable to properly resolve enum constant value, this can sometimes happen in recursive definitions
     VAL2 ,

test/test_suite/enumerations/const_enum_vector.c3t

@@ -2,7 +2,7 @@
 module test;
 import std;
 
-enum Color : const char[<4>]
+const enum Color : char[<4>]
 {
 	LIGHTGRAY   = { 200, 200, 200, 255 },
 }

test/test_suite/enumerations/const_enum_with_function_ptr.c3t

@@ -6,11 +6,11 @@ alias FooFn = fn int();
 
 enum Foo : (FooFn f)
 {
-  FOO = fn int() => 0, // allowed
-  BAR = &foo, // allowed
+  FOO { fn int() => 0 }, // allowed
+  BAR { &foo }, // allowed
 }
 
-enum Bar : const FooFn
+const enum Bar : FooFn
 {
   FOO = fn int() => 0, // allowed
   BAR = &foo, // Error: Expected an constant enum value.

test/test_suite/enumerations/enum_associated_value.c3t

@@ -4,8 +4,8 @@ import libc;
 
 enum Foo : uint (int val, char* testme)
 {
-	A = { 123, "Number A" },
-	B = { 333, "Number B" },
+	A { 123, "Number A" },
+	B { 333, "Number B" },
 }
 
 fn void main()

test/test_suite/enumerations/enum_associated_values_other.c3t

@@ -18,8 +18,8 @@ int dabc;
 struct Abc { int x; }
 enum Foo : int (String val)
 {
-	ABC = "hello" ,
-	DEF = "world"
+	ABC {"hello"},
+	DEF {"world"}
 }
 
 /* #expect: abc.ll

test/test_suite/enumerations/enum_const.c3t

@@ -2,13 +2,13 @@
 module test;
 import std;
 
-enum Bar : const String
+const enum Bar : String
 {
 	XABC = "foekf",
 	XDEF = "foekfokef"
 }
 
-enum Foo : const int
+const enum Foo : int
 {
 	ABC = 4,
 	DEF,
@@ -18,7 +18,7 @@ enum Foo : const int
 }
 
 
-enum Bde2 : const int
+const enum Bde2 :  int
 {
 	FOO = 2,
 	BAR = 100
@@ -30,7 +30,7 @@ const BDE3_BAR = 100;
 
 
 
-enum Abc2 : const int
+const enum Abc2 : int
 {
 	UP,
 	DOWN,

test/test_suite/enumerations/enum_const_inline_interface.c3

@@ -12,7 +12,7 @@ fn void Foo.x(&self) @dynamic
 	io::printn("Foo!");
 }
 
-enum Tester : const inline Foo
+const enum Tester : inline Foo
 {
 	ABC = 1
 }

test/test_suite/enumerations/enum_const_resolution_order.c3t

@@ -8,7 +8,7 @@ struct Foo
 
 module bar;
 
-enum MyEnum : const CInt
+const enum MyEnum : CInt
 {
 	VAL1 = 1,
 	VAL2 = 2,

test/test_suite/enumerations/enum_copy.c3t

@@ -2,7 +2,7 @@ module generic_module_enum <N>;
 
 enum Foo : char (String s)
 {
-	BAR = "bar",
+	BAR {"bar"},
 }
 
 module generic_module_enum_test;

test/test_suite/enumerations/enum_invalid_param.c3

@@ -1,14 +1,14 @@
 enum Test : int (int kindof, int qnameof)
 {
-	FOO = {1, 2}
+	FOO {1, 2}
 }
 
 enum Test2 : (int a, int nameof)  // #error: 'nameof' is not a valid parameter name for enums
 {
-	FOO = {1, 2}
+	FOO {1, 2}
 }
 
 enum Test3 : (int a, int ordinal)  // #error: 'ordinal' is not a valid parameter name for enums
 {
-	FOO = {1, 2}
+	FOO {1, 2}
 }

test/test_suite/enumerations/enum_no_inline_property.c3

@@ -1,5 +1,5 @@
 module test;
-enum MyEnum : const inline short
+const enum MyEnum : inline short
 {
 	ITEM1,
 	ITEM2,

test/test_suite/enumerations/enum_parse_arg.c3

@@ -1,4 +1,4 @@
 enum Foo : (int x, int y)
 {
-	ABC = { 1 2 } // #error: A comma or a closing brace
+	ABC { 1 2 } // #error: A comma or a closing brace
 }

test/test_suite/enumerations/enum_recursive.c3

@@ -2,13 +2,13 @@ module test;
 
 enum Bar : (Foo x)
 {
-	ABC = BAR
+	ABC {BAR}
 }
 
 enum Foo : (Bar b, Foo a)
 {
-	FOO = { ABC, BAR },
-	BAR = { ABC, BAR }
+	FOO { ABC, BAR },
+	BAR { ABC, BAR }
 }
 
 fn void main()

test/test_suite/enumerations/enum_same_param.c3

@@ -1,9 +1,9 @@
 enum Test : (int a, int b)
 {
-	FOO = { 1, 2 }
+	FOO { 1, 2 }
 }
 
 enum Test2 : int (int a, int a)  // #error: Duplicate parameter name 'a'
 {
-	FOO = { 1, 2 }
+	FOO { 1, 2 }
 }

test/test_suite/enumerations/enum_with_associated_value_decl.c3

@@ -1,7 +1,7 @@
 enum Test2 : (usz a, usz b) {
-  FOO = {4, 5, },
+  FOO {4, 5, },
 }
 
 enum Test : (usz a, usz b) {
-  FOO = {a: 1, b: 1}, // #error: This looks like
+  FOO {a: 1, b: 1}, // #error: This looks like
 }

test/test_suite/enumerations/enum_with_const.c3t

@@ -6,10 +6,10 @@ const FG_GREEN  = "\e[0;38;2;192;255;192m";
 const FG_RED    = "\e[0;38;2;255;40;40m";
 
 enum SeverityTag : int (String fg, String label) {
-   INFO  = { FG_GREEN,  "info"  },
-   WARN  = { FG_YELLOW, "warn"  },
-   FATAL = { FG_RED,    "fatal" },
-   FATAL2 = { FG_RED,    "fatal2" },
+   INFO   { FG_GREEN,  "info"  },
+   WARN   { FG_YELLOW, "warn"  },
+   FATAL  { FG_RED,    "fatal" },
+   FATAL2 { FG_RED,    "fatal2" },
 }
 
 fn void main()

test/test_suite/enumerations/introspection_data_error.c3t

@@ -1,7 +1,7 @@
 // #target: macos-x64
 module boom;
 enum Boom: int (String a) {
-    BOOM = {0}
+    BOOM {{0}}
 }
 
 module app;

test/test_suite/enumerations/lambda_in_enum.c3t

@@ -3,7 +3,7 @@ module test;
 alias SomethingFn = fn void();
 enum TestEnum : char (SomethingFn f)
 {
-	FOO = fn () {}
+	FOO {fn () {}}
 }
 
 /* #expect: test.ll

test/test_suite/enumerations/recursive_const_enum.c3

@@ -2,7 +2,7 @@ module main;
 
 faultdef F;
 
-enum Foo : const fault
+const enum Foo : fault
 {
     F = F // #error: Recursive resolution of expression
 }

test/test_suite/enumerations/too_many_associated.c3

@@ -1,9 +1,9 @@
 enum Baz : (String a, int z)
 {
-  BAR = { "123", 1, 3 }, // #error: You're adding too many values, only 2 associated
+  BAR { "123", 1, 3 }, // #error: You're adding too many values, only 2 associated
 }
 
 enum Baz2 : (String a, int z)
 {
-  BAR = { "123" }, // #error: Expected 2 associated values for this enum value
+  BAR { "123" }, // #error: Expected 2 associated values for this enum value
 }

test/test_suite/expressions/casts/inline_to_underlying.c3t

@@ -6,7 +6,7 @@ enum Foo : inline int
 {
 	ABC,
 }
-enum Bar : const inline int
+const enum Bar : inline int
 {
 	HELLO = 1
 }

test/test_suite/switch/switch_in_defer_macro.c3t

@@ -409,16 +409,16 @@ alias Kind = lexer::Kind{Token, Comment};
 
 enum Token : char (String token)
 {
-	KEYWORD1 = "keyword1",
-	KEYWORD2 = "keyword2",
-	SINGLE   = "//",
-	MULTI    = "/*",
+	KEYWORD1 { "keyword1" },
+	KEYWORD2 { "keyword2" },
+	SINGLE   { "//"       },
+	MULTI    { "/*"       },
 }
 
 enum Comment : char (Token start, String end)
 {
-	SINGLE = { SINGLE, "\n" },
-	MULTI  = { MULTI, "*/" },
+	SINGLE { SINGLE, "\n" },
+	MULTI  { MULTI, "*/" },
 }
 
 fn bool is_ident_char(usz i, char c)

test/unit/stdlib/collections/linked_map.c3

@@ -186,7 +186,7 @@ enum Foobar : inline char
 	BAZ
 }
 
-enum Foobar2 : const inline int
+const enum Foobar2 : inline int
 {
 	ABC = 3,
 	DEF = 5,

test/unit/stdlib/collections/map.c3

@@ -63,7 +63,7 @@ enum Foobar : inline char
     BAZ
 }
 
-enum Foobar2 : const inline int
+const enum Foobar2 : inline int
 {
 	ABC = 3,
 	DEF = 5,