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

Use modern C# features in InterpreterContext.cs

Browse Source
This commit is contained in:
Yoshi Askharoun
2023-05-24 16:24:34 -05:00
parent fc5a110f17
commit 3edc265ecd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/Markup/InterpreterContext.cs
+7 -9
View File
@@ -18,15 +18,15 @@ namespace Microsoft.Iris.Markup
private uint _initialBytecodeOffset; private uint _initialBytecodeOffset;
private ParameterContext _parameterContext; private ParameterContext _parameterContext;
private Map<object, object> _scopedLocals; private Map<object, object> _scopedLocals;
private static Stack s_cache = new Stack(); private static Stack s_cache = new();
private InterpreterContext() 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; uint currentOffset = _loadResult.ObjectSection.CurrentOffset;
if (currentOffset > 0U) if (currentOffset > 0U)
@@ -65,8 +65,7 @@ namespace Microsoft.Iris.Markup
switch (symbolRef.Origin) switch (symbolRef.Origin)
{ {
case SymbolOrigin.ScopedLocal: case SymbolOrigin.ScopedLocal:
if (_scopedLocals == null) _scopedLocals ??= new Map<object, object>();
_scopedLocals = new Map<object, object>();
_scopedLocals[symbolRef.Symbol] = value; _scopedLocals[symbolRef.Symbol] = value;
break; break;
case SymbolOrigin.Parameter: case SymbolOrigin.Parameter:
@@ -94,8 +93,7 @@ namespace Microsoft.Iris.Markup
InterpreterContext interpreterContext = null; InterpreterContext interpreterContext = null;
if (s_cache.Count != 0) if (s_cache.Count != 0)
interpreterContext = (InterpreterContext)s_cache.Pop(); interpreterContext = (InterpreterContext)s_cache.Pop();
if (interpreterContext == null) interpreterContext ??= new InterpreterContext();
interpreterContext = new InterpreterContext();
interpreterContext._instance = instance; interpreterContext._instance = instance;
interpreterContext._initialBytecodeOffset = initialBytecodeOffset; interpreterContext._initialBytecodeOffset = initialBytecodeOffset;
interpreterContext._type = type; interpreterContext._type = type;
@@ -120,8 +118,8 @@ namespace Microsoft.Iris.Markup
{ {
int line = 0; int line = 0;
int column = 0; int column = 0;
((IErrorContextSource)this).GetErrorPosition(ref line, ref column); GetErrorPosition(ref line, ref column);
return string.Format("{0} ({1}, {2})", ((IErrorContextSource)this).GetErrorContextDescription(), line, column); return $"{GetErrorContextDescription()} ({line}, {column})";
} }
} }
} }