Merge branch 'master' into icon_blend_additions3

# Conflicts:
#	OpenDreamRuntime/DreamManager.cs
#	OpenDreamRuntime/Objects/DreamIcon.cs
#	OpenDreamRuntime/Objects/DreamList.cs
#	OpenDreamRuntime/Objects/DreamObjectDefinition.cs
#	OpenDreamRuntime/Objects/DreamObjectTree.cs
#	OpenDreamRuntime/Procs/DMProc.cs

DMCompiler/DM/DMObject.cs

@@ -29,7 +29,7 @@ class DMObject {
 
         public List<DMASTObjectVarOverride>? danglingOverrides = null; // Overrides waiting for the LateVarDef event to happen
         private bool _isSubscribedToVarDef = false;
-        
+
         public DMObject(int id, DreamPath path, DMObject parent) {
             Id = id;
             Path = path;
@@ -90,7 +90,7 @@ public void WaitForLateVarDefinition(DMASTObjectVarOverride varOverride)
             }
         }
 
-        ///<remarks> 
+        ///<remarks>
         /// Note that this DOES NOT query our <see cref= "GlobalVariables" />. <br/>
         /// <see langword="TODO:"/> Make this (and other things) match the nomenclature of <see cref="HasLocalVariable"/>
         /// </remarks>
