ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ast_end_token

Browse Source
This commit is contained in:
gingerBill
2021-05-21 12:44:45 +01:00
parent d7e85725e1
commit 159daba759
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser_pos.cpp
+11 -2
View File
@@ -125,6 +125,8 @@ Token ast_end_token(Ast *node) {
GB_ASSERT(node != nullptr); GB_ASSERT(node != nullptr);
switch (node->kind) { switch (node->kind) {
case Ast_Invalid:
return empty_token;
case Ast_Ident: return node->Ident.token; case Ast_Ident: return node->Ident.token;
case Ast_Implicit: return node->Implicit; case Ast_Implicit: return node->Implicit;
case Ast_Undef: return node->Undef; case Ast_Undef: return node->Undef;
@@ -140,7 +142,11 @@ Token ast_end_token(Ast *node) {
return node->CompoundLit.close; return node->CompoundLit.close;
case Ast_BadExpr: return node->BadExpr.end; case Ast_BadExpr: return node->BadExpr.end;
case Ast_TagExpr: return ast_end_token(node->TagExpr.expr); case Ast_TagExpr:
if (node->TagExpr.expr) {
return ast_end_token(node->TagExpr.expr);
}
return node->TagExpr.name;
case Ast_UnaryExpr: return ast_end_token(node->UnaryExpr.expr); case Ast_UnaryExpr: return ast_end_token(node->UnaryExpr.expr);
case Ast_BinaryExpr: return ast_end_token(node->BinaryExpr.right); case Ast_BinaryExpr: return ast_end_token(node->BinaryExpr.right);
case Ast_ParenExpr: return node->ParenExpr.close; case Ast_ParenExpr: return node->ParenExpr.close;
@@ -150,7 +156,10 @@ Token ast_end_token(Ast *node) {
case Ast_SelectorCallExpr: case Ast_SelectorCallExpr:
return ast_end_token(node->SelectorCallExpr.call); return ast_end_token(node->SelectorCallExpr.call);
case Ast_ImplicitSelectorExpr: case Ast_ImplicitSelectorExpr:
return ast_end_token(node->SelectorExpr.selector); if (node->ImplicitSelectorExpr.selector) {
return ast_end_token(node->ImplicitSelectorExpr.selector);
}
return node->ImplicitSelectorExpr.token;
case Ast_IndexExpr: return node->IndexExpr.close; case Ast_IndexExpr: return node->IndexExpr.close;
case Ast_SliceExpr: return node->SliceExpr.close; case Ast_SliceExpr: return node->SliceExpr.close;
case Ast_Ellipsis: case Ast_Ellipsis: