aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--code/main.felan28
-rw-r--r--src/compiler/ast-tree.c32
-rw-r--r--src/compiler/parser.c2
-rw-r--r--src/runner/runner.c174
-rw-r--r--src/runner/runner.h5
5 files changed, 155 insertions, 86 deletions
diff --git a/code/main.felan b/code/main.felan
index 1dff7fb..6d83f56 100644
--- a/code/main.felan
+++ b/code/main.felan
@@ -1,8 +1,10 @@
@import("basic.felan");
+/*
libc :: @c_library("/lib/libc.so.6");
puts :: @c_function(libc,"puts",(*u8)->i32);
sleep :: @c_function(libc,"sleep",(i32)->i32);
+*/
raylib :: @c_library("/lib/libraylib.so.5.5.0");
InitWindow :: @c_function(raylib,"InitWindow",(i32,i32,*u8)->void);
@@ -10,9 +12,16 @@ WindowShouldClose :: @c_function(raylib,"WindowShouldClose",()->bool);
BeginDrawing :: @c_function(raylib,"BeginDrawing",()->void);
EndDrawing :: @c_function(raylib,"EndDrawing",()->void);
CloseWindow :: @c_function(raylib,"CloseWindow",()->void);
-ClearBackground :: @c_function(raylib,"ClearBackground",(color:u32)->void);
+ClearBackground :: @c_function(raylib,"ClearBackground",(color:Color)->void);
DrawText :: @c_function(raylib,"DrawText",(*u8,i32,i32,i32,u32)->void);
+Color :: struct {
+ r:u8;
+ g:u8;
+ b:u8;
+ a:u8;
+};
+
main :: ()->void{
b := "raylib [core] example - basic window\0";
c := "Congrats! You created your first window!\0";
@@ -22,18 +31,23 @@ main :: ()->void{
screenHeight :i32: 450;
a : u8 : 255;
b : u8 : 0;
- white :u32: color(a,a,a,a);
- black :u32: 0xff000000;
+ white :: color(a,a,a,a);
+ black :u32= 0xff000000;
InitWindow(screenWidth,screenHeight,str);
while !WindowShouldClose() {
BeginDrawing();
- ClearBackground(@cast(white,u32));
- DrawText(str2,@cast(190,i32),@cast(200,i32),@cast(20,i32),@cast(black,u32));
+ ClearBackground(white);
+ DrawText(str2,@cast(190,i32),@cast(200,i32),@cast(20,i32),black);
EndDrawing();
}
CloseWindow();
};
-color :: (a:u8,r:u8,g:u8,b:u8)->u32{
- return @cast(a,u32)<<@cast(6*4,u32) | @cast(r,u32)<<@cast(0*4,u32) | @cast(g,u32)<<@cast(2*4,u32) | @cast(b,u32)<<@cast(4*4,u32);
+color :: (a:u8,r:u8,g:u8,b:u8)->Color{
+ c : Color = undefined;
+ c.r = r;
+ c.g = g;
+ c.b = b;
+ c.a = a;
+ return c;
};
diff --git a/src/compiler/ast-tree.c b/src/compiler/ast-tree.c
index 93c69ae..0b4bc63 100644
--- a/src/compiler/ast-tree.c
+++ b/src/compiler/ast-tree.c
@@ -2243,8 +2243,8 @@ AstTreeRoot *makeAstRoot(const ParserNode *parsedRoot, char *filePath) {
case PARSER_TOKEN_BUILTIN_BITWISE_AND:
case PARSER_TOKEN_BUILTIN_BITWISE_XOR:
case PARSER_TOKEN_BUILTIN_BITWISE_OR:
- case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
- case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
case PARSER_TOKEN_SYMBOL_BRACKET_LEFT:
case PARSER_TOKEN_SYMBOL_BRACKET_RIGHT:
goto AFTER_SWITCH;
@@ -2748,8 +2748,8 @@ AstTree *astTreeParseFunction(const ParserNode *parserNode) {
case PARSER_TOKEN_BUILTIN_BITWISE_AND:
case PARSER_TOKEN_BUILTIN_BITWISE_XOR:
case PARSER_TOKEN_BUILTIN_BITWISE_OR:
- case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
- case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
case PARSER_TOKEN_SYMBOL_BRACKET_LEFT:
case PARSER_TOKEN_SYMBOL_BRACKET_RIGHT:
printError(node->str_begin, node->str_end, "Unexpected %s",
@@ -3362,8 +3362,8 @@ AstTree *astTreeParseCurlyBracket(const ParserNode *parserNode) {
case PARSER_TOKEN_BUILTIN_BITWISE_AND:
case PARSER_TOKEN_BUILTIN_BITWISE_XOR:
case PARSER_TOKEN_BUILTIN_BITWISE_OR:
- case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
- case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_LEFT:
+ case PARSER_TOKEN_BUILTIN_SHIFT_RIGHT:
case PARSER_TOKEN_SYMBOL_BRACKET_LEFT:
case PARSER_TOKEN_SYMBOL_BRACKET_RIGHT:
printError(node->str_begin, node->str_end, "Unexpected %s",
@@ -3976,12 +3976,8 @@ bool typeIsEqual(AstTree *type0, AstTree *type1) {
bool ret = typeIsEqualBack(left, right);
- if (type0 != left) {
- astTreeDelete(left);
- }
- if (type1 != right) {
- astTreeDelete(right);
- }
+ astTreeDelete(left);
+ astTreeDelete(right);
return ret;
}
@@ -4300,7 +4296,7 @@ AstTree *getValue(AstTree *tree, bool copy) {
};
AstTree *value = runExpression(tree, scope, &shouldRet, false, true,
- &breakCount, &shouldContinue);
+ &breakCount, &shouldContinue, false);
if (!copy) {
astTreeDelete(tree);
@@ -5103,6 +5099,7 @@ bool setTypesValueInt(AstTree *tree, AstTreeSetTypesHelper helper) {
if (*value - *newValue != 0) {
printWarning(tree->str_begin, tree->str_end, "Value is overflowing");
}
+ free(value);
tree->metadata = newValue;
tree->type = &AST_TREE_U32_TYPE;
} else if (typeIsEqual(helper.lookingType, &AST_TREE_I16_TYPE)) {
@@ -5435,13 +5432,14 @@ bool setTypesTypeFunction(AstTree *tree, AstTreeSetTypesHelper helper) {
AstTreeTypeFunction *metadata = tree->metadata;
for (size_t i = 0; i < metadata->arguments_size; ++i) {
- AstTreeTypeFunctionArgument arg = metadata->arguments[i];
- if (!setAllTypes(arg.type, helper, NULL, NULL)) {
+ AstTreeTypeFunctionArgument *arg = &metadata->arguments[i];
+ if (!setAllTypes(arg->type, helper, NULL, NULL)) {
return false;
- } else if (!typeIsEqual(arg.type->type, &AST_TREE_TYPE_TYPE)) {
- printError(arg.str_begin, arg.str_end, "Expected a type");
+ } else if (!typeIsEqual(arg->type->type, &AST_TREE_TYPE_TYPE)) {
+ printError(arg->str_begin, arg->str_end, "Expected a type");
return false;
}
+ arg->type = getValue(arg->type, false);
}
if (!setAllTypes(metadata->returnType, helper, NULL, NULL)) {
diff --git a/src/compiler/parser.c b/src/compiler/parser.c
index b2258b2..e90d5fb 100644
--- a/src/compiler/parser.c
+++ b/src/compiler/parser.c
@@ -689,6 +689,7 @@ void parserNodeDelete(ParserNode *node) {
case PARSER_TOKEN_OPERATOR_PLUS:
case PARSER_TOKEN_OPERATOR_MINUS:
case PARSER_TOKEN_KEYWORD_COMPTIME:
+ case PARSER_TOKEN_KEYWORD_STRUCT:
case PARSER_TOKEN_SYMBOL_COMMA:
case PARSER_TOKEN_SYMBOL_EOL: {
ParserNodeSingleChildMetadata *metadata = node->metadata;
@@ -736,7 +737,6 @@ void parserNodeDelete(ParserNode *node) {
case PARSER_TOKEN_OPERATOR_BITWISE_OR:
case PARSER_TOKEN_OPERATOR_SHIFT_LEFT:
case PARSER_TOKEN_OPERATOR_SHIFT_RIGHT:
- case PARSER_TOKEN_KEYWORD_STRUCT:
case PARSER_TOKEN_OPERATOR_ACCESS:
case PARSER_TOKEN_OPERATOR_ASSIGN:
case PARSER_TOKEN_OPERATOR_SUM_ASSIGN:
diff --git a/src/runner/runner.c b/src/runner/runner.c
index 923f9af..b41e0db 100644
--- a/src/runner/runner.c
+++ b/src/runner/runner.c
@@ -208,9 +208,9 @@ AstTree *runAstTreeFunction(AstTree *tree, AstTree **arguments,
bool shouldContinue = false;
for (size_t i = 0; i < function->scope.expressions_size; ++i) {
- AstTree *ret = runExpression(function->scope.expressions[i],
- &function->scope, &shouldRet, false,
- isComptime, &breakCount, &shouldContinue);
+ AstTree *ret = runExpression(
+ function->scope.expressions[i], &function->scope, &shouldRet, false,
+ isComptime, &breakCount, &shouldContinue, false);
if (shouldRet) {
return ret;
} else {
@@ -1228,10 +1228,17 @@ AstTree *runAstTreeCFunction(AstTree *tree, AstTree **arguments,
}
ffi_cif cif;
- if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, arguments_size,
- toFFIType(funcType->returnType), args) == FFI_OK) {
+ ffi_type *retType = toFFIType(funcType->returnType);
+ if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, arguments_size, retType, args) ==
+ FFI_OK) {
ffi_arg rc;
ffi_call(&cif, fun, &rc, values);
+
+ for (size_t i = 0; i < arguments_size; ++i) {
+ deleteFFIType(args[i]);
+ }
+ deleteFFIType(retType);
+
if (typeIsEqual(funcType->returnType, &AST_TREE_VOID_TYPE)) {
return &AST_TREE_VOID_TYPE;
} else {
@@ -1250,13 +1257,13 @@ AstTree *runAstTreeCFunction(AstTree *tree, AstTree **arguments,
AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
bool isLeft, bool isComptime, u32 *breakCount,
- bool *shouldContinue) {
+ bool *shouldContinue, bool needOwnership) {
switch (expr->token) {
case AST_TREE_TOKEN_FUNCTION_CALL: {
AstTreeFunctionCall *metadata = expr->metadata;
AstTree *function =
runExpression(metadata->function, scope, shouldRet, false, isComptime,
- breakCount, shouldContinue);
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return function;
}
@@ -1271,9 +1278,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
for (size_t i = 0; i < args_size; ++i) {
AstTreeVariable *function_arg = fun->arguments.data[i];
AstTreeFunctionCallParam param = metadata->parameters[i];
- args[i] =
- getForVariable(param.value, scope, shouldRet, false, isComptime,
- breakCount, shouldContinue, function_arg->isLazy);
+ args[i] = getForVariable(param.value, scope, shouldRet, false,
+ isComptime, breakCount, shouldContinue,
+ function_arg->isLazy, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(function);
for (size_t j = 0; j < i; ++j) {
@@ -1290,7 +1297,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
if (function->token != AST_TREE_TOKEN_BUILTIN_TYPE_OF) {
args[i] =
getForVariable(param.value, scope, shouldRet, false, isComptime,
- breakCount, shouldContinue, false);
+ breakCount, shouldContinue, false, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(function);
for (size_t j = 0; j < i; ++j) {
@@ -1311,8 +1318,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
} else if (function->token == AST_TREE_TOKEN_VALUE_C_FUNCTION) {
for (size_t i = 0; i < args_size; ++i) {
AstTreeFunctionCallParam param = metadata->parameters[i];
- args[i] = getForVariable(param.value, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue, false);
+ args[i] =
+ getForVariable(param.value, scope, shouldRet, false, isComptime,
+ breakCount, shouldContinue, false, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(function);
for (size_t j = 0; j < i; ++j) {
@@ -1335,14 +1343,15 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
case AST_TREE_TOKEN_OPERATOR_ASSIGN: {
AstTreeInfix *metadata = expr->metadata;
AstTree *l = runExpression(metadata->left, scope, shouldRet, true,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return l;
}
if (l->token == AST_TREE_TOKEN_VARIABLE) {
AstTreeVariable *left = l->metadata;
- AstTree *right = runExpression(metadata->right, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ AstTree *right =
+ runExpression(metadata->right, scope, shouldRet, false, isComptime,
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(l);
return right;
@@ -1352,8 +1361,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
return copyAstTree(left->value);
} else if (l->token == AST_TREE_TOKEN_RAW_VALUE_NOT_OWNED ||
l->token == AST_TREE_TOKEN_RAW_VALUE) {
- AstTree *right = runExpression(metadata->right, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ AstTree *right =
+ runExpression(metadata->right, scope, shouldRet, false, isComptime,
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(l);
return right;
@@ -1371,8 +1381,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
case AST_TREE_TOKEN_KEYWORD_RETURN: {
AstTreeReturn *metadata = expr->metadata;
if (metadata->value != NULL) {
- AstTree *ret = runExpression(metadata->value, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ AstTree *ret =
+ runExpression(metadata->value, scope, shouldRet, false, isComptime,
+ breakCount, shouldContinue, true);
*shouldRet = true;
return ret;
} else {
@@ -1387,7 +1398,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
value = copyAstTree(variable->initValue);
} else {
value = runExpression(variable->initValue, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return value;
}
@@ -1399,7 +1410,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTreeIf *metadata = expr->metadata;
AstTree *condition =
runExpression(metadata->condition, scope, shouldRet, false, isComptime,
- breakCount, shouldContinue);
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return condition;
}
@@ -1407,11 +1418,13 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
astTreeDelete(condition);
AstTree *ret;
if (condi) {
- ret = runExpression(metadata->ifBody, scope, shouldRet, isLeft,
- isComptime, breakCount, shouldContinue);
+ ret =
+ runExpression(metadata->ifBody, scope, shouldRet, isLeft, isComptime,
+ breakCount, shouldContinue, false);
} else if (metadata->elseBody != NULL) {
- ret = runExpression(metadata->elseBody, scope, shouldRet, isLeft,
- isComptime, breakCount, shouldContinue);
+ ret =
+ runExpression(metadata->elseBody, scope, shouldRet, isLeft,
+ isComptime, breakCount, shouldContinue, false);
} else {
ret = &AST_TREE_VOID_VALUE;
}
@@ -1424,7 +1437,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
astTreeDelete(ret);
AstTree *condition =
runExpression(metadata->condition, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return condition;
}
@@ -1434,7 +1447,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
break;
}
ret = runExpression(metadata->body, scope, shouldRet, isLeft, isComptime,
- breakCount, shouldContinue);
+ breakCount, shouldContinue, false);
if (*shouldRet) {
return ret;
}
@@ -1451,7 +1464,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
case AST_TREE_TOKEN_KEYWORD_COMPTIME: {
AstTreeSingleChild *operand = expr->metadata;
return runExpression((AstTree *)operand, scope, shouldRet, isLeft,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
}
case AST_TREE_TOKEN_SCOPE: {
AstTreeScope *metadata = expr->metadata;
@@ -1459,9 +1472,10 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTree *ret = &AST_TREE_VOID_VALUE;
for (size_t i = 0; i < metadata->expressions_size && !*shouldRet; ++i) {
astTreeDelete(ret);
- ret = runExpression(metadata->expressions[i], scope, shouldRet,
- i == metadata->expressions_size - 1 && isLeft,
- isComptime, breakCount, shouldContinue);
+ ret =
+ runExpression(metadata->expressions[i], scope, shouldRet,
+ i == metadata->expressions_size - 1 && isLeft,
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return ret;
}
@@ -1475,7 +1489,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTreeUnary *metadata = expr->metadata;
AstTree *function =
runExpression(metadata->function->value, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return function;
}
@@ -1488,9 +1502,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
for (size_t i = 0; i < 1; ++i) {
AstTreeVariable *arg = fun->arguments.data[i];
- arguments[i] =
- getForVariable(arguments[i], scope, shouldRet, isLeft, isComptime,
- breakCount, shouldContinue, arg->isLazy);
+ arguments[i] = getForVariable(arguments[i], scope, shouldRet, isLeft,
+ isComptime, breakCount, shouldContinue,
+ arg->isLazy, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(function);
for (size_t j = 0; j < i; ++j) {
@@ -1525,7 +1539,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTreeInfix *metadata = expr->metadata;
AstTree *function =
runExpression(metadata->function->value, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return function;
}
@@ -1539,9 +1553,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
for (size_t i = 0; i < 2; ++i) {
AstTreeVariable *arg = fun->arguments.data[i];
- arguments[i] =
- getForVariable(arguments[i], scope, shouldRet, isLeft, isComptime,
- breakCount, shouldContinue, arg->isLazy);
+ arguments[i] = getForVariable(arguments[i], scope, shouldRet, isLeft,
+ isComptime, breakCount, shouldContinue,
+ arg->isLazy, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(function);
for (size_t j = 0; j < i; ++j) {
@@ -1627,8 +1641,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
}
case AST_TREE_TOKEN_OPERATOR_ADDRESS: {
AstTreeSingleChild *metadata = expr->metadata;
- AstTree *operand = runExpression(metadata, scope, shouldRet, true,
- isComptime, breakCount, shouldContinue);
+ AstTree *operand =
+ runExpression(metadata, scope, shouldRet, true, isComptime, breakCount,
+ shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return operand;
}
@@ -1646,8 +1661,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
}
case AST_TREE_TOKEN_OPERATOR_DEREFERENCE: {
AstTreeSingleChild *metadata = expr->metadata;
- AstTree *operand = runExpression(metadata, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ AstTree *operand =
+ runExpression(metadata, scope, shouldRet, false, isComptime, breakCount,
+ shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return operand;
}
@@ -1681,6 +1697,12 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTreeVariable *variable = expr->metadata;
if (variable->value->token == AST_TREE_TOKEN_RAW_VALUE ||
variable->value->token == AST_TREE_TOKEN_RAW_VALUE_NOT_OWNED) {
+ if (needOwnership && variable->value->token == AST_TREE_TOKEN_RAW_VALUE) {
+ variable->value->token = AST_TREE_TOKEN_RAW_VALUE_NOT_OWNED;
+ return newAstTree(AST_TREE_TOKEN_RAW_VALUE, variable->value->metadata,
+ copyAstTree(expr->type), variable->value->str_begin,
+ variable->value->str_end);
+ }
return newAstTree(AST_TREE_TOKEN_RAW_VALUE_NOT_OWNED,
variable->value->metadata, copyAstTree(expr->type),
variable->value->str_begin, variable->value->str_end);
@@ -1692,8 +1714,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
UNREACHABLE;
}
if (variable->isLazy) {
- AstTree *value = runExpression(variable->value, scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ AstTree *value =
+ runExpression(variable->value, scope, shouldRet, false, isComptime,
+ breakCount, shouldContinue, false);
runnerVariableSetValue(variable, value);
}
return copyAstTree(variable->value);
@@ -1701,8 +1724,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
}
case AST_TREE_TOKEN_OPERATOR_ACCESS: {
AstTreeAccess *metadata = expr->metadata;
- AstTree *tree = runExpression(metadata->object, scope, shouldRet, true,
- isComptime, breakCount, shouldContinue);
+ AstTree *tree =
+ runExpression(metadata->object, scope, shouldRet, true, isComptime,
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return tree;
}
@@ -1720,7 +1744,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
} else {
AstTree *sizeTree = runExpression(
array_metadata->parameters.data[0], scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return sizeTree;
}
@@ -1796,8 +1820,9 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
for (size_t i = 0; i < metadata->variables.size; ++i) {
AstTreeVariable *member = metadata->variables.data[i];
AstTree *type = member->type;
- member->type = runExpression(member->type, scope, shouldRet, isLeft,
- isComptime, breakCount, shouldContinue);
+ member->type =
+ runExpression(member->type, scope, shouldRet, isLeft, isComptime,
+ breakCount, shouldContinue, false);
astTreeDelete(type);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(expr);
@@ -1810,7 +1835,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTreeSingleChild *metadata = expr->metadata;
AstTreeSingleChild *newMetadata =
runExpression(metadata, scope, shouldRet, isLeft, isComptime,
- breakCount, shouldContinue);
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return newMetadata;
}
@@ -1820,15 +1845,16 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
}
case AST_TREE_TOKEN_OPERATOR_ARRAY_ACCESS: {
AstTreeBracket *metadata = expr->metadata;
- AstTree *operand = runExpression(metadata->operand, scope, shouldRet, true,
- isComptime, breakCount, shouldContinue);
+ AstTree *operand =
+ runExpression(metadata->operand, scope, shouldRet, true, isComptime,
+ breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return operand;
}
AstTree *array_indexNode =
runExpression(metadata->parameters.data[0], scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
astTreeDelete(operand);
return array_indexNode;
@@ -1864,7 +1890,7 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
}
AstTree *arraySize_tree = runExpression(
array_type_metadata->parameters.data[0], scope, shouldRet, false,
- isComptime, breakCount, shouldContinue);
+ isComptime, breakCount, shouldContinue, false);
if (discontinue(*shouldRet, *breakCount)) {
return arraySize_tree;
}
@@ -1974,12 +2000,12 @@ AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
AstTree *getForVariable(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
bool isLeft, bool isComptime, u32 *breakCount,
- bool *shouldContinue, bool isLazy) {
+ bool *shouldContinue, bool isLazy, bool needOwnership) {
if (isLazy) {
return copyAstTree(expr);
} else {
return runExpression(expr, scope, shouldRet, isLeft, isComptime, breakCount,
- shouldContinue);
+ shouldContinue, needOwnership);
}
}
@@ -2001,6 +2027,7 @@ AstTree *toRawValue(AstTree *value) {
case AST_TREE_TOKEN_VALUE_UNDEFINED: {
const size_t size = getSizeOfType(value->type);
AstTreeRawValue *rawValue = a404m_malloc(size);
+ memset(rawValue, 0, size);
return newAstTree(AST_TREE_TOKEN_RAW_VALUE, rawValue,
copyAstTree(value->type), value->str_begin,
value->str_end);
@@ -2380,6 +2407,25 @@ ffi_type *toFFIType(AstTree *type) {
return &ffi_type_longdouble;
case AST_TREE_TOKEN_OPERATOR_POINTER:
return &ffi_type_pointer;
+ case AST_TREE_TOKEN_KEYWORD_STRUCT: {
+ AstTreeStruct *metadata = type->metadata;
+
+ ffi_type *type = a404m_malloc(sizeof(*type));
+ *type = (ffi_type){
+ .size = 0,
+ .alignment = 0,
+ .type = FFI_TYPE_STRUCT,
+ .elements = a404m_malloc((metadata->variables.size + 1) *
+ sizeof(*type->elements)),
+ };
+
+ for (size_t i = 0; i < metadata->variables.size; ++i) {
+ type->elements[i] = toFFIType(metadata->variables.data[i]->type);
+ }
+ type->elements[metadata->variables.size] = NULL;
+
+ return type;
+ }
case AST_TREE_TOKEN_TYPE_ARRAY:
case AST_TREE_TOKEN_TYPE_CODE:
case AST_TREE_TOKEN_TYPE_TYPE:
@@ -2423,7 +2469,6 @@ ffi_type *toFFIType(AstTree *type) {
case AST_TREE_TOKEN_KEYWORD_IF:
case AST_TREE_TOKEN_KEYWORD_WHILE:
case AST_TREE_TOKEN_KEYWORD_COMPTIME:
- case AST_TREE_TOKEN_KEYWORD_STRUCT:
case AST_TREE_TOKEN_VALUE_VOID:
case AST_TREE_TOKEN_FUNCTION_CALL:
case AST_TREE_TOKEN_VARIABLE:
@@ -2471,5 +2516,16 @@ ffi_type *toFFIType(AstTree *type) {
case AST_TREE_TOKEN_SCOPE:
case AST_TREE_TOKEN_NONE:
}
+ printLog("%s", AST_TREE_TOKEN_STRINGS[type->token]);
UNREACHABLE;
}
+
+void deleteFFIType(ffi_type *type) {
+ if (type->type == FFI_TYPE_STRUCT) {
+ for (size_t i = 0; type->elements[i] != NULL; ++i) {
+ deleteFFIType(type->elements[i]);
+ }
+ free(type->elements);
+ free(type);
+ }
+}
diff --git a/src/runner/runner.h b/src/runner/runner.h
index 00322c6..66ad757 100644
--- a/src/runner/runner.h
+++ b/src/runner/runner.h
@@ -21,11 +21,11 @@ AstTree *runAstTreeCFunction(AstTree *tree, AstTree **arguments,
AstTree *runExpression(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
bool isLeft, bool isComptime, u32 *breakCount,
- bool *shouldContinue);
+ bool *shouldContinue,bool needOwnership);
AstTree *getForVariable(AstTree *expr, AstTreeScope *scope, bool *shouldRet,
bool isLeft, bool isComptime, u32 *breakCount,
- bool *shouldContinue, bool isLazy);
+ bool *shouldContinue, bool isLazy,bool needOwnership);
bool discontinue(bool shouldRet, u32 breakCount);
@@ -34,3 +34,4 @@ AstTree *toRawValue(AstTree *value);
AstTree *castTo(AstTree *value, AstTree *to);
ffi_type *toFFIType(AstTree *type);
+void deleteFFIType(ffi_type *type);
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-08 09:02:58 +0000