xxx

Author: ligurio

tests/lapi/io_torture_test.lua

@@ -19,11 +19,17 @@ file:setvbuf(mode [, size])
 ]]
 
 local luzer = require("luzer")
+local test_lib = require("lib")
+
 -- The maximum file size is 1Mb (1000 * 1000).
 local MAX_N = 1e3
 
 local function io_seek(self)
-    local SEEK_MODE = { "set", "cur", "end" }
+    local SEEK_MODE = {
+        "set", -- Base is position 0 (beginning of the file).
+        "cur", -- Base is current position.
+        "end", -- Base is end of file.
+    }
     local mode = self.fdp:oneof(SEEK_MODE)
     local offset = self.fdp:consume_integer(0, self.MAX_N)
     self.fh:seek(mode, offset)
@@ -34,7 +40,11 @@ local function io_flush(self)
 end
 
 local function io_setvbuf(self)
-    local VBUF_MODE = { "no", "full", "line" }
+    local VBUF_MODE = {
+        "no",   -- no buffering.
+        "full", -- full buffering.
+        "line", -- line buffering.
+    }
     local mode = self.fdp:oneof(VBUF_MODE)
     local size = self.fdp:consume_integer(0, self.MAX_N)
     self.fh:setvbuf(mode, size)
@@ -46,13 +56,39 @@ local function io_write(self)
 end
 
 local function io_read(self)
-    -- As a special case, `io.read(0)` works as a test for end of
-    -- file: It returns an empty string if there is more to be
-    -- read or `nil` otherwise.
-    local size = self.fdp:consume_integer(0, self.MAX_N)
-    local READ_MODE = { "*number", "*all", "*line", size }
-    local mode = self.fdp:oneof(READ_MODE)
-    local _ = self.fh:read(mode)
+    local n_formats = self.fdp:consume_integer(1, self.MAX_N)
+    local READ_FORMAT = {
+        "*n", -- Reads a number.
+        "*a", -- Reads the whole file, starting at the current
+              -- position.
+        "*l", -- Reads the next line (skipping the end of line),
+              -- returning nil on end of file.
+    }
+	if test_lib.lua_current_version_ge_than(5, 2) then
+        -- "*L" reads the next line keeping the end of line
+        -- (if present), returning nil on end of file.
+        table.insert(READ_FORMAT, "*L")
+	end
+    -- Build a table with formats, which specify what to read. For
+    -- each format, the function returns a string (or a number)
+    -- with the characters read, or `nil` if it cannot read data
+    -- with the specified format. When called without formats, it
+    -- uses a default format that reads the entire next line.
+    local read_formats = {}
+    for _ = 1, n_formats do
+        local format_is_size = self.fdp:consume_boolean()
+        if format_is_size then
+            -- As a special case, `io.read(0)` works as a test for
+            -- end of file: It returns an empty string if there is
+            -- more to be read or `nil` otherwise.
+            local size = self.fdp:consume_integer(0, test_lib.MAX_INT64)
+            table.insert(read_formats, size)
+        else
+            local format = self.fdp:oneof(READ_FORMAT)
+            -- table.insert(read_formats, format)
+        end
+    end
+    local _ = self.fh:read(unpack(read_formats))
 end
 
 local function io_close(self)