Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Fix error handling in PDT evaluator.

Browse Source
This commit is contained in:
PopSlime
2023-04-22 21:09:53 +08:00
parent d72afaa75b
commit a1fd420493
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs
View File

@@ -64,8 +64,10 @@ namespace Cryville.Common.Pdt {
} }
else { else {
var frame = _stack[_framecount - 1]; var frame = _stack[_framecount - 1];
ReplaceIP(il, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols); if (frame.Type != PdtInternalType.Error) {
for (var j = 0; j < fc1; j++) il.Remove(_ip.Previous); ReplaceIP(il, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols);
for (var j = 0; j < fc1; j++) il.Remove(_ip.Previous);
}
} }
} }
else if (i is PdtInstruction.Collapse) { else if (i is PdtInstruction.Collapse) {
@@ -197,7 +199,7 @@ namespace Cryville.Common.Pdt {
for (int i = 0; i < pc; i++) { for (int i = 0; i < pc; i++) {
var frame = _stack[--_framecount]; var frame = _stack[--_framecount];
if (frame.Type == PdtInternalType.Error) { if (frame.Type == PdtInternalType.Error) {
_framecount -= pc - i; _framecount -= pc - i - 1;
_stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = _goffset, Length = 0 }; _stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = _goffset, Length = 0 };
return false; return false;
} }

6
Assets/Cryville/Crtr/SkinPropertyKey.cs
View File

@@ -189,13 +189,15 @@ namespace Cryville.Crtr {
SkinVariable v; SkinVariable v;
if (!vars.TryGetValue(Name, out v)) if (!vars.TryGetValue(Name, out v))
vars.Add(Name, v = new SkinVariable()); vars.Add(Name, v = new SkinVariable());
ChartPlayer.etor.Evaluate(v.Op, exp); if (!ChartPlayer.etor.Evaluate(v.Op, exp))
throw new EvaluationFailureException();
} }
public override void ExecuteDynamic(ISkinnableGroup group, RuntimeSkinContext ctx, PdtExpression exp, IntKeyedDictionary<SkinVariable> vars, int dl) { public override void ExecuteDynamic(ISkinnableGroup group, RuntimeSkinContext ctx, PdtExpression exp, IntKeyedDictionary<SkinVariable> vars, int dl) {
SkinVariable v; SkinVariable v;
if (!vars.TryGetValue(Name, out v)) if (!vars.TryGetValue(Name, out v))
throw new InvalidOperationException(string.Format("Variable \"{0}\" not defined", IdentifierManager.SharedInstance.Retrieve(Name))); throw new InvalidOperationException(string.Format("Variable \"{0}\" not defined", IdentifierManager.SharedInstance.Retrieve(Name)));
ChartPlayer.etor.Evaluate(v.Op, exp); if (!ChartPlayer.etor.Evaluate(v.Op, exp))
throw new EvaluationFailureException();
} }
} }
} }

3
Assets/Cryville/Crtr/SkinSelectors.cs
View File

@@ -131,7 +131,8 @@ namespace Cryville.Crtr {
public SkinContext Match(SkinContext a) { public SkinContext Match(SkinContext a) {
ChartPlayer.etor.ContextTransform = a.Transform; ChartPlayer.etor.ContextTransform = a.Transform;
try { try {
ChartPlayer.etor.Evaluate(_op, _exp); if (!ChartPlayer.etor.Evaluate(_op, _exp))
throw new EvaluationFailureException();
return _flag ? a : null; return _flag ? a : null;
} }
catch (Exception ex) { catch (Exception ex) {