From dd6596f933b277f7b9106d955bae5e63418c338a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 26 Dec 2012 00:08:42 +0100 Subject: tools/genruby: accept spaces in callback typedefs name --- tools/genruby.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/genruby.rb b/tools/genruby.rb index ede2c7e..7a7c469 100755 --- a/tools/genruby.rb +++ b/tools/genruby.rb @@ -140,7 +140,7 @@ def gen_callbacks path, indent r = [] open(path+'-callbacks','r').readlines.each do |l| l.strip! - if not l=~/^\s*typedef\s+(.*)((?:\(\*?\w+\)| \*?\w+))\s*\((.*)\);/ + if not l=~/^\s*typedef\s+(.*)((?:\(\*\s*?\w+\)| \*?\w+))\s*\((.*)\);/ printf "\033[0;31m# #{l}\n#{indent}# FIXME\033[0m\n" r << indent+"# #{l}\n#{indent}# FIXME" next @@ -148,7 +148,7 @@ def gen_callbacks path, indent ret = $1.strip name = $2.strip args = $3.split(',').collect { |arg| get_type_from_arg arg, l }.join ', ' - t = name.sub(/\(/,'').sub(/\)/,'').sub(/\*/,'') + t = name.sub(/^\(\* */,'').sub(/\)$/,'') sym = ( t.downcase=~/_cb$/ ? t : t+'_cb' ) tsym = set_type t, sym r << indent+"# #{l}" -- cgit v1.1-2-g2b99