anon/libhl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved CLI

Browse Source
This commit is contained in:
Emil
2023-08-16 00:08:15 -06:00
parent 8a859ef028
commit 99327046d4
3 changed files with 265 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

441
src/main.c
View File

@ -7,6 +7,10 @@
#define ALLOCATION_CHUNK (1024UL) #define ALLOCATION_CHUNK (1024UL)
#define ALLOCATION_LIMIT (1024UL * 1024UL) #define ALLOCATION_LIMIT (1024UL * 1024UL)
#ifndef PROGN
# define PROGN "hl"
#endif
enum { NORMAL, BOLD, DARKNESS, ITALIC, UNDERLINE, BLINK, DUNNO_6, REVERSE, INVISIBLE }; enum { NORMAL, BOLD, DARKNESS, ITALIC, UNDERLINE, BLINK, DUNNO_6, REVERSE, INVISIBLE };
enum { GREY, RED, GREEN, YELLOW, BLUE, PINK, CYAN, WHITE, CANCEL }; enum { GREY, RED, GREEN, YELLOW, BLUE, PINK, CYAN, WHITE, CANCEL };
@ -30,281 +34,356 @@ static int effect_keyword = BOLD;
static int effect_preprocessor = BOLD; static int effect_preprocessor = BOLD;
static int effect_default = BOLD; static int effect_default = BOLD;
static char * buffer = NULL;
static unsigned long int buffer_size = 0; static unsigned long int buffer_size = 0;
static void render_character ( static void render_character (
char character char character
) { ) {
putchar (character); putchar (character);
} }
static void render_string ( static void render_string (
char * string char * string
) { ) {
while (* string) render_character (* string++); while (* string) render_character (* string++);
} }
static void render_colour ( static void render_colour (
int colour, int colour,
int effect int effect
) { ) {
if (colour == CANCEL) { if (colour == CANCEL) {
render_string ("\033[0m"); render_string ("\033[0m");
return; return;
} }
render_string ("\033["); render_string ("\033[");
render_character ((char) (effect % 9) + '0'); render_character ((char) (effect % 9) + '0');
render_string (";3"); render_string (";3");
render_character ((char) (colour % 8) + '0'); render_character ((char) (colour % 8) + '0');
render_character ('m'); render_character ('m');
} }
static int is_space ( static int is_space (
char character char character
) { ) {
if ((character == ' ') || (character == '\t') || (character == '\r') || (character == '\n')) { switch (character)
return (1); {
} else { case ' ': case '\t': case '\r': case '\n':
return (0); return (1);
} default:
return (0);
}
} }
static int is_separator ( static int is_separator (
char character char character
) { ) {
if ((character == ' ') || (character == '\t') || (character == '\r') || (character == '\n') || switch (character)
(character == '+') || (character == '-') || (character == '*') || (character == '/') || {
(character == '(') || (character == ')') || (character == '[') || (character == ']') || case ' ': case '\t': case '\r': case '\n':
(character == '{') || (character == '}') || (character == '<') || (character == '>') || case '+': case '-': case '*': case '/':
(character == ';') || (character == ':') || (character == ',') || (character == '.') || case '(': case ')': case '[': case ']':
(character == '!') || (character == '&') || (character == '|') || (character == '?') || case '{': case '}': case '<': case '>':
(character == '~') || (character == '^') || (character == '%') || (character == '=')) { case ';': case ':': case ',': case '.':
return (1); case '!': case '&': case '|': case '?':
} else { case '~': case '^': case '%': case '=':
return (0); return (1);
} default:
return (0);
}
} }
static int compare_multiple_strings ( static int compare_multiple_strings (
char * string, char * string,
const char * * strings, const char ** strings,
const int count const int count
) { ) {
int i = 0; int i = 0;
do { do {
if (strcmp (string, strings [i]) == 0) { if (strcmp (string, strings [i]) == 0) {
return (1); return (1);
} }
++i; ++i;
} while (i != count); } while (i != count);
return (0); return (0);
} }
static int render_short_comment ( static int render_short_comment (
int data_offset char * buffer,
int data_offset
) { ) {
render_colour (colour_short_comment, effect_short_comment); render_colour (colour_short_comment, effect_short_comment);
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} while ((buffer [data_offset] != '\n') && (buffer [data_offset] != '\0')); } while ((buffer [data_offset] != '\n') && (buffer [data_offset] != '\0'));
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
return (data_offset); return (data_offset);
} }
static int render_long_comment ( static int render_long_comment (
int data_offset char * buffer,
int data_offset
) { ) {
render_colour (colour_long_comment, effect_long_comment); render_colour (colour_long_comment, effect_long_comment);
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} while (((buffer [data_offset] != '/') || } while (((buffer [data_offset] != '/') ||
(buffer [data_offset - 1] != '*')) && (buffer [data_offset - 1] != '*')) &&
(buffer [data_offset] != '\0')); (buffer [data_offset] != '\0'));
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
return (data_offset); return (data_offset);
} }
static int render_short_string ( static int render_short_string (
int data_offset char * buffer,
int data_offset
) { ) {
render_colour (colour_short_string, effect_short_string); render_colour (colour_short_string, effect_short_string);
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
if (buffer [data_offset - 1] == '\\') { if (buffer [data_offset - 1] == '\\') {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} }
} while ((buffer [data_offset] != '\'') && (buffer [data_offset] != '\0')); } while ((buffer [data_offset] != '\'') && (buffer [data_offset] != '\0'));
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
return (data_offset); return (data_offset);
} }
static int render_long_string ( static int render_long_string (
int data_offset char * buffer,
int data_offset
) { ) {
render_colour (colour_long_string, effect_long_string); render_colour (colour_long_string, effect_long_string);
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
if (buffer [data_offset - 1] == '\\') { if (buffer [data_offset - 1] == '\\') {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} }
} while ((buffer [data_offset] != '"') && (buffer [data_offset] != '\0')); } while ((buffer [data_offset] != '"') && (buffer [data_offset] != '\0'));
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
return (data_offset); return (data_offset);
} }
static int render_separator ( static int render_separator (
int data_offset char * buffer,
int data_offset
) { ) {
if (is_space (buffer [data_offset]) != 0) { if (is_space (buffer [data_offset]) != 0) {
render_colour (WHITE, NORMAL); render_colour (WHITE, NORMAL);
} else { } else {
render_colour (colour_separator, effect_separator); render_colour (colour_separator, effect_separator);
} }
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
return (data_offset); return (data_offset);
} }
static int render_number ( static int render_number (
int data_offset char * buffer,
int data_offset
) { ) {
render_colour (colour_number, effect_number); render_colour (colour_number, effect_number);
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} while ((is_separator (buffer [data_offset]) == 0) && (buffer [data_offset] != '\0')); } while ((is_separator (buffer [data_offset]) == 0) && (buffer [data_offset] != '\0'));
return (data_offset); return (data_offset);
} }
static int render_word ( static int render_word (
int data_offset char * buffer,
int data_offset
) { ) {
const char * c_keywords [32] = { const char * c_keywords [32] = {
"register", "volatile", "auto", "const", "static", "extern", "if", "else", "register", "volatile", "auto", "const", "static", "extern", "if", "else",
"do", "while", "for", "continue", "switch", "case", "default", "break", "do", "while", "for", "continue", "switch", "case", "default", "break",
"enum", "union", "struct", "typedef", "goto", "void", "return", "sizeof", "enum", "union", "struct", "typedef", "goto", "void", "return", "sizeof",
"char", "short", "int", "long", "signed", "unsigned", "float", "double" "char", "short", "int", "long", "signed", "unsigned", "float", "double"
}; };
const char * preprocessor_keywords [16] = { const char * preprocessor_keywords [16] = {
"#include", "#pragma", "#define", "#undef", "#ifdef", "#ifndef", "#elifdef", "#elifndef", "#include", "#pragma", "#define", "#undef", "#ifdef", "#ifndef", "#elifdef", "#elifndef",
"#if", "#elif", "#else", "#endif", "#embed", "#line", "#error", "#warning" "#if", "#elif", "#else", "#endif", "#embed", "#line", "#error", "#warning"
}; };
char * word = NULL; char * word = NULL;
int i = 0; int i = 0;
do { do {
word = realloc (word, sizeof (* word) * (unsigned long int) (i + 1)); word = realloc (word, sizeof (* word) * (unsigned long int) (i + 1));
word [i] = buffer [data_offset + i]; word [i] = buffer [data_offset + i];
++i; ++i;
} while ((is_separator (buffer [data_offset + i]) == 0) && (buffer [data_offset + i] != '\0')); } while ((is_separator (buffer [data_offset + i]) == 0) && (buffer [data_offset + i] != '\0'));
word = realloc (word, sizeof (* word) * (unsigned long int) (i + 1)); word = realloc (word, sizeof (* word) * (unsigned long int) (i + 1));
word [i] = '\0'; word [i] = '\0';
if (compare_multiple_strings (word, c_keywords, 32) != 0) { if (compare_multiple_strings (word, c_keywords, 32) != 0) {
render_colour (colour_keyword, effect_keyword); render_colour (colour_keyword, effect_keyword);
} else if (compare_multiple_strings (word, preprocessor_keywords, 16) != 0) { } else if (compare_multiple_strings (word, preprocessor_keywords, 16) != 0) {
render_colour (colour_preprocessor, effect_preprocessor); render_colour (colour_preprocessor, effect_preprocessor);
} else { } else {
render_colour (colour_default, effect_default); render_colour (colour_default, effect_default);
} }
do { do {
render_character (buffer [data_offset]); render_character (buffer [data_offset]);
++data_offset; ++data_offset;
} while ((is_separator (buffer [data_offset]) == 0) && (buffer [data_offset] != '\0')); } while ((is_separator (buffer [data_offset]) == 0) && (buffer [data_offset] != '\0'));
free (word); free (word);
return (data_offset); return (data_offset);
} }
void
handle_buffer(
char * buffer
) {
int offset = 0;
while (buffer [offset] != '\0') {
if ((buffer [offset] == '/') && (buffer [offset + 1] == '/')) {
offset = render_short_comment (buffer, offset);
} else if ((buffer [offset] == '/') && (buffer [offset + 1] == '*')) {
offset = render_long_comment (buffer, offset);
} else if (buffer [offset] == '\'') {
offset = render_short_string (buffer, offset);
} else if (buffer [offset] == '"') {
offset = render_long_string (buffer, offset);
} else if (is_separator (buffer [offset]) != 0) {
offset = render_separator (buffer, offset);
} else if ((buffer [offset] >= '0') && (buffer [offset] <= '9')) {
offset = render_number (buffer, offset);
} else {
offset = render_word (buffer, offset);
}
render_colour (CANCEL, NORMAL);
}
}
static char *
slurp(const char * fn)
{
size_t len;
char * b;
FILE * fp = fopen(fn, "r");
if (fp)
{
fseek(fp, 0, SEEK_END);
len = ftell(fp);
rewind(fp);
b = malloc(len);
if (b &&
len != fread(b, 1, len, fp))
{ perror(PROGN); }
fclose(fp);
return b;
}
else
{ return NULL; }
}
#define OPT(c,s) \
if ((c == argv[0][0] && argv[0][1] == '\0') || \
0 == strncmp(argv[0], s, strlen(s)))
#define SOPT(s) \
if (0 == strncmp(argv[0], s, strlen(s)))
/* /*
Valgrind: Depends on uninitialized value (buffer [0])...? Valgrind: Depends on uninitialized value (buffer [0])...?
280 : } while ((buffer [buffer_size - 1] != '\0') || (buffer_size != ALLOCATION_LIMIT)); 280 : } while ((buffer [buffer_size - 1] != '\0') || (buffer_size != ALLOCATION_LIMIT));
285 : while (buffer [offset] != '\0') { 285 : while (buffer [offset] != '\0') {
*/ */
int main ( int main (
int argc, int argc,
char * * argv char ** argv
) { ) {
int offset = 0; char * buffer = NULL;
if (argc != 1) { if (argc != 1) {
(void) argv; (void) argv;
puts ("ARGUMENTS \"Heyo world!\""); while (++argv, --argc) {
return (-1); if (argv[0][0] == '-') {
} argv[0]++;
OPT ('?',"help") {
fprintf (stderr, PROGN ": ... | hl [OPTIONS] FILES ...\n");
return (0);
}
SOPT ("version") {
fprintf(stderr, PROGN ": Version 9000\n");
return (0);
}
else {
fprintf (stderr, PROGN ": Unrecognized option '%s'\n", argv [0]);
return (1);
}
} else {
if ((buffer = slurp (argv [0]))) {
handle_buffer (buffer);
free (buffer);
}
}
}
}
buffer = realloc (buffer, ALLOCATION_CHUNK); buffer = realloc (buffer, ALLOCATION_CHUNK);
do { #define MEMFAIL(v) if (v == NULL) { perror(PROGN); return (1); }
if ((buffer_size + 1) % ALLOCATION_CHUNK == 0) { MEMFAIL(buffer);
buffer = realloc (buffer, ((buffer_size + 1) / ALLOCATION_CHUNK + 1) * ALLOCATION_CHUNK);
}
buffer [buffer_size] = '\0'; /* Fixing Valgrind warnings... */
read (STDIN_FILENO, & buffer [buffer_size], sizeof (* buffer));
++buffer_size;
} while ((buffer [buffer_size - 1] != '\0') /*|| (buffer_size != ALLOCATION_LIMIT)*/);
buffer [buffer_size - 1] = '\0'; do {
if ((buffer_size + 1) % ALLOCATION_CHUNK == 0) {
buffer = realloc (buffer,
((buffer_size + 1)
/ ALLOCATION_CHUNK + 1)
* ALLOCATION_CHUNK);
MEMFAIL(buffer);
}
buffer [buffer_size] = '\0'; /* Fixing Valgrind warnings... */
read (STDIN_FILENO, & buffer [buffer_size], sizeof (* buffer));
++buffer_size;
} while ((buffer [buffer_size - 1] != '\0') /*||
(buffer_size != ALLOCATION_LIMIT)*/);
/* Checking if long comments work... */ buffer [buffer_size - 1] = '\0';
// Checking if short comments work...
while (buffer [offset] != '\0') { // Checking if short comments work...
if ((buffer [offset] == '/') && (buffer [offset + 1] == '/')) { /* Checking if long comments work... */
offset = render_short_comment (offset);
} else if ((buffer [offset] == '/') && (buffer [offset + 1] == '*')) {
offset = render_long_comment (offset);
} else if (buffer [offset] == '\'') {
offset = render_short_string (offset);
} else if (buffer [offset] == '"') {
offset = render_long_string (offset);
} else if (is_separator (buffer [offset]) != 0) {
offset = render_separator (offset);
} else if ((buffer [offset] >= '0') && (buffer [offset] <= '9')) {
offset = render_number (offset);
} else {
offset = render_word (offset);
}
render_colour (CANCEL, NORMAL);
}
free (buffer); handle_buffer(buffer);
return (0); free (buffer);
return (0);
} }

4
tests/extra.c Normal file
View File

@ -0,0 +1,4 @@
int
main(void)
{nothing.}

1
tests/main.c
View File

@ -319,3 +319,4 @@ signed main(){
return 0; return 0;
} }