ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asserts to catch lexer problems

This commit is contained in:
Allen Webster 2017-05-02 17:55:47 -04:00
parent 27dcead16f
commit 892fffe5b1
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
4cpp/4cpp_lexer_types.h
View File

@ -18,7 +18,6 @@
/* DOC(A Cpp_Token_Type classifies a token to make parsing easier. Some types are not actually output by the lexer, but exist because parsers will also make use of token types in their own output.) */ /* DOC(A Cpp_Token_Type classifies a token to make parsing easier. Some types are not actually output by the lexer, but exist because parsers will also make use of token types in their own output.) */
ENUM(uint32_t, Cpp_Token_Type){ ENUM(uint32_t, Cpp_Token_Type){
CPP_TOKEN_JUNK = 0, CPP_TOKEN_JUNK = 0,
CPP_TOKEN_COMMENT = 1, CPP_TOKEN_COMMENT = 1,

59
4ed_file_view.cpp
View File

@ -2152,13 +2152,10 @@ Job_Callback_Sig(job_full_lex){
// TODO(allen): deduplicate this against relex // TODO(allen): deduplicate this against relex
char *chunks[3]; char *chunks[3];
i32 chunk_sizes[3]; i32 chunk_sizes[3];
chunks[0] = buffer->data; chunks[0] = buffer->data;
chunk_sizes[0] = buffer->size1; chunk_sizes[0] = buffer->size1;
chunks[1] = buffer->data + buffer->size1 + buffer->gap_size; chunks[1] = buffer->data + buffer->size1 + buffer->gap_size;
chunk_sizes[1] = buffer->size2; chunk_sizes[1] = buffer->size2;
chunks[2] = 0; chunks[2] = 0;
chunk_sizes[2] = 0; chunk_sizes[2] = 0;
@ -2172,22 +2169,27 @@ Job_Callback_Sig(job_full_lex){
cpp_lex_step(&lex, chunk, chunk_size, text_size, &tokens, 2048); cpp_lex_step(&lex, chunk, chunk_size, text_size, &tokens, 2048);
switch (result){ switch (result){
case LexResult_NeedChunk: ++chunk_index; break; case LexResult_NeedChunk:
{
++chunk_index;
Assert(chunk_index < ArrayCount(chunks));
}break;
case LexResult_NeedTokenMemory: case LexResult_NeedTokenMemory:
if (system->check_cancel(thread)){ {
return; if (system->check_cancel(thread)){
} return;
system->grow_thread_memory(memory); }
tokens.tokens = (Cpp_Token*)(memory->data); system->grow_thread_memory(memory);
tokens.max_count = memory->size / sizeof(Cpp_Token); tokens.tokens = (Cpp_Token*)(memory->data);
break; tokens.max_count = memory->size / sizeof(Cpp_Token);
break;
case LexResult_HitTokenLimit:
if (system->check_cancel(thread)){ case LexResult_HitTokenLimit:
return; if (system->check_cancel(thread)){
} return;
break; }
}break;
case LexResult_Finished: still_lexing = 0; break; case LexResult_Finished: still_lexing = 0; break;
} }
@ -2294,13 +2296,10 @@ file_first_lex_serial(Mem_Options *mem, Editing_File *file){
// TODO(allen): deduplicate this against relex // TODO(allen): deduplicate this against relex
char *chunks[3]; char *chunks[3];
i32 chunk_sizes[3]; i32 chunk_sizes[3];
chunks[0] = buffer->data; chunks[0] = buffer->data;
chunk_sizes[0] = buffer->size1; chunk_sizes[0] = buffer->size1;
chunks[1] = buffer->data + buffer->size1 + buffer->gap_size; chunks[1] = buffer->data + buffer->size1 + buffer->gap_size;
chunk_sizes[1] = buffer->size2; chunk_sizes[1] = buffer->size2;
chunks[2] = 0; chunks[2] = 0;
chunk_sizes[2] = 0; chunk_sizes[2] = 0;
@ -2315,8 +2314,11 @@ file_first_lex_serial(Mem_Options *mem, Editing_File *file){
i32 result = cpp_lex_step(&lex, chunk, chunk_size, text_size, &tokens, NO_OUT_LIMIT); i32 result = cpp_lex_step(&lex, chunk, chunk_size, text_size, &tokens, NO_OUT_LIMIT);
switch (result){ switch (result){
case LexResult_NeedChunk: ++chunk_index; break; case LexResult_NeedChunk:
{
++chunk_index;
Assert(chunk_index < ArrayCount(chunks));
}break;
case LexResult_Finished: case LexResult_Finished:
case LexResult_NeedTokenMemory: case LexResult_NeedTokenMemory:
@ -2418,6 +2420,7 @@ file_relex_parallel(System_Functions *system, Mem_Options *mem, Editing_File *fi
while (!cpp_relex_is_start_chunk(&state, chunk, chunk_size)){ while (!cpp_relex_is_start_chunk(&state, chunk, chunk_size)){
++chunk_index; ++chunk_index;
Assert(chunk_index < ArrayCount(chunks));
chunk = chunks[chunk_index]; chunk = chunks[chunk_index];
chunk_size = chunk_sizes[chunk_index]; chunk_size = chunk_sizes[chunk_index];
} }
@ -2430,6 +2433,7 @@ file_relex_parallel(System_Functions *system, Mem_Options *mem, Editing_File *fi
case LexResult_NeedChunk: case LexResult_NeedChunk:
{ {
++chunk_index; ++chunk_index;
Assert(chunk_index < ArrayCount(chunks));
chunk = chunks[chunk_index]; chunk = chunks[chunk_index];
chunk_size = chunk_sizes[chunk_index]; chunk_size = chunk_sizes[chunk_index];
}break; }break;
@ -2539,6 +2543,7 @@ file_relex_serial(Mem_Options *mem, Editing_File *file, i32 start_i, i32 end_i,
while (!cpp_relex_is_start_chunk(&state, chunk, chunk_size)){ while (!cpp_relex_is_start_chunk(&state, chunk, chunk_size)){
++chunk_index; ++chunk_index;
Assert(chunk_index < ArrayCount(chunks));
chunk = chunks[chunk_index]; chunk = chunks[chunk_index];
chunk_size = chunk_sizes[chunk_index]; chunk_size = chunk_sizes[chunk_index];
} }
@ -2548,10 +2553,12 @@ file_relex_serial(Mem_Options *mem, Editing_File *file, i32 start_i, i32 end_i,
switch (lex_result){ switch (lex_result){
case LexResult_NeedChunk: case LexResult_NeedChunk:
++chunk_index; {
chunk = chunks[chunk_index]; ++chunk_index;
chunk_size = chunk_sizes[chunk_index]; Assert(chunk_index < ArrayCount(chunks));
break; chunk = chunks[chunk_index];
chunk_size = chunk_sizes[chunk_index];
}break;
case LexResult_NeedTokenMemory: InvalidCodePath; case LexResult_NeedTokenMemory: InvalidCodePath;