ceedling 0.0.15 → 0.0.16

data/lib/ceedling/version.rb

@@ -2,14 +2,14 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.15"
+    GEM = "0.0.16"
 
     # @private
     CEEDLING = "0.9.200"
     # @private
     CEXCEPTION = "1.2.17"
     # @private
-    CMOCK = "2.0.213"
+    CMOCK = "2.0.214"
     # @private
     UNITY = "2.0.135"
   end

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.15"
+    GEM = "0.0.16"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_config.rb

@@ -14,6 +14,7 @@ class CMockConfig
     :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                 => {},

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_generator.rb

@@ -160,11 +160,9 @@ class CMockGenerator
   
   def create_mock_implementation(file, function)        
     # prepare return value and arguments       
-    if (function[:modifier].empty?)
-      function_mod_and_rettype = function[:return][:type] 
-    else
-      function_mod_and_rettype = function[:modifier] + ' ' + function[:return][:type] 
-    end
+    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?)
     

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_header_parser.rb

@@ -12,6 +12,7 @@ class CMockHeaderParser
     @funcs = []
     @c_strippables = cfg.strippables
     @c_attributes = (['const'] + cfg.attributes).uniq
+    @c_calling_conventions = cfg.c_calling_conventions.uniq
     @treat_as_void = (['void'] + cfg.treat_as_void).uniq
     @declaration_parse_matcher = /([\d\w\s\*\(\),\[\]]+??)\(([\d\w\s\*\(\),\.\[\]+-]*)\)$/m
     @standards = (['int','short','char','long','unsigned','signed'] + cfg.treat_as.keys).uniq
@@ -200,6 +201,8 @@ class CMockHeaderParser
     descriptors[0..-2].each do |word|
       if @c_attributes.include?(word)
         decl[:modifier] << word
+      elsif @c_calling_conventions.include?(word)
+        decl[:c_calling_convention] = word
       else
         rettype << word
       end

data/new_project_template/vendor/ceedling/vendor/cmock/release/build.info

@@ -1 +1 @@
-213
+214

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 -04:00
-default_executable: 
+date: 2011-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -134,14 +133,14 @@ files:
 - examples/temp_sensor/test/test_AdcConductor.c
 - examples/temp_sensor/test/test_AdcHardware.c
 - examples/temp_sensor/test/test_AdcHardwareConfigurator.c
+- examples/temp_sensor/test/test_AdcModel.c
 - examples/temp_sensor/test/test_AdcTemperatureSensor.c
 - examples/temp_sensor/test/test_Executor.c
+- examples/temp_sensor/test/test_Main.c
 - examples/temp_sensor/test/test_Model.c
 - examples/temp_sensor/test/test_TaskScheduler.c
 - examples/temp_sensor/test/test_TemperatureCalculator.c
 - examples/temp_sensor/test/test_TemperatureFilter.c
-- examples/temp_sensor/test/test_TestAdcModel.c
-- examples/temp_sensor/test/test_TestMain.c
 - examples/temp_sensor/test/test_TimerConductor.c
 - examples/temp_sensor/test/test_TimerConfigurator.c
 - examples/temp_sensor/test/test_TimerHardware.c
@@ -290,7 +289,6 @@ files:
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.c
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.h
 - new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h
-has_rdoc: true
 homepage: http://throwtheswitch.org/
 licenses: []
 
@@ -320,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ceedling
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Gemified version of the Ceedling C testing / build environment