ceedling 0.31.0 → 1.0.0

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

@@ -1,3 +1,10 @@
+/* =========================================================================
+    CMock - Automatic Mock Generation for C
+    ThrowTheSwitch.org
+    Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
 #include "unity.h"
 #include "Types.h"
 #include "UsartTransmitBufferStatus.h"

data/vendor/cmock/lib/cmock.rb

@@ -1,8 +1,10 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+#!/bin/ruby
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 ['../config/production_environment',
  'cmock_header_parser',
@@ -59,7 +61,7 @@ def option_maker(options, key, val)
   options ||= {}
   options[key.to_sym] =
     if val.chr == ':'
-      val[1..-1].to_sym
+      val[1..].to_sym
     elsif val.include? ';'
       val.split(';')
     elsif val == 'true'
@@ -86,20 +88,34 @@ if $0 == __FILE__
 
   options = {}
   filelist = []
+  opt_flag = false
   ARGV.each do |arg|
-    if arg =~ /^-o\"?([a-zA-Z0-9@._\\\/:\s]+)\"?/
+    case arg
+    when /^-o"?([a-zA-Z0-9@._\\\/:\s]+)"?/
       options.merge! CMockConfig.load_config_file_from_yaml(arg.gsub(/^-o/, ''))
-    elsif arg == '--skeleton'
+    when /^-o$/
+      opt_flag = true
+    when '--skeleton'
       options[:skeleton] = true
-    elsif arg =~ /^--strippables=\"?(.*)\"?/
+    when '--version'
+      require 'cmock_version'
+      include CMockVersion
+      puts CMOCK_VERSION
+      exit(0)
+    when /^--strippables="?(.*)"?/
       # --strippables are dealt with separately since the user is allowed to
       # enter any valid regular expression as argument
       options = option_maker(options, 'strippables', Regexp.last_match(1))
-    elsif arg =~ /^--([a-zA-Z0-9._\\\/:\s]+)=\"?([a-zA-Z0-9._\-\\\/:\s\;]*)\"?/x
+    when /^--([a-zA-Z0-9._\\\/:\s]+)="?([a-zA-Z0-9._\-\\\/:\s;@#%!$&()*]*)"?/x
       options = option_maker(options, Regexp.last_match(1),
                              Regexp.last_match(2))
     else
-      filelist << arg
+      if opt_flag
+        options.merge! CMockConfig.load_config_file_from_yaml(arg)
+        opt_flag = false
+      else
+        filelist << arg
+      end
     end
   end
 

data/vendor/cmock/lib/cmock_config.rb

@@ -1,8 +1,9 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 class CMockConfig
   CMOCK_DEFAULT_OPTIONS =
@@ -15,7 +16,7 @@ class CMockConfig
       :weak                        => '',
       :subdir                      => nil,
       :plugins                     => [],
-      :strippables                 => ['(?:__attribute__\s*\(+.*?\)+)'],
+      :strippables                 => ['(?:__attribute__\s*\([ (]*.*?[ )]*\)+)'],
       :attributes                  => %w[__ramfunc __irq __fiq register extern],
       :c_calling_conventions       => %w[__stdcall __cdecl __fastcall],
       :enforce_strict_ordering     => false,
@@ -50,7 +51,7 @@ 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*', '(\bstatic\b|\binline\b)\s*'] # 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)
     }.freeze
 
   def initialize(options = nil)
@@ -63,13 +64,13 @@ class CMockConfig
 
     # do some quick type verification
     %i[plugins attributes treat_as_void].each do |opt|
-      unless options[opt].class == Array
+      unless options[opt].instance_of?(Array)
         options[opt] = []
         puts "WARNING: :#{opt} should be an array." unless options[:verbosity] < 1
       end
     end
     %i[includes includes_h_pre_orig_header includes_h_post_orig_header includes_c_pre_header includes_c_post_header].each do |opt|
-      unless options[opt].nil? || (options[opt].class == Array)
+      unless options[opt].nil? || options[opt].instance_of?(Array)
         options[opt] = []
         puts "WARNING: :#{opt} should be an array." unless options[:verbosity] < 1
       end
@@ -81,13 +82,18 @@ class CMockConfig
       require 'pathname'
       includes1 = options[:includes_c_post_header] || []
       includes2 = options[:unity_helper_path].map do |path|
-        Pathname(path).relative_path_from(Pathname(options[:mock_path])).to_s
+        Pathname(File.expand_path(path)).relative_path_from(Pathname(File.expand_path(options[:mock_path]))).to_s
+      rescue StandardError
+        path
       end
       options[:includes_c_post_header] = (includes1 + includes2).uniq
     end
 
     options[:plugins].compact!
     options[:plugins].map!(&:to_sym)
+
+    raise 'The :ignore plugin is required to disable :fail_on_unexpected_calls' if (!options[:plugins].include? :ignore) && (!options[:fail_on_unexpected_calls])
+
     @options = options
 
     treat_as_map = standard_treat_as_map # .clone
@@ -108,7 +114,11 @@ class CMockConfig
   def self.load_config_file_from_yaml(yaml_filename)
     require 'yaml'
     require 'fileutils'
-    YAML.load_file(yaml_filename)[:cmock]
+    begin
+      YAML.load_file(yaml_filename, aliases: true)[:cmock]
+    rescue ArgumentError
+      YAML.load_file(yaml_filename)[:cmock]
+    end
   end
 
   def path(new_path)
@@ -119,7 +129,7 @@ class CMockConfig
     return nil unless @options[:unity_helper_path]
 
     @options[:unity_helper_path].inject('') do |unity_helper, filename|
-      unity_helper + "\n" + File.new(filename).read
+      unity_helper + "\n#{File.new(filename).read}"
     end
   end
 

data/vendor/cmock/lib/cmock_file_writer.rb

@@ -1,8 +1,9 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 class CMockFileWriter
   attr_reader :config
@@ -14,14 +15,14 @@ class CMockFileWriter
   def create_subdir(subdir)
     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}")
+    FileUtils.mkdir_p "#{@config.mock_path}/#{"#{subdir}/" if subdir}" if subdir && !Dir.exist?("#{@config.mock_path}/#{"#{subdir}/" if subdir}")
   end
 
   def create_file(filename, subdir)
     raise "Where's the block of data to create?" unless block_given?
 
-    full_file_name_temp = "#{@config.mock_path}/#{subdir + '/' if subdir}#{filename}.new"
-    full_file_name_done = "#{@config.mock_path}/#{subdir + '/' if subdir}#{filename}"
+    full_file_name_temp = "#{@config.mock_path}/#{"#{subdir}/" if subdir}#{filename}.new"
+    full_file_name_done = "#{@config.mock_path}/#{"#{subdir}/" if subdir}#{filename}"
     File.open(full_file_name_temp, 'w') do |file|
       yield(file, filename)
     end
@@ -31,7 +32,7 @@ class CMockFileWriter
   def append_file(filename, subdir)
     raise "Where's the block of data to create?" unless block_given?
 
-    full_file_name = "#{@config.skeleton_path}/#{subdir + '/' if subdir}#{filename}"
+    full_file_name = "#{@config.skeleton_path}/#{"#{subdir}/" if subdir}#{filename}"
     File.open(full_file_name, 'a') do |file|
       yield(file, filename)
     end
@@ -41,8 +42,7 @@ class CMockFileWriter
 
   def update_file(dest, src)
     require 'fileutils'
-    FileUtils.rm(dest) if File.exist?(dest)
-    FileUtils.cp(src, dest)
-    FileUtils.rm(src)
+    FileUtils.rm(dest, :force => true)
+    FileUtils.mv(src, dest)
   end
 end

data/vendor/cmock/lib/cmock_generator.rb

@@ -1,8 +1,9 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 class CMockGenerator
   attr_accessor :config, :file_writer, :module_name, :module_ext, :clean_mock_name, :mock_name, :utils, :plugins, :weak, :ordered
@@ -20,11 +21,9 @@ class CMockGenerator
     @framework = @config.framework.to_s
     @fail_on_unexpected_calls = @config.fail_on_unexpected_calls
     @exclude_setjmp_h = @config.exclude_setjmp_h
-
     @subdir = @config.subdir
-    @folder = nil
 
-    @includes_h_pre_orig_header  = (@config.includes || @config.includes_h_pre_orig_header || []).map { |h| h =~ /</ ? h : "\"#{h}\"" }
+    @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}\"" }
     @includes_c_pre_header       = (@config.includes_c_pre_header || []).map { |h| h =~ /</ ? h : "\"#{h}\"" }
     @includes_c_post_header      = (@config.includes_c_post_header || []).map { |h| h =~ /</ ? h : "\"#{h}\"" }
@@ -47,54 +46,70 @@ class CMockGenerator
   end
 
   def create_mock(module_name, parsed_stuff, module_ext = nil, folder = nil)
-    @module_name = module_name
-    @module_ext  = module_ext || '.h'
-    @mock_name   = @prefix + @module_name + @suffix
-    @clean_mock_name = TypeSanitizer.sanitize_c_identifier(@mock_name)
-
-    @folder = if folder && @subdir
-                File.join(@subdir, folder)
-              elsif @subdir
-                @subdir
-              else
-                folder
-              end
-    # adds a trailing slash to the folder output
-    @folder = File.join(@folder, '') if @folder
-
-    create_mock_subdir
+    # determine the name for our new mock
+    mock_name = @prefix + module_name + @suffix
+
+    # determine the folder our mock will reside
+    mock_folder = if folder && @subdir
+                    File.join(@subdir, folder)
+                  elsif @subdir
+                    @subdir
+                  else
+                    folder
+                  end
 
-    create_mock_header_file(parsed_stuff)
-    create_mock_source_file(parsed_stuff)
+    # adds a trailing slash to the folder output
+    mock_folder = File.join(mock_folder, '') if mock_folder
+
+    # create out mock project from incoming data
+    mock_project = {
+      :module_name  => module_name,
+      :module_ext   => (module_ext || '.h'),
+      :mock_name    => mock_name,
+      :clean_name   => TypeSanitizer.sanitize_c_identifier(mock_name),
+      :folder       => mock_folder,
+      :parsed_stuff => parsed_stuff,
+      :skeleton     => false
+    }
+
+    create_mock_subdir(mock_project)
+    create_mock_header_file(mock_project)
+    create_mock_source_file(mock_project)
   end
 
   def create_skeleton(module_name, parsed_stuff)
-    @module_name = module_name
-    create_skeleton_source_file(parsed_stuff)
+    mock_project = {
+      :module_name  => module_name,
+      :module_ext   => '.h',
+      :parsed_stuff => parsed_stuff,
+      :skeleton     => true
+    }
+
+    create_skeleton_source_file(mock_project)
   end
 
   private if $ThisIsOnlyATest.nil? ##############################
 
-  def create_mock_subdir
-    @file_writer.create_subdir(@folder)
+  def create_mock_subdir(mock_project)
+    @file_writer.create_subdir(mock_project[:folder])
   end
 
   def create_using_statement(file, function)
     file << "using namespace #{function[:namespace].join('::')};\n" unless function[:namespace].empty?
   end
 
-  def create_mock_header_file(parsed_stuff)
+  def create_mock_header_file(mock_project)
     if @include_inline == :include
-      @file_writer.create_file(@module_name + (@module_ext || '.h'), @folder) do |file, _filename|
-        file << parsed_stuff[:normalized_source]
+      @file_writer.create_file(mock_project[:module_name] + (mock_project[:module_ext]), mock_project[:folder]) do |file, _filename|
+        file << mock_project[:parsed_stuff][:normalized_source]
       end
     end
 
-    @file_writer.create_file(@mock_name + (@module_ext || '.h'), @folder) do |file, filename|
-      create_mock_header_header(file, filename)
-      create_mock_header_service_call_declarations(file)
-      create_typedefs(file, parsed_stuff[:typedefs])
-      parsed_stuff[:functions].each do |function|
+    @file_writer.create_file(mock_project[:mock_name] + mock_project[:module_ext], mock_project[:folder]) do |file, filename|
+      create_mock_header_header(file, filename, mock_project)
+      create_mock_header_service_call_declarations(file, mock_project)
+      create_typedefs(file, mock_project)
+      mock_project[:parsed_stuff][:functions].each do |function|
         create_using_statement(file, function)
         file << @plugins.run(:mock_function_declarations, function)
       end
@@ -102,41 +117,48 @@ class CMockGenerator
     end
   end
 
-  def create_mock_source_file(parsed_stuff)
-    @file_writer.create_file(@mock_name + '.c', @folder) do |file, filename|
-      create_source_header_section(file, filename, parsed_stuff[:functions])
-      create_instance_structure(file, parsed_stuff[:functions])
+  def create_mock_source_file(mock_project)
+    @file_writer.create_file("#{mock_project[:mock_name]}.c", mock_project[:folder]) do |file, filename|
+      create_source_header_section(file, filename, mock_project)
+      create_instance_structure(file, mock_project)
       create_extern_declarations(file)
-      create_mock_verify_function(file, parsed_stuff[:functions])
-      create_mock_init_function(file)
-      create_mock_destroy_function(file, parsed_stuff[:functions])
-      parsed_stuff[:functions].each do |function|
+      create_mock_verify_function(file, mock_project)
+      create_mock_init_function(file, mock_project)
+      create_mock_destroy_function(file, mock_project)
+      mock_project[:parsed_stuff][:functions].each do |function|
         create_mock_implementation(file, function)
         create_mock_interfaces(file, function)
       end
     end
   end
 
-  def create_skeleton_source_file(parsed_stuff)
-    filename = "#{@config.mock_path}/#{@subdir + '/' if @subdir}#{module_name}.c"
+  def create_skeleton_source_file(mock_project)
+    filename = "#{@config.mock_path}/#{"#{@subdir}/" if @subdir}#{mock_project[:module_name]}.c"
     existing = File.exist?(filename) ? File.read(filename) : ''
-    @file_writer.append_file(@module_name + '.c', @subdir) do |file, fullname|
-      create_source_header_section(file, fullname, []) if existing.empty?
-      parsed_stuff[:functions].each do |function|
+    @file_writer.create_file("#{mock_project[:module_name]}.c", @subdir) do |file, fullname|
+      blank_project = mock_project.clone
+      blank_project[:parsed_stuff] = { :functions => [] }
+      if existing.empty?
+        create_source_header_section(file, fullname, blank_project)
+      else
+        file << existing
+        file << "\n" if existing[-1] != "\n"
+      end
+      mock_project[:parsed_stuff][:functions].each do |function|
         create_function_skeleton(file, function, existing)
       end
     end
   end
 
-  def create_mock_header_header(file, _filename)
-    define_name   = @clean_mock_name.upcase
-    orig_filename = (@folder || '') + @module_name + (@module_ext || '.h')
+  def create_mock_header_header(file, _filename, mock_project)
+    define_name = mock_project[:clean_name].upcase
+    orig_filename = (mock_project[:folder] || '') + mock_project[:module_name] + mock_project[:module_ext]
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
     file << "#ifndef _#{define_name}_H\n"
     file << "#define _#{define_name}_H\n\n"
     file << "#include \"#{@framework}.h\"\n"
     @includes_h_pre_orig_header.each { |inc| file << "#include #{inc}\n" }
-    file << @config.orig_header_include_fmt.gsub(/%s/, orig_filename.to_s) + "\n"
+    file << "#{@config.orig_header_include_fmt.gsub(/%s/, orig_filename.to_s)}\n"
     @includes_h_post_orig_header.each { |inc| file << "#include #{inc}\n" }
     plugin_includes = @plugins.run(:include_files)
     file << plugin_includes unless plugin_includes.empty?
@@ -153,21 +175,29 @@ class CMockGenerator
     file << "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n"
     file << "#endif\n"
     file << "\n"
+    file << "#ifdef __cplusplus\n"
+    file << "extern \"C\" {\n"
+    file << "#endif\n"
+    file << "\n"
   end
 
-  def create_typedefs(file, typedefs)
+  def create_typedefs(file, mock_project)
     file << "\n"
-    typedefs.each { |typedef| file << "#{typedef}\n" }
+    mock_project[:parsed_stuff][:typedefs].each { |typedef| file << "#{typedef}\n" }
     file << "\n\n"
   end
 
-  def create_mock_header_service_call_declarations(file)
-    file << "void #{@clean_mock_name}_Init(void);\n"
-    file << "void #{@clean_mock_name}_Destroy(void);\n"
-    file << "void #{@clean_mock_name}_Verify(void);\n\n"
+  def create_mock_header_service_call_declarations(file, mock_project)
+    file << "void #{mock_project[:clean_name]}_Init(void);\n"
+    file << "void #{mock_project[:clean_name]}_Destroy(void);\n"
+    file << "void #{mock_project[:clean_name]}_Verify(void);\n\n"
   end
 
   def create_mock_header_footer(header)
+    header << "\n"
+    header << "#ifdef __cplusplus\n"
+    header << "}\n"
+    header << "#endif\n"
     header << "\n"
     header << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
     header << "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n"
@@ -178,9 +208,9 @@ class CMockGenerator
     header << "#endif\n"
   end
 
-  def create_source_header_section(file, filename, functions)
-    header_file = (@folder || '') + filename.gsub('.c', (@module_ext || '.h'))
-    file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n" unless functions.empty?
+  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
@@ -192,7 +222,7 @@ class CMockGenerator
     @includes_c_post_header.each { |inc| file << "#include #{inc}\n" }
     file << "\n"
     strs = []
-    functions.each do |func|
+    mock_project[:parsed_stuff][:functions].each do |func|
       strs << func[:name]
       func[:args].each { |arg| strs << arg[:name] }
     end
@@ -202,14 +232,15 @@ class CMockGenerator
     file << "\n"
   end
 
-  def create_instance_structure(file, functions)
+  def create_instance_structure(file, mock_project)
+    functions = mock_project[:parsed_stuff][:functions]
     functions.each do |function|
       file << "typedef struct _CMOCK_#{function[:name]}_CALL_INSTANCE\n{\n"
       file << "  UNITY_LINE_TYPE LineNumber;\n"
       file << @plugins.run(:instance_typedefs, function)
       file << "\n} CMOCK_#{function[:name]}_CALL_INSTANCE;\n\n"
     end
-    file << "static struct #{@clean_mock_name}Instance\n{\n"
+    file << "static struct #{mock_project[:clean_name]}Instance\n{\n"
     if functions.empty?
       file << "  unsigned char placeHolder;\n"
     end
@@ -221,9 +252,6 @@ class CMockGenerator
   end
 
   def create_extern_declarations(file)
-    unless @exclude_setjmp_h
-      file << "extern jmp_buf AbortFrame;\n"
-    end
     if @ordered
       file << "extern int GlobalExpectCount;\n"
       file << "extern int GlobalVerifyOrder;\n"
@@ -231,9 +259,9 @@ class CMockGenerator
     file << "\n"
   end
 
-  def create_mock_verify_function(file, functions)
-    file << "void #{@clean_mock_name}_Verify(void)\n{\n"
-    verifications = functions.collect do |function|
+  def create_mock_verify_function(file, mock_project)
+    file << "void #{mock_project[:clean_name]}_Verify(void)\n{\n"
+    verifications = mock_project[:parsed_stuff][:functions].collect do |function|
       v = @plugins.run(:mock_verify, function)
       v.empty? ? v : ["  call_instance = Mock.#{function[:name]}_CallInstance;\n", v]
     end.join
@@ -245,20 +273,20 @@ class CMockGenerator
     file << "}\n\n"
   end
 
-  def create_mock_init_function(file)
-    file << "void #{@clean_mock_name}_Init(void)\n{\n"
-    file << "  #{@clean_mock_name}_Destroy();\n"
+  def create_mock_init_function(file, mock_project)
+    file << "void #{mock_project[:clean_name]}_Init(void)\n{\n"
+    file << "  #{mock_project[:clean_name]}_Destroy();\n"
     file << "}\n\n"
   end
 
-  def create_mock_destroy_function(file, functions)
-    file << "void #{@clean_mock_name}_Destroy(void)\n{\n"
+  def create_mock_destroy_function(file, mock_project)
+    file << "void #{mock_project[:clean_name]}_Destroy(void)\n{\n"
     file << "  CMock_Guts_MemFreeAll();\n"
     file << "  memset(&Mock, 0, sizeof(Mock));\n"
-    file << functions.collect { |function| @plugins.run(:mock_destroy, function) }.join
+    file << mock_project[:parsed_stuff][:functions].collect { |function| @plugins.run(:mock_destroy, function) }.join
 
     unless @fail_on_unexpected_calls
-      file << functions.collect { |function| @plugins.run(:mock_ignore, function) }.join
+      file << mock_project[:parsed_stuff][:functions].collect { |function| @plugins.run(:mock_ignore, function) }.join
     end
 
     if @ordered
@@ -274,7 +302,7 @@ class CMockGenerator
                                (function[:return][:type]) +
                                (function[:c_calling_convention] ? " #{function[:c_calling_convention]}" : '')
     args_string = function[:args_string]
-    args_string += (', ' + function[:var_arg]) unless function[:var_arg].nil?
+    args_string += ", #{function[:var_arg]}" unless function[:var_arg].nil?
 
     # Encapsulate in namespace(s) if applicable
     function[:namespace].each do |ns|
@@ -335,7 +363,7 @@ class CMockGenerator
                                (function[:return][:type]) +
                                (function[:c_calling_convention] ? " #{function[:c_calling_convention]}" : '')
     args_string = function[:args_string]
-    args_string += (', ' + function[:var_arg]) unless function[:var_arg].nil?
+    args_string += ", #{function[:var_arg]}" unless function[:var_arg].nil?
 
     decl = "#{function_mod_and_rettype} #{function[:name]}(#{args_string})"
 
@@ -345,7 +373,7 @@ class CMockGenerator
     file << "{\n"
     file << "  /*TODO: Implement Me!*/\n"
     function[:args].each { |arg| file << "  (void)#{arg[:name]};\n" }
-    file << "  return (#{(function[:return][:type])})0;\n" unless function[:return][:void?]
+    file << "  return (#{function[:return][:type]})0;\n" unless function[:return][:void?]
     file << "}\n\n"
   end
 end

data/vendor/cmock/lib/cmock_generator_plugin_array.rb

@@ -1,12 +1,14 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 class CMockGeneratorPluginArray
   attr_reader :priority
   attr_accessor :config, :utils, :unity_helper, :ordered
+
   def initialize(config, utils)
     @config       = config
     @ptr_handling = @config.when_ptr
@@ -25,17 +27,20 @@ class CMockGeneratorPluginArray
   def mock_function_declarations(function)
     return nil unless function[:contains_ptr?]
 
-    args_call   = function[:args].map { |m| m[:ptr?] ? "#{m[:name]}, #{m[:name]}_Depth" : (m[:name]).to_s }.join(', ')
+    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(', ')
     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]}"
     end.join(', ')
     if function[:return][:void?]
-      return "#define #{function[:name]}_ExpectWithArray(#{args_call}) #{function[:name]}_CMockExpectWithArray(__LINE__, #{args_call})\n" \
-             "void #{function[:name]}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string});\n"
+      "#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"
     else
-      return "#define #{function[:name]}_ExpectWithArrayAndReturn(#{args_call}, cmock_retval) #{function[:name]}_CMockExpectWithArrayAndReturn(__LINE__, #{args_call}, cmock_retval)\n" \
-             "void #{function[:name]}_CMockExpectWithArrayAndReturn(UNITY_LINE_TYPE cmock_line, #{args_string}, #{function[:return][:str]});\n"
+      "#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"
     end
   end
 

data/vendor/cmock/lib/cmock_generator_plugin_callback.rb

@@ -1,13 +1,13 @@
-# ==========================================
-#   CMock Project - Automatic Mock Generation for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
+# =========================================================================
+#   CMock - Automatic Mock Generation for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
 class CMockGeneratorPluginCallback
   attr_accessor :include_count
-  attr_reader :priority
-  attr_reader :config, :utils
+  attr_reader :priority, :config, :utils
 
   def initialize(config, utils)
     @config = config