Commit Graph

811 Commits

Author SHA1 Message Date
Mark VanderVoord b3f78b4259 Merge pull request #374 from Melirius/Calling-conventions-in-function-pointers-fix
Fix parsing of calling conventions in function pointers
2023-01-05 15:52:13 -05:00
Mark VanderVoord 5551437ea8 Merge pull request #378 from danimartin82/master
Fix skeleton file creation
2023-01-05 15:50:32 -05:00
Mark VanderVoord d3962d56c3 Merge pull request #408 from Yagoor/contribution/extern-c
Added extern "C" to cmock generated headers
2022-10-02 20:12:59 -04:00
Yago Fontoura Do Rosario 5eebd713ba Added extern "C" to cmock generated headers 2022-09-07 21:16:28 +02:00
Mark VanderVoord f65066f15d Merge pull request #404 from tz18/patch-1
Add example for the usage of ReturnThruPtr
2022-07-08 12:15:07 -04:00
Ramon Rakow c532d17f9e Update CMock_Summary.md 2022-07-08 09:11:48 -07:00
Ramon Rakow 406a9bcf2e Update CMock_Summary.md 2022-07-08 09:10:45 -07:00
Ramon Rakow 7121f51944 Add example for the usage of ReturnThruPtr
I found it difficult to decipher the correct syntax for using ReturnThruPtr, and looking at github issues and google groups messages suggests others have had the same trouble. I suggest this example to explicate the correct usage.
2022-07-07 15:21:06 -07:00
Mark VanderVoord 1b81269e78 Merge pull request #401 from nordic-krch/fix/mem_alignment
Ensure alignment of CMock_Guts_Buffer
2022-05-31 11:09:17 -04:00
Krzysztof Chruscinski 9b9f93ff7d Ensure alignment of CMock_Guts_Buffer
Another attempt to fix something that was previously fixed by
73255670 but got reversed due to breaking something else.

The issue is that CMock_Guts_Buffer was unsigned char thus it
may have been unaligned (byte aligned). Portions from this buffer
where casted to a structure. On certain architectures alignment
must be maintained when accessing 32bit or 64 bit data and that
was not maintained with byte aligned array.

