add inline return (not sure if it should be used)

ice1000 · ice1000 · commit fd7edd2b0b6f · 2017-09-19T23:51:56.000+08:00
diff --git a/Cmc/Core/Environment.cs b/Cmc/Core/Environment.cs
@@ -16,6 +16,8 @@ public class Environment
 		/// </summary>
 		public static Environment Galaxy;
 
+		private static readonly MetaData BuiltIn = new MetaData(-1, "[built-in]");
+
 		public static Environment SolarSystem;
 
 		[NotNull] public readonly IList<Declaration> Declarations = new List<Declaration>();
@@ -40,17 +42,17 @@ from builtinType in new[]
 					PrimaryType.BoolType
 				}
 				select new TypeDeclaration(
-					MetaData.BuiltIn,
+					BuiltIn,
 					builtinType,
-					new PrimaryType(MetaData.BuiltIn, builtinType)))
+					new PrimaryType(BuiltIn, builtinType)))
 				Galaxy.Declarations.Add(typeDeclaration);
-			var puts = new ExternDeclaration(MetaData.BuiltIn, "print", null,
-				new LambdaType(MetaData.BuiltIn,
+			var puts = new ExternDeclaration(BuiltIn, "print", null,
+				new LambdaType(BuiltIn,
 					new List<Type>
 					{
-						new PrimaryType(MetaData.BuiltIn, PrimaryType.StringType)
+						new PrimaryType(BuiltIn, PrimaryType.StringType)
 					},
-					new PrimaryType(MetaData.BuiltIn, PrimaryType.NullType)));
+					new PrimaryType(BuiltIn, PrimaryType.NullType)));
 			puts.SurroundWith(Galaxy);
 			SolarSystem.Declarations.Add(puts);
 		}
diff --git a/Cmc/Core/MetaData.cs b/Cmc/Core/MetaData.cs
@@ -23,6 +23,5 @@ public string GetErrorHeader() =>
 
 		private static int _count;
 		public static readonly MetaData Empty = new MetaData(_count++, "Unknown");
-		public static readonly MetaData BuiltIn = new MetaData(-1, "[built-in]");
 	}
 }
diff --git a/Cmc/Stmt/Statement.cs b/Cmc/Stmt/Statement.cs
@@ -87,8 +87,23 @@ public override void SurroundWith(Environment environment)
 				new ReturnStatement(MetaData, new VariableExpression(MetaData, variableName), _labelName));
 		}
 
-		public void InlineThis()
+		/// <summary>
+		///   make this an inlined return statement
+		/// </summary>
+		/// <param name="returnValueStorer">the variable used to store the return value</param>
+		public void InlineThis(VariableExpression returnValueStorer)
 		{
+			if (null != ConvertedStatementList)
+			{
+				var varDecl = ConvertedStatementList.Statements.First();
+				var varExpr = (VariableExpression) ((ReturnStatement) ConvertedStatementList.Statements.Last()).Expression;
+				ConvertedStatementList = new StatementList(MetaData,
+					varDecl,
+					new AssignmentStatement(MetaData, returnValueStorer, varExpr));
+			}
+			else
+				ConvertedStatementList = new StatementList(MetaData,
+					new AssignmentStatement(MetaData, returnValueStorer, Expression));
 		}
 
 		public override IEnumerable<string> Dump() => new[]

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,5 @@ public string GetErrorHeader() =>`
`23`	`23`
`24`	`24`	`private static int _count;`
`25`	`25`	`public static readonly MetaData Empty = new MetaData(_count++, "Unknown");`
`26`		`- public static readonly MetaData BuiltIn = new MetaData(-1, "[built-in]");`
`27`	`26`	`}`
`28`	`27`	`}`