zune/MicrosoftIris
0
0
Fork 0
mirror of https://github.com/ZuneDev/MicrosoftIris.git synced 2026-07-27 13:13:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZuneDev/MicrosoftIris

Browse Source
This commit is contained in:
Yoshi Askharoun
2023-05-24 16:26:17 -05:00
parent 630e918a3d 03aa478fd4
commit 371fe9d1e8
4 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/Markup/Interpreter.cs
+3 -3
View File
@@ -71,7 +71,7 @@ namespace Microsoft.Iris.Markup
while (!errorsDetected)
{
OpCode opCode = (OpCode)reader.ReadByte();
Debug.Data.InterpreterEntry entry = new(opCode);
Debug.Data.InterpreterEntry entry = new(opCode, reader.CurrentOffset, loadResult.Uri);
// Fetch line and column numbers from the table
if (debugging && context.LoadResult.LineNumberTable.TryLookup(reader.CurrentOffset, out int line, out int column))
@@ -700,7 +700,7 @@ namespace Microsoft.Iris.Markup
}
}
Application.Debugger?.LogInterpreterOpCode(opCode, entry);
Application.Debugger?.LogInterpreterOpCode(context, entry);
}
while (stack.Count > count)
{
@@ -922,7 +922,7 @@ namespace Microsoft.Iris.Markup
while (!flag)
{
OpCode opCode = (OpCode)reader.ReadByte();
var entry = new Debug.Data.InterpreterEntry(opCode);
var entry = new Debug.Data.InterpreterEntry(opCode, reader.CurrentOffset, loadResult.Uri);
switch (opCode)
{
UIX/Microsoft/Iris/Markup/InterpreterContext.cs
+7 -9
View File
@@ -18,15 +18,15 @@ namespace Microsoft.Iris.Markup
private uint _initialBytecodeOffset;
private ParameterContext _parameterContext;
private Map<object, object> _scopedLocals;
private static Stack s_cache = new Stack();
private static Stack s_cache = new();
private InterpreterContext()
{
}
string IErrorContextSource.GetErrorContextDescription() => _type.Owner.ErrorContextUri;
public string GetErrorContextDescription() => _type.Owner.ErrorContextUri;
void IErrorContextSource.GetErrorPosition(ref int line, ref int column)
public void GetErrorPosition(ref int line, ref int column)
{
uint currentOffset = _loadResult.ObjectSection.CurrentOffset;
if (currentOffset > 0U)
@@ -65,8 +65,7 @@ namespace Microsoft.Iris.Markup
switch (symbolRef.Origin)
{
case SymbolOrigin.ScopedLocal:
if (_scopedLocals == null)
_scopedLocals = new Map<object, object>();
_scopedLocals ??= new Map<object, object>();
_scopedLocals[symbolRef.Symbol] = value;
break;
case SymbolOrigin.Parameter:
@@ -94,8 +93,7 @@ namespace Microsoft.Iris.Markup
InterpreterContext interpreterContext = null;
if (s_cache.Count != 0)
interpreterContext = (InterpreterContext)s_cache.Pop();
if (interpreterContext == null)
interpreterContext = new InterpreterContext();
interpreterContext ??= new InterpreterContext();
interpreterContext._instance = instance;
interpreterContext._initialBytecodeOffset = initialBytecodeOffset;
interpreterContext._type = type;
@@ -120,8 +118,8 @@ namespace Microsoft.Iris.Markup
{
int line = 0;
int column = 0;
((IErrorContextSource)this).GetErrorPosition(ref line, ref column);
return string.Format("{0} ({1}, {2})", ((IErrorContextSource)this).GetErrorContextDescription(), line, column);
GetErrorPosition(ref line, ref column);
return $"{GetErrorContextDescription()} ({line}, {column})";
}
}
}