emil/libhl
1
3
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getting there...

Browse Source
This commit is contained in:
anon 2023-09-20 22:43:47 +02:00
parent c37c2546e5
commit d48b078d70
2 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/syntax/c.h
View File

@ -12,12 +12,12 @@ const char * preprocessor_keywords[] = {
NULL NULL
}; };
//new_char_tokens("+-&|.()[]{}", operator_hl); new_char_tokens("+-&|.()[]{}", operator_hl);
//new_keyword_tokens(c_keywords, control_hl); new_keyword_tokens(c_keywords, control_hl);
//new_keyword_tokens(preprocessor_keywords, special_hl); new_keyword_tokens(preprocessor_keywords, special_hl);
//new_region_token("/\\*", "\\*/", comment_hl); new_region_token("/\\*", "\\*/", comment_hl);
//new_region_token("//", "\\n", comment_hl); new_region_token("//", "\\n", comment_hl);
//new_region_token("\"", "\"", string_literal_hl); new_region_token("\"", "\"", string_literal_hl);
//new_region_token("<", ">", string_literal_hl); new_region_token("<", ">", string_literal_hl);
//new_keyword_token("keyword", special_hl); new_keyword_token("keyword", special_hl);
new_keyword_token("while", operator_hl); new_keyword_token("while", operator_hl);

107
source/hl.c
View File

@ -184,51 +184,82 @@ int token_fits(const token_t * const token,
const int string_offset, const int string_offset,
const bool is_start_of_line, const bool is_start_of_line,
int * match_offset) { int * match_offset) {
return 0;
UNUSED(match_offset); UNUSED(match_offset);
//return regex_match(pattern, to, string_offset, match_offset);
return (int)regex_match(token->syntax, to, is_start_of_line); match_t * matches = regex_match(token->syntax, to, is_start_of_line);
if (matches->position == -1) {
return 0;
}
const int r = matches->width;
match_offset = matches->position;
free(matches);
return r;
} }
void render_string(const char * const string, void render_string(const char * const string,
const char * const mode) { const char * const mode) {
for (const char * s = string; *s != '\00';) { display_t * display;
int f = 0; HASH_FIND_STR(display_table,
size_t token_index = 0; mode,
int offset = 0; display);
for (; token_index < token_table.element_count; token_index++) { typedef struct {
token_t * t = *(token_t**)vector_get(&token_table, const token_t * t;
token_index); const match_t * m;
const bool is_start_of_line = (s == string) || (*s == '\n'); int i;
f = token_fits(t, string, (int)(s - string), is_start_of_line, &offset); } result_t;
if (f) {
break; result_t * const r = (result_t *)malloc(sizeof(result_t) * 1024); // XXX: dont
int rrs = 0;
for (int i = 0; i < token_table.element_count; i++) {
token_t * t = *(token_t**)vector_get(&token_table,
i);
match_t * match = regex_match(t->syntax, string, true);
if (match->position == -1) {
free(match);
continue;
}
r[rrs++] = (result_t){
.t = t,
.m = match,
.i = 0,
};
}
for (const char * s = string; *s != '\00';) {
const result_t sentinel = (result_t){NULL, &(match_t){ -1, -1}, -1};
const result_t * max;
max = &sentinel;
for (int h = 0; h < rrs; h++) {
result_t * const current_result = r + h;
for (int j = 0; current_result->m[j].position != -1; j++) {
if (current_result->m[j].position == (s - string)) {
if (current_result->m[j].width > max->m->width) {
current_result->i = j;
max = current_result;
}
break;
}
} }
} }
// if (max != &sentinel) {
display_t * display; const int padding = max->m[max->i].position - (s - string);
HASH_FIND_STR(display_table, if (padding) {
mode, display->callback(s,
display); padding,
// NULL);
if (f) {
for (int i = 0; i < offset; i++) {
token_t * t = *(token_t**)vector_get(&token_table,
token_index);
display->callback(s + i,
0,
t->hl->attributes);
} }
token_t * t = *(token_t**)vector_get(&token_table, display->callback(s + padding,
token_index); max->m->width,
display->callback(s + offset, max->t->hl->attributes);
f, s += padding + max->m->width;
t->hl->attributes);
s += f + offset;
} else { } else {
display->callback(s, display->callback(s, 1, NULL);
0,
NULL);
++s; ++s;
} }
} }
@ -239,9 +270,9 @@ int hl_init(void) {
} }
int hl_deinit(void) { int hl_deinit(void) {
for (size_t i = 0; i < token_table.element_count; i++) { //for (size_t i = 0; i < token_table.element_count; i++) {
free_token(*(token_t**)vector_get(&token_table, i)); // free_token(*(token_t**)vector_get(&token_table, i));
} //}
return 0; return 0;
} }