Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(de)compiler fixes and improvements. #1614

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

(de)compiler fixes and improvements. #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c0bf525
Fix #1612.
VladiStep Jan 6, 2024
55a807c
Remove the code that often causes wrong argument types.
VladiStep Jan 6, 2024
21088d8
Remove duplicate/redundant built-in functions for Deltarune.
VladiStep Jan 6, 2024
3fe2bf7
Fix some Deltarune functions arguments types.
VladiStep Jan 7, 2024
f8f6fc7
Improve `AnnotateTypesForFunctionCall()` code.
VladiStep Jan 7, 2024
740f1df
Various optimizations for `AssetTypeResolver` and `Decompiler`.
VladiStep Jan 7, 2024
7177e20
Fix type arguments for "scr_battle()".
VladiStep Jan 8, 2024
0e94511
Dictionary-related optimizations for `ContextualAssetResolver`.
VladiStep Jan 8, 2024
87c7e08
Argument types related changes:
VladiStep Jan 9, 2024
43d5015
Add a "Check built-in functions arguments count" setting.
VladiStep Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
518 changes: 255 additions & 263 deletions UndertaleModLib/Compiler/BuiltinList.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UndertaleModLib/Compiler/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class CompileContext
public Dictionary<string, VariableInfo> userDefinedVariables = new Dictionary<string, VariableInfo>();
public bool ensureFunctionsDefined = true;
public bool ensureVariablesDefined = true;
public static bool GMS2_3;
public static bool GMS2_3, GM2022_11;
public bool TypedAssetRefs => Data.IsVersionAtLeast(2023, 8);
public int LastCompiledArgumentCount = 0;
public Dictionary<string, string> LocalVars = new Dictionary<string, string>();
Expand Down
68 changes: 53 additions & 15 deletions UndertaleModLib/Compiler/Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,19 +397,31 @@ private static void ReportCodeError(string msg, Lexer.Token context, bool synchr
{
if (context != null)
{
if (msg.EndsWith(".", StringComparison.InvariantCulture))
msg = msg.Remove(msg.Length - 1);
int firstDotIndex = msg.IndexOf('.');
if (firstDotIndex != -1)
msg = msg.Remove(firstDotIndex, 1);

if (context.Location != null)
{
msg += string.Format(" around line {0}, column {1}", context.Location.Line, context.Location.Column);
} else if (context.Kind == TokenKind.EOF)
string s = string.Format(" around line {0}, column {1}", context.Location.Line, context.Location.Column);
msg = msg.Insert(firstDotIndex, s);
firstDotIndex += s.Length;
}
else if (context.Kind == TokenKind.EOF)
{
msg += " around EOF (end of file)";
msg = msg.Insert(firstDotIndex, " around EOF (end of file)");
firstDotIndex += " around EOF (end of file)".Length;
}
if (context.Content != null && context.Content.Length > 0)
msg += " (" + context.Content + ")";
ReportCodeError(msg + ".", synchronize);
if (context.Content != null && context.Content.Length > 0)
{
string s = " (" + context.Content + ')';
msg = msg.Insert(firstDotIndex, s);
firstDotIndex += s.Length;
}

msg = msg.Insert(firstDotIndex, ".");

ReportCodeError(msg, synchronize);
}
else
{
Expand All @@ -433,6 +445,7 @@ public static Statement ParseTokens(CompileContext context, List<Lexer.Token> to
{
// Basic initialization
remainingStageOne.Clear();
remainingStageOne.EnsureCapacity(tokens.Count);
ErrorMessages.Clear();
context.LocalVars.Clear();
if ((context.Data?.GeneralInfo?.BytecodeVersion ?? 15) >= 15)
Expand All @@ -446,7 +459,7 @@ public static Statement ParseTokens(CompileContext context, List<Lexer.Token> to
tokens.Add(new Lexer.Token(TokenKind.EOF));

// Run first parse stage- basic abstraction into functions and constants
List<Statement> firstPass = new List<Statement>();
List<Statement> firstPass = new(tokens.Count);

bool chainedVariableReference = false;
for (int i = 0; i < tokens.Count; i++)
Expand Down Expand Up @@ -485,7 +498,8 @@ public static Statement ParseTokens(CompileContext context, List<Lexer.Token> to
try
{
val = Convert.ToInt64(t.Content.Substring(t.Content[0] == '$' ? 1 : 2), 16);
} catch (Exception)
}
catch (Exception)
{
ReportCodeError("Invalid hex literal.", t, false);
constant = new ExpressionConstant(0);
Expand Down Expand Up @@ -1044,11 +1058,31 @@ private static Statement ParseFunctionCall(CompileContext context, bool expressi
if (EnsureTokenKind(TokenKind.CloseParen) == null) return null;

// Check for proper argument count, at least for builtins
if (context.BuiltInList.Functions.TryGetValue(s.Text, out FunctionInfo fi) &&
fi.ArgumentCount != -1 && result.Children.Count != fi.ArgumentCount)
ReportCodeError(string.Format("Function {0} expects {1} arguments, got {2}.",
s.Text, fi.ArgumentCount, result.Children.Count)
, s.Token, false);
if (BuiltinList.CheckBuiltinFuncArgCount
&& context.BuiltInList.Functions.TryGetValue(s.Text, out FunctionInfo fi))
{
if (fi.ArgumentCount < -1)
{
// -2 = at least 1 argument
int minArgCount = -fi.ArgumentCount - 1;
if (result.Children.Count < minArgCount)
{
ReportCodeError(string.Format("Function {0} expects at least {1} arguments, got {2}.\n\n" +
"If you sure that's a mistake, then you can disable built-in functions " +
"argument count checking in the settings.",
s.Text, minArgCount, result.Children.Count),
s.Token, false);
}
}
else if (fi.ArgumentCount != -1 && result.Children.Count != fi.ArgumentCount)
{
ReportCodeError(string.Format("Function {0} expects {1} arguments, got {2}.\n\n" +
"If you sure that's a mistake, then you can disable built-in functions " +
"argument count checking in the settings.",
s.Text, fi.ArgumentCount, result.Children.Count),
s.Token, false);
}
}

return result;
}
Expand Down Expand Up @@ -1717,6 +1751,10 @@ public static Statement Optimize(CompileContext context, Statement s)
// 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))
{
// If it's `string("test {0}", "format")`
if (CompileContext.GM2022_11 && result.Children.Count > 1)
return result;

string conversion;
switch (child0.Constant.kind)
{
Expand Down
Loading
Loading