Skip to content

Handle user-defined enum type explicit default parameter #119

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

Open
ureishi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle user-defined enum type explicit default parameter #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2d4e1a
Handle user defined enum explicit default parameter
ureishi Apr 10, 2023
10bd85c
Update MethodCallsTest.asset
ureishi May 12, 2023
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
2 changes: 1 addition & 1 deletion Packages/com.vrchat.UdonSharp/Editor/Compiler/Binder/Symbols/ParameterSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ParameterSymbol(IParameterSymbol sourceSymbol, AbstractPhaseContext conte

if (RoslynSymbol.HasExplicitDefaultValue)
{
if (Type.IsEnum)
if (Type.UdonType.SystemType.IsEnum)
{
DefaultValue = (IConstantValue) Activator.CreateInstance(
typeof(ConstantValue<>).MakeGenericType(Type.UdonType.SystemType),
Expand Down
18 changes: 18 additions & 0 deletions Packages/com.vrchat.UdonSharp/Tests~/TestScripts/Core/MethodCallsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

namespace UdonSharp.Tests
{
enum MyUserDefinedEnum
{
Element0, Element1
}

[AddComponentMenu("Udon Sharp/Tests/MethodCallsTest")]
public class MethodCallsTest : UdonSharpBehaviour
{
Expand All @@ -29,6 +34,16 @@ private string MyDefaultParamsMethod(string a, string b = "B", string c = "C", s
{
return a + b + c + d + string.Join("", elements);
}

private string MyUserDefinedEnumDefaultParamMethod(MyUserDefinedEnum e = MyUserDefinedEnum.Element0)
{
switch (e)
{
case MyUserDefinedEnum.Element0: return nameof(MyUserDefinedEnum.Element0);
case MyUserDefinedEnum.Element1: return nameof(MyUserDefinedEnum.Element1);
default: return null;
}
}

public void ExecuteTests()
{
Expand Down Expand Up @@ -90,6 +105,9 @@ public void ExecuteTests()

tester.TestAssertion("Params array 5", MyDefaultParamsMethod("a", elements: new string[] { "e", "f" }, b: "b", d: "d") == "abCdef");

tester.TestAssertion("Default user defined enum param 1", MyUserDefinedEnumDefaultParamMethod() == "Element0");
tester.TestAssertion("Default user defined enum param 2", MyUserDefinedEnumDefaultParamMethod(MyUserDefinedEnum.Element1) == "Element1");

enabled = false;
tester.TestAssertion("UdonBehaviour enabled", enabled == false);
enabled = true;
Expand Down