Instead of using attribute that may be complier specific, changing
type of array to long long.
2022-05-30 13:18:46 +02:00
Mark VanderVoord 9934754d1f Pull in Unity.
Update documentation to match latest handling of arrays of length zero.
2022-04-19 17:31:32 -04:00
Mark VanderVoord bb0509719d Merge pull request #383 from regnerjr/patch-1
Fixes link to license file.
2022-03-21 06:57:45 -04:00
John Regner b9eec9ed6f Fixes link to license file.
License file is no longer in the docs folder, it's not at the top level so GitHub can match it.
2022-03-01 15:07:48 -08:00
Mark VanderVoord f5a76956d6 Merge pull request #381 from Tschet1/fix_runaway_regex
Fix runaway regex
2022-02-21 08:02:58 -05:00
Müller, Jan bb85af5567 Fix runaway regex
Multiple nested greedy quantifiers can cause to increase complexity of
the regular expression so that the matching in the cmock_header_parser
would take multiple minutes.
Fixed by removing one of the quantifiers that seems not to be needed.
2022-02-21 13:47:09 +01:00
Dani Martin 202721e561 Fix skeleton file creation 2021-12-17 13:18:19 +01:00
Ivan Siutsou 8b2e897d35 The same output witout convention 2021-11-07 23:04:44 +02:00
Ivan Siutsou 7100ef0e62 Fix parsing of calling conventions in function pointers 2021-11-07 21:47:51 +02:00
Mark VanderVoord 3806f7ebe3 Merge pull request #369 from JmcRobbie/master
Fixes minor typo
2021-10-13 08:03:13 -04:00
Jack McRobbie 3ec9468bbe Fixes minor typo 2021-10-11 17:13:32 +11:00
Mark VanderVoord 3d4ba8d20b Grab latest unity.
Bump Version.
2021-06-18 14:43:57 -04:00
Mark VanderVoord 3b443e551d Merge pull request #347 from ThrowTheSwitch/feature/only_config_is_shared
Update so only config is shared.
2021-02-05 15:56:22 -05:00
Mark VanderVoord 27bca0c3c4 style cleanup 2021-02-05 15:53:43 -05:00
Mark VanderVoord 9bb250ea4a Update so only config is shared. Everything else about the current job is passed. 2021-02-05 15:15:14 -05:00
Mark VanderVoord 9d092898ef Merge pull request #346 from ThrowTheSwitch/reapply_329
Revert "Revert "CMock can now compile without setjmp.h present on the…
v2.5.3
2021-01-29 10:54:18 -05:00
Mark VanderVoord dd00b96f0d Fix broken tests for supporting exclude_setjmp. Verify cexception won't be run when this is enabled. 2021-01-29 10:47:52 -05:00
Mark VanderVoord aa5113e012 Update apt-get in the hopes that this makes multilib happy. 2021-01-29 10:12:40 -05:00
Mark VanderVoord 325b6b333a Revert "Revert "CMock can now compile without setjmp.h present on the platform""
This reverts commit 3eccb8e3d4.
2021-01-29 10:06:08 -05:00
Mark VanderVoord 73fd65928c Merge pull request #345 from ThrowTheSwitch/revert-329-master
Revert "CMock can now compile without setjmp.h present on the platform"
2021-01-28 08:15:45 -05:00
Mark VanderVoord 3eccb8e3d4 Revert "CMock can now compile without setjmp.h present on the platform" 2021-01-28 08:15:10 -05:00
Mark VanderVoord 1f939c9005 Merge pull request #329 from jmrubillon/master
CMock can now compile without setjmp.h present on the platform
2021-01-28 08:04:40 -05:00
Jean Rubillon 9e1c6c068d Fix missed has_setjmp_h convert to exclude_setjmp_h 2021-01-28 12:57:02 +00:00
Jean Rubillon 4ae268dbbe Changed has_setjmp_h option to exclude_setjmp_h 2021-01-27 18:56:02 +00:00
Mark VanderVoord d847e6777c Merge pull request #344 from ThrowTheSwitch/test/switch_to_actions
Switch to github actions
2021-01-16 22:22:34 -05:00
Mark VanderVoord dcde998087 cleanup style 2021-01-16 22:20:16 -05:00
Mark VanderVoord 38d6dccc8e Show the correct badge for this project.
Fix a bug in a test.
2021-01-16 22:15:36 -05:00
Mark VanderVoord 03acc531bf when we checkout the project, do it recursively so we get unity for our tests. :) 2021-01-16 21:33:19 -05:00
Mark VanderVoord 45920ed724 Need project present before running bundler. 2021-01-16 21:21:51 -05:00
Mark VanderVoord c4842fad0c Don't run bundler as root. 2021-01-16 21:17:55 -05:00
Mark VanderVoord 9f3cee70cd Switch to github actions 2021-01-16 21:13:55 -05:00
Mark VanderVoord 4dd557f2df Merge pull request #311 from andred/master
allow compilation with stricter warnings
2021-01-07 18:02:24 -05:00
Mark VanderVoord af1818a652 Merge pull request #327 from Hannes103/feature/sub-folder-supprt
add optional folder argument to create_mock()
2021-01-07 17:59:10 -05:00
Mark VanderVoord e352bb8c3b Merge pull request #340 from CezaryGapinski/fix-static-variables-for-enabled-inline-funcs-mocks
Fix static variables detection in headers for enabled inline function mocks
2021-01-07 17:57:36 -05:00
Mark VanderVoord 63f5e2f962 Merge pull request #341 from laurensmiers/master
Remove comments before start of inline-function-parsing
2021-01-07 17:57:17 -05:00
Cezary Gapinski 5eec2510b1 Change inline function detection to leave code not related to functions
static keyword can be used for variable in headers, like in issue #313 or ThrowTheSwitch/Ceedling#541
2020-12-15 21:10:45 +01:00
Cezary Gapinski f5984f44e8 Add test to leaves static variables for enabled inline functions mocks 2020-12-14 21:12:11 +01:00
Mark VanderVoord 9c1c6a05dc Merge pull request #337 from ollehu/master
Improve the regexps for parsing parameters to cmock.rb
2020-11-12 11:54:15 -05:00
ollehu 70d5750659 Merge branch 'master' into master 2020-11-12 16:01:43 +01:00
Mark VanderVoord 72f1c9e2b8 Merge pull request #339 from naggety/master
Allow parsing empty values for options in CLI arguments
2020-11-04 07:06:33 -05:00
Iñigo Huguet 334f46781a Allow parsing empty values for options in CLI arguments
If an option is passed via CLI, it cannot be passed with an
empty value because the Regex makes it to match 1 or more
characters.

For example, arguments `--mock_prefix=""` and `--mock_prefix=`
are invalid, because they don't match the regex and are not
recognized as options, so they're treated as files to mock.

Changing the regex to match 0 or more characters for the option
value, instead of 1 or more, solves the problem.
2020-11-04 09:42:36 +01:00