ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-04 14:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report parse errors preceding catastrophic error.

Browse Source
This commit is contained in:
Miguel Lechon
2021-03-12 16:12:00 +01:00
parent 34c48c84ff
commit 2829d0923b
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/syntax_errors/07.md
+1 -2
View File
@@ -1,2 +1 @@
label:@tag {1, 2, 3} label:@tag {1, 2, 3} /* unterminated comment
a /* unterminated comment
source/md_impl.c
+32 -8
View File
@@ -1415,26 +1415,51 @@ _MD_CodeLocFromFileOffset(MD_String8 filename, MD_u8 * file_contents, MD_u8 *at)
MD_PRIVATE_FUNCTION_IMPL void MD_PRIVATE_FUNCTION_IMPL void
_MD_Error(MD_ParseCtx *ctx, MD_Node *node, MD_u8 *at, MD_b32 catastrophic, char *fmt, ...) _MD_Error(MD_ParseCtx *ctx, MD_Node *node, MD_u8 *at, MD_b32 catastrophic, char *fmt, ...)
{ {
if(!ctx->catastrophic_error) // NOTE(mal): Can't trust parsing errors after first catastrophic error MD_CodeLoc error_loc = _MD_CodeLocFromFileOffset(ctx->filename, ctx->file_contents.str, at);
// NOTE(mal): Sort errors. We traverse the whole list assuming there won't be many of them.
// We could drop a prev pointer into MD_Error and start from ctx->last_error to make it faster
MD_Error *prev_error = 0;
for(MD_Error *e = ctx->first_error; e; e = e->next)
{
if(e->location.line < error_loc.line ||
(e->location.line == error_loc.line && e->location.column < error_loc.column))
{
prev_error = e;
}
else
{
break;
}
}
// NOTE(mal): Ignore errors after first catastrophic error
if(!ctx->catastrophic_error || !prev_error || prev_error->catastrophic == 0)
{ {
MD_Error *error = _MD_PushArray(_MD_GetCtx(), MD_Error, 1); MD_Error *error = _MD_PushArray(_MD_GetCtx(), MD_Error, 1);
error->node = node; error->node = node;
error->catastrophic = catastrophic; error->catastrophic = catastrophic;
error->location = _MD_CodeLocFromFileOffset(ctx->filename, ctx->file_contents.str, at); error->location = error_loc;
error->filename = ctx->filename; error->filename = ctx->filename;
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
error->string = MD_PushStringFV(fmt, args); error->string = MD_PushStringFV(fmt, args);
va_end(args); va_end(args);
if(ctx->last_error) if(prev_error)
{ {
ctx->last_error->next = error; error->next = prev_error->next;
ctx->last_error = error; prev_error->next = error;
} }
else else
{ {
ctx->first_error = ctx->last_error = error; error->next = ctx->first_error;
ctx->first_error = error;
}
if(!ctx->last_error || ctx->last_error == prev_error)
{
ctx->last_error = error;
} }
if(catastrophic) if(catastrophic)
@@ -1679,8 +1704,7 @@ _MD_ParseOneNode(MD_ParseCtx *ctx)
&result.node->first_child, &result.node->first_child,
&result.node->last_child); &result.node->last_child);
// NOTE(mal): Generate error for tags in positions such us "label:@tag {children}" // NOTE(mal): Generate error for tags in positions such as "label:@tag {children}"
// in posi
MD_Node *fc = result.node->first_child; MD_Node *fc = result.node->first_child;
if(fc == result.node->last_child && !MD_NodeIsNil(fc->first_tag) && // NOTE(mal): One child. Tagged. if(fc == result.node->last_child && !MD_NodeIsNil(fc->first_tag) && // NOTE(mal): One child. Tagged.
fc->kind == MD_NodeKind_Label && fc->whole_string.size == 0) // NOTE(mal): Unlabeled set fc->kind == MD_NodeKind_Label && fc->whole_string.size == 0) // NOTE(mal): Unlabeled set