Merge remote-tracking branch 'daurnimator/iolib'

2 files changed, 37 insertions, 4 deletions

diff --git a/README.md b/README.md
index 6d94e2e..75959f2 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@
     - [x] Package
     - [ ] io
         - [x] `file:__tostring()`
+        - [x] `file:flush()`
         - [x] `file:write()`
         - [x] `io.close()`
         - [x] `io.stderr`
@@ -36,15 +37,14 @@
         - [x] `io.stdout`
         - [x] `io.type()`
         - [x] `io.write()`
-        - [ ] `io.flush()`
-        - [ ] `io.input()`
+        - [x] `io.flush()`
+        - [ ] `io.input()`: partially implemented
         - [ ] `io.lines()`
         - [ ] `io.open()`
-        - [ ] `io.output()`
+        - [ ] `io.output()`: partially implemented
         - [ ] `io.popen()`
         - [ ] `io.read()`
         - [ ] `io.tmpfile()`
-        - [ ] `file:flush()`
         - [ ] `file:lines()`
         - [ ] `file:read()`
         - [ ] `file:setvbuf()`
diff --git a/src/liolib.js b/src/liolib.js
index 575b3ec..51e18ee 100644
--- a/src/liolib.js
+++ b/src/liolib.js
@@ -78,6 +78,23 @@ const getiofile = function(L, findex) {
     return p.f;
 };
 
+const g_iofile = function(L, f, mode) {
+    if (!lua.lua_isnoneornil(L, 1)) {
+        lauxlib.luaL_error(L, lua.to_luastring("opening files not yet implemented"));
+    }
+    /* return current value */
+    lua.lua_getfield(L, lua.LUA_REGISTRYINDEX, f);
+    return 1;
+};
+
+const io_input = function(L) {
+  return g_iofile(L, IO_INPUT, "r");
+};
+
+const io_output = function(L) {
+  return g_iofile(L, IO_OUTPUT, "w");
+};
+
 const g_write = function(L, f, arg) {
     let nargs = lua.lua_gettop(L) - arg;
     let status = true;
@@ -105,14 +122,30 @@ const f_write = function(L) {
     return g_write(L, f, 2);
 };
 
+const io_flush = function (L) {
+    /* stub, as node doesn't have synchronized buffered IO */
+    getiofile(L, IO_OUTPUT);
+    return lauxlib.luaL_fileresult(L, true, null, null);
+};
+
+const f_flush = function (L) {
+    /* stub, as node doesn't have synchronized buffered IO */
+    tofile(L);
+    return lauxlib.luaL_fileresult(L, true, null, null);
+};
+
 const iolib = {
     "close": io_close,
+    "flush": io_flush,
+    "input": io_input,
+    "output": io_output,
     "type": io_type,
     "write": io_write
 };
 
 const flib = {
     "close": io_close,
+    "flush": f_flush,
     "write": f_write,
     "__tostring": f_tostring
 };