ceedling 0.15.1 → 0.15.2

data/vendor/cmock/docs/license.txt

@@ -1,4 +1,4 @@
- Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+ Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
 
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

data/vendor/cmock/lib/cmock.rb

@@ -2,7 +2,7 @@
 #   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]
-# ========================================== 
+# ==========================================
 
 [ "../config/production_environment",
   "cmock_header_parser",
@@ -13,10 +13,13 @@
   "cmock_generator_utils",
   "cmock_unityhelper_parser"].each {|req| require "#{File.expand_path(File.dirname(__FILE__))}/#{req}"}
 
+
+$QUICK_RUBY_VERSION = RUBY_VERSION.split('.').inject(0){|vv,v| vv * 100 + v.to_i }
+
 class CMock
-  
+
   def initialize(options=nil)
-    cm_config      = CMockConfig.new(options)    
+    cm_config      = CMockConfig.new(options)
     cm_unityhelper = CMockUnityHelperParser.new(cm_config)
     cm_writer      = CMockFileWriter.new(cm_config)
     cm_gen_utils   = CMockGeneratorUtils.new(cm_config, {:unity_helper => cm_unityhelper})
@@ -25,7 +28,7 @@ class CMock
     @cm_generator  = CMockGenerator.new(cm_config, cm_writer, cm_gen_utils, cm_gen_plugins)
     @silent        = (cm_config.verbosity < 2)
   end
-  
+
   def setup_mocks(files)
     [files].flatten.each do |src|
       generate_mock src
@@ -41,25 +44,46 @@ class CMock
   end
 end
 
+def option_maker(options, key, val)
+  options = options || {}
+  options[key.to_sym] =
+    if val.chr == ":"
+      val[1..-1].to_sym
+    elsif val.include? ";"
+      val.split(';')
+    elsif val == 'true'
+      true
+    elsif val == 'false'
+      false
+    elsif val =~ /^\d+$/
+      val.to_i
+    else
+      val
+    end
+  options
+end
+
   # Command Line Support ###############################
-  
+
 if ($0 == __FILE__)
   usage = "usage: ruby #{__FILE__} (-oOptionsFile) File(s)ToMock"
-  
+
   if (!ARGV[0])
     puts usage
     exit 1
   end
-  
-  options = nil
+
+  options = {}
   filelist = []
   ARGV.each do |arg|
-    if (arg =~ /^-o(\w*)/)
-      options = arg.gsub(/^-o/,'')
+    if (arg =~ /^-o\"?([a-zA-Z0-9._\\\/:\s]+)\"?/)
+      options.merge! CMockConfig.load_config_file_from_yaml( arg.gsub(/^-o/,'') )
+    elsif (arg =~ /^--([a-zA-Z0-9._\\\/:\s]+)=\"?([a-zA-Z0-9._\\\/:\s\;]+)\"?/)
+      options = option_maker(options, $1, $2)
     else
       filelist << arg
     end
   end
-  
+
   CMock.new(options).setup_mocks(filelist)
-end
+end

data/vendor/cmock/lib/cmock_config.rb

@@ -2,46 +2,45 @@
 #   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]
-# ========================================== 
+# ==========================================
 
 class CMockConfig
-  
-  CMockDefaultOptions = 
+
+  CMockDefaultOptions =
   {
-    :framework                => :unity,
-    :mock_path                => 'mocks',
-    :mock_prefix              => 'Mock',
-    :plugins                  => [],
-    :strippables              => ['(?:__attribute__\s*\(+.*?\)+)'],
-    :attributes               => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
-    :c_calling_conventions    => ['__stdcall', '__cdecl', '__fastcall'],
-    :enforce_strict_ordering  => false,
-    :unity_helper_path        => false,
-    :treat_as                 => {},
-    :treat_as_void            => [],
-    :memcmp_if_unknown        => true,
-    :when_no_prototypes       => :warn,           #the options being :ignore, :warn, or :error
-    :when_ptr                 => :compare_data,   #the options being :compare_ptr, :compare_data, or :smart
-    :verbosity                => 2,               #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose
-    :treat_externs            => :exclude,        #the options being :include or :exclude
-    :ignore                   => :args_and_calls, #the options being :args_and_calls or :args_only
-    :callback_include_count   => true,
-    :callback_after_arg_check => false,
-    :includes                    => nil, 
-    :includes_h_pre_orig_header  => nil, 
-    :includes_h_post_orig_header => nil, 
-    :includes_c_pre_header       => nil, 
-    :includes_c_post_header      => nil
+    :framework                   => :unity,
+    :mock_path                   => 'mocks',
+    :mock_prefix                 => 'Mock',
+    :plugins                     => [],
+    :strippables                 => ['(?:__attribute__\s*\(+.*?\)+)'],
+    :attributes                  => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
+    :c_calling_conventions       => ['__stdcall', '__cdecl', '__fastcall'],
+    :enforce_strict_ordering     => false,
+    :unity_helper_path           => false,
+    :treat_as                    => {},
+    :treat_as_void               => [],
+    :memcmp_if_unknown           => true,
+    :when_no_prototypes          => :warn,           #the options being :ignore, :warn, or :error
+    :when_ptr                    => :compare_data,   #the options being :compare_ptr, :compare_data, or :smart
+    :verbosity                   => 2,               #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose
+    :treat_externs               => :exclude,        #the options being :include or :exclude
+    :callback_include_count      => true,
+    :callback_after_arg_check    => false,
+    :includes                    => nil,
+    :includes_h_pre_orig_header  => nil,
+    :includes_h_post_orig_header => nil,
+    :includes_c_pre_header       => nil,
+    :includes_c_post_header      => nil,
   }
-  
+
   def initialize(options=nil)
     case(options)
-      when NilClass then options = CMockDefaultOptions.clone 
+      when NilClass then options = CMockDefaultOptions.clone
       when String   then options = CMockDefaultOptions.clone.merge(load_config_file_from_yaml(options))
       when Hash     then options = CMockDefaultOptions.clone.merge(options)
       else          raise "If you specify arguments, it should be a filename or a hash of options"
     end
-    
+
     #do some quick type verification
     [:plugins, :attributes, :treat_as_void].each do |opt|
       unless (options[opt].class == Array)
@@ -59,30 +58,34 @@ class CMockConfig
     options[:plugins].compact!
     options[:plugins].map! {|p| p.to_sym}
     @options = options
-    
+
     treat_as_map = standard_treat_as_map()#.clone
     treat_as_map.merge!(@options[:treat_as])
     @options[:treat_as] = treat_as_map
-    
+
     @options.each_key { |key| eval("def #{key.to_s}() return @options[:#{key.to_s}] end") }
   end
-  
+
   def load_config_file_from_yaml yaml_filename
+    self.class.load_config_file_from_yaml yaml_filename
+  end
+
+  def self.load_config_file_from_yaml yaml_filename
     require 'yaml'
     require 'fileutils'
     YAML.load_file(yaml_filename)[:cmock]
   end
-  
+
   def set_path(path)
     @src_path = path
   end
-  
+
   def load_unity_helper
     return File.new(@options[:unity_helper_path]).read if (@options[:unity_helper_path])
     return nil
   end
 
-  def standard_treat_as_map 
+  def standard_treat_as_map
     {
       'int'             => 'INT',
       'char'            => 'INT8',

data/vendor/cmock/lib/cmock_generator.rb

@@ -2,14 +2,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]
-# ========================================== 
+# ==========================================
 
 $here = File.dirname __FILE__
 
 class CMockGenerator
 
   attr_accessor :config, :file_writer, :module_name, :clean_mock_name, :mock_name, :utils, :plugins, :ordered
-  
+
   def initialize(config, file_writer, utils, plugins)
     @file_writer = file_writer
     @utils       = utils
@@ -18,7 +18,7 @@ class CMockGenerator
     @prefix      = @config.mock_prefix
     @ordered     = @config.enforce_strict_ordering
     @framework   = @config.framework.to_s
-    
+
     @includes_h_pre_orig_header  = (@config.includes || @config.includes_h_pre_orig_header || []).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}\""}
@@ -32,9 +32,9 @@ class CMockGenerator
     create_mock_header_file(parsed_stuff)
     create_mock_source_file(parsed_stuff)
   end
-  
+
   private if $ThisIsOnlyATest.nil? ##############################
-  
+
   def create_mock_header_file(parsed_stuff)
     @file_writer.create_file(@mock_name + ".h") do |file, filename|
       create_mock_header_header(file, filename)
@@ -61,28 +61,35 @@ class CMockGenerator
       end
     end
   end
-  
-  def create_mock_header_header(file, filename) 
-    define_name   = @clean_mock_name.gsub(/\.h/, "_h").upcase
-    orig_filename = filename.gsub(@config.mock_prefix, "")   
+
+  def create_mock_header_header(file, filename)
+    define_name   = @clean_mock_name.gsub(/[-\/\\\.\,\s]+/,'_').upcase
+    orig_filename = filename[@config.mock_prefix.size..-1]
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
     file << "#ifndef _#{define_name}_H\n"
     file << "#define _#{define_name}_H\n\n"
-    @includes_h_pre_orig_header.each {|inc| file << "#include #{inc}\n"} 
+    @includes_h_pre_orig_header.each {|inc| file << "#include #{inc}\n"}
     file << "#include \"#{orig_filename}\"\n"
     @includes_h_post_orig_header.each {|inc| file << "#include #{inc}\n"}
     plugin_includes = @plugins.run(:include_files)
     file << plugin_includes if (!plugin_includes.empty?)
     file << "\n"
+    file << "/* Ignore the following warnings, since we are copying code */\n"
+    file << "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n"
+    file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n"
+    file << "#endif\n"
+    file << "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n"
+    file << "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n"
+    file << "\n"
   end
-  
+
   def create_typedefs(file, typedefs)
     file << "\n"
     typedefs.each {|typedef| file << "#{typedef}\n" }
     file << "\n\n"
   end
 
-  def create_mock_header_service_call_declarations(file) 
+  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"
@@ -91,7 +98,7 @@ class CMockGenerator
   def create_mock_header_footer(header)
     header << "\n#endif\n"
   end
-  
+
   def create_source_header_section(file, filename)
     header_file = filename.gsub(".c",".h")
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
@@ -105,9 +112,9 @@ class CMockGenerator
     @includes_c_post_header.each {|inc| file << "#include #{inc}\n"}
     file << "\n"
   end
-  
+
   def create_instance_structure(file, functions)
-    functions.each do |function| 
+    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)
@@ -123,7 +130,7 @@ class CMockGenerator
     end
     file << "} Mock;\n\n"
   end
-  
+
   def create_extern_declarations(file)
     file << "extern jmp_buf AbortFrame;\n"
     if (@ordered)
@@ -132,7 +139,7 @@ class CMockGenerator
     end
     file << "\n"
   end
-  
+
   def create_mock_verify_function(file, functions)
     file << "void #{@clean_mock_name}_Verify(void)\n{\n"
     verifications = functions.collect {|function| @plugins.run(:mock_verify, function)}.join
@@ -140,13 +147,13 @@ class CMockGenerator
     file << verifications
     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"
     file << "}\n\n"
   end
-  
+
   def create_mock_destroy_function(file, functions)
     file << "void #{@clean_mock_name}_Destroy(void)\n{\n"
     file << "  CMock_Guts_MemFreeAll();\n"
@@ -158,15 +165,15 @@ class CMockGenerator
     end
     file << "}\n\n"
   end
-  
-  def create_mock_implementation(file, function)        
-    # prepare return value and arguments       
+
+  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]}" : '')
     args_string = function[:args_string]
     args_string += (", " + function[:var_arg]) unless (function[:var_arg].nil?)
-    
+
     # Create mock function
     file << "#{function_mod_and_rettype} #{function[:name]}(#{args_string})\n"
     file << "{\n"
@@ -183,11 +190,12 @@ class CMockGenerator
       file << "    UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called later than expected.\");\n"
       # file << "  UNITY_TEST_ASSERT((cmock_call_instance->CallOrder == ++GlobalVerifyOrder), cmock_line, \"Out of order function calls. Function '#{function[:name]}'\");\n"
     end
