file-reader.expr: simpler implementation

test-resources/file-reader.expr

@@ -1,23 +1,22 @@
 builtin ["os.file", "base"];
 
 readInt=func(fh){
-	line=fileRead(fh);
+	line=fileReadText(fh);
 	line ? [nil] {nil} :: {int(line)}
 };
 
 ds={
 	"init":func(filename){
 		fh=fileOpen(filename);
-		fh ? [nil] {nil} :: { @current=readInt(fh); @prev=@current };
+		fh ? [nil] {nil} :: { @current=readInt(fh) };
 		fh
 	},
 	"current":func(){
-		prev
+		current
 	},
 	"next":func(fh){
-		current ? 
-			[nil] {current}
-			:: {@prev=current; @current=readInt(fh) but current}
+		@current=readInt(fh);
+		current
 	},
 	"clean":func(fh){
 		fileClose(fh)
@@ -25,9 +24,9 @@ ds={
 }
 
 //;f=$(ds, "int.list")
-/*
-;f++
-;f++
-;f++
-*/
+
+//;f++
+//;f++
+//;f++
+//*/
 //;add(f)