From a262194af80a610593d5a18859afa1451d0b1770 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 3 May 2020 09:05:39 -0400 Subject: [PATCH] Submit some style cleanup. Bump Unity Version. --- lib/cmock_generator_plugin_ignore.rb | 18 +++++++++--------- vendor/unity | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/cmock_generator_plugin_ignore.rb b/lib/cmock_generator_plugin_ignore.rb index 776a0a8..b292f3d 100644 --- a/lib/cmock_generator_plugin_ignore.rb +++ b/lib/cmock_generator_plugin_ignore.rb @@ -23,15 +23,15 @@ class CMockGeneratorPluginIgnore end def mock_function_declarations(function) - if function[:return][:void?] - lines = "#define #{function[:name]}_Ignore() #{function[:name]}_CMockIgnore()\n" \ - "void #{function[:name]}_CMockIgnore(void);\n" - else - lines = "#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 + lines = if function[:return][:void?] + "#define #{function[:name]}_Ignore() #{function[:name]}_CMockIgnore()\n" \ + "void #{function[:name]}_CMockIgnore(void);\n" + else + "#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 - #add stop ignore function. it does not matter if there are any args + # Add stop ignore function. it does not matter if there are any args lines << "#define #{function[:name]}_StopIgnore() #{function[:name]}_CMockStopIgnore()\n" \ "void #{function[:name]}_CMockStopIgnore(void);\n" lines @@ -67,7 +67,7 @@ class CMockGeneratorPluginIgnore lines << " Mock.#{function[:name]}_IgnoreBool = (char)1;\n" lines << "}\n\n" - #add stop ignore function. it does not matter if there are any args + # Add stop ignore function. it does not matter if there are any args lines << "void #{function[:name]}_CMockStopIgnore(void)\n{\n" unless function[:return][:void?] lines << " if(Mock.#{function[:name]}_IgnoreBool)\n" diff --git a/vendor/unity b/vendor/unity index 9f4b225..fd80d51 160000 --- a/vendor/unity +++ b/vendor/unity @@ -1 +1 @@ -Subproject commit 9f4b2251de45aaca27c12f6cee3403dff96c80fe +Subproject commit fd80d514ee6b17a54bee29eaa5225ca25eef5ea9