Minor tweaks to generator

Author: BNAndras

exercises/practice/gigasecond/.meta/spec_generator.lua

@@ -2,31 +2,31 @@ local function components(moment)
   return moment:match("(%d%d%d%d)%-(%d%d)%-(%d%d)T?(%d*):?(%d*):?(%d*)")
 end
 
-local function to_num(str)
-  if str ~= nil and str ~= '' then
-    return tonumber(str)
+local function map_to_num(...)
+  local t = {...}
+  for i, str in ipairs(t) do
+    if str ~= nil and str ~= '' then
+      t[i] = tonumber(str)
+    else
+      t[i] = 0
+    end
   end
-  return 0
+  return table.unpack(t)
 end
 
 return {
   module_name = 'gigasecond',
 
   generate_test = function(case)
-    local year, month, day, hour, min, sec = components(case.input.moment)
-    year, month, day = to_num(year), to_num(month), to_num(day)
-    hour, min, sec = to_num(hour), to_num(min), to_num(sec)
-
-    local e_year, e_month, e_day, e_hour, e_min, e_sec = components(case.expected)
-    e_year, e_month, e_day = to_num(e_year), to_num(e_month), to_num(e_day)
-    e_hour, e_min, e_sec = to_num(e_hour), to_num(e_min), to_num(e_sec)
+    local year, month, day, hour, min, sec = map_to_num(components(case.input.moment))
+    local e_year, e_month, e_day, e_hour, e_min, e_sec = map_to_num(components(case.expected))
 
     local template = [[
       local momentA = os.time({ year = %d, month = %d, day = %d, hour = %d, min = %d, sec = %d })
       local momentB = os.time({ year = %d, month = %d, day = %d, hour = %d, min = %d, sec = %d })
-      local result = gigasecond.anniversary(momentA)
+      local actual = gigasecond.anniversary(momentA)
       local expected = os.date('!%%x', momentB)
-      assert.are.equals(expected, result)]]
+      assert.are.equals(expected, actual)]]
 
     return template:format(
       year, month, day, hour, min, sec,

exercises/practice/gigasecond/gigasecond_spec.lua

@@ -4,40 +4,40 @@ describe('gigasecond', function()
   it('date only specification of time', function()
     local momentA = os.time({ year = 2011, month = 4, day = 25, hour = 0, min = 0, sec = 0 })
     local momentB = os.time({ year = 2043, month = 1, day = 1, hour = 1, min = 46, sec = 40 })
-    local result = gigasecond.anniversary(momentA)
+    local actual = gigasecond.anniversary(momentA)
     local expected = os.date('!%x', momentB)
-    assert.are.equals(expected, result)
+    assert.are.equals(expected, actual)
   end)
 
   it('second test for date only specification of time', function()
     local momentA = os.time({ year = 1977, month = 6, day = 13, hour = 0, min = 0, sec = 0 })
     local momentB = os.time({ year = 2009, month = 2, day = 19, hour = 1, min = 46, sec = 40 })
-    local result = gigasecond.anniversary(momentA)
+    local actual = gigasecond.anniversary(momentA)
     local expected = os.date('!%x', momentB)
-    assert.are.equals(expected, result)
+    assert.are.equals(expected, actual)
   end)
 
   it('third test for date only specification of time', function()
     local momentA = os.time({ year = 1959, month = 7, day = 19, hour = 0, min = 0, sec = 0 })
     local momentB = os.time({ year = 1991, month = 3, day = 27, hour = 1, min = 46, sec = 40 })
-    local result = gigasecond.anniversary(momentA)
+    local actual = gigasecond.anniversary(momentA)
     local expected = os.date('!%x', momentB)
-    assert.are.equals(expected, result)
+    assert.are.equals(expected, actual)
   end)
 
   it('full time specified', function()
     local momentA = os.time({ year = 2015, month = 1, day = 24, hour = 22, min = 0, sec = 0 })
     local momentB = os.time({ year = 2046, month = 10, day = 2, hour = 23, min = 46, sec = 40 })
-    local result = gigasecond.anniversary(momentA)
+    local actual = gigasecond.anniversary(momentA)
     local expected = os.date('!%x', momentB)
-    assert.are.equals(expected, result)
+    assert.are.equals(expected, actual)
   end)
 
   it('full time with day roll-over', function()
     local momentA = os.time({ year = 2015, month = 1, day = 24, hour = 23, min = 59, sec = 59 })
     local momentB = os.time({ year = 2046, month = 10, day = 3, hour = 1, min = 46, sec = 39 })
-    local result = gigasecond.anniversary(momentA)
+    local actual = gigasecond.anniversary(momentA)
     local expected = os.date('!%x', momentB)
-    assert.are.equals(expected, result)
+    assert.are.equals(expected, actual)
   end)
 end)