ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 18:56:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match entire class declaration at once

Browse Source 
The previous commit fixed the original issue, but matched templated
classes incorrectly. This should handle all cases. #332
This commit is contained in:
Derek Bankieris 2016-10-25 12:51:51 -05:00
parent 73816bbd9a
commit 055a7337e4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libexec/trick/pm/parse_s_define.pm
View File

@ -517,8 +517,7 @@ sub handle_sim_class ($$$$) {
$s =~ s/ZZZYYYXXX(\d+)ZZZYYYXXX//esg ;
# grab the class name and the name of the class we are inheriting from
($full_template_args) = $s =~ /template\s+<([^>]+)>/ ;
($class_name, $inherit_class) = $s =~ /class\s+(\S+)\s*(?::\s*public\s*(.*\S))?/ ;
($full_template_args, $class_name, $inherit_class) = $s =~ /(?:template\s+<([^>]+)>)?\s*class\s+(\S+)\s*(?::\s*public\s*(.*\S))?/ ;
$template_args = $full_template_args ;
$template_args =~ s/class|typename//g ;