From 33f5e8a47d6ec8ed0053b5220076e693f97d214d Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Fri, 7 Jul 2023 18:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正解析死循环问题
---
 designer/utslcodeeditor.tsf      |  1 +
 designer/utslvclsyntaxparser.tsf | 10 ++++++++--
 funcext/tvclib/utslvclpage.tsf   |  4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf
index 1fe9d16..5f09788 100644
--- a/designer/utslcodeeditor.tsf
+++ b/designer/utslcodeeditor.tsf
@@ -1000,6 +1000,7 @@ type TExecuteEditer=class(TCustomControl) //ִ
         s := replacetext(s,"$(CURRENT_DIRECTORY)",dir);
         s := replacetext(s,"$(SEARCH_PATH)",owner.getlibpathstr());
         s := replacetext(s,"$(TSL_EXE)",gettslexe());
+        len := length(s);
         return s;
     end
     function doSaveCurrentName();
diff --git a/designer/utslvclsyntaxparser.tsf b/designer/utslvclsyntaxparser.tsf
index efda20c..344217a 100644
--- a/designer/utslvclsyntaxparser.tsf
+++ b/designer/utslvclsyntaxparser.tsf
@@ -39,7 +39,7 @@ type tslparser = class(tslparserbase) //
     end
     function tkopok();
     begin
-        return FCurrentPos>0 and FCurrentPos<FTokenLen;
+        return FCurrentPos>=0 and FCurrentPos<FTokenLen;
     end
     function getTokenPos(ps);
     begin
@@ -52,7 +52,7 @@ type tslparser = class(tslparserbase) //
     function ctoken(tk,tp,pos,r);
     begin
         if not FTokens then return 0;
-        r := tkopok(pos);
+        //r := tkopok(pos);
         tk := FTokens[FCurrentPos,0];
         tp := FTokens[FCurrentPos,1];
         pos := FTokens[FCurrentPos,2]+1;
@@ -398,6 +398,12 @@ type tslparser = class(tslparserbase) //
         while true do
         begin
             ctoken(tk,tp,pos);
+            if ifnil(tk) then break;
+            if tk="end" and tp=TT_IDE then 
+            begin
+                bpos();
+                break;
+            end 
             if tk=";" then
             begin
                 if rcount then
diff --git a/funcext/tvclib/utslvclpage.tsf b/funcext/tvclib/utslvclpage.tsf
index c1b9aff..15d775c 100644
--- a/funcext/tvclib/utslvclpage.tsf
+++ b/funcext/tvclib/utslvclpage.tsf
@@ -454,6 +454,10 @@ type tcustompagecontrol = class(TCustomControl)
         if  FCurrentid=-1 then 
         begin
             setselidx(0);
+        end else 
+        begin
+            if not (page is class(TWinControl)) then CalcTabs();
+            InvalidateRect(nil,false);
         end 
     end   
     public