jenterkin/tree-sitter-jhcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(scanner): fix context type

Browse Source 
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
This commit is contained in:
Michael Hoffmann
2023-11-13 18:17:37 +01:00
parent fdf6463216
commit c3690b9f0c
2 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dialects/terraform/src/scanner.c
View File

@@ -8,17 +8,21 @@
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#define VEC_RESIZE(vec, _cap) \ #define VEC_RESIZE(vec, _cap) \
{ \
void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0])); \ void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0])); \
assert(tmp != NULL); \ assert(tmp != NULL); \
(vec).data = tmp; \ (vec).data = tmp; \
assert((vec).data != NULL); \ assert((vec).data != NULL); \
(vec).cap = (_cap); (vec).cap = (_cap); \
}
#define VEC_PUSH(vec, el) \ #define VEC_PUSH(vec, el) \
{ \
if ((vec).cap == (vec).len) { \ if ((vec).cap == (vec).len) { \
VEC_RESIZE((vec), MAX(16, (vec).len * 2)); \ VEC_RESIZE((vec), MAX(16, (vec).len * 2)); \
} \ } \
(vec).data[(vec).len++] = (el); (vec).data[(vec).len++] = (el); \
}
#define VEC_POP(vec) \ #define VEC_POP(vec) \
{ \ { \
@@ -44,12 +48,14 @@
} }
#define STRING_RESIZE(vec, _cap) \ #define STRING_RESIZE(vec, _cap) \
{ \
void *tmp = realloc((vec).data, ((_cap) + 1) * sizeof((vec).data[0])); \ void *tmp = realloc((vec).data, ((_cap) + 1) * sizeof((vec).data[0])); \
assert(tmp != NULL); \ assert(tmp != NULL); \
(vec).data = tmp; \ (vec).data = tmp; \
memset((vec).data + (vec).len, 0, \ memset((vec).data + (vec).len, 0, \
(((_cap) + 1) - (vec).len) * sizeof((vec).data[0])); \ (((_cap) + 1) - (vec).len) * sizeof((vec).data[0])); \
(vec).cap = (_cap); (vec).cap = (_cap); \
}
#define STRING_GROW(vec, _cap) \ #define STRING_GROW(vec, _cap) \
if ((vec).cap < (_cap)) { \ if ((vec).cap < (_cap)) { \
@@ -91,13 +97,7 @@ typedef struct {
char *data; char *data;
} String; } String;
String string_new() { String string_new() { return (String){.cap = 16, .len = 0, .data = calloc(1, sizeof(char) * 17)}; }
return (String){
.cap = 16,
.len = 0,
.data = calloc(1, sizeof(char) * 17),
};
}
typedef struct { typedef struct {
enum ContextType type; enum ContextType type;
@@ -106,12 +106,7 @@ typedef struct {
String heredoc_identifier; String heredoc_identifier;
} Context; } Context;
Context context_new(enum ContextType type) { Context context_new() { return (Context){ }; }
Context ctx = {
.type = type,
};
return ctx;
}
typedef struct { typedef struct {
uint32_t len; uint32_t len;
@@ -134,7 +129,7 @@ static unsigned serialize(Scanner *scanner, char *buf) {
return 0; return 0;
} }
memcpy(&buf[size], &scanner->context_stack.len, sizeof(uint32_t)); memcpy(&buf[size], &(scanner->context_stack.len), sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
for (int i = 0; i < scanner->context_stack.len; i++) { for (int i = 0; i < scanner->context_stack.len; i++) {
Context *context = &scanner->context_stack.data[i]; Context *context = &scanner->context_stack.data[i];
@@ -145,7 +140,7 @@ static unsigned serialize(Scanner *scanner, char *buf) {
return 0; return 0;
} }
buf[size++] = context->type; buf[size++] = context->type;
memcpy(&buf[size], &context->heredoc_identifier.len, sizeof(uint32_t)); memcpy(&buf[size], &(context->heredoc_identifier.len), sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
memcpy(&buf[size], context->heredoc_identifier.data, context->heredoc_identifier.len); memcpy(&buf[size], context->heredoc_identifier.data, context->heredoc_identifier.len);
size += context->heredoc_identifier.len; size += context->heredoc_identifier.len;
@@ -154,27 +149,30 @@ static unsigned serialize(Scanner *scanner, char *buf) {
} }
static void deserialize(Scanner *scanner, const char *buffer, unsigned length) { static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
VEC_CLEAR(scanner->context_stack);
if (length == 0) { if (length == 0) {
return; return;
} }
VEC_CLEAR(scanner->context_stack);
unsigned size = 0; unsigned size = 0;
uint32_t context_stack_size; uint32_t context_stack_size;
memcpy(&context_stack_size, &buffer[size], sizeof(uint32_t)); memcpy(&context_stack_size, &buffer[size], sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
for (uint32_t j = 0; j < context_stack_size; j++) { for (uint32_t j = 0; j < context_stack_size; j++) {
Context ctx = { Context ctx = context_new();
.type = (enum ContextType)buffer[size++], ctx.heredoc_identifier = string_new();
.heredoc_identifier = string_new(), ctx.type = (enum ContextType)buffer[size++];
};
uint32_t heredoc_identifier_size; uint32_t heredoc_identifier_size;
memcpy(&heredoc_identifier_size, &buffer[size], sizeof(uint32_t)); memcpy(&heredoc_identifier_size, &buffer[size], sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
if (heredoc_identifier_size > 0) {
STRING_GROW(ctx.heredoc_identifier, heredoc_identifier_size); STRING_GROW(ctx.heredoc_identifier, heredoc_identifier_size);
memcpy(ctx.heredoc_identifier.data, buffer + size, heredoc_identifier_size); memcpy(ctx.heredoc_identifier.data, buffer + size, heredoc_identifier_size);
ctx.heredoc_identifier.len = heredoc_identifier_size; ctx.heredoc_identifier.len = heredoc_identifier_size;
size += heredoc_identifier_size; size += heredoc_identifier_size;
}
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
} }
assert(size == length); assert(size == length);
@@ -246,7 +244,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
} }
// manage quoted context // manage quoted context
if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context(scanner) && lexer->lookahead == '"') { if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context(scanner) && lexer->lookahead == '"') {
Context ctx = context_new(QUOTED_TEMPLATE); Context ctx = context_new();
ctx.type = QUOTED_TEMPLATE;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, QUOTED_TEMPLATE_START); return accept_and_advance(lexer, QUOTED_TEMPLATE_START);
@@ -261,7 +260,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
!in_interpolation_context(scanner) && lexer->lookahead == '$') { !in_interpolation_context(scanner) && lexer->lookahead == '$') {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = context_new(TEMPLATE_INTERPOLATION); Context ctx = context_new();
ctx.type = TEMPLATE_INTERPOLATION;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START); return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START);
@@ -286,7 +286,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
!in_directive_context(scanner) && lexer->lookahead == '%') { !in_directive_context(scanner) && lexer->lookahead == '%') {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = context_new(TEMPLATE_DIRECTIVE); Context ctx = context_new();
ctx.type = TEMPLATE_DIRECTIVE;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START); return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START);
@@ -314,7 +315,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
STRING_PUSH(identifier, lexer->lookahead); STRING_PUSH(identifier, lexer->lookahead);
advance(lexer); advance(lexer);
} }
Context ctx = context_new(HEREDOC_TEMPLATE); Context ctx = context_new();
ctx.type = HEREDOC_TEMPLATE;
ctx.heredoc_identifier = identifier; ctx.heredoc_identifier = identifier;
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_inplace(lexer, HEREDOC_IDENTIFIER); return accept_inplace(lexer, HEREDOC_IDENTIFIER);

