ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-01 15:35:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Yengine temp file delete was still bad in case of script errors

Browse Source
This commit is contained in:
UbitUmarov
2018-03-09 21:33:39 +00:00
parent cf5ec5d29c
commit c723a1be16
3 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs
View File

@@ -835,33 +835,41 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Do both global functions, script-defined class static methods and
// script-defined instance methods, as we handle the differences
// during compilation of the functions/methods themselves.
for(int pass = 0; pass < 2; pass++)
// headers
foreach(TokenDeclVar declFunc in tokenScript.variablesStack)
{
foreach(TokenDeclVar declFunc in tokenScript.variablesStack)
if(declFunc.retType != null)
GenerateMethodHeader(declFunc);
}
foreach(TokenDeclSDType sdType in tokenScript.sdSrcTypesValues)
{
if(sdType is TokenDeclSDTypeClass)
{
if(declFunc.retType != null)
TokenDeclSDTypeClass sdtClass = (TokenDeclSDTypeClass)sdType;
foreach(TokenDeclVar declFunc in sdtClass.members)
{
if(pass == 0)
if((declFunc.retType != null) && ((declFunc.sdtFlags & ScriptReduce.SDT_ABSTRACT) == 0))
GenerateMethodHeader(declFunc);
else
GenerateMethodBody(declFunc);
}
}
foreach(TokenDeclSDType sdType in tokenScript.sdSrcTypesValues)
}
// now bodies
foreach(TokenDeclVar declFunc in tokenScript.variablesStack)
{
if(declFunc.retType != null)
GenerateMethodBody(declFunc);
}
foreach(TokenDeclSDType sdType in tokenScript.sdSrcTypesValues)
{
if(sdType is TokenDeclSDTypeClass)
{
if(sdType is TokenDeclSDTypeClass)
TokenDeclSDTypeClass sdtClass = (TokenDeclSDTypeClass)sdType;
foreach(TokenDeclVar declFunc in sdtClass.members)
{
TokenDeclSDTypeClass sdtClass = (TokenDeclSDTypeClass)sdType;
foreach(TokenDeclVar declFunc in sdtClass.members)
{
if((declFunc.retType != null) && ((declFunc.sdtFlags & ScriptReduce.SDT_ABSTRACT) == 0))
{
if(pass == 0)
GenerateMethodHeader(declFunc);
else
GenerateMethodBody(declFunc);
}
}
if((declFunc.retType != null) && ((declFunc.sdtFlags & ScriptReduce.SDT_ABSTRACT) == 0))
GenerateMethodBody(declFunc);
}
}
}