Refactor common code

Content.Tests/DummyDreamMapManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using DMCompiler.Json;
+using OpenDreamShared.Common.Json;
 using OpenDreamRuntime.Map;
 using OpenDreamRuntime.Objects;
 using OpenDreamRuntime.Objects.Types;

Content.Tests/RuntimeTests.cs

@@ -1,6 +1,6 @@
 using System;
-using DMCompiler.Bytecode;
 using NUnit.Framework;
+using OpenDreamShared.Common.Bytecode;
 
 namespace Content.Tests;
 

DMCompiler/Compiler/DM/AST/DMAST.Expression.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using DMCompiler.DM;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.Compiler.DM.AST;
 

DMCompiler/Compiler/DM/AST/DMAST.ObjectStatements.cs

@@ -1,4 +1,5 @@
 using DMCompiler.DM;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.Compiler.DM.AST;
 

DMCompiler/Compiler/DM/AST/DMAST.ProcStatements.cs

@@ -1,4 +1,5 @@
 using DMCompiler.DM;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.Compiler.DM.AST;
 

DMCompiler/Compiler/DM/AST/DMAST.cs

@@ -1,4 +1,5 @@
 using DMCompiler.DM;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.Compiler.DM.AST;
 

DMCompiler/Compiler/DM/DMParser.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.Compiler.DM {
     internal partial class DMParser(DMCompiler compiler, DMLexer lexer) : Parser<Token>(compiler, lexer) {

DMCompiler/Compiler/DM/DMParserHelper.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler.DM.AST;
+using OpenDreamShared.Common.Bytecode;
 
 namespace DMCompiler.Compiler.DM;
 

DMCompiler/Compiler/DM/DMPath.cs

@@ -1,4 +1,6 @@
-namespace DMCompiler.Compiler.DM;
+using OpenDreamShared.Common;
+
+namespace DMCompiler.Compiler.DM;
 
 internal abstract class VarDeclInfo {
     public DreamPath? TypePath;

DMCompiler/Compiler/DMM/DMMParser.cs

@@ -1,7 +1,8 @@
 using DMCompiler.Compiler.DM;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM.Builders;
-using DMCompiler.Json;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.Compiler.DMM;
 

DMCompiler/DM/Builders/DMCodeTreeBuilder.cs

@@ -1,4 +1,5 @@
 using DMCompiler.Compiler.DM.AST;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.DM.Builders;
 

DMCompiler/DM/Builders/DMExpressionBuilder.cs

@@ -4,6 +4,8 @@
 using DMCompiler.DM.Expressions;
 using static DMCompiler.DM.Builders.DMExpressionBuilder.ScopeMode;
 using String = DMCompiler.DM.Expressions.String;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.DM.Builders;
 

DMCompiler/DM/Builders/DMProcBuilder.cs

@@ -1,9 +1,11 @@
 using System.Diagnostics;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM.Expressions;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.DM.Builders {
     internal sealed class DMProcBuilder(DMCompiler compiler, DMObject dmObject, DMProc proc) {

DMCompiler/DM/DMCodeTree.Procs.cs

@@ -1,5 +1,6 @@
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM.AST;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/DMCodeTree.Vars.cs

@@ -1,9 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM.Builders;
 using DMCompiler.DM.Expressions;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
 using ScopeMode = DMCompiler.DM.Builders.DMExpressionBuilder.ScopeMode;
 
 namespace DMCompiler.DM;

DMCompiler/DM/DMCodeTree.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using DMCompiler.Compiler;
 using DMCompiler.DM.Builders;
+using OpenDreamShared.Common;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/DMValueType.cs → DMCompiler/DM/DMComplexValueType.cs

@@ -1,35 +1,7 @@
-namespace DMCompiler.DM;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
 
-// If you are modifying this, you must also modify OpenDreamShared.Dream.DreamValueType !!
-// Unfortunately the client needs this and it can't reference DMCompiler due to the sandbox
-
-///<summary>
-///Stores any explicit casting done via the "as" keyword. Also stores compiler hints for DMStandard.<br/>
-///is a [Flags] enum because it's possible for something to have multiple values (especially with the quirky DMStandard ones)
-/// </summary>
-[Flags]
-public enum DMValueType {
-    Anything = 0x0,
-    Null = 0x1,
-    Text = 0x2,
-    Obj = 0x4,
-    Mob = 0x8,
-    Turf = 0x10,
-    Num = 0x20,
-    Message = 0x40,
-    Area = 0x80,
-    Color = 0x100,
-    File = 0x200,
-    CommandText = 0x400,
-    Sound = 0x800,
-    Icon = 0x1000,
-    Path = 0x2000, // For proc return types
-
-    //Byond here be dragons
-    Unimplemented = 0x4000, // Marks that a method or property is not implemented. Throws a compiler warning if accessed.
-    CompiletimeReadonly = 0x8000, // Marks that a property can only ever be read from, never written to. This is a const-ier version of const, for certain standard values like list.type
-    NoConstFold = 0x10000 // Marks that a const var cannot be const-folded during compile
-}
+namespace DMCompiler.DM;
 
 /// <summary>
 /// Allows for more complex things than DMValueType does, such as supporting type paths

DMCompiler/DM/DMExpression.cs

@@ -1,7 +1,9 @@
-using DMCompiler.Bytecode;
 using System.Diagnostics.CodeAnalysis;
 using DMCompiler.Compiler;
 using DMCompiler.DM.Expressions;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/DMObject.cs

@@ -1,7 +1,9 @@
 using System.Linq;
-using DMCompiler.Bytecode;
 using DMCompiler.DM.Expressions;
-using DMCompiler.Json;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/DMObjectTree.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM.AST;
-using DMCompiler.Json;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/DMProc.cs

@@ -1,12 +1,14 @@
-using DMCompiler.Bytecode;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using DMCompiler.DM.Expressions;
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM.Builders;
-using DMCompiler.Json;
 using DMCompiler.Optimizer;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.DM {
     internal sealed class DMProc {

DMCompiler/DM/DMVariable.cs

@@ -1,4 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DMCompiler.DM;
 

DMCompiler/DM/Expressions/Binary.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DM/Expressions/Builtins.cs

@@ -1,7 +1,9 @@
-using DMCompiler.Bytecode;
 using System.Diagnostics.CodeAnalysis;
 using DMCompiler.Compiler;
-using DMCompiler.Json;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.DM.Expressions;
 
@@ -61,7 +63,7 @@ public void EmitPushArglist(ExpressionContext ctx) {
 internal sealed class New(DMCompiler compiler, Location location, DMExpression expr, ArgumentList arguments) : DMExpression(location) {
     public override DreamPath? Path => expr.Path;
     public override bool PathIsFuzzy => Path == null;
-    public override DMComplexValueType ValType => !expr.ValType.IsAnything ? expr.ValType : (Path?.GetAtomType(compiler) ?? DMValueType.Anything);
+    public override DMComplexValueType ValType => !expr.ValType.IsAnything ? expr.ValType : (compiler.GetAtomType(Path) ?? DMValueType.Anything);
 
     public override void EmitPushValue(ExpressionContext ctx) {
         var argumentInfo = arguments.EmitArguments(ctx, null);
@@ -74,7 +76,7 @@ public override void EmitPushValue(ExpressionContext ctx) {
 // new /x/y/z (...)
 internal sealed class NewPath(DMCompiler compiler, Location location, IConstantPath create, ArgumentList arguments) : DMExpression(location) {
     public override DreamPath? Path => (create is ConstantTypeReference typeReference) ? typeReference.Path : null;
-    public override DMComplexValueType ValType => Path?.GetAtomType(compiler) ?? DMValueType.Anything;
+    public override DMComplexValueType ValType => compiler.GetAtomType(Path) ?? DMValueType.Anything;
 
     public override void EmitPushValue(ExpressionContext ctx) {
         DMCallArgumentsType argumentsType;

DMCompiler/DM/Expressions/Constant.cs

@@ -1,7 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using DMCompiler.Compiler;
-using DMCompiler.Json;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common.Json;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DM/Expressions/Dereference.cs

@@ -1,7 +1,9 @@
-using DMCompiler.Bytecode;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using DMCompiler.Compiler;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common.Bytecode;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DM/Expressions/LValue.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DM/Expressions/Procs.cs

@@ -1,6 +1,8 @@
 using System.Linq;
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamShared.Common.DM;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DM/Expressions/Unary.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using DMCompiler.Bytecode;
+using OpenDreamShared.Common.Bytecode;
 
 namespace DMCompiler.DM.Expressions;
 

DMCompiler/DMCompiler.cs

@@ -1,4 +1,3 @@
-using DMCompiler.Bytecode;
 using DMCompiler.Compiler.DM;
 using DMCompiler.Compiler.DMM;
 using DMCompiler.Compiler.DMPreprocessor;
@@ -13,8 +12,12 @@
 using DMCompiler.Compiler;
 using DMCompiler.Compiler.DM.AST;
 using DMCompiler.DM.Builders;
-using DMCompiler.Json;
 using DMCompiler.Optimizer;
+using OpenDreamShared.Common.DM;
+using OpenDreamShared.Common;
+using OpenDreamShared.Common.Json;
+using OpenDreamShared.Common.Bytecode;
+using OpenDreamNoClient.Bytecode;
 
 namespace DMCompiler;
 
@@ -78,7 +81,7 @@
             if (ErrorCount > 0) {
                 successfulCompile = false;
             } else {
-                var output = SaveJson(maps, preprocessor.IncludedInterface, outputFile);
+                var output = SaveJson(maps, preprocessor.IncludedInterface, outputFile, new OpcodeVerifier());
                 if (ErrorCount > 0) {
                     successfulCompile = false;
                 } else {
@@ -294,10 +297,10 @@
         return maps;
     }
 
-    private string SaveJson(List<DreamMapJson> maps, string interfaceFile, string outputFile) {
+    private string SaveJson(List<DreamMapJson> maps, string interfaceFile, string outputFile, IOpcodeVerifier verifier) {
         var jsonRep = DMObjectTree.CreateJsonRepresentation();
         var compiledDream = new DreamCompiledJson {
-            Metadata = new DreamCompiledJsonMetadata { Version = OpcodeVerifier.GetOpcodesHash() },
+            Metadata = new DreamCompiledJsonMetadata { Version = verifier.GetOpcodesHash() },
             Strings = DMObjectTree.StringTable,
             Resources = DMObjectTree.Resources.ToArray(),
             Maps = maps,
@@ -389,6 +392,26 @@
 
         return ret;
     }
+
+    public DMValueType? GetAtomType(DreamPath? path) {
+        if (path == null) {
+            return null;
+        }
+
+        if (!DMObjectTree.TryGetDMObject((DreamPath)path, out var dmType))
+            return DMValueType.Anything;
+
+        if (dmType.IsSubtypeOf(DreamPath.Obj))
+            return DMValueType.Obj;
+        if (dmType.IsSubtypeOf(DreamPath.Mob))
+            return DMValueType.Mob;
+        if (dmType.IsSubtypeOf(DreamPath.Turf))
+            return DMValueType.Turf;
+        if (dmType.IsSubtypeOf(DreamPath.Area))
+            return DMValueType.Area;
+
+        return DMValueType.Anything;
+    }
 }
 
 public struct DMCompilerSettings {

DMCompiler/DMCompiler.csproj

@@ -13,6 +13,11 @@
     <DMStandard Include="DMStandard\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\OpenDreamCommon\OpenDreamCommon.csproj" />
+    <ProjectReference Include="..\OpenDreamNoClient\OpenDreamNoClient.csproj" />
+  </ItemGroup>
+
   <Target Name="CopyDMStandard" AfterTargets="AfterBuild">
     <Copy SourceFiles="@(DMStandard)" DestinationFiles="@(DMStandard->'$(OutDir)\DMStandard\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>