- added ability to use callbacks with or without argument checking

- added ability to use callbacks with or without the extra count argument
- updated docs

git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@164 bf332499-1b4d-0410-844d-d2d48d5cc64c

lib/cmock_generator_plugin_callback.rb

@@ -6,6 +6,7 @@
 
 class CMockGeneratorPluginCallback
 
+  attr_accessor :include_count
   attr_reader :priority
   attr_reader :config, :utils
   
@@ -13,6 +14,13 @@ class CMockGeneratorPluginCallback
     @config = config
     @utils = utils
     @priority = 3
+    
+    @include_count = @config.callback_include_count
+    if (@config.callback_after_arg_check)
+      alias :mock_implementation          :mock_implementation_for_callbacks
+    else
+      alias :mock_implementation_precheck :mock_implementation_for_callbacks
+    end
   end
 
   def instance_structure(function)
@@ -24,18 +32,24 @@ class CMockGeneratorPluginCallback
   def mock_function_declarations(function)
     func_name = function[:name]
     return_type = function[:return][:const?] ? "const #{function[:return][:type]}" : function[:return][:type]
-    "typedef #{return_type} (* CMOCK_#{func_name}_CALLBACK)(#{(function[:args_string] == "void") ? '' : function[:args_string] + ', '}int cmock_num_calls);\n" +
-    "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback);\n"
+    style  = (@include_count ? 1 : 0) | (function[:args].empty? ? 0 : 2)
+    styles = [ "void", "int cmock_num_calls", function[:args_string], "#{function[:args_string]}, int cmock_num_calls" ]
+    "typedef #{return_type} (* CMOCK_#{func_name}_CALLBACK)(#{styles[style]});\nvoid #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback);\n"
   end
 
-  def mock_implementation_precheck(function)
+  def mock_implementation_for_callbacks(function)
     func_name   = function[:name]
-    call_string = function[:args].empty? ? '' : function[:args].map{|m| m[:name]}.join(', ') + ', '
+    style  = (@include_count ? 1 : 0) | (function[:args].empty? ? 0 : 2) | (function[:return][:void?] ? 0 : 4)
     "  if (Mock.#{func_name}_CallbackFunctionPointer != NULL)\n  {\n" +
-    if (function[:return][:void?])
-      "    Mock.#{func_name}_CallbackFunctionPointer(#{call_string}Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
-    else
-      "    return Mock.#{func_name}_CallbackFunctionPointer(#{call_string}Mock.#{func_name}_CallbackCalls++);\n  }\n"
+    case(style)
+      when 0 then "    Mock.#{func_name}_CallbackFunctionPointer();\n    return;\n  }\n"
+      when 1 then "    Mock.#{func_name}_CallbackFunctionPointer(Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
+      when 2 then "    Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')});\n    return;\n  }\n"
+      when 3 then "    Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')}, Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
+      when 4 then "    return Mock.#{func_name}_CallbackFunctionPointer(void);\n  }\n"
+      when 5 then "    return Mock.#{func_name}_CallbackFunctionPointer(Mock.#{func_name}_CallbackCalls++);\n  }\n"
+      when 6 then "    return Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')});\n  }\n"
+      when 7 then "    return Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')}, Mock.#{func_name}_CallbackCalls++);\n  }\n"
     end
   end