Rename treat_inline to treat_inlines

docs/CMock_Summary.md

@@ -518,7 +518,7 @@ from the defaults. We've tried to specify what the defaults are below.
   * `:include` will mock externed functions
   * `:exclude` will ignore externed functions (default).
 
-* `:treat_inline`:
+* `:treat_inlines`:
   This specifies how you want CMock to handle functions that have been
   marked as inline in the header file. Should it mock them?
 

lib/cmock_config.rb

@@ -29,7 +29,7 @@ class CMockConfig
     :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
-    :treat_inline                => :exclude,        #the options being :include or :exclude
+    :treat_inlines               => :exclude,        #the options being :include or :exclude
     :callback_include_count      => true,
     :callback_after_arg_check    => false,
     :includes                    => nil,

lib/cmock_generator.rb

@@ -16,7 +16,7 @@ class CMockGenerator
     @prefix      = @config.mock_prefix
     @suffix      = @config.mock_suffix
     @weak        = @config.weak
-    @include_inline        = @config.treat_inline
+    @include_inline        = @config.treat_inlines
     @ordered     = @config.enforce_strict_ordering
     @framework   = @config.framework.to_s
     @fail_on_unexpected_calls = @config.fail_on_unexpected_calls
@@ -62,7 +62,7 @@ class CMockGenerator
   end
 
   def create_mock_header_file(parsed_stuff)
-    if @include_inline
+    if @include_inline == :include
       @file_writer.create_file(@module_name + ".h", @subdir) do |file, filename|
         file << parsed_stuff[:normalized_source]
       end

lib/cmock_header_parser.rb

@@ -6,7 +6,7 @@
 
 class CMockHeaderParser
 
-  attr_accessor :funcs, :c_attr_noconst, :c_attributes, :treat_as_void, :treat_externs, :treat_inline
+  attr_accessor :funcs, :c_attr_noconst, :c_attributes, :treat_as_void, :treat_externs, :treat_inlines
 
   def initialize(cfg)
     @funcs = []
@@ -24,9 +24,9 @@ class CMockHeaderParser
     @local_as_void = @treat_as_void
     @verbosity = cfg.verbosity
     @treat_externs = cfg.treat_externs
-    @treat_inline = cfg.treat_inline
+    @treat_inlines = cfg.treat_inlines
     @c_strippables += ['extern'] if (@treat_externs == :include) #we'll need to remove the attribute if we're allowing externs
-    @c_strippables += ['inline'] if (@treat_inline == :include) #we'll need to remove the attribute if we're allowing externs
+    @c_strippables += ['inline'] if (@treat_inlines == :include) #we'll need to remove the attribute if we're allowing inlines
   end
 
   def parse(name, source)
@@ -151,7 +151,7 @@ class CMockHeaderParser
       end
     end
 
-    if (@treat_inline == :include)
+    if (@treat_inlines == :include)
       # Functions having "{ }" at this point are/were inline functions,
       # User wants them in so 'disguise' them as normal functions with the ";"
       source.gsub!("{ }", ";")
@@ -177,7 +177,7 @@ class CMockHeaderParser
       src_lines.delete_if {|line| !(line =~ /(?:^|\s+)(?:extern)\s+/).nil?} # remove extern functions
     end
 
-    if (@treat_inline == :include)
+    if (@treat_inlines == :include)
       src_lines.each {
         |src_line|
         src_line.gsub!(/^inline/, "") # Remove "inline" so that they are 'normal' functions

test/system/test_compilation/config.yml

@@ -4,7 +4,7 @@
   :includes: []
   :mock_path: ./system/generated/
   :mock_prefix: mock_
-  :treat_inline: :include
+  :treat_inlines: :include
   :treat_as_void:
   - OSEK_TASK
   - VOID_TYPE_CRAZINESS

test/unit/cmock_config_test.rb

@@ -19,7 +19,7 @@ describe CMockConfig, "Verify CMockConfig Module" do
     assert_equal(CMockConfig::CMockDefaultOptions[:attributes],            config.attributes)
     assert_equal(CMockConfig::CMockDefaultOptions[:plugins],               config.plugins)
     assert_equal(CMockConfig::CMockDefaultOptions[:treat_externs],         config.treat_externs)
-    assert_equal(CMockConfig::CMockDefaultOptions[:treat_inline],          config.treat_inline)
+    assert_equal(CMockConfig::CMockDefaultOptions[:treat_inlines],         config.treat_inlines)
   end
 
   it "replace only options specified in a hash" do
@@ -31,7 +31,7 @@ describe CMockConfig, "Verify CMockConfig Module" do
     assert_equal(test_attributes,                                           config.attributes)
     assert_equal(CMockConfig::CMockDefaultOptions[:plugins],                config.plugins)
     assert_equal(CMockConfig::CMockDefaultOptions[:treat_externs],          config.treat_externs)
-    assert_equal(CMockConfig::CMockDefaultOptions[:treat_inline],           config.treat_inline)
+    assert_equal(CMockConfig::CMockDefaultOptions[:treat_inlines],          config.treat_inlines)
   end
 
   it "replace only options specified in a yaml file" do
@@ -42,7 +42,7 @@ describe CMockConfig, "Verify CMockConfig Module" do
     assert_nil(config.includes)
     assert_equal(test_plugins,                                              config.plugins)
     assert_equal(:include,                                                  config.treat_externs)
-    assert_equal(:include,                                                  config.treat_inline)
+    assert_equal(:include,                                                  config.treat_inlines)
   end
 
   it "populate treat_as map with internal standard_treat_as_map defaults, redefine defaults, and add custom values" do

test/unit/cmock_config_test.yml

@@ -2,5 +2,5 @@
   :plugins:
     - 'soda'
     - 'pizza'
-  :treat_externs: :include
-  :treat_inline:  :include
+  :treat_externs:  :include
+  :treat_inlines:  :include

test/unit/cmock_generator_main_test.rb

@@ -43,7 +43,6 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
 
     #no strict handling
     @config.expect :mock_prefix, "Mock"
-    @config.expect :treat_inline, false
     @config.expect :mock_suffix, ""
     @config.expect :weak, ""
     @config.expect :enforce_strict_ordering, nil
@@ -55,6 +54,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
     @config.expect :includes_c_post_header, nil
     @config.expect :subdir, nil
     @config.expect :fail_on_unexpected_calls, true
+    @config.expect :treat_inlines, :exclude
     @cmock_generator = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
     @cmock_generator.module_name = @module_name
     @cmock_generator.mock_name = "Mock#{@module_name}"
@@ -62,7 +62,6 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
 
     #strict handling
     @config.expect :mock_prefix, "Mock"
-    @config.expect :treat_inline, false
     @config.expect :mock_suffix, ""
     @config.expect :weak, ""
     @config.expect :enforce_strict_ordering, true
@@ -74,6 +73,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
     @config.expect :includes_c_post_header, nil
     @config.expect :subdir, nil
     @config.expect :fail_on_unexpected_calls, true
+    @config.expect :treat_inlines, :exclude
     @cmock_generator_strict = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
     @cmock_generator_strict.module_name = @module_name
     @cmock_generator_strict.mock_name = "Mock#{@module_name}"
@@ -126,7 +126,6 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
     #no strict handling
     @config.expect :mock_prefix, "Mock"
     @config.expect :mock_suffix, ""
-    @config.expect :treat_inline, ":exclude"
     @config.expect :weak, ""
     @config.expect :enforce_strict_ordering, nil
     @config.expect :framework, :unity
@@ -136,6 +135,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
     @config.expect :includes_c_post_header, nil
     @config.expect :subdir, nil
     @config.expect :fail_on_unexpected_calls, true
+    @config.expect :treat_inlines, :exclude
     @cmock_generator2 = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
     @cmock_generator2.module_name = "Pout-Pout Fish"
     @cmock_generator2.mock_name = "MockPout-Pout Fish"

test/unit/cmock_header_parser_test.rb

@@ -23,7 +23,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
     @config.expect :when_no_prototypes, :error
     @config.expect :verbosity, 1
     @config.expect :treat_externs, :exclude
-    @config.expect :treat_inline, :exclude
+    @config.expect :treat_inlines, :exclude
     @config.expect :array_size_type, ['int', 'size_t']
     @config.expect :array_size_name, 'size|len'
 
@@ -476,7 +476,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
       "void bar(unsigned int)"
     ]
 
-    @parser.treat_inline = :include
+    @parser.treat_inlines = :include
     assert_equal(expected, @parser.import_source(source).map!{|s|s.strip})
   end
 
@@ -505,7 +505,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
     ]
 
     @parser.treat_externs = :include
-    @parser.treat_inline = :include
+    @parser.treat_inlines = :include
     assert_equal(expected, @parser.import_source(source).map!{|s|s.strip})
   end