add regex for bool parsing & test struct w/ bool parsing (#169)

wallacerunner · kou · web-flow · commit 71607446d4a1 · 2025-01-10T14:30:46.000+09:00
GitHub: fix GH-168 Struct parsing invokes "parse_ctype" on the whole member signature, which fails if member type is "bool" due to plain string matching for it. This change updates "bool" type matching to a regexp, so TYPE_BOOL is correctly parsed for a whole signature like "bool toggle" as well as just "bool". --------- Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
diff --git 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
@@ -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

-Original file line number
+Diff line change
 returnTYPE_INTPTR_T
 when/\Auintptr_t(?:\s+\w+)?\z/
 returnTYPE_UINTPTR_T
 -when"bool"
 +when/\Abool(?:\s+\w+)?\z/
 returnTYPE_BOOL
 when/\*/,/\[[\s\d]*\]/
 returnTYPE_VOIDP
-Original file line number
+Diff line change
 assert_equal[[TYPE_INT,TYPE_VOIDP,TYPE_VOIDP],['x','cb','name']],parse_struct_signature('int x; void (*cb)(); const char* name')
 end
 +deftest_struct_bool
 +assert_equal([[TYPE_INT,TYPE_BOOL],['x','toggle']],
 +parse_struct_signature('int x; bool toggle'))
 +end
++
 deftest_struct_undefined
 assert_raise(DLError){parse_struct_signature(['int i','DWORD cb'])}
 end