shithub: sl

Info  •  Files  •  Log  •  Branches

move iostream and table types out of publicity

--- a/src/cvalues.c

+++ b/src/cvalues.c

@@ -527,8 +527,8 @@

 {

 	if(iscvalue(v)){

 		csl_v *pcv = ptr(v);

-		sl_ios *x = value2c(sl_ios*, v);

-		if(cv_class(pcv) == sl_iostreamtype && x->bm == bm_mem){

+		sl_ios *x;

+		if(isiostream(v) && (x = value2c(sl_ios*, v))->bm == bm_mem){

 			*pdata = x->buf;

 			*psz = x->size;

 			return;

--- a/src/iostream.c

+++ b/src/iostream.c

@@ -6,6 +6,7 @@

 #include "iostream.h"

 static sl_v sl_linesym, sl_blocksym, sl_memorysym, sl_nonesym;

+static sl_type *sl_iostreamtype;

 static void

 print_iostream(sl_v v, sl_ios *f)

@@ -43,7 +44,7 @@

 	nil

 };

-static int

+int

 isiostream(sl_v v)

 {

 	return iscvalue(v) && cv_class(ptr(v)) == sl_iostreamtype;

--- a/src/iostream.h

+++ b/src/iostream.h

@@ -1,3 +1,4 @@

 sl_ios *toiostream(sl_v v);

+int isiostream(sl_v v) sl_purefn;

 sl_v stream_to_string(sl_v *ps);

 void iostream_init(void);

--- a/src/sl.c

+++ b/src/sl.c

@@ -32,7 +32,7 @@

 sl_v sl_bytesym, sl_runesym, sl_floatsym, sl_doublesym;

 sl_v sl_stringtypesym, sl_runestringtypesym;

-sl_type *sl_tabletype, *sl_iostreamtype, *sl_mptype, *sl_builtintype;

+sl_type *sl_mptype, *sl_builtintype;

 sl_type *sl_s8type, *sl_u8type;

 sl_type *sl_s16type, *sl_u16type;

 sl_type *sl_s32type, *sl_u32type;

--- a/src/sl.h

+++ b/src/sl.h

@@ -432,7 +432,7 @@

 extern sl_v sl_bytesym, sl_runesym, sl_floatsym, sl_doublesym;

 extern sl_v sl_stringtypesym, sl_runestringtypesym;

-extern sl_type *sl_tabletype, *sl_iostreamtype, *sl_mptype, *sl_builtintype;

+extern sl_type *sl_mptype, *sl_builtintype;

 extern sl_type *sl_s8type, *sl_u8type;

 extern sl_type *sl_s16type, *sl_u16type;

 extern sl_type *sl_s32type, *sl_u32type;

--- a/src/slmain.c

+++ b/src/slmain.c

@@ -101,7 +101,7 @@

 		exit(1);

 	}

-	sl_v f = cvalue(sl_iostreamtype, (int)sizeof(sl_ios));

+	sl_v f = fn_builtin_buffer(nil, 0);

 	sl_gc_handle(&f);

 	sl_v args = argv_list(argc, argv);

 	sl_gc_handle(&args);

--- a/src/table.c

+++ b/src/table.c

@@ -7,6 +7,8 @@

 #define inline_space sizeof(((sl_htable*)nil)->_space)

+static sl_type *sl_tabletype;

+

 static void

 print_htable(sl_v v, sl_ios *f)

 {