administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix #1699

Browse source
This commit is contained in:
Бондарев Иван 2019-02-03 14:46:35 +01:00
parent c05030ec9e
commit 4395542319
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
VisualPascalABCNET/IB/Debugger/ExpressionEvaluation.cs
View file

@ -5612,7 +5612,25 @@ namespace VisualPascalABC
if (pars.Length != 1)
throw new WrongNumberArguments(name);
break;
default:
Type t = AssemblyHelper.GetType(name);
if (t != null)
{
if (pars.Length != 1)
throw new WrongNumberArguments(name);
if (pars[0] is Value)
{
Value v = pars[0] as Value;
DebugType dt = DebugUtils.GetDebugType(t);
if (dt == v.Type || v.Type.IsSubclassOf(dt))
return v;
else
throw new InvalidCastException();
}
else
throw new InvalidCastException();
}
throw new UnknownName(name);
}
try
@ -5894,10 +5912,10 @@ namespace VisualPascalABC
{
throw new WrongTypeOfArgument(name);
}
catch (System.InvalidCastException)
/*catch (System.InvalidCastException)
{
throw new WrongTypeOfArgument(name);
}
}*/
return null;
}
@ -6664,6 +6682,11 @@ namespace VisualPascalABC
args.Add(GetSimpleValue(rv));
}
res.prim_val = EvalStandFuncWithParam(id.name, args.ToArray());
if (res.prim_val is Value)
{
res.obj_val = res.prim_val as Value;
res.prim_val = null;
}
}
eval_stack.Push(res);
}