summaryrefslogtreecommitdiff
path: root/src/compiler/parser.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/parser.c')
-rw-r--r--src/compiler/parser.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/parser.c b/src/compiler/parser.c
index 12985e1..69a9c8a 100644
--- a/src/compiler/parser.c
+++ b/src/compiler/parser.c
@@ -1156,7 +1156,6 @@ ParserNode *parserFunction(LexerNode *node, LexerNode *begin, LexerNode *end,
ParserNode *parent) {
LexerNode *paramsNode = node - 1;
LexerNode *retTypeNode = node + 1;
- LexerNode *bodyNode = node + 2;
if (paramsNode < begin || paramsNode->parserNode == NULL) {
printError(node->str_begin, node->str_end, "No params");
return NULL;
@@ -1166,12 +1165,15 @@ ParserNode *parserFunction(LexerNode *node, LexerNode *begin, LexerNode *end,
}
ParserNode *params = getUntilCommonParent(paramsNode->parserNode, parent);
ParserNode *retType = getUntilCommonParent(retTypeNode->parserNode, parent);
- ParserNode *body;
- if (bodyNode >= end || bodyNode->parserNode == NULL) {
+ LexerNode *bodyNode =
+ getNextLexerNodeUsingCommonParent(retTypeNode, end, parent);
+
+ ParserNode *body;
+ if (bodyNode == NULL || bodyNode >= end || bodyNode->parserNode == NULL) {
body = NULL;
} else {
- body = getUntilCommonParent(bodyNode->parserNode, parent);
+ body = bodyNode->parserNode;
if (body == NULL || body->token != PARSER_TOKEN_SYMBOL_CURLY_BRACKET) {
printError(node->str_begin, node->str_end, "Bad body");
return NULL;