Some changed to file IO and new functions

Author: StavromulaBeta

src/builtins.c

@@ -125,10 +125,12 @@
 #ifndef DISABLEIO
 {.name="parameters",          .calltype=call, .returns=true, .rettype=list},
 {.name="input",               .calltype=call, .returns=true, .rettype=string},
-{.name="open",                .calltype=call, .argc=2, .args={string, string}, .returns=true, .rettype=io},
+{.name="open",                .calltype=call, .argc=2, .args={symbol, string}, .returns=true, .rettype=io},
 {.name="read-file",           .calltype=call, .argc=1, .args={io}, .returns=true, .rettype=string},
+{.name="read-line",           .calltype=call, .argc=1, .args={io}, .returns=true, .rettype=string},
 {.name="close",               .calltype=call, .argc=1, .args={io}},
 {.name="path",                .calltype=call, .returns=true, .rettype=string},
+{.name="seek",                .calltype=call, .argc=3, .args={symbol, number, io}, .returns=false},
 #endif
 
 {.name=NULL},

src/cognac.c

@@ -15,6 +15,7 @@
 #include <sys/wait.h>
 #include <execinfo.h>
 
+
 #define STR_(x) #x
 #define STR(x) STR_(x)
 #define MAX_ERROR_LINE_LENGTH 256
@@ -26,6 +27,8 @@ module_t prelude1 = { .prefix = "prelude" }; // written in C
 module_t prelude2 = { .prefix = "prelude" }; // written in Cognate
 module_list_t preludes = { .mod=&prelude2, .next = &(module_list_t){.mod=&prelude1, .next=NULL} };
 
+const char* builtin_symbols[] = { "start", "end", "current", "read", "write", "append", "read-write", "read-append", "read-write-existing" };
+
 char runtime_filename[] = "/tmp/cognac-runtime-XXXXXX.h";
 
 int usleep (unsigned int);
@@ -886,7 +889,12 @@ void to_c(module_t* mod)
 	FILE* c_source = fopen(c_source_path, "w");
 	fprintf(c_source, "#include \"%s\"\n\n", runtime_filename);
 	for (symbol_list_t* syms = mod->symbols ; syms ; syms = syms->next)
