Merge branch 'EvilBeaver:develop' into feature/exception-breakpoints

akpaevj · Aug 5, 2024 · 60ebc10 · 60ebc10
2 parents 44ad5b9 + ae93a2e
commit 60ebc10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/OneScript.Web.Server/HeaderDictionaryWrapper.cs b/src/OneScript.Web.Server/HeaderDictionaryWrapper.cs
@@ -306,7 +306,7 @@ public override bool IsIndexed
 
         public override IValue GetIndexedValue(IValue index)
         {
-            if (!_items.TryGetValue(index.AsString(), out var result))
+            if (_items.TryGetValue(index.AsString(), out var result))
                 return ValueFactory.Create(result); 
             else
                 return ValueFactory.Create();
@@ -318,16 +318,6 @@ public override void SetIndexedValue(IValue index, IValue val)
                 _items[index.AsString()] = val.AsString();
         }
 
-        public override bool IsPropReadable(int propNum)
-        {
-            return false;
-        }
-
-        public override bool IsPropWritable(int propNum)
-        {
-            return false;
-        }
-
         internal bool ContainsKey(IValue key)
         {
             return _items.ContainsKey(key.AsString());

diff --git a/src/ScriptEngine/Machine/MachineInstance.cs b/src/ScriptEngine/Machine/MachineInstance.cs
@@ -246,6 +246,7 @@ internal IValue EvaluateInFrame(string expression, ExecutionFrame selectedFrame)
             MachineInstance runner = new MachineInstance
             {
                 _mem = this._mem,
+                _globalContexts = this._globalContexts,
                 _debugInfo = CurrentScript
             };
             currentMachine = Current;
@@ -1382,7 +1383,8 @@ private void Execute(int arg)
                 ThisScope = localScope,
                 Scopes = scopes,
                 Locals = new IVariable[method.LocalVariables.Length],
-                InstructionPointer = 0
+                InstructionPointer = 0,
+                IsReentrantCall = true
             };
             var locals = frame.Locals;
             for (int i = 0; i < locals.Length; i++)