ceedling 1.0.1 → 1.1.0

data/vendor/cmock/examples/temp_sensor/test/TestUsartModel.c

@@ -1,7 +1,7 @@
 /* =========================================================================
     CMock - Automatic Mock Generation for C
     ThrowTheSwitch.org
-    Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
     SPDX-License-Identifier: MIT
 ========================================================================= */
 

data/vendor/cmock/examples/temp_sensor/test/TestUsartPutChar.c

@@ -1,7 +1,7 @@
 /* =========================================================================
     CMock - Automatic Mock Generation for C
     ThrowTheSwitch.org
-    Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
     SPDX-License-Identifier: MIT
 ========================================================================= */
 

data/vendor/cmock/examples/temp_sensor/test/TestUsartTransmitBufferStatus.c

@@ -1,7 +1,7 @@
 /* =========================================================================
     CMock - Automatic Mock Generation for C
     ThrowTheSwitch.org
-    Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
     SPDX-License-Identifier: MIT
 ========================================================================= */
 

data/vendor/cmock/lib/cmock.rb

@@ -2,7 +2,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 

data/vendor/cmock/lib/cmock_config.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -43,6 +43,7 @@ class CMockConfig
       :array_size_name             => 'size|len',
       :skeleton                    => false,
       :exclude_setjmp_h            => false,
+      :create_error_stubs          => true,
 
       # Format to look for inline functions.
       # This is a combination of "static" and "inline" keywords ("static inline", "inline static", "inline", "static")
@@ -51,7 +52,12 @@ class CMockConfig
       # - The keywords can appear before or after the return type (this is a compiler warning but people do weird stuff),
       #   so we check for word boundaries when searching for them
       # - We first remove "static inline" combinations and boil down to single inline or static statements
-      :inline_function_patterns    => ['(static\s+inline|inline\s+static)\s*', '(\binline\b)\s*', '(?:static\s*)?(?:__inline__)?__attribute__\s*\([ (]*always_inline[ )]*\)', 'static __inline__'] # Last part (\s*) is just to remove whitespaces (only to prettify the output)
+      :inline_function_patterns    => ['(static\s+inline|inline\s+static)\s*', '(\binline\b)\s*', '(?:static\s*)?(?:__inline__)?__attribute__\s*\([ (]*always_inline[ )]*\)', 'static __inline__'], # Last part (\s*) is just to remove whitespaces (only to prettify the output)
+
+      # Compile-time assertion macro names to strip entirely to avoid being confused with function prototypes
+      # Common C11, BSD, and embedded RTOS variants are included by default. Add custom names as needed.
+      :ct_assert_patterns          => ['ct_assert', '_?[Ss]tatic_[Aa]ssert', 'STATIC_ASSERT', 'BUILD_ASSERT', 'CTASSERT'],
+      :debug_output                => false
     }.freeze
 
   def initialize(options = nil)

data/vendor/cmock/lib/cmock_file_writer.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -16,6 +16,17 @@ class CMockFileWriter
     require 'fileutils'
     FileUtils.mkdir_p "#{@config.mock_path}/" unless Dir.exist?("#{@config.mock_path}/")
     FileUtils.mkdir_p "#{@config.mock_path}/#{"#{subdir}/" if subdir}" if subdir && !Dir.exist?("#{@config.mock_path}/#{"#{subdir}/" if subdir}")
+  rescue SystemCallError => e
+    raise "Unable to create mock output directory: #{e.message}. Check :mock_path ('#{@config.mock_path}') configuration."
+  end
+
+  def create_skeleton_subdir(subdir)
+    require 'fileutils'
+    base = effective_skeleton_path
+    FileUtils.mkdir_p base
+    FileUtils.mkdir_p "#{base}/#{subdir}" if subdir
+  rescue SystemCallError => e
+    raise "Unable to create skeleton output directory: #{e.message}. Check :skeleton_path ('#{base}') configuration."
   end
 
   def create_file(filename, subdir)
@@ -27,6 +38,27 @@ class CMockFileWriter
       yield(file, filename)
     end
     update_file(full_file_name_done, full_file_name_temp)