-		fprintf(c_source, "SYMBOL SYM%s = \"%s\";\n", syms->text, syms->text);
+	{
+		for (int i = 0 ; i < sizeof(builtin_symbols) / sizeof(builtin_symbols[0]) ; ++i)
+			if (!strcmp(builtin_symbols[i], syms->text)) goto next;
+		fprintf(c_source, "const SYMBOL SYM%s = \"%s\";\n", syms->text, syms->text);
+	next:;
+	}
 	if (mod->symbols) fputc('\n', c_source);
 	for (func_list_t* func = mod->funcs ; func ; func = func->next)
 	{

src/prelude.cog

@@ -47,8 +47,11 @@ Def Times (
 
 
 Def With (
-	Let Fp be Open;
-	Do Swap Fp;
+	Let Mode be Symbol!;
+	Let Filename be String!;
+	Def Body;
+	Let Fp be Open as Mode Filename;
+	Body Fp;
 	Close Fp
 );
 

src/runtime.h

@@ -191,6 +191,16 @@ extern int main(int, char**);
 
 static const char* restrict function_stack_start;
 
+const SYMBOL SYMstart = "start";
+const SYMBOL SYMend = "end";
+const SYMBOL SYMcurrent = "current";
+const SYMBOL SYMread = "read";
+const SYMBOL SYMwrite = "write";
+const SYMBOL SYMappend = "append";
+const SYMBOL SYMreadHwrite = "read-write";
+const SYMBOL SYMreadHappend = "read-append";
+const SYMBOL SYMreadHwriteHexisting = "read-write-existing";
+
 // Variables and	needed by functions.c defined in runtime.c
 static void init_stack(void);
 static STRING show_object(const ANY object, const _Bool, char*);
@@ -287,7 +297,7 @@ static STRING ___join(STRING, STRING);
 static NUMBER ___stringHlength(STRING);
 static STRING ___substring(NUMBER, NUMBER, STRING);
 static STRING ___input(void);
-static IO ___open(STRING, STRING);
+static IO ___open(SYMBOL, STRING);
 static void ___close(IO);
 static NUMBER ___number(STRING);
 static STRING ___path(void);
@@ -1697,7 +1707,7 @@ static STRING ___show(ANY o)
 
 static LIST ___split(STRING sep, STRING str)
 {
-	if (!*sep) throw_error("Empty separator");
+	if (!*sep) throw_error("Seperator cannot be empty");
 	LIST lst = NULL;
 	size_t len = strlen(sep);
 	char* found;
@@ -1961,12 +1971,19 @@ static NUMBER ___tanh(NUMBER a)
 	return tanh(a);
 }
 
-static IO ___open(STRING path, STRING mode)
+static IO ___open(SYMBOL m, STRING path)
 {
 	assert_impure();
-	// TODO mode should definitely be a symbol.
+	char* mode;
+	if (m == SYMread) mode = "r";
+	else if (m == SYMwrite) mode = "w";
+	else if (m == SYMappend) mode = "a";
+	else if (m == SYMreadHappend) mode = "a+";
+	else if (m == SYMreadHwrite) mode = "w+";
+	else if (m == SYMreadHwriteHexisting) mode = "r+";
+	else throw_error("Expected one of \\read, \\write, \\append, \\read-write, \\read-append, \\read-write-existing");
 	FILE* fp = fopen(path, mode);
-	if unlikely(!fp) throw_error_fmt("cannot open file '%s'", path);
+	if unlikely(!fp) throw_error_fmt("Cannot open file '%s'", path);
 	IO io = gc_malloc(sizeof *io);
 	io->path = path;
 	io->mode = mode;
@@ -1979,6 +1996,7 @@ static STRING ___readHfile(IO io)
 	assert_impure();
 	// Read a file to a string.
 	FILE *fp = io->file;
+	fseek(fp, 0, SEEK_SET); // seek to beginning
 	if unlikely(!io->mode) throw_error_fmt("File '%s' is not open", io->path);
 	if unlikely(fp == NULL) throw_error_fmt("Cannot open file '%s'", io->path);
 	struct stat st;
@@ -1988,7 +2006,14 @@ static STRING ___readHfile(IO io)
 		throw_error_fmt("Error reading file '%s'", io->path);
 	text[st.st_size] = '\0'; // Remove trailing eof.
 	return text;
-	// TODO: single line (or delimited) file read function for better IO performance
+}
+
+static STRING ___readHline(IO io)
+{
+	assert_impure();
+	char* buf = (char*)(space[z] + alloc[z]); // use the top of memory as a buffer like Show does
+	fgets(buf, INT_MAX, io->file);
+	return gc_strdup(buf); // this can only GC once so won't overwrite the buffer.
 }
 
 static void ___close(IO io)
@@ -2018,16 +2043,21 @@ static void ___write(STRING s, IO io)
 	fputs(s, io->file);
 }
 
-static void ___seek(NUMBER n, IO io)
+static void ___seek(SYMBOL ref, NUMBER n, IO io)
 {
-	size_t p = n;
-	if unlikely(p != n) throw_error_fmt("cannot seek to position %.14g", n);
-	fseek(io->file, p, SEEK_CUR);
+	int pos;
+	if (ref == SYMstart) pos = SEEK_SET;
+	else if (ref == SYMend) pos = SEEK_END;
+	else if (ref == SYMcurrent) pos = SEEK_CUR;
+	else throw_error_fmt("Expected one of \\start, \\end, \\current");
+	long offset = n;
+	if unlikely(offset != n || fseek(io->file, offset, pos))
+		throw_error_fmt("Can't seek to position %.14g relative to %s", n, ref);
 }
 
 static void invalid_jump(uint8_t* env)
 {
-	throw_error("cannot resume expired continuation");
+	throw_error("Cannot resume expired continuation");
 }
 
 static void oh_no(uint8_t* env)
@@ -2062,7 +2092,7 @@ static TABLE ___table (BLOCK expr)
 	// Move to a list.
 	TABLE d = NULL;
 	size_t len = stack_length();
-	if (len % 2 != 0) throw_error("table initialiser must be key-value pairs");
+	if (len % 2 != 0) throw_error("Table initialiser must be key-value pairs");
 	for (size_t i = 0; i < len; i += 2)
 	{
 		ANY key = stack.start[i+1];
@@ -2074,7 +2104,7 @@ static TABLE ___table (BLOCK expr)
 			ptrdiff_t diff = compare_objects(ptr->key, key);
 			if (diff > 0) { assign = (cognate_table**)&ptr->child1 ; ptr = ptr->child1; }
 			else if (diff < 0) { assign = (cognate_table**)&ptr->child2 ; ptr = ptr->child2; }
-			else throw_error("duplicate keys in table initialiser");
+			else throw_error("Duplicate keys in table initialiser");
 		}
 
 		*assign = gc_malloc(sizeof (**assign));

tests/io.cog

@@ -1,6 +1,23 @@
-Let S be With "tests/io.txt" "r" ( Read-file );
+With \read "tests/io.txt" (
 
-Print If == "foo\nbar\n" S
-	"PASS: Reading multi-line file to string"
-else
-	"FAIL: Reading multi-line file to string";
+	Let F be the file;
+
+
+	Let S be Read-file F;
+
+	Print If == "foo\nbar\n" S
+		"PASS: Reading multi-line file to string"
+	else
+		"FAIL: Reading multi-line file to string";
+
+	Seek from \start to position 0 in F;
+
+	Let L be Read-line F;
+
+	Print If == "foo\n" L
+		"PASS: Reading first line of file to string"
+	else
+		"FAIL: Reading first line of file to string";
+
+
+);