Use ParameterSymbol instead of EventTypeParam

Author: BitcoderCZ

FanScript.Cli/Program.cs

@@ -58,7 +58,7 @@ static int runVerb<T>(Func<T, int> action, T arg, string name)
             try
             {
 #endif
-            return action(arg);
+                return action(arg);
 #if !DEBUG
             }
             catch (Exception ex)

FanScript.LangServer/Handlers/CompletionHandler.cs

@@ -73,7 +73,7 @@ internal class CompletionHandler : CompletionHandlerBase
                             builder.Append(' ');
                         }
 
-                        if (param.IsConstant)
+                        if (param.Modifiers.HasFlag(Modifiers.Constant))
                             builder.Append(param.Name);
                     }
 

FanScript/Compiler/Binding/Binder.cs

@@ -354,7 +354,6 @@ private BoundStatement BindEventStatement(EventStatementSyntax syntax)
             ImmutableArray<ParameterSymbol> parameters = type
                 .GetInfo()
                 .Parameters
-                .Select(param => param.ToParameter())
                 .ToImmutableArray();
 
             enterScope();
@@ -1260,10 +1259,10 @@ private TypeSymbol BindTypeClause(TypeClauseSyntax? syntax)
                     diagnostics.ReportArgumentMustHaveModifier(argumentLocation, parameter.Name, Modifiers.Ref);
                 else if (parameter.Modifiers.HasFlag(Modifiers.Out) && !argMods.Enum.HasFlag(Modifiers.Out))
                     diagnostics.ReportArgumentMustHaveModifier(argumentLocation, parameter.Name, Modifiers.Out);
-                else if (argMods.Enum.MakesTargetReference(out Modifiers? makesRefMod) && (argument is not BoundVariableExpression variable ||
+                if (argMods.Enum.MakesTargetReference(out Modifiers? makesRefMod) && (argument is not BoundVariableExpression variable ||
                     (variable.Variable.IsReadOnly && argument.Syntax.Kind != SyntaxKind.VariableDeclarationExpression && variable.Variable is not NullVariableSymbol)))
                     diagnostics.ReportByRefArgMustBeVariable(argumentLocation, makesRefMod.Value);
-                else if (parameter.Modifiers.HasFlag(Modifiers.Constant) && argument.ConstantValue is null)
+                if (parameter.Modifiers.HasFlag(Modifiers.Constant) && argument.ConstantValue is null)
                     diagnostics.ReportValueMustBeConstant(argument.Syntax.Location);
 
                 boundArguments[i] = BindConversion(argumentLocation, argument, parameter.Type);

FanScript/Compiler/EventType.cs

@@ -166,27 +166,27 @@ public static class EventTypeE
             new EventTypeInfo(EventType.LateUpdate, []),
             new EventTypeInfo(EventType.BoxArt, []),
             new EventTypeInfo(EventType.Touch, [
-                new EventTypeParam("screenX", Modifiers.Out, TypeSymbol.Float),
-                new EventTypeParam("screenY", Modifiers.Out, TypeSymbol.Float),
-                new EventTypeParam("TOUCH_STATE", 0, TypeSymbol.Float, true),
-                new EventTypeParam("TOUCH_FINGER", 0, TypeSymbol.Float, true),
+                new ParameterSymbol("screenX", Modifiers.Out, TypeSymbol.Float),
+                new ParameterSymbol("screenY", Modifiers.Out, TypeSymbol.Float),
+                new ParameterSymbol("TOUCH_STATE", Modifiers.Constant, TypeSymbol.Float),
+                new ParameterSymbol("TOUCH_FINGER", Modifiers.Constant, TypeSymbol.Float),
             ]),
             new EventTypeInfo(EventType.Swipe, [
-                new EventTypeParam("direction", Modifiers.Out, TypeSymbol.Vector3),
+                new ParameterSymbol("direction", Modifiers.Out, TypeSymbol.Vector3),
             ]),
             new EventTypeInfo(EventType.Button, [
-                new EventTypeParam("BUTTON_TYPE", 0, TypeSymbol.Float, true),
+                new ParameterSymbol("BUTTON_TYPE", Modifiers.Constant, TypeSymbol.Float),
             ]),
             new EventTypeInfo(EventType.Collision, [
-                new EventTypeParam("object1", 0, TypeSymbol.Object),
-                new EventTypeParam("object2", Modifiers.Out, TypeSymbol.Object),
-                new EventTypeParam("impulse", Modifiers.Out, TypeSymbol.Float),
-                new EventTypeParam("normal", Modifiers.Out, TypeSymbol.Vector3),
+                new ParameterSymbol("object1", 0, TypeSymbol.Object),
+                new ParameterSymbol("object2", Modifiers.Out, TypeSymbol.Object),
+                new ParameterSymbol("impulse", Modifiers.Out, TypeSymbol.Float),
+                new ParameterSymbol("normal", Modifiers.Out, TypeSymbol.Vector3),
             ]),
             new EventTypeInfo(EventType.Loop, [
-                new EventTypeParam("start", 0, TypeSymbol.Float),
-                new EventTypeParam("stop", 0, TypeSymbol.Float),
-                new EventTypeParam("counter", Modifiers.Out, TypeSymbol.Float),
+                new ParameterSymbol("start", 0, TypeSymbol.Float),
+                new ParameterSymbol("stop", 0, TypeSymbol.Float),
+                new ParameterSymbol("counter", Modifiers.Out, TypeSymbol.Float),
             ]),
         };
 
@@ -200,7 +200,7 @@ protected override EventType GetKeyForItem(EventTypeInfo item)
         }
     }
 
-    public record EventTypeInfo(EventType Type, ImmutableArray<EventTypeParam> Parameters)
+    public record EventTypeInfo(EventType Type, ImmutableArray<ParameterSymbol> Parameters)
     {
         public override string ToString()
         {
@@ -232,10 +232,4 @@ public override string ToString()
                 .ToString();
         }
     }
-
-    public record EventTypeParam(string Name, Modifiers Modifiers, TypeSymbol Type, bool IsConstant = false)
-    {
-        public ParameterSymbol ToParameter()
-            => new ParameterSymbol(Name, Modifiers, Type);
-    }
 }

FanScript/Compiler/Symbols/BuiltinFunctions.cs

@@ -503,10 +503,10 @@ public static readonly FunctionSymbol GetObject
 
             [FunctionDoc(
                 Info = """
-                Returns the object at (<link type="param">x</>, <link type="param">y</>, <link type="param">z</>).
+                Returns the object at (<link type="param">X</>, <link type="param">Y</>, <link type="param">Z</>).
                 """,
                 ReturnValueInfo = """
-                The object at (<link type="param">x</>, <link type="param">y</>, <link type="param">z</>).
+                The object at (<link type="param">X</>, <link type="param">Y</>, <link type="param">Z</>).
                 """,
                 ParameterInfos = [
                     """