+  rescue SystemCallError => e
+    raise "Unable to write mock file '#{full_file_name_done}': #{e.message}. Check :mock_path ('#{@config.mock_path}') and :subdir ('#{subdir}') configuration."
+  end
+
+  def create_skeleton_file(filename, subdir)
+    raise "Where's the block of data to create?" unless block_given?
+
+    base = effective_skeleton_path
+    full_file_name_temp = "#{base}/#{"#{subdir}/" if subdir}#{filename}.new"
+    full_file_name_done = "#{base}/#{"#{subdir}/" if subdir}#{filename}"
+    File.open(full_file_name_temp, 'w') do |file|
+      yield(file, filename)
+    end
+    update_file(full_file_name_done, full_file_name_temp)
+  rescue SystemCallError => e
+    raise "Unable to write skeleton file '#{full_file_name_done}': #{e.message}. Check :skeleton_path ('#{base}') and :subdir ('#{subdir}') configuration."
+  end
+
+  def skeleton_file_path(filename, subdir)
+    base = effective_skeleton_path
+    "#{base}/#{"#{subdir}/" if subdir}#{filename}"
   end
 
   def append_file(filename, subdir)
@@ -40,6 +72,11 @@ class CMockFileWriter
 
   private ###################################
 
+  def effective_skeleton_path
+    path = @config.skeleton_path
+    path.nil? || path.empty? ? @config.mock_path : path
+  end
+
   def update_file(dest, src)
     require 'fileutils'
     FileUtils.rm(dest, :force => true)

data/vendor/cmock/lib/cmock_generator.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -22,6 +22,7 @@ class CMockGenerator
     @fail_on_unexpected_calls = @config.fail_on_unexpected_calls
     @exclude_setjmp_h = @config.exclude_setjmp_h
     @subdir = @config.subdir
+    @debug_output = @config.debug_output
 
     @includes_h_pre_orig_header  = ((@config.includes || []) + (@config.includes_h_pre_orig_header || [])).uniq.map { |h| h =~ /</ ? h : "\"#{h}\"" }
     @includes_h_post_orig_header = (@config.includes_h_post_orig_header || []).map { |h| h =~ /</ ? h : "\"#{h}\"" }
@@ -85,6 +86,7 @@ class CMockGenerator
       :skeleton     => true
     }
 
+    @file_writer.create_skeleton_subdir(@subdir)
     create_skeleton_source_file(mock_project)
   end
 
@@ -133,9 +135,9 @@ class CMockGenerator
   end
 
   def create_skeleton_source_file(mock_project)
-    filename = "#{@config.mock_path}/#{"#{@subdir}/" if @subdir}#{mock_project[:module_name]}.c"
+    filename = @file_writer.skeleton_file_path("#{mock_project[:module_name]}.c", @subdir)
     existing = File.exist?(filename) ? File.read(filename) : ''
-    @file_writer.create_file("#{mock_project[:module_name]}.c", @subdir) do |file, fullname|
+    @file_writer.create_skeleton_file("#{mock_project[:module_name]}.c", @subdir) do |file, fullname|
       blank_project = mock_project.clone
       blank_project[:parsed_stuff] = { :functions => [] }
       if existing.empty?
@@ -210,24 +212,30 @@ class CMockGenerator
 
   def create_source_header_section(file, filename, mock_project)
     header_file = (mock_project[:folder] || '') + filename.sub(/.*\K\.c/, mock_project[:module_ext])
