bug fix and renamed file builtin object to files

src/builtins/basic.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "basic.h"
-#include "file.h"
+#include "files.h"
 #include "math.h"
 
 static Object *bin_print(Runtime *runtime, Object **argv, unsigned int argc, Error *error)
@@ -129,8 +129,8 @@ static Object *bin_sliceBuffer(Runtime *runtime, Object **argv, unsigned int arg
 }
 
 const StaticMapSlot bins_basic[] = {
-	{ "math", SM_SMAP, .as_smap = bins_math, },
-	{ "file", SM_SMAP, .as_smap = bins_file, },
+	{ "math",  SM_SMAP, .as_smap = bins_math, },
+	{ "files", SM_SMAP, .as_smap = bins_files, },
 //	{ "net",  SM_SMAP, .as_smap = bins_net, },
 
 	{ "newBuffer",   SM_FUNCT, .as_funct = bin_newBuffer, .argc = 1 },

src/builtins/file.h

@@ -1,2 +0,0 @@
-#include "../runtime/o_staticmap.h"
-extern const StaticMapSlot bins_file[];

src/builtins/files.c

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <errno.h>
-#include "file.h"
+#include "files.h"
 
 enum {
 	MD_READ = 0,
@@ -20,7 +20,7 @@ static Object *bin_openFile(Runtime *runtime, Object **argv, unsigned int argc,
 
 	if(!Object_IsInt(argv[1]))
 		{
-			Error_Report(error, 0, "Expected second argument to be an int, but it's a %s", Object_GetName(argv[0]));
+			Error_Report(error, 0, "Expected second argument to be an int, but it's a %s", Object_GetName(argv[1]));
 			return NULL;
 		}
 
@@ -85,7 +85,7 @@ static Object *bin_read(Runtime *runtime, Object **argv, unsigned int argc, Erro
 
 	if(!Object_IsBuffer(argv[1]))
 		{
-			Error_Report(error, 0, "Expected first argument to be a buffer, but it's a %s", Object_GetName(argv[0]));
+			Error_Report(error, 0, "Expected second argument to be a buffer, but it's a %s", Object_GetName(argv[1]));
 			return NULL;
 		}
 
@@ -146,7 +146,7 @@ static Object *bin_write(Runtime *runtime, Object **argv, unsigned int argc, Err
 
 	if(!Object_IsBuffer(argv[1]))
 		{
-			Error_Report(error, 0, "Expected first argument to be a buffer, but it's a %s", Object_GetName(argv[0]));
+			Error_Report(error, 0, "Expected second argument to be a buffer, but it's a %s", Object_GetName(argv[1]));
 			return NULL;
 		}
 
@@ -265,14 +265,14 @@ static Object *bin_nextDirItem(Runtime *runtime, Object **argv, unsigned int arg
 	return Object_FromString(ent->d_name, -1, heap, error);
 }
 
-const StaticMapSlot bins_file[] = {
+const StaticMapSlot bins_files[] = {
 	{ "READ",        SM_INT, .as_int = MD_READ, },
 	{ "WRITE",       SM_INT, .as_int = MD_WRITE, },
 	{ "APPEND",      SM_INT, .as_int = MD_APPEND, },
 	{ "openFile",    SM_FUNCT, .as_funct = bin_openFile, .argc = 2, },
 	{ "openDir",     SM_FUNCT, .as_funct = bin_openDir,  .argc = 1, },
 	{ "nextDirItem", SM_FUNCT, .as_funct = bin_nextDirItem, .argc = 1, },
-	{ "read",        SM_FUNCT, .as_funct = bin_read,     .argc = 2, },
+	{ "read",        SM_FUNCT, .as_funct = bin_read,     .argc = 3, },
 	{ "write",       SM_FUNCT, .as_funct = bin_write,    .argc = 3, },
 	{ NULL, SM_END, {}, {} },
 };

src/builtins/files.h

@@ -0,0 +1,2 @@
+#include "../runtime/o_staticmap.h"
+extern const StaticMapSlot bins_files[];