ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-09-13 13:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

made new typedef void handling more better to ignore function pointer typedefs with void return type

Browse Source 
git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@90 bf332499-1b4d-0410-844d-d2d48d5cc64c
This commit is contained in:
mkarlesky
2009-04-23 17:27:44 +00:00
parent 637dd73d4d
commit 8229ec8448
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_header_parser.rb
+1 -1
View File
@@ -27,7 +27,7 @@ class CMockHeaderParser
# look for any edge cases of typedef'd void; # look for any edge cases of typedef'd void;
# void must be void for cmock AndReturn calls to process properly. # void must be void for cmock AndReturn calls to process properly.
# to a certain extent, these replacements assume we're chewing on pre-processed header files # to a certain extent, these replacements assume we're chewing on pre-processed header files
void_types = source.scan(/typedef\s+void\s+([^\s]+)\s*;/) void_types = source.scan(/typedef\s+void\s+([\w\d]+)\s*;/)
void_types.each {|type| source.gsub!(/#{type}/, 'void')} if void_types.size > 0 void_types.each {|type| source.gsub!(/#{type}/, 'void')} if void_types.size > 0
source.gsub!(/\s*\\\s*/m, ' ') # smush multiline into single line source.gsub!(/\s*\\\s*/m, ' ') # smush multiline into single line
test/unit/cmock_header_parser_test.rb
+5 -4
View File
@@ -115,10 +115,11 @@ class CMockHeaderParserTest < Test::Unit::TestCase
source = source =
"typedef void SILLY_VOID_TYPE1;\n" + "typedef void SILLY_VOID_TYPE1;\n" +
"typedef void SILLY_VOID_TYPE2 ;\n\n" + "typedef void SILLY_VOID_TYPE2 ;\n" +
"typedef void (*FUNCPTR)(void);\n\n" + # do no substitution on type
"SILLY_VOID_TYPE2 Foo(int a, unsigned int b);\n" + "SILLY_VOID_TYPE2 Foo(int a, unsigned int b);\n" +
"void\n shiz(SILLY_VOID_TYPE1 *);\n" + "void\n shiz(SILLY_VOID_TYPE1 *);\n" +
"void tat(void);\n" "void tat(FUNCPTR);\n"
@parser = CMockHeaderParser.new(source, @config) @parser = CMockHeaderParser.new(source, @config)
parsed_stuff = @parser.parse parsed_stuff = @parser.parse
@@ -145,10 +146,10 @@ class CMockHeaderParserTest < Test::Unit::TestCase
{ {
:modifier => "", :modifier => "",
:args_string => "void", :args_string => "FUNCPTR cmock_arg1",
:rettype => "void", :rettype => "void",
:var_arg => nil, :var_arg => nil,
:args => [], :args => [{:type => "FUNCPTR", :name => "cmock_arg1"}],
:name => "tat" :name => "tat"
} }
] ]