reorder some Stmt

add extension method to indent a list of strings

Author: sor

backend/Core/Extensions.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text;
+using Myll.Generator;
 
 namespace Myll.Core
 {
@@ -42,6 +43,15 @@ public static string Join( this IEnumerable<string> values, string delimiter )
 			// there is a specialized string.Join with string[]
 			=> string.Join( delimiter, values );
 
+		public static IEnumerable<string> Indent( this IEnumerable<string> values, string indent )
+			=> values.Select( l => string.Format( "{0}{1}", indent, l ) );
+
+		public static IEnumerable<string> Indent( this IEnumerable<string> values, int level )
+		{
+			string indent = StmtFormatting.IndentString.Repeat( level );
+			return values.Select( l => string.Format( "{0}{1}", indent, l ) );
+		}
+
 		[Pure]
 		public static bool IsEmpty<T>( [NotNull] this IEnumerable<T> values )
 			=> !values.Any();

backend/Core/Stmt.cs

@@ -173,15 +173,44 @@ public class AggrAssign : Stmt
 		public Expr    leftExpr;
 		public Expr    rightExpr;
 
+		public override Strings Gen( int level )
+			=> new Strings { Format( op.GetAssignFormat(), leftExpr.Gen(), rightExpr.Gen() ) }
+				.Indent( level )
+				.ToList();
+	}
+
+	public class ExprStmt : Stmt
+	{
+		public Expr expr;
+
+		public override Strings Gen( int level )
+			=> new Strings { Format( "{0};", expr.Gen() ) }
+				.Indent( level )
+				.ToList();
+	}
+
+	public class EmptyStmt : Stmt
+	{
 		public override Strings Gen( int level )
 		{
-			string indent = IndentString.Repeat( level );
-			return new Strings {
-				indent + Format( op.GetAssignFormat(), leftExpr.Gen(), rightExpr.Gen() ) + ";"
-			};
+			throw new NotImplementedException( "Would this just work as a semicolon?" );
 		}
 	}
 
+	// This class should be phased out in the far future, but for now it's just too useful
+	public class FreetextStmt : Stmt
+	{
+		public Strings lines;
+
+		public FreetextStmt( string text )
+			=> lines = new Strings { text };
+
+		public override Strings Gen( int level )
+			=> lines
+				.Indent( level )
+				.ToList();
+	}
+
 	/// =!= Stmt which contain other Stmt themselves =!=
 
 	// TODO move or remove?
@@ -484,23 +513,4 @@ public override Strings Gen( int level )
 			return ret;
 		}
 	}
-
-	public class ExprStmt : Stmt
-	{
-		public Expr expr;
-
-		public override Strings Gen( int level )
-		{
-			string indent = IndentString.Repeat( level );
-			return new Strings { Format( "{0}{1};", indent, expr.Gen() ) };
-		}
-	}
-
-	public class EmptyStmt : Stmt
-	{
-		public override Strings Gen( int level )
-		{
-			throw new NotImplementedException( "Would this just work as a semicolon?" );
-		}
-	}
 }

backend/Generator/ExprFormatting.cs

@@ -52,20 +52,20 @@ private static readonly IDictionary<Operand, string>
 
 		private static readonly IDictionary<Operand, string>
 			ToAssignFormat = new Dictionary<Operand, string> {
-				{ Operand.Pow, "{0} = pow( {0}, {1} )" },
-				{ Operand.Multiply, "{0} *= {1}" },
-				{ Operand.EuclideanDivide, "{0} /= {1}" },
-				{ Operand.Modulo, "{0} %= {1}" },
-				{ Operand.Dot, "{0} = dot( {0}, {1} )" },
-				{ Operand.Cross, "{0} = cross( {0}, {1} )" },
-				{ Operand.Divide, "{0} = (double){0} / (double){1}" }, // TODO: this for integral, div() for others
-				{ Operand.Add, "{0} += {1}" },
-				{ Operand.Subtract, "{0} -= {1}" },
-				{ Operand.BitAnd, "{0} &= {1}" },
-				{ Operand.BitXor, "{0} ^= {1}" },
-				{ Operand.BitOr, "{0} |= {1}" },
-				{ Operand.LeftShift, "{0} <<= {1}"},
-				{ Operand.RightShift,"{0} >>= {1}"},
+				{ Operand.Pow,				"{0} = pow( {0}, {1} );" },
+				{ Operand.Multiply,			"{0} *= {1};" },
+				{ Operand.EuclideanDivide,	"{0} /= {1};" },
+				{ Operand.Modulo,			"{0} %= {1};" },
+				{ Operand.Dot,				"{0} = dot( {0}, {1} );" },
+				{ Operand.Cross,			"{0} = cross( {0}, {1} );" },
+				{ Operand.Divide,			"{0} = (double){0} / (double){1};" }, // TODO: this for integral, div() for others
+				{ Operand.Add,				"{0} += {1};" },
+				{ Operand.Subtract,			"{0} -= {1};" },
+				{ Operand.BitAnd,			"{0} &= {1};" },
+				{ Operand.BitXor,			"{0} ^= {1};" },
+				{ Operand.BitOr,			"{0} |= {1};" },
+				{ Operand.LeftShift,		"{0} <<= {1};" },
+				{ Operand.RightShift,		"{0} >>= {1};" },
 			};
 
 		public static string GetFormat( this Operand op )