56
src/scanner.c
View File

@@ -8,17 +8,21 @@
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#define VEC_RESIZE(vec, _cap) \ #define VEC_RESIZE(vec, _cap) \
{ \
void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0])); \ void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0])); \
assert(tmp != NULL); \ assert(tmp != NULL); \
(vec).data = tmp; \ (vec).data = tmp; \
assert((vec).data != NULL); \ assert((vec).data != NULL); \
(vec).cap = (_cap); (vec).cap = (_cap); \
}
#define VEC_PUSH(vec, el) \ #define VEC_PUSH(vec, el) \
{ \
if ((vec).cap == (vec).len) { \ if ((vec).cap == (vec).len) { \
VEC_RESIZE((vec), MAX(16, (vec).len * 2)); \ VEC_RESIZE((vec), MAX(16, (vec).len * 2)); \
} \ } \
(vec).data[(vec).len++] = (el); (vec).data[(vec).len++] = (el); \
}
#define VEC_POP(vec) \ #define VEC_POP(vec) \
{ \ { \
@@ -44,12 +48,14 @@
} }
#define STRING_RESIZE(vec, _cap) \ #define STRING_RESIZE(vec, _cap) \
{ \
void *tmp = realloc((vec).data, ((_cap) + 1) * sizeof((vec).data[0])); \ void *tmp = realloc((vec).data, ((_cap) + 1) * sizeof((vec).data[0])); \
assert(tmp != NULL); \ assert(tmp != NULL); \
(vec).data = tmp; \ (vec).data = tmp; \
memset((vec).data + (vec).len, 0, \ memset((vec).data + (vec).len, 0, \
(((_cap) + 1) - (vec).len) * sizeof((vec).data[0])); \ (((_cap) + 1) - (vec).len) * sizeof((vec).data[0])); \
(vec).cap = (_cap); (vec).cap = (_cap); \
}
#define STRING_GROW(vec, _cap) \ #define STRING_GROW(vec, _cap) \
if ((vec).cap < (_cap)) { \ if ((vec).cap < (_cap)) { \
@@ -91,13 +97,7 @@ typedef struct {
char *data; char *data;
} String; } String;
String string_new() { String string_new() { return (String){.cap = 16, .len = 0, .data = calloc(1, sizeof(char) * 17)}; }
return (String){
.cap = 16,
.len = 0,
.data = calloc(1, sizeof(char) * 17),
};
}
typedef struct { typedef struct {
enum ContextType type; enum ContextType type;
@@ -106,12 +106,7 @@ typedef struct {
String heredoc_identifier; String heredoc_identifier;
} Context; } Context;
Context context_new(enum ContextType type) { Context context_new() { return (Context){ }; }
Context ctx = {
.type = type,
};
return ctx;
}
typedef struct { typedef struct {
uint32_t len; uint32_t len;
@@ -134,7 +129,7 @@ static unsigned serialize(Scanner *scanner, char *buf) {
return 0; return 0;
} }
memcpy(&buf[size], &scanner->context_stack.len, sizeof(uint32_t)); memcpy(&buf[size], &(scanner->context_stack.len), sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
for (int i = 0; i < scanner->context_stack.len; i++) { for (int i = 0; i < scanner->context_stack.len; i++) {
Context *context = &scanner->context_stack.data[i]; Context *context = &scanner->context_stack.data[i];
@@ -145,7 +140,7 @@ static unsigned serialize(Scanner *scanner, char *buf) {
return 0; return 0;
} }
buf[size++] = context->type; buf[size++] = context->type;
memcpy(&buf[size], &context->heredoc_identifier.len, sizeof(uint32_t)); memcpy(&buf[size], &(context->heredoc_identifier.len), sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
memcpy(&buf[size], context->heredoc_identifier.data, context->heredoc_identifier.len); memcpy(&buf[size], context->heredoc_identifier.data, context->heredoc_identifier.len);
size += context->heredoc_identifier.len; size += context->heredoc_identifier.len;
@@ -154,27 +149,30 @@ static unsigned serialize(Scanner *scanner, char *buf) {
} }
static void deserialize(Scanner *scanner, const char *buffer, unsigned length) { static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
VEC_CLEAR(scanner->context_stack);
if (length == 0) { if (length == 0) {
return; return;
} }
VEC_CLEAR(scanner->context_stack);
unsigned size = 0; unsigned size = 0;
uint32_t context_stack_size; uint32_t context_stack_size;
memcpy(&context_stack_size, &buffer[size], sizeof(uint32_t)); memcpy(&context_stack_size, &buffer[size], sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
for (uint32_t j = 0; j < context_stack_size; j++) { for (uint32_t j = 0; j < context_stack_size; j++) {
Context ctx = { Context ctx = context_new();
.type = (enum ContextType)buffer[size++], ctx.heredoc_identifier = string_new();
.heredoc_identifier = string_new(), ctx.type = (enum ContextType)buffer[size++];
};
uint32_t heredoc_identifier_size; uint32_t heredoc_identifier_size;
memcpy(&heredoc_identifier_size, &buffer[size], sizeof(uint32_t)); memcpy(&heredoc_identifier_size, &buffer[size], sizeof(uint32_t));
size += sizeof(uint32_t); size += sizeof(uint32_t);
if (heredoc_identifier_size > 0) {
STRING_GROW(ctx.heredoc_identifier, heredoc_identifier_size); STRING_GROW(ctx.heredoc_identifier, heredoc_identifier_size);
memcpy(ctx.heredoc_identifier.data, buffer + size, heredoc_identifier_size); memcpy(ctx.heredoc_identifier.data, buffer + size, heredoc_identifier_size);
ctx.heredoc_identifier.len = heredoc_identifier_size; ctx.heredoc_identifier.len = heredoc_identifier_size;
size += heredoc_identifier_size; size += heredoc_identifier_size;
}
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
} }
assert(size == length); assert(size == length);
@@ -246,7 +244,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
} }
// manage quoted context // manage quoted context
if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context(scanner) && lexer->lookahead == '"') { if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context(scanner) && lexer->lookahead == '"') {
Context ctx = context_new(QUOTED_TEMPLATE); Context ctx = context_new();
ctx.type = QUOTED_TEMPLATE;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, QUOTED_TEMPLATE_START); return accept_and_advance(lexer, QUOTED_TEMPLATE_START);
@@ -261,7 +260,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
!in_interpolation_context(scanner) && lexer->lookahead == '$') { !in_interpolation_context(scanner) && lexer->lookahead == '$') {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = context_new(TEMPLATE_INTERPOLATION); Context ctx = context_new();
ctx.type = TEMPLATE_INTERPOLATION;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START); return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START);
@@ -286,7 +286,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
!in_directive_context(scanner) && lexer->lookahead == '%') { !in_directive_context(scanner) && lexer->lookahead == '%') {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = context_new(TEMPLATE_DIRECTIVE); Context ctx = context_new();
ctx.type = TEMPLATE_DIRECTIVE;
ctx.heredoc_identifier = string_new(); ctx.heredoc_identifier = string_new();
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START); return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START);
@@ -314,7 +315,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
STRING_PUSH(identifier, lexer->lookahead); STRING_PUSH(identifier, lexer->lookahead);
advance(lexer); advance(lexer);
} }
Context ctx = context_new(HEREDOC_TEMPLATE); Context ctx = context_new();
ctx.type = HEREDOC_TEMPLATE;
ctx.heredoc_identifier = identifier; ctx.heredoc_identifier = identifier;
VEC_PUSH(scanner->context_stack, ctx); VEC_PUSH(scanner->context_stack, ctx);
return accept_inplace(lexer, HEREDOC_IDENTIFIER); return accept_inplace(lexer, HEREDOC_IDENTIFIER);