@@ -179,15 +179,18 @@ public DMVariable GetGlobalVariable(string name) {
         }
 
         public void CreateInitializationProc() {
-            if (InitializationProcExpressions.Count > 0 && InitializationProc == null)
-            {
+            if (InitializationProcExpressions.Count > 0 && InitializationProc == null) {
                 var init = DMObjectTree.CreateDMProc(this, null);
                 InitializationProc = init.Id;
                 init.PushArguments(0);
                 init.Call(DMReference.SuperProc);
 
                 foreach (DMExpression expression in InitializationProcExpressions) {
                     try {
+                        if (expression.Location.Line is int line) {
+                            init.DebugSource(expression.Location.SourceFile);
+                            init.DebugLine(line);
+                        }
                         expression.EmitPushValue(this, init);
                     } catch (CompileErrorException e) {
                         DMCompiler.Emit(e.Error);

DMCompiler/DM/DMObjectTree.cs

@@ -169,6 +169,10 @@ public static void CreateGlobalInitProc() {
             foreach (var globals in _globalInitAssigns.Values) {
                 foreach (var assign in globals) {
                     try {
+                        if (assign.Value.Location.Line is int line) {
+                            GlobalInitProc.DebugSource(assign.Value.Location.SourceFile);
+                            GlobalInitProc.DebugLine(line);
+                        }
                         assign.Value.EmitPushValue(root, GlobalInitProc);
                         GlobalInitProc.Assign(DMReference.CreateGlobal(assign.GlobalId));
                     } catch (CompileErrorException e) {

DMCompiler/DM/DMProc.cs

@@ -48,7 +48,7 @@ public DMProcScope(DMProcScope parentScope) {
         public List<DMValueType> ParameterTypes = new();
         public Location Location = Location.Unknown;
         public ProcAttributes Attributes;
-        public string Name { get => _astDefinition?.Name; }
+        public string Name { get => _astDefinition?.Name ?? "<init>"; }
         public int Id;
         public Dictionary<string, int> GlobalVariables = new();
 
@@ -65,12 +65,23 @@ public DMProcScope(DMProcScope parentScope) {
         [CanBeNull] private Stack<string> _loopStack = null;
         private Stack<DMProcScope> _scopes = new();
         private Dictionary<string, LocalVariable> _parameters = new();
-        private int _localVariableIdCounter = 0;
         private int _labelIdCounter = 0;
         private int _maxStackSize = 0;
         private int _currentStackSize = 0;
         private bool _negativeStackSizeError = false;
 
+        private List<LocalVariableJson> _localVariableNames = new();
+        private int _localVariableIdCounter = 0;
+        private int AllocLocalVariable(string name) {
+            _localVariableNames.Add(new LocalVariableJson { Offset = (int)Bytecode.Position, Add = name });
+            return _localVariableIdCounter++;
+        }
+        private void DeallocLocalVariables(int amount) {
+            if (amount > 0) {
+                _localVariableNames.Add(new LocalVariableJson { Offset = (int)Bytecode.Position, Remove = amount });
+                _localVariableIdCounter -= amount;
+            }
+        }
 
         public DMProc(int id, DMObject dmObject, [CanBeNull] DMASTProcDefinition astDefinition)
         {
@@ -136,6 +147,9 @@ public ProcDefinitionJson GetJsonRepresentation() {
                     });
                 }
             }
+            if (_localVariableNames.Count > 0) {
+                procDefinition.Locals = _localVariableNames;
+            }
 
             return procDefinition;
         }
@@ -214,15 +228,15 @@ public bool TryAddLocalVariable(string name, DreamPath? type) {
             if (_parameters.ContainsKey(name)) //Parameters and local vars cannot share a name
                 return false;
 
-            int localVarId = _localVariableIdCounter++;
+            int localVarId = AllocLocalVariable(name);
             return _scopes.Peek().LocalVariables.TryAdd(name, new LocalVariable(localVarId, false, type));
         }
 
         public bool TryAddLocalConstVariable(string name, DreamPath? type, Expressions.Constant value) {
             if (_parameters.ContainsKey(name)) //Parameters and local vars cannot share a name
                 return false;
 
-            int localVarId = _localVariableIdCounter++;
+            int localVarId = AllocLocalVariable(name);
             return _scopes.Peek().LocalVariables.TryAdd(name, new LocalConstVariable(localVarId, type, value));
         }
 
@@ -544,7 +558,7 @@ public void StartScope() {
 
         public void EndScope() {
             DMProcScope destroyedScope = _scopes.Pop();
-            _localVariableIdCounter -= destroyedScope.LocalVariables.Count;
+            DeallocLocalVariables(destroyedScope.LocalVariables.Count);
         }
 
         public void Jump(string label) {

DMCompiler/DM/Visitors/DMObjectBuilder.cs

@@ -227,9 +227,10 @@ private static void ProcessProcDefinition(DMASTProcDefinition procDefinition, DM
                 }
 
                 if (procDefinition.IsVerb && (dmObject.IsSubtypeOf(DreamPath.Atom) || dmObject.IsSubtypeOf(DreamPath.Client)) && !DMCompiler.Settings.NoStandard) {
-                    Expressions.Field field = new Expressions.Field(Location.Unknown, dmObject.GetVariable("verbs"));
+                    var initLoc = procDefinition.Location;
+                    Expressions.Field field = new Expressions.Field(initLoc, dmObject.GetVariable("verbs"));
                     DreamPath procPath = new DreamPath(".proc/" + procName);
-                    Expressions.Append append = new Expressions.Append(Location.Unknown, field, new Expressions.Path(Location.Unknown, procPath));
+                    Expressions.Append append = new Expressions.Append(initLoc, field, new Expressions.Path(initLoc, procPath));
 
                     dmObject.InitializationProcExpressions.Add(append);
                 }
@@ -377,8 +378,9 @@ private static void EmitInitializationAssign(DMObject currentObject, DMVariable
 
                 DMObjectTree.AddGlobalInitAssign(currentObject, globalId.Value, expression);
             } else {
-                Expressions.Field field = new Expressions.Field(Location.Unknown, variable);
-                Expressions.Assignment assign = new Expressions.Assignment(Location.Unknown, field, expression);
+                var initLoc = expression.Location;
+                Expressions.Field field = new Expressions.Field(initLoc, variable);
+                Expressions.Assignment assign = new Expressions.Assignment(initLoc, field, expression);
 
                 currentObject.InitializationProcExpressions.Add(assign);
             }

DMCompiler/DMCompiler.cs

@@ -131,10 +131,8 @@ DMPreprocessor build() {
 
             if (Settings.DumpPreprocessor) {
                 //Preprocessing is done twice because the output is used up when dumping it
-                DMPreprocessor dumpPreproc = build();
-
                 StringBuilder result = new();
-                foreach (Token t in dumpPreproc) {
+                foreach (Token t in build()) {
                     result.Append(t.Text);
                 }
 
@@ -283,12 +281,15 @@ private static string SaveJson(List<DreamMapJson> maps, string interfaceFile, st
             if (DMObjectTree.Globals.Count > 0) {
                 GlobalListJson globalListJson = new GlobalListJson();
                 globalListJson.GlobalCount = DMObjectTree.Globals.Count;
+                globalListJson.Names = new List<string>(globalListJson.GlobalCount);
 
                 // Approximate capacity (4/285 in tgstation, ~3%)
                 globalListJson.Globals = new Dictionary<int, object>((int) (DMObjectTree.Globals.Count * 0.03));
 
                 for (int i = 0; i < DMObjectTree.Globals.Count; i++) {
                     DMVariable global = DMObjectTree.Globals[i];
+                    globalListJson.Names.Add(global.Name);
+
                     if (!global.TryAsJsonRepresentation(out var globalJson))
                         ForcedError(global.Value.Location, $"Failed to serialize global {global.Name}");
 

OpenDreamRuntime/AtomManager.cs

@@ -173,7 +173,7 @@ public IconAppearance CreateAppearanceFromDefinition(DreamObjectDefinition def)
         }
     }
 
-    internal interface IAtomManager {
+    public interface IAtomManager {
         public Dictionary<DreamList, DreamObject> OverlaysListToAtom { get; }
         public Dictionary<DreamList, DreamObject> UnderlaysListToAtom { get; }
 

OpenDreamRuntime/DreamManager.cs

@@ -4,6 +4,7 @@
 using OpenDreamRuntime.Objects;
 using OpenDreamRuntime.Objects.MetaObjects;
 using OpenDreamRuntime.Procs;
+using OpenDreamRuntime.Procs.DebugAdapter;
 using OpenDreamRuntime.Procs.Native;
 using OpenDreamRuntime.Resources;
 using OpenDreamShared;
@@ -20,15 +21,19 @@ partial class DreamManager : IDreamManager {
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IDreamMapManager _dreamMapManager = default!;
+        [Dependency] private readonly IDreamDebugManager _dreamDebugManager = default!;
         [Dependency] private readonly IProcScheduler _procScheduler = default!;
         [Dependency] private readonly DreamResourceManager _dreamResourceManager = default!;
+        [Dependency] private readonly ITaskManager _taskManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IDreamObjectTree _objectTree = default!;
 
         public DreamObject WorldInstance { get; private set; }
         public Exception? LastDMException { get; set; }
 
         // Global state that may not really (really really) belong here
         public List<DreamValue> Globals { get; set; } = new();
+        public IReadOnlyList<string> GlobalNames { get; private set; } = new List<string>();
         public DreamList WorldContentsList { get; private set; }
         public Dictionary<DreamObject, DreamList> AreaContents { get; set; } = new();
         public Dictionary<DreamObject, int> ReferenceIDs { get; set; } = new();
@@ -48,20 +53,17 @@ public void PreInitialize(string jsonPath) {
             _dreamResourceManager.Initialize();
 
             if (!LoadJson(jsonPath)) {
-                IoCManager.Resolve<ITaskManager>().RunOnMainThread(() => { IoCManager.Resolve<IBaseServer>().Shutdown("Error while loading the compiled json. The opendream.json_path CVar may be empty, or points to a file that doesn't exist"); });
+                _taskManager.RunOnMainThread(() => { IoCManager.Resolve<IBaseServer>().Shutdown("Error while loading the compiled json. The opendream.json_path CVar may be empty, or points to a file that doesn't exist"); });
             }
         }
 
         public void StartWorld() {
             // It is now OK to call user code, like /New procs.
             Initialized = true;
-            InitializedTick = IoCManager.Resolve<IGameTiming>().CurTick;
+            InitializedTick = _gameTiming.CurTick;
 
             // Call global <init> with waitfor=FALSE
-            if (_compiledJson.GlobalInitProc is ProcDefinitionJson initProcDef) {
-                var globalInitProc = new DMProc(DreamPath.Root, "(global init)", null, null, null, initProcDef.Bytecode, initProcDef.MaxStackSize, initProcDef.Attributes, initProcDef.VerbName, initProcDef.VerbCategory, initProcDef.VerbDesc, initProcDef.Invisibility, _objectTree, _dreamResourceManager);
-                globalInitProc.Spawn(WorldInstance, new DreamProcArguments());
-            }
+            _objectTree.GlobalInitProc?.Spawn(WorldInstance, new());
 
             // Call New() on all /area and /turf that exist, each with waitfor=FALSE separately. If <global init> created any /area, call New a SECOND TIME
             // new() up /objs and /mobs from compiled-in maps [order: (1,1) then (2,1) then (1,2) then (2,2)]
@@ -116,6 +118,7 @@ public bool LoadJson(string? jsonPath) {
             if (_compiledJson.Globals is GlobalListJson jsonGlobals) {
                 Globals.Clear();
                 Globals.EnsureCapacity(jsonGlobals.GlobalCount);
+                GlobalNames = jsonGlobals.Names;
 
                 for (int i = 0; i < jsonGlobals.GlobalCount; i++) {
                     object globalValue = jsonGlobals.Globals.GetValueOrDefault(i, null);

OpenDreamRuntime/DreamThread.cs

@@ -19,7 +19,7 @@ public abstract class DreamProc {
         public string Name { get; }
 
         // This is currently publicly settable because the loading code doesn't know what our super is until after we are instantiated
-        public DreamProc SuperProc { set; get; }
+        public DreamProc? SuperProc { set; get; }
 
         public ProcAttributes Attributes { get; }
 
@@ -31,7 +31,7 @@ public abstract class DreamProc {
         public string? VerbDesc { get; }
         public sbyte? Invisibility { get; }
 
-        protected DreamProc(DreamPath owningType, string name, DreamProc superProc, ProcAttributes attributes, List<String>? argumentNames, List<DMValueType>? argumentTypes, string? verbName, string? verbCategory, string? verbDesc, sbyte? invisibility) {
+        protected DreamProc(DreamPath owningType, string name, DreamProc? superProc, ProcAttributes attributes, List<String>? argumentNames, List<DMValueType>? argumentTypes, string? verbName, string? verbCategory, string? verbDesc, sbyte? invisibility) {
             OwningType = owningType;
             Name = name;
             SuperProc = superProc;
@@ -124,6 +124,12 @@ public ProcStatus Resume() {
         public virtual void ReturnedInto(DreamValue value) {}
 
         public virtual void Cancel() {}
+
+        public override string ToString() {
+            var sb = new StringBuilder();
+            AppendStackFrame(sb);
+            return sb.ToString();
+        }
     }
 
     public sealed class DreamThread {
@@ -149,7 +155,7 @@ public DreamThread(string name) {
             Name = name;
         }
 
-        public static DreamValue Run(DreamProc proc, DreamObject src, DreamObject usr, DreamProcArguments? arguments) {
+        public static DreamValue Run(DreamProc proc, DreamObject src, DreamObject? usr, DreamProcArguments? arguments) {
             var context = new DreamThread(proc.ToString());
             var state = proc.CreateState(context, src, usr, arguments ?? new DreamProcArguments(null));
             context.PushProcState(state);
@@ -250,17 +256,17 @@ public ProcStatus HandleDefer() {
 
             // `WaitFor = true` frames
             while (_current is not null && _current.WaitFor) {
-                var frame = _current;
+                newStackReversed.Push(_current);
                 PopProcState();
-                newStackReversed.Push(frame);
             }
 
             // `WaitFor = false` frame
             if(_current == null) throw new InvalidOperationException();
+            var threadName = _current.ToString();
             newStackReversed.Push(_current);
             PopProcState();
 
-            DreamThread newThread = new DreamThread("defer " + Name);
+            DreamThread newThread = new DreamThread(threadName);
             foreach (var frame in newStackReversed) {
                 frame.Thread = newThread;
                 newThread.PushProcState(frame);
@@ -309,10 +315,6 @@ public void HandleException(Exception exception)
         {
             _current?.Cancel();
 
-            if (_current is DMProcState state) {
-                state.ReturnPools();
-            }
-
             var dreamMan = IoCManager.Resolve<IDreamManager>();
             dreamMan.LastDMException = exception;
 
@@ -330,6 +332,11 @@ public void HandleException(Exception exception)
             dreamMan.WriteWorldLog(builder.ToString(), LogLevel.Error);
 
             IoCManager.Resolve<Procs.DebugAdapter.IDreamDebugManager>()?.HandleException(this, exception);
+
+            // Only return pools after giving the debugger a chance to inspect them.
+            if (_current is DMProcState state) {
+                state.ReturnPools();
+            }
         }
 
         public IEnumerable<ProcState> InspectStack() {

OpenDreamRuntime/DreamValue.cs

@@ -90,16 +90,13 @@ public DreamValue(object value) {
         }
 
         public override string ToString() {
-            string strValue;
             if (Value == null) {
-                strValue = "null";
+                return "null";
             } else if (Type == DreamValueType.String) {
-                strValue = $"\"{Value}\"";
+                return $"\"{Value}\"";
             } else {
-                strValue = Value.ToString() ?? "<ToString() = null>";
+                return Value.ToString() ?? "<ToString() = null>";
             }
-
-            return "DreamValue(" + Type + ", " + strValue + ")";
         }
 
         [Obsolete("Deprecated. Use TryGetValueAsString() or MustGetValueAsString() instead.")]

OpenDreamRuntime/EntryPoint.cs

@@ -66,8 +66,7 @@ protected override void Dispose(bool disposing) {
         public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs) {
             if (level == ModUpdateLevel.PostEngine) {
                 _commandSystem.RunRepeatingCommands();
-                if (!_debugManager.Stopped)
-                    _dreamManager.Update();
+                _dreamManager.Update();
                 _debugManager.Update();
             }
         }

OpenDreamRuntime/IDreamManager.cs

@@ -13,7 +13,8 @@ public interface IDreamManager {
         /// </summary>
         public Exception? LastDMException { get; set; }
 
-        public List<DreamValue> Globals { get; set; }
+        public List<DreamValue> Globals { get; }
+        public IReadOnlyList<string> GlobalNames { get; }
         public DreamList WorldContentsList { get; }
         public Dictionary<DreamObject, DreamList> AreaContents { get; set; }
         public Dictionary<DreamObject, int> ReferenceIDs { get; set; }

OpenDreamRuntime/Objects/DreamIcon.cs

@@ -357,8 +357,10 @@ public sealed class DreamIconOperationBlendImage : DreamIconOperationBlend {
     private readonly ParsedDMIDescription _blendingDescription;
 
     public DreamIconOperationBlendImage(BlendType type, int xOffset, int yOffset, DreamValue blending) : base(type, xOffset, yOffset) {
+        //TODO: Find a way to get rid of this!
         var objectTree = IoCManager.Resolve<IDreamObjectTree>();
         var resourceManager = IoCManager.Resolve<DreamResourceManager>();
+
         (var blendingResource, _blendingDescription) = DreamMetaObjectIcon.GetIconResourceAndDescription(objectTree, resourceManager, blending);
         _blending = resourceManager.LoadImage(blendingResource);
     }