+    return_type_cast = function[:return][:const?] ? "(const #{function[:return][:type]})" : ''
     file << @plugins.run(:mock_implementation, function)
-    file << "  return cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?]) 
+    file << "  return #{return_type_cast}cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?])
     file << "}\n\n"
   end
-  
+
   def create_mock_interfaces(file, function)
     file << @utils.code_add_argument_loader(function)
     file << @plugins.run(:mock_interfaces, function)

data/vendor/cmock/lib/cmock_generator_plugin_expect_any_args.rb

@@ -0,0 +1,68 @@
+# ==========================================
+#   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]
+# ==========================================
+
+class CMockGeneratorPluginExpectAnyArgs
+
+  attr_reader :priority
+  attr_reader :config, :utils
+
+  def initialize(config, utils)
+    @config = config
+    @utils = utils
+    @priority = 3
+  end
+
+  def instance_structure(function)
+    if (function[:return][:void?]) || (@config.plugins.include? :ignore)
+      ""
+    else
+      "  #{function[:return][:type]} #{function[:name]}_FinalReturn;\n"
+    end
+  end
+
+  def instance_typedefs(function)
+    "  CMOCK_ARG_MODE IgnoreMode;\n"
+  end
+
+  def mock_function_declarations(function)
+
+    if (function[:return][:void?])
+      return "#define #{function[:name]}_ExpectAnyArgs() #{function[:name]}_CMockExpectAnyArgs(__LINE__)\n" +
+             "void #{function[:name]}_CMockExpectAnyArgs(UNITY_LINE_TYPE cmock_line);\n"
+    else
+      return "#define #{function[:name]}_ExpectAnyArgsAndReturn(cmock_retval) #{function[:name]}_CMockExpectAnyArgsAndReturn(__LINE__, cmock_retval)\n" +
+             "void #{function[:name]}_CMockExpectAnyArgsAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]});\n"
+    end
+  end
+
+  def mock_implementation(function)
+    lines = "  if (cmock_call_instance->IgnoreMode == CMOCK_ARG_NONE)\n  {\n"
+    if (function[:return][:void?])
+      lines << "    return;\n  }\n"
+    else
+      retval = function[:return].merge( { :name => "cmock_call_instance->ReturnVal"} )
+      lines << "  " + @utils.code_assign_argument_quickly("Mock.#{function[:name]}_FinalReturn", retval) unless (retval[:void?])
+      return_type_cast = function[:return][:const?] ? "(const #{function[:return][:type]})" : ''
+      lines << "    return #{return_type_cast}cmock_call_instance->ReturnVal;\n  }\n"
+    end
+    lines
+  end
+
+  def mock_interfaces(function)
+    lines = ""
+    if (function[:return][:void?])
+      lines << "void #{function[:name]}_CMockExpectAnyArgs(UNITY_LINE_TYPE cmock_line)\n{\n"
+    else
+      lines << "void #{function[:name]}_CMockExpectAnyArgsAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]})\n{\n"
+    end
+    lines << @utils.code_add_base_expectation(function[:name], true)
+    unless (function[:return][:void?])
+      lines << "  cmock_call_instance->ReturnVal = cmock_to_return;\n"
+    end
+    lines << "  cmock_call_instance->IgnoreMode = CMOCK_ARG_NONE;\n"
+    lines << "}\n\n"
+  end
+end

data/vendor/cmock/lib/cmock_generator_plugin_ignore.rb

@@ -2,28 +2,19 @@
 #   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]
-# ========================================== 
+# ==========================================
 
 class CMockGeneratorPluginIgnore
 
   attr_reader :priority
   attr_reader :config, :utils
-  
+
   def initialize(config, utils)
     @config = config
-    if (@config.ignore == :args_and_calls)
-      alias :mock_implementation_precheck :mock_implementation_for_ignores
-      alias :mock_implementation          :nothing
-      alias :mock_verify                  :mock_conditionally_verify_counts
-    else
-      alias :mock_implementation          :mock_implementation_for_ignores
-      alias :mock_implementation_precheck :nothing
-      alias :mock_verify                  :nothing
-    end
     @utils = utils
     @priority = 2
   end
