Add compiler support for set src in range() and orange()

These were undocumented values. Also made `set src in world/usr` implicitly convert into `set src = world/usr.contents`
OpenDreamProject · Feb 10, 2024 · e3655a5 · e3655a5
1 parent 28a5b71
commit e3655a5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/DMCompiler/DM/VerbSrc.cs b/DMCompiler/DM/VerbSrc.cs
@@ -6,6 +6,8 @@
 public enum VerbSrc {
     View,
     OView,
+    Range,
+    ORange,
     World,
     WorldContents,
     Usr,

diff --git a/DMCompiler/DM/Visitors/DMProcBuilder.cs b/DMCompiler/DM/Visitors/DMProcBuilder.cs
@@ -190,7 +190,7 @@ public void ProcessStatementSet(DMASTProcStatementSet statementSet) {
                 // TODO: Would be much better if the parser was just more strict with the expression
                 switch (statementSet.Value) {
                     case DMASTIdentifier {Identifier: "usr"}:
-                        _proc.VerbSrc = VerbSrc.Usr;
+                        _proc.VerbSrc = statementSet.WasInKeyword ? VerbSrc.UsrContents : VerbSrc.Usr;
                         break;
                     case DMASTDereference {Expression: DMASTIdentifier{Identifier: "usr"}, Operations: var operations}:
                         if (operations is not [DMASTDereference.FieldOperation {Identifier: var deref}])
@@ -214,7 +214,7 @@ public void ProcessStatementSet(DMASTProcStatementSet statementSet) {
 
                         break;
                     case DMASTIdentifier {Identifier: "world"}:
-                        _proc.VerbSrc = VerbSrc.World;
+                        _proc.VerbSrc = statementSet.WasInKeyword ? VerbSrc.WorldContents : VerbSrc.World;
                         DMCompiler.UnimplementedWarning(statementSet.Location,
                             "'set src = world' is unimplemented");
                         break;
@@ -229,6 +229,10 @@ public void ProcessStatementSet(DMASTProcStatementSet statementSet) {
                     case DMASTProcCall {Callable: DMASTCallableProcIdentifier {Identifier: { } viewType and ("view" or "oview")}}:
                         _proc.VerbSrc = viewType == "view" ? VerbSrc.View : VerbSrc.OView; // TODO: Ranges
                         break;
+                    // range() and orange() are undocumented, but they work
+                    case DMASTProcCall {Callable: DMASTCallableProcIdentifier {Identifier: { } viewType and ("range" or "orange")}}:
+                        _proc.VerbSrc = viewType == "range" ? VerbSrc.Range : VerbSrc.ORange; // TODO: Ranges
+                        break;
                     default:
                         DMCompiler.Emit(WarningCode.BadExpression, statementSet.Value.Location, "Invalid verb src");
                         break;

diff --git a/OpenDreamRuntime/ServerVerbSystem.cs b/OpenDreamRuntime/ServerVerbSystem.cs
@@ -47,8 +47,10 @@ public void RegisterVerb(DreamProc verb) {
         }
 
         VerbAccessibility? verbAccessibility = verb.VerbSrc switch {
-            VerbSrc.View => VerbAccessibility.View, // TODO: Ranges on the view() types
+            VerbSrc.View => VerbAccessibility.View, // TODO: Ranges on the view()/range() types
             VerbSrc.OView => VerbAccessibility.OView,
+            VerbSrc.Range => VerbAccessibility.Range,
+            VerbSrc.ORange => VerbAccessibility.ORange,
             VerbSrc.World => VerbAccessibility.WorldContents,
             VerbSrc.WorldContents => VerbAccessibility.WorldContents,
             VerbSrc.Usr or VerbSrc.UsrContents => VerbAccessibility.UsrContents,

diff --git a/OpenDreamShared/Dream/VerbSystem.cs b/OpenDreamShared/Dream/VerbSystem.cs
@@ -88,6 +88,8 @@ public struct VerbArg {
     public enum VerbAccessibility : byte {
         View,
         OView,
+        Range,
+        ORange,
         WorldContents,
         UsrContents,
         Usr,
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     public enum VerbSrc {
         View,
         OView,
+        Range,
+        ORange,
         World,
         WorldContents,
         Usr,
@@ Expand Down @@