From ce97272fc05f0de96039186ce1796e9d4ae62ac4 Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Sat, 4 May 2024 12:33:35 +0800
Subject: [PATCH] fix: Crash when has source line like "std::cout <<
 (3+4*4>5*(4+3)-1 && (4-3>5)) <<std::endl;".

---
 NEWS.md                          | 1 +
 RedPandaIDE/parser/cppparser.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 73923747..f487ebb9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -159,6 +159,7 @@ Red Panda C++ Version 2.27
   - fix: In options -> code format -> Program, Choose astyle path button doesn't work.
   - fix: project not correctly reparsed after rename unit.
   - enhancement: support C++ 17 structured binding in stl map containers foreach loop.
+  - fix: Crash when has source line like "std::cout << (3+4*4>5*(4+3)-1 && (4-3>5)) <<std::endl;";
     
 Red Panda C++ Version 2.26
   - enhancement: Code suggestion for embedded std::vectors.
diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp
index b2acfa56..296f44f2 100644
--- a/RedPandaIDE/parser/cppparser.cpp
+++ b/RedPandaIDE/parser/cppparser.cpp
@@ -4240,6 +4240,10 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic,
             tempType+=mTokenizer[mIndex]->text;
             mIndex++;
             break;
+        case ',':
+            tempType="";
+            mIndex++;
+            break;
         case '(':
             if (mTokenizer[mIndex]->matchIndex+1<maxIndex
                     && mTokenizer[mTokenizer[mIndex]->matchIndex+1]->text=='(') {
@@ -4361,8 +4365,8 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic,
                 }
                 mIndex++;
             } else {
-                tempType="";
-                mIndex++;
+                mIndex = indexOfNextPeriodOrSemicolon(mIndex, maxIndex);
+                return;
             }
         }
     }