Parser.cpp: fix TypeLoc::Elaborated wrapped inside TypeLoc::Qualified

deadlocklogic · deadlocklogic · commit 3a202a8517ab · 2024-01-02T07:21:41.000+02:00
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
@@ -2643,13 +2643,12 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,
         if (LocValid)
         {
             TypeLoc UTL, ETL, ITL;
-            auto TypeLocClass = TL->getTypeLocClass();
-            if (TypeLocClass == TypeLoc::Qualified)
+            if (TL->getTypeLocClass() == TypeLoc::Qualified)
             {
                 UTL = TL->getUnqualifiedLoc();
                 TL = &UTL;
             }
-            else if (TypeLocClass == TypeLoc::Elaborated)
+            if (TL->getTypeLocClass() == TypeLoc::Elaborated)
             {
                 ETL = TL->getAs<ElaboratedTypeLoc>();
                 ITL = ETL.getNextTypeLoc();
@@ -2692,13 +2691,12 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,
         if (LocValid)
         {
             TypeLoc UTL, ETL, ITL;
-            auto TypeLocClass = TL->getTypeLocClass();
-            if (TypeLocClass == TypeLoc::Qualified)
+            if (TL->getTypeLocClass() == TypeLoc::Qualified)
             {
                 UTL = TL->getUnqualifiedLoc();
                 TL = &UTL;
             }
-            else if (TypeLocClass == TypeLoc::Elaborated)
+            if (TL->getTypeLocClass() == TypeLoc::Elaborated)
             {
                 ETL = TL->getAs<ElaboratedTypeLoc>();
                 ITL = ETL.getNextTypeLoc();
@@ -2747,7 +2745,7 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,
                 UTL = TL->getUnqualifiedLoc();
                 TL = &UTL;
             }
-            else if (TypeLocClass == TypeLoc::Elaborated)
+            if (TypeLocClass == TypeLoc::Elaborated)
             {
                 ETL = TL->getAs<ElaboratedTypeLoc>();
                 ITL = ETL.getNextTypeLoc();

Original file line number	Diff line number	Diff line change
`@@ -2643,13 +2643,12 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,`
`2643`	`2643`	`if (LocValid)`
`2644`	`2644`	`{`
`2645`	`2645`	`TypeLoc UTL, ETL, ITL;`
`2646`		`- auto TypeLocClass = TL->getTypeLocClass();`
`2647`		`- if (TypeLocClass == TypeLoc::Qualified)`
	`2646`	`+ if (TL->getTypeLocClass() == TypeLoc::Qualified)`
`2648`	`2647`	`{`
`2649`	`2648`	`UTL = TL->getUnqualifiedLoc();`
`2650`	`2649`	`TL = &UTL;`
`2651`	`2650`	`}`
`2652`		`- else if (TypeLocClass == TypeLoc::Elaborated)`
	`2651`	`+ if (TL->getTypeLocClass() == TypeLoc::Elaborated)`
`2653`	`2652`	`{`
`2654`	`2653`	`ETL = TL->getAs<ElaboratedTypeLoc>();`
`2655`	`2654`	`ITL = ETL.getNextTypeLoc();`
`@@ -2692,13 +2691,12 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,`
`2692`	`2691`	`if (LocValid)`
`2693`	`2692`	`{`
`2694`	`2693`	`TypeLoc UTL, ETL, ITL;`
`2695`		`- auto TypeLocClass = TL->getTypeLocClass();`
`2696`		`- if (TypeLocClass == TypeLoc::Qualified)`
	`2694`	`+ if (TL->getTypeLocClass() == TypeLoc::Qualified)`
`2697`	`2695`	`{`
`2698`	`2696`	`UTL = TL->getUnqualifiedLoc();`
`2699`	`2697`	`TL = &UTL;`
`2700`	`2698`	`}`
`2701`		`- else if (TypeLocClass == TypeLoc::Elaborated)`
	`2699`	`+ if (TL->getTypeLocClass() == TypeLoc::Elaborated)`
`2702`	`2700`	`{`
`2703`	`2701`	`ETL = TL->getAs<ElaboratedTypeLoc>();`
`2704`	`2702`	`ITL = ETL.getNextTypeLoc();`
`@@ -2747,7 +2745,7 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,`
`2747`	`2745`	`UTL = TL->getUnqualifiedLoc();`
`2748`	`2746`	`TL = &UTL;`
`2749`	`2747`	`}`
`2750`		`- else if (TypeLocClass == TypeLoc::Elaborated)`
	`2748`	`+ if (TypeLocClass == TypeLoc::Elaborated)`
`2751`	`2749`	`{`
`2752`	`2750`	`ETL = TL->getAs<ElaboratedTypeLoc>();`
`2753`	`2751`	`ITL = ETL.getNextTypeLoc();`