diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-03 23:14:47 -0500 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-02-04 07:56:32 +0000 |
| commit | 28e028ddd5579c3d405b21523cdc2773c798e32f (patch) | |
| tree | 8d4bfc7b50d00a15686c9d933ec4472943a526d8 /docbook/make-wsluarm.pl | |
| parent | 1cd78285270dace76023d8a7e0d5694ce964f0b4 (diff) | |
| download | wireshark-28e028ddd5579c3d405b21523cdc2773c798e32f.tar.gz | |
Fix wslua docs script to handle class names with digits, like Int64/UInt64
Change-Id: I555e4401828680cc8d6516b11af21d2ae5c0144d
Reviewed-on: https://code.wireshark.org/review/99
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'docbook/make-wsluarm.pl')
| -rwxr-xr-x | docbook/make-wsluarm.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docbook/make-wsluarm.pl b/docbook/make-wsluarm.pl index 365245f4f2..29f3a8b6a4 100755 --- a/docbook/make-wsluarm.pl +++ b/docbook/make-wsluarm.pl @@ -108,7 +108,7 @@ sub { $module{descr} = $2 } ], -[ 'WSLUA_CLASS_DEFINE\050\s*([A-Z][a-zA-Z0-9]+).*?\051;' . $TRAILING_COMMENT_RE, +[ 'WSLUA_CLASS_DEFINE(?:_BASE)?\050\s*([A-Z][a-zA-Z0-9]+).*?\051;' . $TRAILING_COMMENT_RE, sub { deb ">c=$1=$2=$3=$4=$5=$6=$7=\n"; $class = { @@ -163,7 +163,7 @@ sub { push @{${$class}{constructors}}, $function; } ], -[ 'WSLUA_METHOD\s+([A-Za-z]+)_([a-z0-9_]+)[^\173]*\173' . $TRAILING_COMMENT_RE, +[ 'WSLUA_METHOD\s+([A-Za-z0-9]+)_([a-z0-9_]+)[^\173]*\173' . $TRAILING_COMMENT_RE, sub { deb ">cm=$1=$2=$3=$4=$5=$6=$7=\n"; my $name = "$1"; @@ -180,7 +180,7 @@ sub { push @{${$class}{methods}}, $function; } ], -[ 'WSLUA_METAMETHOD\s+([A-Za-z]+)(__[a-z0-9]+)[^\173]*\173' . $TRAILING_COMMENT_RE, +[ 'WSLUA_METAMETHOD\s+([A-Za-z0-9]+)(__[a-z0-9]+)[^\173]*\173' . $TRAILING_COMMENT_RE, sub { deb ">cm=$1=$2=$3=$4=$5=$6=$7=\n"; my $name = "$1"; @@ -198,7 +198,7 @@ sub { push @{${$class}{methods}}, $function; } ], -[ '#define WSLUA_(OPT)?ARG_([a-z0-9_]+)_([A-Z0-9]+)\s+\d+' . $TRAILING_COMMENT_RE, +[ '#define WSLUA_(OPT)?ARG_([A-Za-z0-9_]+)_([A-Z0-9]+)\s+\d+' . $TRAILING_COMMENT_RE, sub { deb ">a=$1=$2=$3=$4=$5=$6=$7=\n"; my $name = $1 eq 'OPT' ? "[$3]" : $3; @@ -214,7 +214,7 @@ sub { ${${$function}{args}}{$name} = {descr=>$4,} } ], -[ '#define WSLUA_(OPT)?ARG_([A-Za-z]+)_([a-z_]+)_([A-Z0-9]+)\s+\d+' . $TRAILING_COMMENT_RE, +[ '#define WSLUA_(OPT)?ARG_([A-Za-z0-9]+)_([a-z_]+)_([A-Z0-9]+)\s+\d+' . $TRAILING_COMMENT_RE, sub { deb ">ca=$1=$2=$3=$4=$5=$6=$7=\n"; my $name = $1 eq 'OPT' ? "[$4]" : $4; @@ -222,7 +222,7 @@ sub { ${${$function}{args}}{$name} = {descr=>$7,optional => $1 eq '' ? 1 : 0 } } ], -[ '/\052\s+WSLUA_ATTRIBUTE\s+([A-Za-z]+)_([a-z_]+)\s+([A-Z]*)\s*(.*?)\052/', +[ '/\052\s+WSLUA_ATTRIBUTE\s+([A-Za-z0-9]+)_([a-z_]+)\s+([A-Z]*)\s*(.*?)\052/', sub { deb ">at=$1=$2=$3=$4=$5=$6=$7=\n"; my $name = "$1"; @@ -272,7 +272,7 @@ sub { push @{$errors}, gorolla($4); } ], -[ 'WSLUA_(OPT)?ARG_ERROR\s*\050\s*(([A-Z][A-Za-z]+)_)?([a-z_]+)\s*,\s*([A-Z0-9]+)\s*,\s*' . $QUOTED_RE, +[ 'WSLUA_(OPT)?ARG_ERROR\s*\050\s*(([A-Z][A-Za-z0-9]+)_)?([a-z_]+)\s*,\s*([A-Z0-9]+)\s*,\s*' . $QUOTED_RE, sub { deb ">ae=$1=$2=$3=$4=$5=$6=$7=\n"; my $errors; |