Fixed calling subroutines inside subroutines sometimes throwing an exception. Fixed subroutine IndexAssigner issue. Fixed returning values recursively.

Author: ItsDeltin

Deltinteger/Deltinteger/Parse/Functions/DefinedMethod.cs

@@ -340,7 +340,7 @@ public void SetupSubroutine()
 
             // Setup the return handler.
             ReturnHandler returnHandler = new ReturnHandler(subroutineRule.ActionSet, Name, multiplePaths);
-            ActionSet actionSet = subroutineRule.ActionSet.New(returnHandler);
+            ActionSet actionSet = subroutineRule.ActionSet.New(returnHandler).New(subroutineRule.ActionSet.IndexAssigner.CreateContained());
 
             // Get the variables that will be used to store the parameters.
             IndexReference[] parameterStores = new IndexReference[ParameterVars.Length];
@@ -371,6 +371,8 @@ public void SetupSubroutine()
         // Calls single-instance methods.
         private IWorkshopTree ParseSubroutine(ActionSet actionSet, MethodCall methodCall)
         {
+            if (subroutineInfo == null) SetupSubroutine();
+
             for (int i = 0; i < subroutineInfo.ParameterStores.Length; i++)
                 actionSet.AddAction(subroutineInfo.ParameterStores[i].SetVariable((Element)methodCall.ParameterValues[i]));
 

Deltinteger/Deltinteger/Parse/Functions/RecursiveStack.cs

@@ -49,7 +49,7 @@ private IWorkshopTree ParseCall(ActionSet actionSet, MethodCall methodCall)
             continueAt.SetSkipCount((Element)nextContinue.GetVariable());
             actionSet.AddAction(continueAt);
 
-            method.block.Translate(actionSet);
+            method.block.Translate(actionSet.New(returnHandler));
 
             PopParameterStacks(actionSet);
 

Deltinteger/Deltinteger/Parse/Functions/ReturnHandler.cs

@@ -75,7 +75,7 @@ public RuleReturnHandler(ActionSet actionSet) : base(actionSet, null, false) {}
 
         public override void ApplyReturnSkips() => throw new Exception("Can't apply return skips in a rule.");
         public override IWorkshopTree GetReturnedValue() => throw new Exception("Can't get the returned value of a rule.");
-        public override void ReturnValue(IWorkshopTree value) => throw new Exception("Can't return a value in a rule..");
+        public override void ReturnValue(IWorkshopTree value) => throw new Exception("Can't return a value in a rule.");
 
         public override void Return()
         {