Some changes in Syntax

3 files changed, 155 insertions, 112 deletions

diff --git a/src/Syntax.zig b/src/Syntax.zig
index f29c7fc..6858027 100644
--- a/src/Syntax.zig
+++ b/src/Syntax.zig
@@ -1,14 +1,18 @@
 pub const makefile = @import("Syntax/makefile.zig");
 pub const zig = @import("Syntax/zig.zig");
 
+const es = @import("root");
 const std = @import("std");
 
+const ComptimeStringMap = std.ComptimeStringMap;
+const Highlight = es.Highlight;
 const Syntax = @This();
 
-pub const database = [_]Syntax{
-    makefile.syntax,
-    zig.syntax,
-};
+pub const chooseSyntax = ComptimeStringMap(
+    Syntax,
+    pairWith(&makefile.filematch, makefile.syntax)
+        ++ pairWith(&zig.filematch, zig.syntax),
+).get;
 
 pub const Flags = struct {
     hl_numbers: bool = false,
@@ -16,10 +20,7 @@ pub const Flags = struct {
 };
 
 name: []const u8,
-// TODO: Make these into comptime StringSets, see std.ComptimeStringMap
-filematch: []const []const u8,
-keywords1: []const []const u8,
-keywords2: []const []const u8,
+keyword_classifier: fn([]const u8) ?Highlight,
 singleline_comment_start: ?[]const u8,
 multiline_comment_start: ?[]const u8,
 multiline_comment_end: ?[]const u8,
@@ -29,3 +30,25 @@ flags: Flags,
 pub fn isSeparator(self: Syntax, char: u8) bool {
     return std.ascii.isSpace(char) or std.mem.indexOfScalar(u8, self.separators, char) != null;
 }
+
+pub fn pairWith(
+    comptime keys: []const []const u8,
+    comptime value: anytype,
+) [keys.len]KeyValue(@TypeOf(value)) {
+    @setEvalBranchQuota(20000);
+
+    var pairs = [_]KeyValue(@TypeOf(value)) {undefined} ** keys.len;
+    for (keys) |key, i| {
+        pairs[i] = .{ .@"0" = key, .@"1" = value };
+    }
+
+    return pairs;
+}
+
+fn KeyValue(comptime V: type) type {
+    return struct {
+        @"0": []const u8,
+        @"1": V,
+    };
+}
+
diff --git a/src/Syntax/makefile.zig b/src/Syntax/makefile.zig
index 5c93df4..6ae7386 100644
--- a/src/Syntax/makefile.zig
+++ b/src/Syntax/makefile.zig
@@ -1,78 +1,89 @@
 // zig fmt: off
 
 const es = @import("root");
+const std = @import("std");
 
+const ComptimeStringMap = std.ComptimeStringMap;
+const Highlight = es.Highlight;
 const Syntax = es.Syntax;
 
+pub const filematch = [_][]const u8{
+    "GNUmakefile", "makefile", "Makefile",
+
+    ".mk",
+};
+
 pub const syntax = Syntax{
     .name = "Makefile",
-    .filematch = &[_][]const u8{ "GNUmakefile", "makefile", "Makefile", ".mk" },
-    .keywords1 = &[_][]const u8{
-        "$@", "$(@D)", "$(@F)",
-        "$%", "$(%D)", "$(%F)",
-        "$<", "$(<D)", "$(<F)",
-        "$?", "$(?D)", "$(?F)",
-        "$^", "$(^D)", "$(^F)",
-        "$+", "$(+D)", "$(+F)",
-        "$|",
-        "$*", "$(*D)", "$(*F)",
+    .keyword_classifier = ComptimeStringMap(
+        Highlight,
+        Syntax.pairWith(&keywords1, .keyword1) ++ Syntax.pairWith(&keywords2, .keyword2),
+    ).get,
+    .singleline_comment_start = "#",
+    .multiline_comment_start = null,
+    .multiline_comment_end = null,
+    .separators = "(){};:-@+",
+    .flags = .{},
+};
 
-        ".DEFAULT", ".DEFAULT_GOAL", ".DELETE_ON_ERROR", ".EXPORT_ALL_VARIABLES", ".EXTRA_PREREQS",
-        ".FEATURES", ".IGNORE", ".INCLUDE_DIRS", ".INTERMEDIATE", ".LIBPATTERNS", ".LOADED",
-        ".LOW_RESOLUTION_TIME", ".NOTPARALLEL", ".ONESHELL", ".PHONY", ".POSIX", ".PRECIOUS",
-        ".RECIPEPREFIX", ".SECONDARY", ".SECONDEXPANSION", ".SHELLFLAGS", ".SHELLSTATUS", ".SILENT",
-        ".SUFFIXES", ".VARIABLES",
+const keywords1 = [_][]const u8{
+    "$@", "$(@D)", "$(@F)",
+    "$%", "$(%D)", "$(%F)",
+    "$<", "$(<D)", "$(<F)",
+    "$?", "$(?D)", "$(?F)",
+    "$^", "$(^D)", "$(^F)",
+    "$+", "$(+D)", "$(+F)",
+    "$*", "$(*D)", "$(*F)",
+    "$|",
 
-        "abspath", "addprefix", "addsuffix", "and", "basename", "call", "define", "dir", "else",
-        "endef", "endif", "error", "eval", "export", "file", "filter", "filter-out", "findstring",
-        "firstword", "flavor", "foreach", "gmk-eval", "gmk-expand", "guile", "if", "ifdef", "ifeq",
-        "ifndef", "ifneq", "include", "info", "join", "lastword", "load", "notdir", "or", "origin",
-        "override", "patsubst", "private", "realpath", "shell", "sort", "strip", "subst", "suffix",
-        "undefined", "unexport", "value", "vpath", "warning", "wildcard", "word", "wordlist",
-        "words",
+    ".DEFAULT", ".DEFAULT_GOAL", ".DELETE_ON_ERROR", ".EXPORT_ALL_VARIABLES", ".EXTRA_PREREQS",
+    ".FEATURES", ".IGNORE", ".INCLUDE_DIRS", ".INTERMEDIATE", ".LIBPATTERNS", ".LOADED",
+    ".LOW_RESOLUTION_TIME", ".NOTPARALLEL", ".ONESHELL", ".PHONY", ".POSIX", ".PRECIOUS",
+    ".RECIPEPREFIX", ".SECONDARY", ".SECONDEXPANSION", ".SHELLFLAGS", ".SHELLSTATUS", ".SILENT",
+    ".SUFFIXES", ".VARIABLES",
 
-        "ar", "as", "awk", "bison", "c99", "cat", "cc", "chgrp", "chmod", "chown", "cmp", "co", "cp",
-        "ctangle", "cweave", "diff", "do", "done", "echo", "elif", "else", "egrep", "expr", "fc",
-        "for", "f77", "false", "fi", "find", "flex", "g++", "get", "grep", "gzip", "if", "in",
-        "install", "install-info", "ld", "ldconfig", "lex", "lint", "ln", "ls", "m2c", "make",
-        "makeinfo", "mkdir", "mknod", "mv", "pc", "printf", "pwd", "ranlib", "rm", "rmdir", "sed",
-        "sleep", "sort", "tangle", "tar", "test", "tex", "texi2dvi", "then", "tr", "true", "touch",
-        "weave", "yacc",
-    },
-    .keywords2 = &[_][]const u8{
-        "AR", "AS", "AWK", "BISON", "CAT", "CC", "CHGRP", "CHMOD", "CHOWN", "CMP", "CO", "CP", "CPP",
-        "CTANGLE", "CWEAVE", "CXX", "DIFF", "ECHO", "EGREP", "EXPR", "FALSE", "FC", "FIND", "FLEX",
-        "GET", "GREP", "GZIP", "INSTALL", "INSTALL_DATA", "INSTALL_INFO", "INSTALL_PROGRAM", "LD",
-        "LDCONFIG", "LEX", "LINT", "LN", "LS", "M2C", "MAKE", "MAKEINFO", "MKDIR", "MKNOD", "MV",
-        "RM", "PC", "PRINTF", "PWD", "RANLIB", "RMDIR", "SED", "SLEEP", "SORT", "TANGLE", "TAR",
-        "TEST", "TEX", "TEXI2DVI", "TOUCH", "TR", "TRUE", "WEAVE", "YACC",
+    "abspath", "addprefix", "addsuffix", "and", "basename", "call", "define", "dir", "else", "endef",
+    "endif", "error", "eval", "export", "file", "filter", "filter-out", "findstring", "firstword",
+    "flavor", "foreach", "gmk-eval", "gmk-expand", "guile", "if", "ifdef", "ifeq", "ifndef", "ifneq",
+    "include", "info", "join", "lastword", "load", "notdir", "or", "origin", "override", "patsubst",
+    "private", "realpath", "shell", "sort", "strip", "subst", "suffix", "undefined", "unexport",
+    "value", "vpath", "warning", "wildcard", "word", "wordlist", "words",
 
-        "ARFLAGS", "BISONFLAGS", "ASFLAGS", "CFLAGS", "COFLAGS", "CPPFLAGS", "CXXFLAGS", "FFLAGS",
-        "GFLAGS", "LDFLAGS", "LDLIBS", "LFLAGS", "LINTFLAGS", "MAKEFLAGS", "MFLAGS", "PFLAGS",
-        "REALFLAGS", "YFLAGS",
+    "ar", "as", "awk", "bison", "c99", "cat", "cc", "chgrp", "chmod", "chown", "cmp", "co", "cp",
+    "ctangle", "cweave", "diff", "do", "done", "echo", "elif", "else", "egrep", "expr", "fc", "for",
+    "f77", "false", "fi", "find", "flex", "g++", "get", "grep", "gzip", "if", "in", "install",
+    "install-info", "ld", "ldconfig", "lex", "lint", "ln", "ls", "m2c", "make", "makeinfo", "mkdir",
+    "mknod", "mv", "pc", "printf", "pwd", "ranlib", "rm", "rmdir", "sed", "sleep", "sort", "tangle",
+    "tar", "test", "tex", "texi2dvi", "then", "tr", "true", "touch", "weave", "yacc",
+};
 
-        "COMSPEC", "CURDIR", "DESTDIR", "GPATH", "LOADLIBES", "MAKECMDGOALS", "MAKEFILES",
-        "MAKEFILE_LIST", "MAKELEVEL", "MAKEOVERRIDES", "MAKESHELL", "MAKE_HOST", "MAKE_RESTARTS",
-        "MAKE_TERMERR", "MAKE_TERMOUT", "MAKE_VERSION", "OUTPUT_OPTION", "SHELL", "SUFFIXES",
-        "VPATH",
+const keywords2 = [_][]const u8{
+    "AR", "AS", "AWK", "BISON", "CAT", "CC", "CHGRP", "CHMOD", "CHOWN", "CMP", "CO", "CP", "CPP",
+    "CTANGLE", "CWEAVE", "CXX", "DIFF", "ECHO", "EGREP", "EXPR", "FALSE", "FC", "FIND", "FLEX",
+    "GET", "GREP", "GZIP", "INSTALL", "INSTALL_DATA", "INSTALL_INFO", "INSTALL_PROGRAM", "LD",
+    "LDCONFIG", "LEX", "LINT", "LN", "LS", "M2C", "MAKE", "MAKEINFO", "MKDIR", "MKNOD", "MV", "RM",
+    "PC", "PRINTF", "PWD", "RANLIB", "RMDIR", "SED", "SLEEP", "SORT", "TANGLE", "TAR", "TEST", "TEX",
+    "TEXI2DVI", "TOUCH", "TR", "TRUE", "WEAVE", "YACC",
 
-        "bindir", "datadir", "datarootdir", "docdir", "dvidir", "exec_prefix", "htmldir",
-        "includedir", "infodir", "libexecdir", "libdir", "lispdir", "localedir", "localstatedir",
-        "mandir", "manext", "man1dir", "man1ext", "man2dir", "man2ext", "man3dir", "man3ext",
-        "man4dir", "man4ext", "man5dir", "man5ext", "man6dir", "man6ext", "man7dir", "man7ext",
-        "man8dir", "man8ext", "manndir", "mannext", "oldincludedir", "pdfdir", "psdir", "prefix",
-        "runstatedir", "sbindir", "srcdir", "sharedstatedir", "sysconfdir",
+    "ARFLAGS", "BISONFLAGS", "ASFLAGS", "CFLAGS", "COFLAGS", "CPPFLAGS", "CXXFLAGS", "FFLAGS",
+    "GFLAGS", "LDFLAGS", "LDLIBS", "LFLAGS", "LINTFLAGS", "MAKEFLAGS", "MFLAGS", "PFLAGS",
+    "REALFLAGS", "YFLAGS",
 
-        "all", "check", "clean", "dist", "distclean", "dvi", "html", "info", "install",
-        "install-dvi", "install-html", "install-pdf", "install-ps", "install-strip", "installcheck",
-        "installdirs", "maintainer-clean", "mostlyclean", "pdf", "ps", "uninstall", "TAGS",
+    "COMSPEC", "CURDIR", "DESTDIR", "GPATH", "LOADLIBES", "MAKECMDGOALS", "MAKEFILES",
+    "MAKEFILE_LIST", "MAKELEVEL", "MAKEOVERRIDES", "MAKESHELL", "MAKE_HOST", "MAKE_RESTARTS",
+    "MAKE_TERMERR", "MAKE_TERMOUT", "MAKE_VERSION", "OUTPUT_OPTION", "SHELL", "SUFFIXES", "VPATH",
 
-        "NORMAL_INSTALL", "NORMAL_UNINSTALL", "POST_INSTALL", "POST_UNINSTALL", "PRE_INSTALL",
-        "PRE_UNINSTALL"
-    },
-    .singleline_comment_start = "#",
-    .multiline_comment_start = null,
-    .multiline_comment_end = null,
-    .separators = "(){};:-@+",
-    .flags = .{},
+    "bindir", "datadir", "datarootdir", "docdir", "dvidir", "exec_prefix", "htmldir", "includedir",
+    "infodir", "libexecdir", "libdir", "lispdir", "localedir", "localstatedir", "mandir", "manext",
+    "man1dir", "man1ext", "man2dir", "man2ext", "man3dir", "man3ext", "man4dir", "man4ext",
+    "man5dir", "man5ext", "man6dir", "man6ext", "man7dir", "man7ext", "man8dir", "man8ext",
+    "manndir", "mannext", "oldincludedir", "pdfdir", "psdir", "prefix", "runstatedir", "sbindir",
+    "srcdir", "sharedstatedir", "sysconfdir",
+
+    "all", "check", "clean", "dist", "distclean", "dvi", "html", "info", "install", "install-dvi",
+    "install-html", "install-pdf", "install-ps", "install-strip", "installcheck", "installdirs",
+    "maintainer-clean", "mostlyclean", "pdf", "ps", "uninstall", "TAGS",
+
+    "NORMAL_INSTALL", "NORMAL_UNINSTALL", "POST_INSTALL", "POST_UNINSTALL", "PRE_INSTALL",
+    "PRE_UNINSTALL",
 };
diff --git a/src/Syntax/zig.zig b/src/Syntax/zig.zig
index 4826bfb..c8bc225 100644
--- a/src/Syntax/zig.zig
+++ b/src/Syntax/zig.zig
@@ -3,57 +3,66 @@
 const es = @import("root");
 const std = @import("std");
 
+const ComptimeStringMap = std.ComptimeStringMap;
+const Highlight = es.Highlight;
 const Syntax = es.Syntax;
 
+pub const filematch = [_][]const u8{
+    ".zig",
+};
+
 // TODO: Add support for the multiline string \\
 pub const syntax = Syntax{
     .name = "Zig",
-    .filematch = &[_][]const u8{ ".zig" },
-    .keywords1 = &[_][]const u8{
-        // 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",
-
-        // primitive values
-        "false", "null", "true", "undefined",
-    },
-    .keywords2 = &[_][]const u8{
-        // 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",
-
-        // 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",
-    },
+    .keyword_classifier = ComptimeStringMap(
+        Highlight,
+        Syntax.pairWith(&keywords1, .keyword1) ++ Syntax.pairWith(&keywords2, .keyword2),
+    ).get,
     .singleline_comment_start = "//",
     .multiline_comment_start = null,
     .multiline_comment_end = null,
     .separators = "&*^:,.=!<{[(-%|+?>}]);/~",
     .flags = .{ .hl_numbers = true, .hl_strings = true },
 };
+
+const keywords1 = [_][]const u8 {
+    // 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",
+
+    // primitive values
+    "false", "null", "true", "undefined",
+};
+
+const keywords2 = [_][]const u8 {
+    // primitive types
+    // TODO: generate all the integer 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",
+
+    // former primitive types
+    "c_void",
+
+    // 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",
+};