Extracted common argument-formatting code

Author: ryanplusplus

rockspecs/mach-git-0.rockspec

@@ -22,5 +22,6 @@ build = {
     ['mach.unexpected_args_error'] = 'mach/unexpected_args_error.lua',
     ['mach.out_of_order_call_error'] = 'mach/out_of_order_call_error.lua',
     ['mach.call_status_message'] = 'mach/call_status_message.lua',
+    ['mach.format_arguments'] = 'mach/format_arguments.lua',
   }
 }

src/mach/CompletedCall.lua

@@ -0,0 +1,24 @@
+local completed_call = {}
+completed_call.__index = completed_call
+
+completed_call.__tostring = function(self)
+  local arg_strings = {}
+  for _, arg in ipairs(self._args) do
+    table.insert(arg_strings, tostring(arg))
+  end
+
+  return self._name .. '(' .. table.concat(arg_strings, ', ') .. ')'
+end
+
+local function create(name, args)
+  local o = {
+    _name = name,
+    _args = args
+  }
+
+  setmetatable(o, completed_call)
+
+  return o
+end
+
+return create

src/mach/call_status_message.lua

@@ -0,0 +1,27 @@
+return function(completed_calls, incomplete_calls)
+  local incomplete_call_strings = {}
+  for _, incomplete_call in ipairs(incomplete_calls) do
+    table.insert(incomplete_call_strings, tostring(incomplete_call))
+  end
+
+  local completed_call_strings = {}
+  for _, completed_call in ipairs(completed_calls) do
+    table.insert(completed_call_strings, tostring(completed_call))
+  end
+
+  local message = ''
+
+  if #completed_calls > 0 then
+    message = message ..
+      '\ncompleted calls:' ..
+      '\n\t' .. table.concat(completed_call_strings, '\n\t')
+  end
+
+  if #incomplete_calls > 0 then
+    message = message ..
+      '\nincomplete calls:' ..
+      '\n\t' .. table.concat(incomplete_call_strings, '\n\t')
+  end
+
+  return message
+end

src/mach/format_arguments.lua

@@ -0,0 +1,8 @@
+return function(args)
+  local arg_strings = {}
+  for _, arg in ipairs(args) do
+    table.insert(arg_strings, tostring(arg))
+  end
+
+  return '(' .. table.concat(arg_strings, ', ') .. ')'
+end

src/mach/out_of_order_call_error.lua

@@ -1,13 +1,9 @@
 local call_status_message = require 'mach.call_status_message'
+local format_arguments = require 'mach.format_arguments'
 
 return function(name, args, completed_calls, incomplete_calls, level)
-  local arg_strings = {}
-  for _, arg in ipairs(args) do
-    table.insert(arg_strings, tostring(arg))
-  end
-
   local error_message =
-    'out of order function call ' .. name .. '(' .. table.concat(arg_strings, ', ') .. ')' ..
+    'out of order function call ' .. name .. format_arguments(args) ..
     call_status_message(completed_calls, incomplete_calls)
 
   error(error_message, level + 1)

src/mach/unexpected_args_error.lua

@@ -1,13 +1,9 @@
 local call_status_message = require 'mach.call_status_message'
+local format_arguments = require 'mach.format_arguments'
 
 return function(name, args, completed_calls, incomplete_calls, level)
-  local arg_strings = {}
-  for _, arg in ipairs(args) do
-    table.insert(arg_strings, tostring(arg))
-  end
-
   local error_message =
-    'unexpected arguments (' .. table.concat(arg_strings) .. ') provided to function ' .. name ..
+    'unexpected arguments ' .. format_arguments(args) .. ' provided to function ' .. name ..
     call_status_message(completed_calls, incomplete_calls)
 
   error(error_message, level + 1)

src/mach/unexpected_call_error.lua

@@ -1,13 +1,9 @@
 local call_status_message = require 'mach.call_status_message'
+local format_arguments = require 'mach.format_arguments'
 
 return function(name, args, completed_calls, incomplete_calls, level)
-  local arg_strings = {}
-  for _, arg in ipairs(args) do
-    table.insert(arg_strings, tostring(arg))
-  end
-
   local message =
-    'unexpected function call ' .. name .. '(' .. table.concat(arg_strings, ', ') .. ')' ..
+    'unexpected function call ' .. name .. format_arguments(args) ..
     call_status_message(completed_calls, incomplete_calls)
 
   error(message, level + 1)