-    file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n" unless mock_project[:parsed_stuff][:functions].empty?
-    file << "#include <string.h>\n"
-    file << "#include <stdlib.h>\n"
-    unless @exclude_setjmp_h
-      file << "#include <setjmp.h>\n"
-    end
-    file << "#include \"cmock.h\"\n"
-    @includes_c_pre_header.each { |inc| file << "#include #{inc}\n" }
-    file << "#include \"#{header_file}\"\n"
-    @includes_c_post_header.each { |inc| file << "#include #{inc}\n" }
-    file << "\n"
-    strs = []
-    mock_project[:parsed_stuff][:functions].each do |func|
-      strs << func[:name]
-      func[:args].each { |arg| strs << arg[:name] }
-    end
-    strs.uniq.sort.each do |str|
-      file << "static const char* CMockString_#{str} = \"#{str}\";\n"
+    if mock_project[:skeleton]
+      @includes_c_pre_header.each { |inc| file << "#include #{inc}\n" }
+      file << "#include \"#{header_file}\"\n"
+      @includes_c_post_header.each { |inc| file << "#include #{inc}\n" }
+    else
+      file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n" unless mock_project[:parsed_stuff][:functions].empty?
+      file << "#include <string.h>\n"
+      file << "#include <stdlib.h>\n"
+      unless @exclude_setjmp_h
+        file << "#include <setjmp.h>\n"
+      end
+      file << "#include \"cmock.h\"\n"
+      @includes_c_pre_header.each { |inc| file << "#include #{inc}\n" }
+      file << "#include \"#{header_file}\"\n"
+      @includes_c_post_header.each { |inc| file << "#include #{inc}\n" }
+      file << "\n"
+      strs = []
+      mock_project[:parsed_stuff][:functions].each do |func|
+        strs << func[:name]
+        func[:args].each { |arg| strs << arg[:name] }
+      end
+      strs.uniq.sort.each do |str|
+        file << "static const char* CMockString_#{str} = \"#{str}\";\n"
+      end
     end
     file << "\n"
   end
@@ -296,11 +304,20 @@ class CMockGenerator
     file << "}\n\n"
   end
 
+  def function_return_type(function)
+    # When const_ptr? is true, the "const" in :modifier belongs after the asterisk (e.g. "int* const"),
+    # not as a prefix (which would incorrectly produce "const int*").
+    ret = if function[:return][:const_ptr?]
+            "#{function[:return][:type]} const"
+          else
+            (function[:modifier].empty? ? '' : "#{function[:modifier]} ") + function[:return][:type]
+          end
+    ret + (function[:c_calling_convention] ? " #{function[:c_calling_convention]}" : '')
+  end
+
   def create_mock_implementation(file, function)
     # prepare return value and arguments
-    function_mod_and_rettype = (function[:modifier].empty? ? '' : "#{function[:modifier]} ") +
-                               (function[:return][:type]) +
-                               (function[:c_calling_convention] ? " #{function[:c_calling_convention]}" : '')
+    function_mod_and_rettype = function_return_type(function)
     args_string = function[:args_string]
     args_string += ", #{function[:var_arg]}" unless function[:var_arg].nil?
 
@@ -328,8 +345,10 @@ class CMockGenerator
     file << "  UNITY_LINE_TYPE cmock_line = TEST_LINE_NUM;\n"
     file << "  CMOCK_#{function[:name]}_CALL_INSTANCE* cmock_call_instance;\n"
     file << "  UNITY_SET_DETAIL(CMockString_#{function[:name]});\n"
+    file << "  TEST_MESSAGE(\"CMock: mock #{function[:name]} called\");\n" if @debug_output
     file << "  cmock_call_instance = (CMOCK_#{function[:name]}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.#{function[:name]}_CallInstance);\n"
     file << "  Mock.#{function[:name]}_CallInstance = CMock_Guts_MemNext(Mock.#{function[:name]}_CallInstance);\n"
+    file << @plugins.run(:mock_precheck_return_thru_ptr, function)
     file << @plugins.run(:mock_implementation_precheck, function)
     file << "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, CMockStringCalledMore);\n"
     file << "  cmock_line = cmock_call_instance->LineNumber;\n"
@@ -359,9 +378,7 @@ class CMockGenerator
 
   def create_function_skeleton(file, function, existing)
     # prepare return value and arguments
-    function_mod_and_rettype = (function[:modifier].empty? ? '' : "#{function[:modifier]} ") +
-                               (function[:return][:type]) +
-                               (function[:c_calling_convention] ? " #{function[:c_calling_convention]}" : '')
+    function_mod_and_rettype = function_return_type(function)
     args_string = function[:args_string]
     args_string += ", #{function[:var_arg]}" unless function[:var_arg].nil?
 

