Merge pull request #332 from Grossley/master

Omit "String" optimization in same way to omitted "real" optimization
UnderminersTeam · Nov 13, 2020 · b0743c5 · b0743c5
2 parents 0df8758 + cb14274
commit b0743c5
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/UndertaleModLib/Compiler/Parser.cs b/UndertaleModLib/Compiler/Parser.cs
@@ -1594,23 +1594,27 @@ public static Statement Optimize(CompileContext context, Statement s)
                         {
                             case "string":
                                 {
-                                    string conversion = "";
-                                    switch (result.Children[0].Constant.kind)
+                                    // Ignore the optimization for GMS build versions less than 1763 and not equal to 1539.
+                                    if ((context.Data?.GeneralInfo.Build >= 1763) || (context.Data?.GeneralInfo.Major >= 2) || (context.Data?.GeneralInfo.Build == 1539))
                                     {
-                                        case ExpressionConstant.Kind.Number:
-                                            conversion = result.Children[0].Constant.valueNumber.ToString();
-                                            break;
-                                        case ExpressionConstant.Kind.Int64:
-                                            conversion = result.Children[0].Constant.valueInt64.ToString();
-                                            break;
-                                        case ExpressionConstant.Kind.String:
-                                            conversion = result.Children[0].Constant.valueString;
-                                            break;
-                                        default:
-                                            return result; // This shouldn't happen
+                                        string conversion = "";
+                                        switch (result.Children[0].Constant.kind)
+                                        {
+                                            case ExpressionConstant.Kind.Number:
+                                                conversion = result.Children[0].Constant.valueNumber.ToString();
+                                                break;
+                                            case ExpressionConstant.Kind.Int64:
+                                                conversion = result.Children[0].Constant.valueInt64.ToString();
+                                                break;
+                                            case ExpressionConstant.Kind.String:
+                                                conversion = result.Children[0].Constant.valueString;
+                                                break;
+                                            default:
+                                                return result; // This shouldn't happen
+                                        }
+                                        result = new Statement(Statement.StatementKind.ExprConstant);
+                                        result.Constant = new ExpressionConstant(conversion);
                                     }
-                                    result = new Statement(Statement.StatementKind.ExprConstant);
-                                    result.Constant = new ExpressionConstant(conversion);
                                 }
                                 break;
                             case "real":