aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--code/main.felan34
-rw-r--r--src/compiler/lexer.c2
-rw-r--r--src/compiler/lexer.h1
-rw-r--r--src/compiler/parser.c110
-rw-r--r--src/compiler/parser.h4
5 files changed, 109 insertions, 42 deletions
diff --git a/code/main.felan b/code/main.felan
index 4035a51..0bc0209 100644
--- a/code/main.felan
+++ b/code/main.felan
@@ -1,17 +1,31 @@
@import("basic.felan");
+// @import("lib/print.felan");
-main :: () -> void {
- a := false;
- b :: true;
- lazy c := a;
- a = true;
- if c {
- putc 'a';
+print :: (a:bool) -> void {
+ if a {
+ putc 't';
+ putc 'r';
+ putc 'u';
+ putc 'e';
}else{
- putc 'b';
+ putc 'f';
+ putc 'a';
+ putc 'l';
+ putc 's';
+ putc 'e';
}
};
-__sum__ :: (left:i8,right:i8)->i8{
- return @add(left,right);
+st :: struct {
+ p:()->void;
+};
+
+print :: ()->void{
+ print(true);
+};
+
+main :: () -> void {
+ s : st = undefined;
+ s.p = print;
+ s.p();
};
diff --git a/src/compiler/lexer.c b/src/compiler/lexer.c
index f3a5d0e..79eeff0 100644
--- a/src/compiler/lexer.c
+++ b/src/compiler/lexer.c
@@ -62,6 +62,7 @@ const char *LEXER_TOKEN_STRINGS[] = {
"LEXER_TOKEN_SYMBOL_DEREFERENCE",
"LEXER_TOKEN_SYMBOL_ACCESS",
+ "LEXER_TOKEN_SYMBOL_FUNCTION_CALL",
"LEXER_TOKEN_SYMBOL_PLUS",
"LEXER_TOKEN_SYMBOL_MINUS",
@@ -474,6 +475,7 @@ lexerPushClear(LexerNodeArray *array, size_t *array_size, char const *iter,
case LEXER_TOKEN_SYMBOL_ADDRESS:
case LEXER_TOKEN_SYMBOL_DEREFERENCE:
case LEXER_TOKEN_SYMBOL_ACCESS:
+ case LEXER_TOKEN_SYMBOL_FUNCTION_CALL:
case LEXER_TOKEN_SYMBOL_LOGICAL_NOT:
case LEXER_TOKEN_SYMBOL_LOGICAL_AND:
case LEXER_TOKEN_SYMBOL_LOGICAL_OR:
diff --git a/src/compiler/lexer.h b/src/compiler/lexer.h
index 0634e3e..9d86462 100644
--- a/src/compiler/lexer.h
+++ b/src/compiler/lexer.h
@@ -67,6 +67,7 @@ typedef enum LexerToken {
LEXER_TOKEN_SYMBOL_DEREFERENCE,
LEXER_TOKEN_ORDER3 = LEXER_TOKEN_SYMBOL_DEREFERENCE,
LEXER_TOKEN_SYMBOL_ACCESS,
+ LEXER_TOKEN_SYMBOL_FUNCTION_CALL,
LEXER_TOKEN_SYMBOL_PLUS,
LEXER_TOKEN_ORDER4 = LEXER_TOKEN_SYMBOL_PLUS,
diff --git a/src/compiler/parser.c b/src/compiler/parser.c
index 4781122..4776b29 100644
--- a/src/compiler/parser.c
+++ b/src/compiler/parser.c
@@ -925,7 +925,7 @@ ParserNode *parseNode(LexerNode *node, LexerNode *begin, LexerNode *end,
case LEXER_TOKEN_SYMBOL_EOL:
return parserEol(node, begin, parent);
case LEXER_TOKEN_SYMBOL_CLOSE_PARENTHESIS:
- return parserParenthesis(node, begin, parent);
+ return parserParenthesis(node, begin, parent, conti);
case LEXER_TOKEN_SYMBOL_CLOSE_CURLY_BRACKET:
return parserCurlyBrackets(node, begin, parent);
case LEXER_TOKEN_SYMBOL_CLOSE_BRACKET:
@@ -998,6 +998,8 @@ ParserNode *parseNode(LexerNode *node, LexerNode *begin, LexerNode *end,
case LEXER_TOKEN_SYMBOL_ACCESS:
return parserBinaryOperator(node, begin, end, parent,
PARSER_TOKEN_OPERATOR_ACCESS);
+ case LEXER_TOKEN_SYMBOL_FUNCTION_CALL:
+ return parserFunctionCall(node, begin, parent);
case LEXER_TOKEN_SYMBOL_LOGICAL_AND:
return parserBinaryOperator(node, begin, end, parent,
PARSER_TOKEN_OPERATOR_LOGICAL_AND);
@@ -1337,14 +1339,72 @@ ParserNode *parserComma(LexerNode *node, LexerNode *begin, ParserNode *parent) {
}
ParserNode *parserParenthesis(LexerNode *closing, LexerNode *begin,
- ParserNode *parent) {
+ ParserNode *parent, bool *conti) {
+ LexerNode *opening = NULL;
+
+ for (LexerNode *iter = closing - 1; iter >= begin; --iter) {
+ if (iter->parserNode == NULL &&
+ iter->token == LEXER_TOKEN_SYMBOL_OPEN_PARENTHESIS) {
+ opening = iter;
+ break;
+ }
+ }
+
+ if (opening == NULL) {
+ printError(closing->str_begin, closing->str_end,
+ "No opening for parenthesis");
+ return NULL;
+ }
+
+ LexerNode *beforeNode = opening - 1;
+ ParserNode *before;
+ if (beforeNode >= begin && beforeNode->parserNode != NULL &&
+ (before = getUntilCommonParent(beforeNode->parserNode, parent)) != NULL &&
+ isExpression(before)) {
+ closing->token = LEXER_TOKEN_SYMBOL_FUNCTION_CALL;
+ *conti = true;
+ return NULL;
+ }
+
+ ParserNode *parserNode = a404m_malloc(sizeof(*parserNode));
+ parserNode->parent = parent;
+
+ for (LexerNode *iter = opening; iter < closing; ++iter) {
+ if (iter->parserNode != NULL) {
+ ParserNode *pNode =
+ getUntilCommonParents(iter->parserNode, parent, parserNode);
+ if (pNode == NULL) {
+ printLog(pNode->str_begin, pNode->str_end, "Bad node");
+ return NULL;
+ } else {
+ pNode->parent = parserNode;
+ }
+ }
+ }
+
+ opening->parserNode = parserNode;
+ closing->parserNode = parserNode;
+
+ parserNode->token = PARSER_TOKEN_SYMBOL_PARENTHESIS;
+ parserNode->str_begin = opening->str_begin;
+ parserNode->str_end = closing->str_end;
+
+ if (parserNodeArray(opening + 1, closing, parserNode)) {
+ return parserNode;
+ } else {
+ free(parserNode);
+ return NULL;
+ }
+}
+
+ParserNode *parserFunctionCall(LexerNode *closing, LexerNode *begin,
+ ParserNode *parent) {
ParserNode *parserNode = a404m_malloc(sizeof(*parserNode));
parserNode->parent = parent;
LexerNode *opening = NULL;
for (LexerNode *iter = closing - 1; iter >= begin; --iter) {
-
if (iter->parserNode != NULL) {
ParserNode *pNode =
getUntilCommonParents(iter->parserNode, parent, parserNode);
@@ -1373,37 +1433,24 @@ ParserNode *parserParenthesis(LexerNode *closing, LexerNode *begin,
if (beforeNode < begin || beforeNode->parserNode == NULL ||
(before = getUntilCommonParent(beforeNode->parserNode, parent)) == NULL ||
!isExpression(before)) {
- before = NULL;
- } else {
- before->parent = parserNode;
+ UNREACHABLE;
}
- if (before == NULL) {
- parserNode->token = PARSER_TOKEN_SYMBOL_PARENTHESIS;
- parserNode->str_begin = opening->str_begin;
- parserNode->str_end = closing->str_end;
+ before->parent = parserNode;
- if (parserNodeArray(opening + 1, closing, parserNode)) {
- return parserNode;
- } else {
- free(parserNode);
- return NULL;
- }
+ parserNode->token = PARSER_TOKEN_FUNCTION_CALL;
+ parserNode->str_begin = before->str_begin;
+ parserNode->str_end = closing->str_end;
+
+ if (parserNodeArray(opening + 1, closing, parserNode)) {
+ ParserNodeFunctionCall *metadata = a404m_malloc(sizeof(*metadata));
+ metadata->function = before;
+ metadata->params = parserNode->metadata;
+ parserNode->metadata = metadata;
+ return parserNode;
} else {
- parserNode->token = PARSER_TOKEN_FUNCTION_CALL;
- parserNode->str_begin = before->str_begin;
- parserNode->str_end = closing->str_end;
-
- if (parserNodeArray(opening + 1, closing, parserNode)) {
- ParserNodeFunctionCall *metadata = a404m_malloc(sizeof(*metadata));
- metadata->function = before;
- metadata->params = parserNode->metadata;
- parserNode->metadata = metadata;
- return parserNode;
- } else {
- free(parserNode);
- return NULL;
- }
+ free(parserNode);
+ return NULL;
}
}
@@ -1830,7 +1877,8 @@ ParserNode *parserVariable(LexerNode *node, LexerNode *begin, LexerNode *end,
metadata->type = type;
LexerNode *flagNode = nameNode - 1;
- if (flagNode >= begin && flagNode->parserNode == NULL && flagNode->token == LEXER_TOKEN_KEYWORD_LAZY) {
+ if (flagNode >= begin && flagNode->parserNode == NULL &&
+ flagNode->token == LEXER_TOKEN_KEYWORD_LAZY) {
metadata->isLazy = true;
flagNode->parserNode = variableNode;
} else {
diff --git a/src/compiler/parser.h b/src/compiler/parser.h
index dadfd81..ef6330e 100644
--- a/src/compiler/parser.h
+++ b/src/compiler/parser.h
@@ -231,7 +231,9 @@ ParserNode *parserBoolValue(LexerNode *node, ParserNode *parent);
ParserNode *parserEol(LexerNode *node, LexerNode *begin, ParserNode *parent);
ParserNode *parserComma(LexerNode *node, LexerNode *begin, ParserNode *parent);
ParserNode *parserParenthesis(LexerNode *closing, LexerNode *begin,
- ParserNode *parent);
+ ParserNode *parent, bool *conti);
+ParserNode *parserFunctionCall(LexerNode *closing, LexerNode *begin,
+ ParserNode *parent);
ParserNode *parserCurlyBrackets(LexerNode *closing, LexerNode *begin,
ParserNode *parent);
ParserNode *parserBracketsRight(LexerNode *closing, LexerNode *begin,
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-08 05:13:53 +0000