data/vendor/cmock/lib/cmock_generator_plugin_array.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -13,6 +13,7 @@ class CMockGeneratorPluginArray
     @config       = config
     @ptr_handling = @config.when_ptr
     @ordered      = @config.enforce_strict_ordering
+    @error_stubs  = @config.create_error_stubs
     @utils        = utils
     @unity_helper = @utils.helpers[:unity_helper]
     @priority     = 8
@@ -20,28 +21,68 @@ class CMockGeneratorPluginArray
 
   def instance_typedefs(function)
     function[:args].inject('') do |all, arg|
-      arg[:ptr?] ? all + "  int Expected_#{arg[:name]}_Depth;\n" : all
+      arg[:ptr?] || arg[:string?] ? all + "  int Expected_#{arg[:name]}_Depth;\n" : all
     end
   end
 
   def mock_function_declarations(function)
     return nil unless function[:contains_ptr?]
 
-    args_call_i = function[:args].map { |m| m[:ptr?] ? "#{m[:name]}, #{m[:name]}_Depth" : (m[:name]).to_s }.join(', ')
-    args_call_o = function[:args].map { |m| m[:ptr?] ? "#{m[:name]}, (#{m[:name]}_Depth)" : (m[:name]).to_s }.join(', ')
+    func_name = function[:name]
+
+    # C function signature: always explicit depth for every pointer/string arg
     args_string = function[:args].map do |m|
-      type = @utils.arg_type_with_const(m)
-      m[:ptr?] ? "#{type} #{m[:name]}, int #{m[:name]}_Depth" : "#{type} #{m[:name]}"
+      m[:ptr?] || m[:string?] ? "#{@utils.arg_declaration(m)}, int #{m[:name]}_Depth" : @utils.arg_declaration(m)
     end.join(', ')
+
+    # Short macro params: paired ptrs (before OR after) omit _Depth (auto-filled from paired size arg)
+    # string? args always need an explicit _Depth
+    args_call_i = function[:args].map do |m|
+      (m[:ptr?] || m[:string?]) && !m[:array_size_name] ? "#{m[:name]}, #{m[:name]}_Depth" : m[:name].to_s
+    end.join(', ')
+
+    # Short macro call: paired ptrs pass paired size name as depth automatically
+    args_call_o = function[:args].map do |m|
+      if (m[:ptr?] || m[:string?]) && m[:array_size_name]
+        "#{m[:name]}, (#{m[:array_size_name]})"
+      elsif m[:ptr?] || m[:string?]
+        "#{m[:name]}, (#{m[:name]}_Depth)"
+      else
+        m[:name].to_s
+      end
+    end.join(', ')
+
+    # Extended macro params: every ptr/string gets an explicit _Depth
+    args_call_ext_i = function[:args].map do |m|
+      m[:ptr?] || m[:string?] ? "#{m[:name]}, #{m[:name]}_Depth" : m[:name].to_s
+    end.join(', ')
+
+    # Extended macro call: every ptr/string passes (name_Depth)
+    args_call_ext_o = function[:args].map do |m|
+      m[:ptr?] || m[:string?] ? "#{m[:name]}, (#{m[:name]}_Depth)" : m[:name].to_s
+    end.join(', ')
+
+    has_paired = function[:args].any? { |m| m[:array_size_name] }
+
+    lines = ''
     if function[:return][:void?]
