memoire

@@ -9,15 +9,19 @@ local recrw = dofile(SRC_DIR .. "recrw.lua")

     load a deck (a table of `Card`s) from a Recfile

 ]]

 local function loaddeck(fname, conf)

+    local t0 = os.clock()

     local fh = io.open(fname)

     if not fh then print("no fh") return nil end

     local rt = fh:read "a"

     if not rt then print("no read") return nil end

     fh:close()

+    local t1 = os.clock()

     local pr = recrw.read(rt)

     if not pr then print("no recs") return nil end

+    local t2 = os.clock()

     local ep = Card:fromrecs(pr, conf)

-    if not ep then print("no cards") return nil end

+    local t3 = os.clock()

+    print(string.format("times (ms): %.1f load, %.1f recparse, %.1f cardparse", 1000 * (t1 - t0), 1000 * (t2 - t1), 1000 * (t3 - t2)))

     return ep

 end

@@ -26,15 +30,20 @@ end

 ]]

 local function savedeck(fname, deck)

     local rrf = {}

+    local t0 = os.clock()

     for i, cg in ipairs(deck) do

         rrf[i] = cg:torec()

     end

+    local t1 = os.clock()

     local wot = recrw.write(rrf)

+    local t2 = os.clock()

     local fh = io.open(fname, "w")

     if not fh then io.write("couldn't open output\n") end

     local wr, err = fh:write(wot)

     if not wr then io.write("couldn't write to output\n") end

     fh:close()

+    local t3 = os.clock()

+    print(string.format("times (ms): %.1f recify, %.1f rectext, %.1f write", 1000 * (t1 - t0), 1000 * (t2 - t1), 1000 * (t3 - t2)))

 end

 return { load = loaddeck, save = savedeck }

@@ -94,7 +94,7 @@ local function recs2text(recs, si, ei)

     if si == ei then

         for label, vl in pairs(recs[si]) do

             for j, value in ipairs(vl) do

-                ret = ret .. string.format("\n%s: %s", label, tostring(value):gsub("\n", "\n+ "))

+                ret = ret .. (label .. ": " .. tostring(value):gsub("\n", "\n+ ") .. "\n")

             end

         end

         return ret .. "\n"