krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

fixed close function

Browse Source
This commit is contained in:
Add00
2023-08-08 23:41:23 -04:00
parent e2dda434f8
commit 648a5f84db
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
repl/lib_fileio.c
View File

@@ -133,13 +133,20 @@ static int nativeClose(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments
Toy_File* file = (Toy_File*)TOY_AS_OPAQUE(selfLiteral); Toy_File* file = (Toy_File*)TOY_AS_OPAQUE(selfLiteral);
int result = fclose(file->fp); int result = 0;
if (file->error > 0) {
result = file->error;
}
else {
result = fclose(file->fp);
}
// return the result // return the result
Toy_Literal resultLiteral = TOY_TO_BOOLEAN_LITERAL(result > 0); Toy_Literal resultLiteral = TOY_TO_BOOLEAN_LITERAL(result > 0);
Toy_pushLiteralArray(&interpreter->stack, resultLiteral); Toy_pushLiteralArray(&interpreter->stack, resultLiteral);
// cleanup // cleanup
TOY_FREE(Toy_File, file);
Toy_freeLiteral(selfLiteral); Toy_freeLiteral(selfLiteral);
return 1; return 1;
@@ -186,14 +193,51 @@ static int nativeRead(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments)
Toy_File* file = (Toy_File*)TOY_AS_OPAQUE(selfLiteral); Toy_File* file = (Toy_File*)TOY_AS_OPAQUE(selfLiteral);
char buffer[256] = {0}; Toy_Literal resultLiteral = {0};
// fscanf(file->fp, buffer); if (file->error == 0) {
switch (selfLiteral.type)
{
case TOY_LITERAL_INTEGER:
{
int value = 0;
file->error = fscanf(file->fp, "%i", &value);
Toy_RefString* result = Toy_createRefStringLength(buffer, 256); resultLiteral = TOY_TO_INTEGER_LITERAL(value);
Toy_pushLiteralArray(&interpreter->stack, TOY_TO_STRING_LITERAL(result)); break;
}
case TOY_LITERAL_FLOAT:
{
float value = 0.0f;
file->error = fscanf(file->fp, "%f", &value);
resultLiteral = TOY_TO_FLOAT_LITERAL(value);
break;
}
case TOY_LITERAL_STRING:
{
char value[TOY_MAX_STRING_LENGTH] = {0};
fgets(value, sizeof(value) - 1, file->fp);
value[TOY_MAX_STRING_LENGTH] = '\0';
resultLiteral = TOY_TO_STRING_LITERAL(Toy_createRefStringLength(value, TOY_MAX_STRING_LENGTH));
break;
}
default:
break;
}
}
Toy_pushLiteralArray(&interpreter->stack, resultLiteral);
// cleanup
Toy_freeLiteral(resultLiteral);
Toy_freeLiteral(valueLiteral); Toy_freeLiteral(valueLiteral);
Toy_freeLiteral(selfLiteral); Toy_freeLiteral(selfLiteral);

4
test/scripts/lib/fileio.toy
View File

@@ -10,9 +10,9 @@ import fileio;
// file.write(12, ",", 12); // file.write(12, ",", 12);
// file.size(); // file.size();
// file.isOpened(); // file.isOpened();
// file.error(); // file.getrror();
// file.position(); // file.position();
// file.mode(); // file.mode();
// file.close(); print file.close();
} }