diff --git a/lib/fiddle/cparser.rb b/lib/fiddle/cparser.rb index 264ca166..cdd139d5 100644 --- a/lib/fiddle/cparser.rb +++ b/lib/fiddle/cparser.rb @@ -247,7 +247,7 @@ def parse_ctype(ty, tymap=nil) return TYPE_INTPTR_T when /\Auintptr_t(?:\s+\w+)?\z/ return TYPE_UINTPTR_T - when "bool" + when /\Abool(?:\s+\w+)?\z/ return TYPE_BOOL when /\*/, /\[[\s\d]*\]/ return TYPE_VOIDP diff --git a/test/fiddle/test_cparser.rb b/test/fiddle/test_cparser.rb index f1b67476..20529115 100644 --- a/test/fiddle/test_cparser.rb +++ b/test/fiddle/test_cparser.rb @@ -277,6 +277,11 @@ def test_struct_string assert_equal [[TYPE_INT,TYPE_VOIDP,TYPE_VOIDP], ['x', 'cb', 'name']], parse_struct_signature('int x; void (*cb)(); const char* name') end + def test_struct_bool + assert_equal([[TYPE_INT, TYPE_BOOL], ['x', 'toggle']], + parse_struct_signature('int x; bool toggle')) + end + def test_struct_undefined assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) } end