-      "#define #{function[:name]}_ExpectWithArrayAndReturn(#{args_call_i}, cmock_retval) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectWithArray (not AndReturn)\");\n" \
-      "#define #{function[:name]}_ExpectWithArray(#{args_call_i}) #{function[:name]}_CMockExpectWithArray(__LINE__, #{args_call_o})\n" \
-      "void #{function[:name]}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string});\n"
+      if @error_stubs
+        lines << "#define #{func_name}_ExpectWithArrayAndReturn(#{args_call_i}, cmock_retval) TEST_FAIL_MESSAGE(\"#{func_name} requires _ExpectWithArray (not AndReturn)\");\n"
+        lines << "#define #{func_name}_ExpectWithArrayExtendedAndReturn(#{args_call_ext_i}, cmock_retval) TEST_FAIL_MESSAGE(\"#{func_name} requires _ExpectWithArrayExtended (not AndReturn)\");\n" if has_paired
+      end
+      lines << "#define #{func_name}_ExpectWithArray(#{args_call_i}) #{func_name}_CMockExpectWithArray(__LINE__, #{args_call_o})\n"
+      lines << "#define #{func_name}_ExpectWithArrayExtended(#{args_call_ext_i}) #{func_name}_CMockExpectWithArray(__LINE__, #{args_call_ext_o})\n" if has_paired
+      lines << "void #{func_name}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string});\n"
     else
-      "#define #{function[:name]}_ExpectWithArray(#{args_call_i}) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectWithArrayAndReturn\");\n" \
-      "#define #{function[:name]}_ExpectWithArrayAndReturn(#{args_call_i}, cmock_retval) #{function[:name]}_CMockExpectWithArrayAndReturn(__LINE__, #{args_call_o}, cmock_retval)\n" \
-      "void #{function[:name]}_CMockExpectWithArrayAndReturn(UNITY_LINE_TYPE cmock_line, #{args_string}, #{function[:return][:str]});\n"
+      if @error_stubs
+        lines << "#define #{func_name}_ExpectWithArray(#{args_call_i}) TEST_FAIL_MESSAGE(\"#{func_name} requires _ExpectWithArrayAndReturn\");\n"
+        lines << "#define #{func_name}_ExpectWithArrayExtended(#{args_call_ext_i}) TEST_FAIL_MESSAGE(\"#{func_name} requires _ExpectWithArrayExtendedAndReturn\");\n" if has_paired
+      end
+      lines << "#define #{func_name}_ExpectWithArrayAndReturn(#{args_call_i}, cmock_retval) #{func_name}_CMockExpectWithArrayAndReturn(__LINE__, #{args_call_o}, cmock_retval)\n"
+      lines << "#define #{func_name}_ExpectWithArrayExtendedAndReturn(#{args_call_ext_i}, cmock_retval) #{func_name}_CMockExpectWithArrayAndReturn(__LINE__, #{args_call_ext_o}, cmock_retval)\n" if has_paired
+      lines << "void #{func_name}_CMockExpectWithArrayAndReturn(UNITY_LINE_TYPE cmock_line, #{args_string}, #{function[:return][:str]});\n"
     end
+    lines
   end
 
   def mock_interfaces(function)
@@ -49,11 +90,18 @@ class CMockGeneratorPluginArray
 
     lines = []
     func_name = function[:name]
+
+    # C function: always explicit depth for every pointer/string arg
     args_string = function[:args].map do |m|
-      type = @utils.arg_type_with_const(m)
-      m[:ptr?] ? "#{type} #{m[:name]}, int #{m[:name]}_Depth" : "#{type} #{m[:name]}"
+      m[:ptr?] || m[:string?] ? "#{@utils.arg_declaration(m)}, int #{m[:name]}_Depth" : @utils.arg_declaration(m)
     end.join(', ')
-    call_string = function[:args].map { |m| m[:ptr?] ? "#{m[:name]}, #{m[:name]}_Depth" : m[:name] }.join(', ')
+
+    # Call to CMockExpectParameters_: :before-paired ptrs pass only ptr name (their depth is set from paired size arg)
+    # string? args always pass their depth explicitly
+    call_string = function[:args].map do |m|
+      (m[:ptr?] || m[:string?]) && m[:array_size_order] != :before ? "#{m[:name]}, #{m[:name]}_Depth" : m[:name]
+    end.join(', ')
+
     lines << if function[:return][:void?]
                "void #{func_name}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string})\n"
              else
@@ -62,6 +110,11 @@ class CMockGeneratorPluginArray
     lines << "{\n"
     lines << @utils.code_add_base_expectation(func_name)
     lines << "  CMockExpectParameters_#{func_name}(cmock_call_instance, #{call_string});\n"
