Translating return Goto expressions as code blocks

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenTranslatingGotos.cs

@@ -140,7 +140,7 @@ public void ShouldNotIncludeLabelNamesWithoutAGoto()
             var returnTrue = Expression.Return(returnLabelTarget, Expression.Constant(true));
 
             var ifLessThanOneReturnTrue = Expression.IfThen(variableLessThanOne, returnTrue);
-            
+
             var testBlock = Expression.Block(
                 ifLessThanOneReturnTrue,
                 Expression.Label(returnLabelTarget, Expression.Constant(false)));
@@ -157,5 +157,43 @@ public void ShouldNotIncludeLabelNamesWithoutAGoto()
 
             Assert.AreEqual(EXPECTED.TrimStart(), translated);
         }
+
+
+        [TestMethod]
+        public void ShouldTranslateAReturnStatementWithABlock()
+        {
+            var returnLabelTarget = Expression.Label(typeof(int));
+
+            var intVariable = Expression.Variable(typeof(int), "i");
+            var variableInit = Expression.Assign(intVariable, Expression.Constant(0));
+            var variablePlusOne = Expression.Add(intVariable, Expression.Constant(1));
+            var variableAdditionOne = Expression.Assign(intVariable, variablePlusOne);
+            var variablePlusTwo = Expression.Add(intVariable, Expression.Constant(2));
+            var variableAdditionTwo = Expression.Assign(intVariable, variablePlusTwo);
+
+            var variableBlock = Expression.Block(
+                new[] { intVariable },
+                variableInit,
+                variableAdditionOne,
+                variableAdditionTwo,
+                intVariable);
+
+            var returnVariableBlock = Expression.Return(returnLabelTarget, variableBlock);
+
+            var returnBlock = Expression.Block(returnVariableBlock);
+
+            const string EXPECTED = @"
+return 
+{
+    var i = 0;
+    i = i + 1;
+    i = i + 2;
+    return i;
+}";
+
+            var translated = returnBlock.ToReadableString();
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
     }
 }

ReadableExpressions/Translators/GotoExpressionTranslator.cs

@@ -27,23 +27,23 @@ public override string Translate(Expression expression, TranslationContext conte
             return _gotoKindHandlers[gotoExpression.Kind].Invoke(gotoExpression, context);
         }
 
-        private static string TranslateBreak(GotoExpression gotoExpression, TranslationContext context)
+        private static string TranslateBreak(GotoExpression breakExpression, TranslationContext context)
             => "break;";
 
-        private static string TranslateContinue(GotoExpression gotoExpression, TranslationContext context)
+        private static string TranslateContinue(GotoExpression continueExpression, TranslationContext context)
             => "continue;";
 
         private static string TranslateGoto(GotoExpression gotoExpression, TranslationContext context)
             => $"goto {gotoExpression.Target.Name};";
 
-        private static string TranslateReturn(GotoExpression gotoExpression, TranslationContext context)
+        private static string TranslateReturn(GotoExpression returnExpression, TranslationContext context)
         {
-            if (gotoExpression.Value == null)
+            if (returnExpression.Value == null)
             {
                 return "return;";
             }
 
-            var value = context.Translate(gotoExpression.Value);
+            var value = context.TranslateAsCodeBlock(returnExpression.Value);
 
             return $"return {value}";
         }

ReadableExpressions/Translators/LabelExpressionTranslator.cs

@@ -16,9 +16,11 @@ public override string Translate(Expression expression, TranslationContext conte
 
             var labelNamePart = GetLabelNamePart(label, context);
 
-            var labelValuePart = (label.DefaultValue != null)
-                ? $"{Environment.NewLine}return {context.Translate(label.DefaultValue)};"
-                : null;
+            if (label.DefaultValue == null)
+            {
+                return labelNamePart;
+            }
+            var labelValuePart = $"{Environment.NewLine}return {context.TranslateAsCodeBlock(label.DefaultValue)};";
 
             return labelNamePart + labelValuePart;
         }