ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1612 from nasa/1611-enum-class

Browse Source 
Trick Fails to Compile Sims with enum classes #1611
This commit is contained in:
Hong Chen 2023-11-16 11:39:24 -06:00 committed by GitHub
commit e40fe00311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libexec/trick/convert_swig
View File

@ -83,6 +83,10 @@ my $typedef_struct = qr/typedef\s+(?:struct|union)\s* # the words typedef s
my $namespace_def = qr/namespace\s* # keyword namespace my $namespace_def = qr/namespace\s* # keyword namespace
(?:\s+[_A-Za-z]\w*) # class name (?:\s+[_A-Za-z]\w*) # class name
/sx ; /sx ;
my $enum_class_def = qr/enum\s+class\s* # keywords enum_class
(?:\s+[_A-Za-z]\w*)\s* # class name
(?:\{|:(?!\:)) # { or punctuator :
/sx ;
my $class_def = qr/(?:class|struct)\s* # keyword class or struct my $class_def = qr/(?:class|struct)\s* # keyword class or struct
(?:\s+[_A-Za-z]\w*)\s* # class name (?:\s+[_A-Za-z]\w*)\s* # class name
(?:\{|:(?!\:)) # { or punctuator : (?:\{|:(?!\:)) # { or punctuator :
@ -394,13 +398,15 @@ sub process_contents($$$$) {
($typedef_const_struct)| ($typedef_const_struct)|
($template_def)| ($template_def)|
($namespace_def)| ($namespace_def)|
($enum_class_def)|
($class_def))//sx ) { ($class_def))//sx ) {
my ( $non_var ) = $1 ; my ( $non_var ) = $1 ;
my ( $typedef_struct_string ) = $2 ; my ( $typedef_struct_string ) = $2 ;
my ( $typedef_const_struct_string ) = $3 ; my ( $typedef_const_struct_string ) = $3 ;
my ( $template_string ) = $4 ; my ( $template_string ) = $4 ;
my ( $namespace_string ) = $5 ; my ( $namespace_string ) = $5 ;
my ( $class_string ) = $6 ; my ( $enum_class_string ) = $6 ;
my ( $class_string ) = $7 ;
## Handle the case of: non_var ## Handle the case of: non_var
if ( $non_var ne "" ) { if ( $non_var ne "" ) {
@ -435,6 +441,13 @@ sub process_contents($$$$) {
$class_names_ref ) ; $class_names_ref ) ;
} }
## ##
## Handle the case of: class_def ==> enum class <enum-name> ( '{' | ':' )
##
if ( $enum_class_string ne "" ) {
$$new_contents_ref .= $enum_class_string ;
}
##
## Handle the case of: class_def ==> ( class | struct ) <class-name> ( '{' | ':' ) ## Handle the case of: class_def ==> ( class | struct ) <class-name> ( '{' | ':' )
## ##
if ( $class_string ne "" ) { if ( $class_string ne "" ) {