+    # Override depths for :before-paired pointers. CMockExpectParameters_ sets these from the paired
+    # size arg; the explicit _Depth param here allows _ExpectWithArrayExtended to override that value.
+    function[:args].each do |arg|
+      lines << "  cmock_call_instance->Expected_#{arg[:name]}_Depth = #{arg[:name]}_Depth;\n" if (arg[:ptr?] || arg[:string?]) && arg[:array_size_order] == :before
+    end
     lines << "  cmock_call_instance->ReturnVal = cmock_to_return;\n" unless function[:return][:void?]
     lines << "}\n\n"
   end

data/vendor/cmock/lib/cmock_generator_plugin_callback.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -15,6 +15,7 @@ class CMockGeneratorPluginCallback
     @priority = 6
 
     @include_count = @config.callback_include_count
+    @debug_output = @config.debug_output
   end
 
   def instance_structure(function)
@@ -33,7 +34,8 @@ class CMockGeneratorPluginCallback
     "typedef #{return_type} (* CMOCK_#{func_name}_CALLBACK)(#{styles[style]});\n" \
     "void #{func_name}_AddCallback(CMOCK_#{func_name}_CALLBACK Callback);\n" \
     "void #{func_name}_Stub(CMOCK_#{func_name}_CALLBACK Callback);\n" \
-    "#define #{func_name}_StubWithCallback #{func_name}_#{action}\n"
+    "#define #{func_name}_StubWithCallback #{func_name}_#{action}\n" \
+    "int #{func_name}_CallCount(void);\n"
   end
 
   def generate_call(function)
@@ -43,7 +45,8 @@ class CMockGeneratorPluginCallback
   end
 
   def mock_implementation(function)
-    "  if (Mock.#{function[:name]}_CallbackFunctionPointer != NULL)\n  {\n" +
+    "  if (Mock.#{function[:name]}_CallbackFunctionPointer != NULL)\n  {\n" \
+    "    UNITY_SET_DETAIL(CMockString_#{function[:name]});\n" +
       if function[:return][:void?]
         "    #{generate_call(function)};\n  }\n"
       else
@@ -70,12 +73,19 @@ class CMockGeneratorPluginCallback
     has_ignore = @config.plugins.include? :ignore
     lines = ''
     lines << "void #{func_name}_AddCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n"
+    lines << "  TEST_MESSAGE(\"CMock: #{func_name}_AddCallback called\");\n" if @debug_output
     lines << "  Mock.#{func_name}_IgnoreBool = (char)0;\n" if has_ignore
     lines << "  Mock.#{func_name}_CallbackBool = (char)1;\n"
+    lines << "  Mock.#{func_name}_CallbackCalls = 0;\n"
     lines << "  Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n"
+    lines << "int #{func_name}_CallCount(void)\n{\n"
+    lines << "  TEST_MESSAGE(\"CMock: #{func_name}_CallCount called\");\n" if @debug_output
+    lines << "  return Mock.#{func_name}_CallbackCalls;\n}\n\n"
     lines << "void #{func_name}_Stub(CMOCK_#{func_name}_CALLBACK Callback)\n{\n"
+    lines << "  TEST_MESSAGE(\"CMock: #{func_name}_Stub called\");\n" if @debug_output
     lines << "  Mock.#{func_name}_IgnoreBool = (char)0;\n" if has_ignore
     lines << "  Mock.#{func_name}_CallbackBool = (char)0;\n"
+    lines << "  Mock.#{func_name}_CallbackCalls = 0;\n"
     lines << "  Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n"
   end
 

data/vendor/cmock/lib/cmock_generator_plugin_cexception.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -29,7 +29,7 @@ class CMockGeneratorPluginCexception
              "void #{function[:name]}_CMockExpectAndThrow(UNITY_LINE_TYPE cmock_line, CEXCEPTION_T cmock_to_throw);\n"
     else
       "#define #{function[:name]}_ExpectAndThrow(#{function[:args_call]}, cmock_to_throw) #{function[:name]}_CMockExpectAndThrow(__LINE__, #{function[:args_call]}, cmock_to_throw)\n" \
