mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts/helper/find-idents.c: handle single line comment tokens

Browse source
This commit is contained in:
Consolatis 2023-02-09 05:33:16 +01:00 • committed by Johan Malm
parent 29031a4c85
commit 309843c9c6
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
scripts/helper/find-idents.c
View file

@ -54,6 +54,7 @@ enum {
SPECIAL_COMPARISON_OP, SPECIAL_COMPARISON_OP,
SPECIAL_COMMENT_BEGIN, SPECIAL_COMMENT_BEGIN,
SPECIAL_COMMENT_END, SPECIAL_COMMENT_END,
SPECIAL_COMMENT_LINE_BEGIN,
}; };
static char *current_buffer_position; static char *current_buffer_position;
@ -111,25 +112,12 @@ add_token(void)
return token; return token;
} }
static void
handle_whitespace(struct token *token)
{
if (current_buffer_position[0] == '\n') {
++current_line;
}
current_buffer_position++;
if (isspace(current_buffer_position[0])) {
handle_whitespace(token);
}
}
static void static void
get_identifier_token(struct token *token) get_identifier_token(struct token *token)
{ {
buf_add_char(&token->name, current_buffer_position[0]); buf_add_char(&token->name, current_buffer_position[0]);
current_buffer_position++; current_buffer_position++;
if (isspace(current_buffer_position[0])) { if (isspace(current_buffer_position[0])) {
handle_whitespace(token);
return; return;
} }
switch (current_buffer_position[0]) { switch (current_buffer_position[0]) {
@ -153,7 +141,6 @@ get_number_token(struct token *token)
buf_add_char(&token->name, current_buffer_position[0]); buf_add_char(&token->name, current_buffer_position[0]);
current_buffer_position++; current_buffer_position++;
if (isspace(current_buffer_position[0])) { if (isspace(current_buffer_position[0])) {
handle_whitespace(token);
return; return;
} }
switch (current_buffer_position[0]) { switch (current_buffer_position[0]) {
@ -198,6 +185,7 @@ struct {
{ "!=", SPECIAL_COMPARISON_OP }, { "!=", SPECIAL_COMPARISON_OP },
{ "/*", SPECIAL_COMMENT_BEGIN }, { "/*", SPECIAL_COMMENT_BEGIN },
{ "*/", SPECIAL_COMMENT_END }, { "*/", SPECIAL_COMMENT_END },
{ "//", SPECIAL_COMMENT_LINE_BEGIN },
{ ";", ';' }, { ";", ';' },
{ "{", '{' }, { "{", '{' },
{ "}", '}' }, { "}", '}' },
@ -255,9 +243,6 @@ get_special_token(struct token *token)
} }
done: done:
current_buffer_position += token->name.len; current_buffer_position += token->name.len;
if (isspace(current_buffer_position[0])) {
handle_whitespace(token);
}
} }
static void static void
@ -282,6 +267,7 @@ lex(char *buffer)
tokens = NULL; tokens = NULL;
nr_tokens = 0; nr_tokens = 0;
alloc_tokens = 0; alloc_tokens = 0;
bool in_single_comment = false;
current_buffer_position = buffer; current_buffer_position = buffer;
@ -309,11 +295,21 @@ lex(char *buffer)
token = add_token(); token = add_token();
get_special_token(token); get_special_token(token);
token->kind = TOKEN_SPECIAL; token->kind = TOKEN_SPECIAL;
if (token->special == SPECIAL_COMMENT_LINE_BEGIN) {
token->special = SPECIAL_COMMENT_BEGIN;
in_single_comment = true;
}
continue; continue;
case '#': case '#':
handle_preprocessor_directive(); handle_preprocessor_directive();
break; break;
case '\n': case '\n':
if (in_single_comment) {
token = add_token();
token->kind = TOKEN_SPECIAL;
token->special = SPECIAL_COMMENT_END;
in_single_comment = false;
}
++current_line; ++current_line;
break; break;
default: default:
@ -350,14 +346,14 @@ static bool
grep(struct token *tokens, const char *pattern) grep(struct token *tokens, const char *pattern)
{ {
bool found = false; bool found = false;
bool in_comment = false; unsigned int in_comment = 0;
for (struct token *t = tokens; t->kind; t++) { for (struct token *t = tokens; t->kind; t++) {
if (t->kind == TOKEN_SPECIAL) { if (t->kind == TOKEN_SPECIAL) {
if (t->special == SPECIAL_COMMENT_BEGIN) { if (t->special == SPECIAL_COMMENT_BEGIN) {
in_comment = true; ++in_comment;
} else if (t->special == SPECIAL_COMMENT_END) { } else if (t->special == SPECIAL_COMMENT_END) {
in_comment = false; --in_comment;
} }
} }
if (in_comment) { if (in_comment) {