tsl

更新动态库

designer/utslvclsyntaxparser.tsf

@@ -227,6 +227,7 @@ type tslparser = class(tslparserbase) //
                 while true do
                 begin
                     ctoken(tk,tp,pos);
+                    if ifnil(tk) then break;
                     if tk=")" then 
                     begin
                         r["inheritedendpos"] := pos;
@@ -280,11 +281,12 @@ type tslparser = class(tslparserbase) //
                     while true do
                     begin
                         ctoken(tk,tp,pos);
+                        if ifnil(tk) then break;
                         if tp=TT_IDE then
                         begin
                             pu[length(pu)]:= tk;
                         end else
-                        if tk=";" then break;
+                            if tk=";" then break;
                     end
                     r["uses"]:= array("row":row,"beg":usb,"end":pos,"info":pu);
                 end else
@@ -499,6 +501,7 @@ type tslparser = class(tslparserbase) //
         if tk <> "(" then fn := tk;
         while true do
         begin
+            if ifnil(tk) then break;
             if tk="begin" then
             begin
                 //return parserstatement();

funcext/tvclib/tslvcl.tsf

@@ -5797,7 +5797,7 @@ type Ttfm2Component = class(TTmfParser)
             if cn="tdcreateform" or cn="tdcreatepanel" then return ;
             if hastfmfile(phs,cn) then 
             begin
-                Loadtfmtoform(o2,phs,cn);
+                Loadtfmtoform(o,phs,cn); //从 o2 改为o
                 return ;
             end 
             ic := ci["inherited"][0];

funcext/tvclib/utslvclpage.tsf

@@ -653,6 +653,14 @@ type tcustompagecontrol = class(TCustomControl)
             pg := FTabItems[i].PageSheet;
             if not pg then continue;
             pg.Align := alNone;
+            if (pg is class(TWinControl)) and pg.WsPopUp then
+            begin
+                if i=FCurrentid  then 
+                begin
+                    pg.show();
+                end 
+                continue;
+            end 
             if i=FCurrentid then
             begin
                 pg.Visible := true;