-             "void #{function[:name]}_CMockExpectAndThrow(UNITY_LINE_TYPE cmock_line, #{function[:args_string]}, CEXCEPTION_T cmock_to_throw);\n"
+             "void #{function[:name]}_CMockExpectAndThrow(UNITY_LINE_TYPE cmock_line, #{helper_args_string(function)}, CEXCEPTION_T cmock_to_throw);\n"
     end
   end
 
@@ -40,11 +40,20 @@ class CMockGeneratorPluginCexception
   end
 
   def mock_interfaces(function)
-    arg_insert = function[:args_string] == 'void' ? '' : "#{function[:args_string]}, "
+    arg_insert = function[:args_string] == 'void' ? '' : "#{helper_args_string(function)}, "
     ["void #{function[:name]}_CMockExpectAndThrow(UNITY_LINE_TYPE cmock_line, #{arg_insert}CEXCEPTION_T cmock_to_throw)\n{\n",
      @utils.code_add_base_expectation(function[:name]),
      @utils.code_call_argument_loader(function),
      "  cmock_call_instance->ExceptionToThrow = cmock_to_throw;\n",
      "}\n\n"].join
   end
+
+  private
+
+  def helper_args_string(function)
+    return function[:args_string] if function[:args_string] == 'void'
+    return function[:args_string] unless function[:args]&.any? { |m| m.is_a?(Hash) && m[:array_dims] }
+
+    function[:args].map { |m| CMockGeneratorUtils.arg_declaration(m) }.join(', ')
+  end
 end

data/vendor/cmock/lib/cmock_generator_plugin_expect.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   CMock - Automatic Mock Generation for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -13,9 +13,11 @@ class CMockGeneratorPluginExpect
     @config       = config
     @ptr_handling = @config.when_ptr
     @ordered      = @config.enforce_strict_ordering
+    @error_stubs  = @config.create_error_stubs
     @utils        = utils
     @unity_helper = @utils.helpers[:unity_helper]
     @priority     = 5
+    @debug_output = @config.debug_output
 
     if @config.plugins.include? :expect_any_args
       alias :mock_implementation :mock_implementation_might_check_args
@@ -35,25 +37,27 @@ class CMockGeneratorPluginExpect
   end
 
   def mock_function_declarations(function)
+    lines = ''
     if function[:args].empty?
       if function[:return][:void?]
-        "#define #{function[:name]}_ExpectAndReturn(cmock_retval) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _Expect (not AndReturn)\");\n" \
-        "#define #{function[:name]}_Expect() #{function[:name]}_CMockExpect(__LINE__)\n" \
-        "void #{function[:name]}_CMockExpect(UNITY_LINE_TYPE cmock_line);\n"
+        lines << "#define #{function[:name]}_ExpectAndReturn(cmock_retval) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _Expect (not AndReturn)\");\n" if @error_stubs
+        lines << "#define #{function[:name]}_Expect() #{function[:name]}_CMockExpect(__LINE__)\n"
+        lines << "void #{function[:name]}_CMockExpect(UNITY_LINE_TYPE cmock_line);\n"
       else
-        "#define #{function[:name]}_Expect() TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectAndReturn\");\n" \
-        "#define #{function[:name]}_ExpectAndReturn(cmock_retval) #{function[:name]}_CMockExpectAndReturn(__LINE__, cmock_retval)\n" \
-        "void #{function[:name]}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]});\n"
+        lines << "#define #{function[:name]}_Expect() TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectAndReturn\");\n" if @error_stubs
+        lines << "#define #{function[:name]}_ExpectAndReturn(cmock_retval) #{function[:name]}_CMockExpectAndReturn(__LINE__, cmock_retval)\n"
+        lines << "void #{function[:name]}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]});\n"
       end
     elsif function[:return][:void?]