-  
+
   def instance_structure(function)
     if (function[:return][:void?])
       "  int #{function[:name]}_IgnoreBool;\n"
@@ -31,50 +22,39 @@ class CMockGeneratorPluginIgnore
       "  int #{function[:name]}_IgnoreBool;\n  #{function[:return][:type]} #{function[:name]}_FinalReturn;\n"
     end
   end
-  
+
   def mock_function_declarations(function)
     if (function[:return][:void?])
-      if (@config.ignore == :args_only)
-        return "#define #{function[:name]}_Ignore() #{function[:name]}_CMockIgnore(__LINE__)\n" +
-               "void #{function[:name]}_CMockIgnore(UNITY_LINE_TYPE cmock_line);\n"
-      else
-        return "#define #{function[:name]}_Ignore() #{function[:name]}_CMockIgnore()\n" +
-               "void #{function[:name]}_CMockIgnore(void);\n"
-      end
-    else        
+      return "#define #{function[:name]}_Ignore() #{function[:name]}_CMockIgnore()\n" +
+             "void #{function[:name]}_CMockIgnore(void);\n"
+    else
       return "#define #{function[:name]}_IgnoreAndReturn(cmock_retval) #{function[:name]}_CMockIgnoreAndReturn(__LINE__, cmock_retval)\n" +
              "void #{function[:name]}_CMockIgnoreAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]});\n"
-    end 
+    end
   end
-  
-  def mock_implementation_for_ignores(function)
-    lines = "  if (Mock.#{function[:name]}_IgnoreBool)\n  {\n" 
+
+  def mock_implementation_precheck(function)
+    lines = "  if (Mock.#{function[:name]}_IgnoreBool)\n  {\n"
     if (function[:return][:void?])
       lines << "    return;\n  }\n"
     else
       retval = function[:return].merge( { :name => "cmock_call_instance->ReturnVal"} )
-      lines << "    if (cmock_call_instance == NULL)\n      return Mock.#{function[:name]}_FinalReturn;\n"
+      return_type = function[:return][:const?] ? "const #{function[:return][:type]}" : function[:return][:type]
+      lines << "    if (cmock_call_instance == NULL)\n      return (#{return_type})Mock.#{function[:name]}_FinalReturn;\n"
       lines << "  " + @utils.code_assign_argument_quickly("Mock.#{function[:name]}_FinalReturn", retval) unless (retval[:void?])
-      lines << "    return cmock_call_instance->ReturnVal;\n  }\n"
+      lines << "    return (#{return_type})cmock_call_instance->ReturnVal;\n  }\n"
     end
     lines
   end
-  
+
   def mock_interfaces(function)
     lines = ""
-    args_only = (@config.ignore == :args_only)
     if (function[:return][:void?])
-      if (args_only)
-        lines << "void #{function[:name]}_CMockIgnore(UNITY_LINE_TYPE cmock_line)\n{\n"
-      else
-        lines << "void #{function[:name]}_CMockIgnore(void)\n{\n"
-      end
+      lines << "void #{function[:name]}_CMockIgnore(void)\n{\n"
     else
       lines << "void #{function[:name]}_CMockIgnoreAndReturn(UNITY_LINE_TYPE cmock_line, #{function[:return][:str]})\n{\n"
     end
-    if (args_only)
-      lines << @utils.code_add_base_expectation(function[:name], true)
-    elsif (!function[:return][:void?]) 
+    if (!function[:return][:void?])
       lines << @utils.code_add_base_expectation(function[:name], false)
     end
     unless (function[:return][:void?])
@@ -84,12 +64,8 @@ class CMockGeneratorPluginIgnore
     lines << "}\n\n"
   end
 
-  def mock_conditionally_verify_counts(function)
+  def mock_verify(function)
     func_name = function[:name]
     "  if (Mock.#{func_name}_IgnoreBool)\n    Mock.#{func_name}_CallInstance = CMOCK_GUTS_NONE;\n"
   end
-  
-  def nothing(function)
-    return ""
-  end
 end