diff --git a/xighlight.c b/xighlight.c index a0147e6..89a449c 100644 --- a/xighlight.c +++ b/xighlight.c @@ -28,16 +28,12 @@ static void highlight_common (void) { /* Should be changed to support basic GCC, syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("'", "'", '\\', COLOUR_PINK, EFFECT_BOLD); syntax_define_range ("`", "'", '\\', COLOUR_PINK, EFFECT_BOLD); syntax_define_operators (".,:;<=>+*-/%!&~^?|()[]{}", COLOUR_BLUE, EFFECT_BOLD); - (void) syntax_insert (1, 1, "abcdefghijklmnopqrstuvwxyz", syntax_separator, '\0', COLOUR_WHITE, EFFECT_NORMAL); - (void) syntax_insert (1, 1, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", syntax_separator, '\0', COLOUR_WHITE, EFFECT_BOLD); - (void) syntax_insert (1, 1, "_", syntax_separator, '\0', COLOUR_PINK, EFFECT_BOLD); + syntax_define_default (1, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); highlighted = 1; } @@ -45,7 +41,7 @@ static void highlight_common (void) { /* Should be changed to support basic GCC, static void highlight_c (void) { char * separators = ".,:;<=>+-*/%!&~^?|()[]{}'\" \t\r\n"; - char * keywords [32] = { + char * keywords [] = { "register", "volatile", "auto", "const", "static", "extern", "if", "else", "do", "while", "for", "continue", "switch", "case", "default", "break", "enum", "union", "struct", "typedef", "goto", "void", "return", "sizeof", @@ -58,8 +54,6 @@ static void highlight_c (void) { syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("/*", "*/", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("//", "\n", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("#", "\n", '\\', COLOUR_PINK, EFFECT_NORMAL); @@ -67,7 +61,9 @@ static void highlight_c (void) { syntax_define_operators (".,:;<=>+*-/%!&~^?|()[]{}", COLOUR_BLUE, EFFECT_BOLD); - syntax_define_words (1, keywords, 32, COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (keywords, sizeof (keywords) / sizeof (keywords [0]), COLOUR_BLUE, EFFECT_NORMAL); + + syntax_define_default (1, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); highlighted = 1; } @@ -75,7 +71,7 @@ static void highlight_c (void) { static void highlight_ada (void) { char * separators = ".,:;<=>+-*/&|()\" \t\r\n"; - char * keywords [73] = { + char * keywords [] = { "abort", "else", "new", "return", "abs", "elsif", "not", "reverse", "abstract", "end", "null", "accept", "entry", "select", "access", "of", "separate", "aliased", "exit", "or", "some", "all", "others", "subtype", @@ -94,14 +90,14 @@ static void highlight_ada (void) { syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("--", "\n", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("'", "'", '\0', COLOUR_PINK, EFFECT_BOLD); syntax_define_operators (".,:;<=>+-*/&|()'", COLOUR_BLUE, EFFECT_BOLD); - syntax_define_words (0, keywords, 73, COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (keywords, sizeof (keywords) / sizeof (keywords [0]), COLOUR_BLUE, EFFECT_NORMAL); + + syntax_define_default (0, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); highlighted = 1; } @@ -109,7 +105,7 @@ static void highlight_ada (void) { static void highlight_cpp (void) { char * separators = ".,:;<=>+-*/%!&~^?|()[]{}'\" \t\r\n"; - char * keywords [102] = { + char * keywords [] = { "alignas", "alignof", "and", "and_eq", "asm", "atomic_cancel", "atomic_commit", "atomic_noexcept", "auto", "bitand", "bitor", "bool", "break", "case", "catch", "char", "char8_t", "char16_t", "char32_t", "class", "compl", "concept", "const", "consteval", @@ -131,8 +127,6 @@ static void highlight_cpp (void) { syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("/*", "*/", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("//", "\n", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("#", "\n", '\\', COLOUR_PINK, EFFECT_NORMAL); @@ -140,7 +134,9 @@ static void highlight_cpp (void) { syntax_define_operators (".,:;<=>+*-/%!&~^?|()[]{}", COLOUR_BLUE, EFFECT_BOLD); - syntax_define_words (1, keywords, 102, COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (keywords, sizeof (keywords) / sizeof (keywords [0]), COLOUR_BLUE, EFFECT_NORMAL); + + syntax_define_default (1, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); highlighted = 1; } @@ -148,7 +144,7 @@ static void highlight_cpp (void) { static void highlight_python (void) { char * separators = ".,:<=>+*-/%!&~^?|()[]'\" \t\r\n"; - char * keywords [35] = { + char * keywords [] = { "False", "await", "else", "import", "pass", "None", "break", "except", "in", "raise", "True", "class", "finally", "is", "return", "and", "continue", "for", "lambda", "try", "as", "def", "from", "nonlocal", @@ -162,14 +158,14 @@ static void highlight_python (void) { syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("#", "\n", '\\', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("'", "'", '\\', COLOUR_PINK, EFFECT_BOLD); syntax_define_operators (".,:<=>+*-/%!&~^?|()[]", COLOUR_BLUE, EFFECT_BOLD); - syntax_define_words (0, keywords, 35, COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (keywords, sizeof (keywords) / sizeof (keywords [0]), COLOUR_BLUE, EFFECT_NORMAL); + + syntax_define_default (0, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); highlighted = 1; } @@ -177,7 +173,7 @@ static void highlight_python (void) { static void highlight_valgrind (void) { char * separators = "./-=?() \t\r\n"; - char * keywords [1] = { + char * keywords [] = { "Invalid" }; @@ -187,15 +183,70 @@ static void highlight_valgrind (void) { syntax_define_separators (separators); - syntax_define_default (COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); - syntax_define_range ("==", "==", '\0', COLOUR_GREY, EFFECT_BOLD); syntax_define_range ("(", ")", '\0', COLOUR_PINK, EFFECT_NORMAL); syntax_define_range ("???", "\n", '\0', COLOUR_RED, EFFECT_BOLD); syntax_define_operators ("./-:", COLOUR_BLUE, EFFECT_BOLD); - syntax_define_words (0, keywords, 1, COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (keywords, sizeof (keywords) / sizeof (keywords [0]), COLOUR_BLUE, EFFECT_NORMAL); + + syntax_define_default (0, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_BOLD); + + highlighted = 1; +} + +static void highlight_common_assembly (void) { + char * separators = ".,+-[]<> \t\r\n"; + + char * instructions [] = { + "mov", "movabs", "movapd", "movaps", "movebe", "movsd", "movsx", "movzx", + "movsxd", "movd", "movq", "movs", "movsb", "movsw", "movsd", "movsq", + "cmovmp", "cmovrcxz", "cmovc", "cmovnc", "cmove", "cmovne", "cmovz", "cmovnz", + "cmovg", "cmovng", "cmovge", "cmovnge", "cmovl", "cmovnl", "cmovle", "cmovnle", + "cmova", "cmovna", "cmovae", "cmovnae", "cmovb", "cmovnb", "cmovbe", "cmovnbe", + "cmovs", "cmovns", "cmovo", "cmovno", "cmovp", "cmovnp", "cmovpo", "cmovpe", + "cmp", "cmps", "cmpsb", "cmpsw", "cmpsd", "cmpsq", "cmpxchg", "lea", + "monitor", "cpuid", "in", "out", "syscall", "sysenter", "sysret", "sysexit", + "swap", "bswap", "pop", "push", "call", "ret", "enter", "leave", + "and", "or", "not", "neg", "sal", "sar", "shl", "shr", + "inc", "dec", "add", "sub", "mul", "div", "imul", "idiv", + "nop", "fnop", "adc", "sbb", "aaa", "aas", "aam", "aad", + "jmp", "jrcxz", "jc", "jnc", "je", "jne", "jz", "jnz", + "jg", "jng", "jge", "jnge", "jl", "jnl", "jle", "jnle", + "ja", "jna", "jae", "jnae", "jb", "jnb", "jbe", "jnbe", + "js", "jns", "jo", "jno", "jp", "jnp", "jpo", "jpe", + "rep", "repe", "repz", "repne", "repnz", "loop", "loope", "loopne" + }; + + char * registers [] = { + "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", + "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", + "r8d", "r9d", "r10d", "r11d", "r12d", "r13d", "r14d", "r15d", + "ax", "cx", "dx", "bx", "sp", "bp", "si", "di", + "r8w", "r9w", "r10w", "r11w", "r12w", "r13w", "r14w", "r15w", + "al", "cl", "dl", "bl", "spl", "bpl", "sil", "dil", + "r8b", "r9b", "r10b", "r11b", "r12b", "r13b", "r14b", "r15b", + "ah", "ch", "dh", "bh" + }; + + if (highlighted != 0) { + syntax_delete (); + } + + syntax_define_separators (separators); + + syntax_define_range ("#", "\n", '\0', COLOUR_GREY, EFFECT_BOLD); + syntax_define_range ("[", "]", '\0', COLOUR_RED, EFFECT_NORMAL); + syntax_define_range ("<", ">", '\0', COLOUR_PINK, EFFECT_NORMAL); + + syntax_define_operators (".,+-", COLOUR_BLUE, EFFECT_BOLD); + + syntax_define_words (instructions, sizeof (instructions) / sizeof (instructions [0]), COLOUR_BLUE, EFFECT_NORMAL); + syntax_define_words (registers, sizeof (registers) / sizeof (registers [0]), COLOUR_CYAN, EFFECT_NORMAL); + + syntax_define_default (1, COLOUR_WHITE, EFFECT_NORMAL, COLOUR_WHITE, EFFECT_NORMAL); highlighted = 1; } @@ -213,6 +264,7 @@ int main (int argc, char * * argv) { argument_define ("-C", "--c++", highlight_cpp); /*argument_define ("-p", "--python", highlight_python);*/ argument_define ("-V", "--valgrind", highlight_valgrind); + argument_define ("-A", "--assembly", highlight_common_assembly); if (argc != 1) { argument_select (argc, argv); @@ -234,6 +286,8 @@ int main (int argc, char * * argv) { highlight_ada (); } else if ((select == FILE_TYPE_CPP_SOURCE) || (select == FILE_TYPE_CPP_HEADER)) { highlight_cpp (); + } else if (select == FILE_TYPE_COMMON_ASSEMBLY) { + highlight_common_assembly (); } else { highlight_common (); }