Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored parse_signature #61

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactored parse_signature #61

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f65f23
Refactored parse_signature
kojix2 Dec 23, 2020
03ea077
Change ret to ctype
kojix2 Dec 23, 2020
e1abb46
Fixed regular expression
kojix2 Dec 23, 2020
1094a35
Pass tymap to parse_ctype
kojix2 Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions lib/fiddle/cparser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,15 @@ def parse_struct_signature(signature, tymap=nil)
#
def parse_signature(signature, tymap=nil)
tymap ||= {}
case compact(signature)
when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
func, args = $1, $2
return [func, TYPE_VOIDP, split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
when /^([\w\*\s]+[\*\s])(\w+)\((.*?)\);?$/
ret, func, args = $1.strip, $2, $3
return [func, parse_ctype(ret, tymap), split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
else
raise(RuntimeError,"can't parse the function prototype: #{signature}")
end
ctype, func, args = case compact(signature)
when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
[TYPE_VOIDP, $1, $2]
when /^([\w\*\s]+[\*\s])(\w+)\((.*?)\);?$/
[parse_ctype($1.strip, tymap), $2, $3]
else
raise("can't parse the function prototype: #{signature}")
end
[func, ctype, split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
end

# Given a String of C type +ty+, returns the corresponding Fiddle constant.
Expand Down