From 365e50d67e0aa135b9d1f7e11937dc67bb8b39bb Mon Sep 17 00:00:00 2001
From: Uko Kokņevičs
Date: Fri, 31 Dec 2021 21:18:41 +0200
Subject: Update zig mode

---
 src/Syntax/zig.zig | 61 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/Syntax/zig.zig b/src/Syntax/zig.zig
index d0bf60c..9519c74 100644
--- a/src/Syntax/zig.zig
+++ b/src/Syntax/zig.zig
@@ -1,4 +1,4 @@
-// Please don't zig fmt this
+// zig fmt: off
 
 const std = @import("std");
 
@@ -9,33 +9,46 @@ pub const syntax = Syntax{
     .name = "Zig",
     .filematch = &[_][]const u8{ ".zig" },
     .keywords1 = &[_][]const u8{
-        "align", "allowzero", "and", "anyframe", "anytype", "asm", "async", "await", "break", "catch", "comptime",
-        "const", "continue", "defer", "else", "enum", "errdefer", "error", "export", "extern", "false", "fn", "for", "if",
-        "inline", "noalias", "nosuspend", "null", "or", "orelse", "packed", "pub", "resume", "return", "linksection",
-        "struct", "suspend", "switch", "test", "threadlocal", "true", "try", "undefined", "union", "unreachable",
-        "usingnamespace", "var", "volatile", "while",
+        // keywords
+        "align", "allowzero", "and", "anyframe", "anytype", "asm", "async", "await", "break",
+        "callconv", "catch", "comptime", "const", "continue", "defer", "else", "enum", "errdefer",
+        "error", "export", "extern", "fn", "for", "if", "inline", "noalias", "nosuspend", "noinline",
+        "opaque", "or", "orelse", "packed", "pub", "resume", "return", "linksection", "struct",
+        "suspend", "switch", "test", "threadlocal", "try", "union", "unreachable", "usingnamespace",
+        "var", "volatile", "while",
 
-        "opaque",
+        // primitive values
+        "false", "null", "true", "undefined",
     },
     .keywords2 = &[_][]const u8{
-        // TODO: Generate all integer types with a comptime fn.
-        "i8", "u8", "i16", "u16", "i32", "u32", "i64", "u64", "i128", "u128", "isize", "usize", "c_short", "c_ushort",
-        "c_int", "c_uint", "c_long", "c_ulong", "c_longlong", "c_ulonglong", "c_longdouble", "c_void", "f16", "f32",
-        "f64", "f128", "bool", "void", "noreturn", "type", "anyerror", "comptime_int", "comptime_float",
+        // primitive types
+        "i8", "u8", "i16", "u16", "i32", "u32", "i64", "u64", "i128", "u128", "isize", "usize",
+        "c_short", "c_ushort", "c_int", "c_uint", "c_long", "c_ulong", "c_longlong", "c_ulonglong",
+        "c_longdouble", "f16", "f32", "f64", "f128", "bool", "anyopaque", "void", "noreturn", "type",
+        "anyerror", "comptime_int", "comptime_float",
 
-        "@addWithOverflow", "@alignCast", "@alignOf", "@as", "@asyncCall", "@atomicLoad", "@atomicRmw", "@atomicStore",
-        "@bitCast", "@bitOffsetOf", "@boolToInt", "@bitSizeOf", "@breakpoint", "@mulAdd", "@byteSwap", "@bitReverse",
-        "@offsetOf", "@call", "@cDefine", "@cImport", "@cInclude", "@clz", "@cmpxchgStrong", "@cmpxchgWeak",
-        "@compileError", "@compileLog", "@ctz", "@cUndef", "@divExact", "@divFloor", "@divTrunc", "@embedFile",
-        "@enumToIt", "@errorName", "@errorReturnTrace", "@errorToInt", "@errSetCast", "@export", "@extern", "@fence",
-        "@field", "@fieldParentPtr", "@floatCast", "@floatToInt", "@frame", "@Frame", "@frameAddress", "@frameSize",
-        "@hasDecl", "@hasField", "@import", "@intCast", "@intToEnum", "@intToError" , "@intToFloat", "@intToPtr",
-        "@maximum", "@memcpy", "@memset", "@minimum", "@wasmMemorySize", "@wasmMemoryGrow", "@mod", "@mulWithOverflow",
-        "@panic", "@popCount", "@prefetch", "@ptrCast", "@ptrToInt", "@rem", "@returnAddress", "@select",
-        "@setAlignStack", "@setCold", "@setEvalBranchQuota", "@setFloatMode", "@setRuntimeSafety", "@shlExact",
-        "@shlWithOverflow", "@shrExact", "@shuffle", "@sizeOf", "@splat", "@reduce", "@src", "@sqrt", "@sin", "@cos",
-        "@exp", "@exp2", "@log", "@log2", "@log10", "@fabs", "@floor", "@ceil", "@trunc", "@round", "@subWithOverflow",
-        "@tagName", "@This", "@truncate", "@Type", "@typeInfo", "@typeName", "@TypeOf", "@unionInit",
+        // removed types
+        "c_void",
+
+        // TODO: Generate all integer types
+
+        // builtin functions
+        "@addWithOverflow", "@alignCast", "@alignOf", "@as", "@asyncCall", "@atomicLoad",
+        "@atomicRmw", "@atomicStore", "@bitCast", "@bitOffsetOf", "@boolToInt", "@bitSizeOf",
+        "@breakpoint", "@mulAdd", "@byteSwap", "@bitReverse", "@offsetOf", "@call", "@cDefine",
+        "@cImport", "@cInclude", "@clz", "@cmpxchgStrong", "@cmpxchgWeak", "@compileError",
+        "@compileLog", "@ctz", "@cUndef", "@divExact", "@divFloor", "@divTrunc", "@embedFile",
+        "@enumToInt", "@errorName", "@errorReturnTrace", "@errorToInt", "@errSetCast", "@export",
+        "@extern", "@fence", "@field", "@fieldParentPtr", "@floatCast", "@floatToInt", "@frame",
+        "@Frame", "@frameAddress", "@frameSize", "@hasDecl", "@hasField", "@import", "@intCast",
+        "@intToEnum", "@intToError" , "@intToFloat", "@intToPtr", "@maximum", "@memcpy", "@memset",
+        "@minimum", "@wasmMemorySize", "@wasmMemoryGrow", "@mod", "@mulWithOverflow", "@panic",
+        "@popCount", "@prefetch", "@ptrCast", "@ptrToInt", "@rem", "@returnAddress", "@select",
+        "@setAlignStack", "@setCold", "@setEvalBranchQuota", "@setFloatMode", "@setRuntimeSafety",
+        "@shlExact", "@shlWithOverflow", "@shrExact", "@shuffle", "@sizeOf", "@splat", "@reduce",
+        "@src", "@sqrt", "@sin", "@cos", "@exp", "@exp2", "@log", "@log2", "@log10", "@fabs",
+        "@floor", "@ceil", "@trunc", "@round", "@subWithOverflow", "@tagName", "@This", "@truncate",
+        "@Type", "@typeInfo", "@typeName", "@TypeOf", "@unionInit",
     },
     .singleline_comment_start = "//",
     .multiline_comment_start = null,
-- 
cgit v1.2.3