-      "#define #{function[:name]}_ExpectAndReturn(#{function[:args_call]}, cmock_retval) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _Expect (not AndReturn)\");\n" \
-      "#define #{function[:name]}_Expect(#{function[:args_call]}) #{function[:name]}_CMockExpect(__LINE__, #{function[:args_call]})\n" \
-      "void #{function[:name]}_CMockExpect(UNITY_LINE_TYPE cmock_line, #{function[:args_string]});\n"
+      lines << "#define #{function[:name]}_ExpectAndReturn(#{function[:args_call]}, cmock_retval) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _Expect (not AndReturn)\");\n" if @error_stubs
+      lines << "#define #{function[:name]}_Expect(#{function[:args_call]}) #{function[:name]}_CMockExpect(__LINE__, #{function[:args_call]})\n"
+      lines << "void #{function[:name]}_CMockExpect(UNITY_LINE_TYPE cmock_line, #{helper_args_string(function)});\n"
     else
-      "#define #{function[:name]}_Expect(#{function[:args_call]}) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectAndReturn\");\n" \
-      "#define #{function[:name]}_ExpectAndReturn(#{function[:args_call]}, cmock_retval) #{function[:name]}_CMockExpectAndReturn(__LINE__, #{function[:args_call]}, cmock_retval)\n" \
-      "void #{function[:name]}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:args_string]}, #{function[:return][:str]});\n"
+      lines << "#define #{function[:name]}_Expect(#{function[:args_call]}) TEST_FAIL_MESSAGE(\"#{function[:name]} requires _ExpectAndReturn\");\n" if @error_stubs
+      lines << "#define #{function[:name]}_ExpectAndReturn(#{function[:args_call]}, cmock_retval) #{function[:name]}_CMockExpectAndReturn(__LINE__, #{function[:args_call]}, cmock_retval)\n"
+      lines << "void #{function[:name]}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{helper_args_string(function)}, #{function[:return][:str]});\n"
     end
+    lines
   end
 
   def mock_implementation_always_check_args(function)
@@ -82,13 +86,14 @@ class CMockGeneratorPluginExpect
                if function[:args_string] == 'void'
                  "void #{func_name}_CMockExpect(UNITY_LINE_TYPE cmock_line)\n{\n"
                else
-                 "void #{func_name}_CMockExpect(UNITY_LINE_TYPE cmock_line, #{function[:args_string]})\n{\n"
+                 "void #{func_name}_CMockExpect(UNITY_LINE_TYPE cmock_line, #{helper_args_string(function)})\n{\n"
                end
              elsif function[:args_string] == 'void'
                "void #{func_name}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]})\n{\n"
              else
-               "void #{func_name}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:args_string]}, #{function[:return][:str]})\n{\n"
+               "void #{func_name}_CMockExpectAndReturn(UNITY_LINE_TYPE cmock_line, #{helper_args_string(function)}, #{function[:return][:str]})\n{\n"
              end
+    lines << "  TEST_MESSAGE(\"CMock: #{func_name}_#{function[:return][:void?] ? 'Expect' : 'ExpectAndReturn'} called\");\n" if @debug_output
     lines << @utils.code_add_base_expectation(func_name)
     lines << @utils.code_call_argument_loader(function)
     lines << @utils.code_assign_argument_quickly('cmock_call_instance->ReturnVal', function[:return]) unless function[:return][:void?]
@@ -102,4 +107,17 @@ class CMockGeneratorPluginExpect
     "    UNITY_TEST_FAIL(cmock_line, CMockStringCalledLess);\n" \
     "  }\n"
   end
+
+  private
+
+  # Build args string for generated _CMockExpect/_CMockExpectAndReturn helper signatures.
+  # Converts flat array parameters (e.g. POINT_T a[N]) to pointer notation (POINT_T* a)
+  # to avoid GCC -Wstringop-overflow, which treats static array sizes in function
+  # parameters as bounds hints and errors when callers pass smaller objects.
+  def helper_args_string(function)
+    return function[:args_string] if function[:args_string] == 'void'
+    return function[:args_string] unless function[:args]&.any? { |m| m.is_a?(Hash) && m[:array_dims] }
+
+    function[:args].map { |m| CMockGeneratorUtils.arg_declaration(m) }.join(', ')
+  end
 end