From d59ec41c52e8026de2f7cee9049529e1276df3ad Mon Sep 17 00:00:00 2001 From: Dmitry Ledentsov Date: Mon, 28 Nov 2016 17:05:27 +0100 Subject: [PATCH 1/4] fixing the test for #100 --- test/unit/cmock_generator_main_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index 81d7bfb..51aa573 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -499,8 +499,9 @@ describe CMockGenerator, "Verify CMockGenerator Module" do expected = [ "int __stdcall SupaFunction(uint32 sandwiches, corn ...)\n", "{\n", " UNITY_LINE_TYPE cmock_line = TEST_LINE_NUM;\n", + " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance;\n" " UNITY_SET_DETAIL(CMockString_SupaFunction);\n", - " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance = (CMOCK_SupaFunction_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.SupaFunction_CallInstance);\n", + " cmock_call_instance = (CMOCK_SupaFunction_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.SupaFunction_CallInstance);\n", " Mock.SupaFunction_CallInstance = CMock_Guts_MemNext(Mock.SupaFunction_CallInstance);\n", " uno", " UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, CMockStringCalledMore);\n", From 242fd73d3ef4aab4e26adb1cd2a3411eaa62a13c Mon Sep 17 00:00:00 2001 From: Dmitry Ledentsov Date: Mon, 28 Nov 2016 17:11:29 +0100 Subject: [PATCH 2/4] C89 conforming declaration of `cmock_call_instance --- lib/cmock_generator.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb index 58b3fa6..7009ece 100644 --- a/lib/cmock_generator.rb +++ b/lib/cmock_generator.rb @@ -222,8 +222,9 @@ class CMockGenerator file << "#{function_mod_and_rettype} #{function[:name]}(#{args_string})\n" file << "{\n" file << " UNITY_LINE_TYPE cmock_line = TEST_LINE_NUM;\n" + file << " CMOCK_#{function[:name]}_CALL_INSTANCE* cmock_call_instance;\n" file << " UNITY_SET_DETAIL(CMockString_#{function[:name]});\n" - file << " CMOCK_#{function[:name]}_CALL_INSTANCE* cmock_call_instance = (CMOCK_#{function[:name]}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.#{function[:name]}_CallInstance);\n" + file << " cmock_call_instance = (CMOCK_#{function[:name]}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.#{function[:name]}_CallInstance);\n" file << " Mock.#{function[:name]}_CallInstance = CMock_Guts_MemNext(Mock.#{function[:name]}_CallInstance);\n" file << @plugins.run(:mock_implementation_precheck, function) file << " UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, CMockStringCalledMore);\n" From b0264f68f4cfa299a8c22a4b1bd63f33b9bf3d06 Mon Sep 17 00:00:00 2001 From: Dmitry Ledentsov Date: Mon, 28 Nov 2016 17:15:51 +0100 Subject: [PATCH 3/4] editing in the browser... forgotten comma --- test/unit/cmock_generator_main_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index 51aa573..f5fc50d 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -499,7 +499,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do expected = [ "int __stdcall SupaFunction(uint32 sandwiches, corn ...)\n", "{\n", " UNITY_LINE_TYPE cmock_line = TEST_LINE_NUM;\n", - " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance;\n" + " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance;\n", " UNITY_SET_DETAIL(CMockString_SupaFunction);\n", " cmock_call_instance = (CMOCK_SupaFunction_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.SupaFunction_CallInstance);\n", " Mock.SupaFunction_CallInstance = CMock_Guts_MemNext(Mock.SupaFunction_CallInstance);\n", From cfe52ba90f5319d970dde46a5cdbdd9953d88fc7 Mon Sep 17 00:00:00 2001 From: Dmitry Ledentsov Date: Mon, 28 Nov 2016 19:34:59 +0100 Subject: [PATCH 4/4] fix the test --- test/unit/cmock_generator_main_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index f5fc50d..23ef26f 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -465,8 +465,9 @@ describe CMockGenerator, "Verify CMockGenerator Module" do expected = [ "static int SupaFunction(uint32 sandwiches, const char* named)\n", "{\n", " UNITY_LINE_TYPE cmock_line = TEST_LINE_NUM;\n", + " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance;\n", " UNITY_SET_DETAIL(CMockString_SupaFunction);\n", - " CMOCK_SupaFunction_CALL_INSTANCE* cmock_call_instance = (CMOCK_SupaFunction_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.SupaFunction_CallInstance);\n", + " cmock_call_instance = (CMOCK_SupaFunction_CALL_INSTANCE*)CMock_Guts_GetAddressFor(Mock.SupaFunction_CallInstance);\n", " Mock.SupaFunction_CallInstance = CMock_Guts_MemNext(Mock.SupaFunction_CallInstance);\n", " uno", " UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, CMockStringCalledMore);\n",