@@ -374,8 +374,7 @@ private void VisitEnumDecl(EnumDecl enumDecl)
374
374
{
375
375
var typeName = GetRemappedTypeName ( enumDecl , context : null , enumDecl . IntegerType , out var nativeTypeName ) ;
376
376
377
- desc = new EnumDesc ( )
378
- {
377
+ desc = new EnumDesc ( ) {
379
378
AccessSpecifier = accessSpecifier ,
380
379
TypeName = typeName ,
381
380
EscapedName = escapedName ,
@@ -662,8 +661,7 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
662
661
if ( needsReturnFixup )
663
662
{
664
663
_outputBuilder . WriteParameterSeparator ( ) ;
665
- parameterDesc = new ( )
666
- {
664
+ parameterDesc = new ( ) {
667
665
Name = "_result" ,
668
666
Type = $ "{ returnTypeName } *"
669
667
} ;
@@ -685,8 +683,7 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
685
683
{
686
684
_outputBuilder . WriteParameterSeparator ( ) ;
687
685
}
688
- var parameterDesc = new ParameterDesc
689
- {
686
+ var parameterDesc = new ParameterDesc {
690
687
Name = "" ,
691
688
Type = "__arglist"
692
689
} ;
@@ -815,9 +812,11 @@ void VisitCtorInitializers(CXXConstructorDecl cxxConstructorDecl, int firstCtorI
815
812
{
816
813
continue ;
817
814
}
818
-
819
- var memberRef = ( Ref ) cxxConstructorDecl . CursorChildren [ i ] ;
820
- var memberInit = ( Stmt ) cxxConstructorDecl . CursorChildren [ ++ i ] ;
815
+ if ( cxxConstructorDecl . CursorChildren [ i ] is not Ref memberRef
816
+ || cxxConstructorDecl . CursorChildren [ ++ i ] is not Stmt memberInit )
817
+ {
818
+ continue ;
819
+ }
821
820
822
821
if ( memberInit is ImplicitValueInitExpr )
823
822
{
@@ -827,7 +826,7 @@ void VisitCtorInitializers(CXXConstructorDecl cxxConstructorDecl, int firstCtorI
827
826
var memberRefName = GetRemappedCursorName ( memberRef . Referenced ) ;
828
827
var memberInitName = memberInit . Spelling ;
829
828
830
- if ( memberInit is CastExpr { SubExprAsWritten : DeclRefExpr declRefExpr } )
829
+ if ( memberInit is CastExpr { SubExprAsWritten : DeclRefExpr declRefExpr } )
831
830
{
832
831
memberInitName = GetRemappedCursorName ( declRefExpr . Decl ) ;
833
832
}
@@ -859,6 +858,7 @@ void VisitCtorInitializers(CXXConstructorDecl cxxConstructorDecl, int firstCtorI
859
858
{
860
859
_outputBuilder . EndConstructorInitializer ( ) ;
861
860
}
861
+
862
862
}
863
863
}
864
864
}
@@ -1319,8 +1319,7 @@ void ForTypedefDecl(ParmVarDecl parmVarDecl, TypedefDecl typedefDecl)
1319
1319
escapedName += index ;
1320
1320
}
1321
1321
1322
- var desc = new ParameterDesc
1323
- {
1322
+ var desc = new ParameterDesc {
1324
1323
Name = escapedName ,
1325
1324
Type = typeName ,
1326
1325
NativeTypeName = nativeTypeName ,
@@ -2139,8 +2138,7 @@ void OutputVtblEntry(CXXRecordDecl cxxRecordDecl, CXXMethodDecl cxxMethodDecl)
2139
2138
var remappedName = FixupNameForMultipleHits ( cxxMethodDecl ) ;
2140
2139
var escapedName = EscapeAndStripMethodName ( remappedName ) ;
2141
2140
2142
- var desc = new FieldDesc
2143
- {
2141
+ var desc = new FieldDesc {
2144
2142
AccessSpecifier = AccessSpecifier . Public ,
2145
2143
NativeTypeName = nativeTypeName ,
2146
2144
EscapedName = escapedName ,
@@ -2954,7 +2952,7 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
2954
2952
var arraySize = Math . Max ( ( arrayType as ConstantArrayType ) ? . Size ?? 0 , 1 ) ;
2955
2953
var totalSize = arraySize ;
2956
2954
var totalSizeString = $ "{ arraySize } ";
2957
- var sizePerDimension = new List < ( long index , long size ) > ( ) { ( 0 , arraySize ) } ;
2955
+ var sizePerDimension = new List < ( long index , long size ) > ( ) { ( 0 , arraySize ) } ;
2958
2956
2959
2957
while ( IsTypeConstantOrIncompleteArray ( recordDecl , elementType , out var subArrayType ) )
2960
2958
{
0 commit comments