Skip to content

Fix the issue that an exception occurs when writing return; in setter… #88

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

Merged
merged 2 commits into from
Jul 15, 2021
Merged

Fix the issue that an exception occurs when writing return; in setter… #88

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
6d31749
Fix the problem that an exception occurs when writing return with set…
ChanyaVRC Jul 14, 2021
ec17a46
Add test for #88
MerlinVR Jul 15, 2021
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
1 change: 1 addition & 0 deletions Assets/UdonSharp/Editor/UdonSharpASTVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
Debug.Assert(visitorContext.returnLabel == null, "Return label must be null");
var returnLabel = visitorContext.labelTable.GetNewJumpLabel("return");
visitorContext.returnLabel = returnLabel;
visitorContext.returnSymbol = null;

visitorContext.uasmBuilder.AddJumpLabel(setter.entryPoint);

Expand Down
6 changes: 6 additions & 0 deletions Assets/UdonSharp/Tests/TestScripts/Core/PropertyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public int MyIntBackedProperty
get { return backingField; }
set
{
if (value == 222)
return;

MyIntProperty = value;
backingField = value;
}
Expand Down Expand Up @@ -85,6 +88,9 @@ public void ExecuteTests()
MyIntBackedProperty = 8;
tester.TestAssertion("Property manual setter", MyIntProperty == 8 && MyIntBackedProperty == 8);

MyIntBackedProperty = 222;
tester.TestAssertion("Property setter return", MyIntBackedProperty == 8);

PropertyTest[] selfArr = new PropertyTest[] { this };

selfArr[0].MyIntProperty = 10;
Expand Down