diff --git a/TSL.exe b/TSL.exe index 35d3bb1..f30e612 100644 Binary files a/TSL.exe and b/TSL.exe differ diff --git a/TSLInterp.dll b/TSLInterp.dll index 4bac316..5dbf837 100644 Binary files a/TSLInterp.dll and b/TSLInterp.dll differ diff --git a/designer/tediterform.tsf b/designer/tediterform.tsf index acf2a18..ab2e618 100644 --- a/designer/tediterform.tsf +++ b/designer/tediterform.tsf @@ -23,8 +23,18 @@ type TEditerForm = class(TVCform) // inherited; end function editerinfo(); - begin - return "tslÓïÑÔ±¾µØ±à¼­Æ÷\r\n°æ±¾:1.0.0\r\nÈÕÆÚ:2022-07-19"; + begin + s := "tslÓïÑÔ±¾µØ±à¼­Æ÷\r\n°æ±¾:1.0.0\r\nÈÕÆÚ:2022-07-19"; + f := tslfilename()+".about"; + if fileexists("",f) then + begin + size := filesize("",f); + if readFile(rwraw(),"",f,0,size,data) then + begin + return data; + end + end + return s; end function Create(AOwner);override; begin @@ -428,7 +438,7 @@ type TEditerForm = class(TVCform) // end "¹ØÓÚ": begin - return messageboxa(editerinfo(),"˵Ã÷",0,self.Handle); + return messageboxa(static editerinfo(),"¹ØÓÚ",0,self.Handle); end end diff --git a/designer/tslediter.tsl.about b/designer/tslediter.tsl.about new file mode 100644 index 0000000..7a50326 --- /dev/null +++ b/designer/tslediter.tsl.about @@ -0,0 +1,3 @@ +"tslÓïÑÔ±¾µØ±à¼­Æ÷about +°æ±¾:1.0.0 +ÈÕÆÚ:2022-07-19" diff --git a/designer/utslcodeformat.tsf b/designer/utslcodeformat.tsf index 44d606d..ec20836 100644 --- a/designer/utslcodeformat.tsf +++ b/designer/utslcodeformat.tsf @@ -943,7 +943,11 @@ type TFormatParser = class begin stype := TK_UNIT; end - "private","public","published","interface","implementation","initialization" : stype := TK_PRIVATE; + {$ifdef weakref} + "private","public","published","interface","implementation","initialization","weakref","autoref" : stype := TK_PRIVATE; + {$else} + "private","public","published","interface","implementation","initialization": stype := TK_PRIVATE; + {$endif} "function","procedure": stype := TK_FUNCTION; "type": stype := TK_TYPE; "try": stype := TK_TRY; diff --git a/designer/utslvcldebuger.tsf b/designer/utslvcldebuger.tsf index b0f6e47..2c4efaf 100644 --- a/designer/utslvcldebuger.tsf +++ b/designer/utslvcldebuger.tsf @@ -938,7 +938,8 @@ type TTslDebuga=class(TCustomControl) //echo "\r\nrectype",format("0x%x",recvtype); if 0x0401=recvtype then begin - owner.echoAppendString(d["errmsg"]); + //owner.echoAppendString(d["errmsg"]); + ExecuteCommand("showeval",d["errmsg"]); return; end if recvtype <> 0x402 then diff --git a/funcext/tvclib/utslvclstdctl.tsf b/funcext/tvclib/utslvclstdctl.tsf index 94fc2f8..842fc81 100644 --- a/funcext/tvclib/utslvclstdctl.tsf +++ b/funcext/tvclib/utslvclstdctl.tsf @@ -6692,7 +6692,7 @@ type tcustomprocess = class(tcomponent) // if fprocesshandle then return 0; if not parserasexeclevparam(exe,cmd,e,arg,envp) then return 0; Sysexecnewpipe(0); - ferrinfo := nil; + ferrinfo := nil; hd := sysexec(e,arg,nil,false,code); if hd=0 then begin diff --git a/plugin/TSLCPLUGIN.DLL b/plugin/TSLCPLUGIN.DLL index b3079e9..3cb756d 100644 Binary files a/plugin/TSLCPLUGIN.DLL and b/plugin/TSLCPLUGIN.DLL differ diff --git a/tslkrnl.dll b/tslkrnl.dll index c4fd557..00b6310 100644 Binary files a/tslkrnl.dll and b/tslkrnl.dll differ diff --git a/tsl语言本地编辑器.docx b/tsl语言本地编辑器.docx index d12e0c7..d9e06a5 100644 Binary files a/tsl语言本地编辑器.docx and b/tsl语言本地编辑器.docx differ