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

Jump to bottom

Unwrap optionals with dynamic cast #3580

Merged
merged 8 commits into from
Sep 13, 2024
Merged

Unwrap optionals with dynamic cast #3580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9100598
Add tests for unwrapping optionals with dynamic casts
RZhang05 Sep 9, 2024
352c9eb
Add more tests.
RZhang05 Sep 10, 2024
6a69bb1
Conditionally unwrap optionals on dynamic cast
RZhang05 Sep 10, 2024
e14a7bb
Fix handling of nil and ambiguous tests
RZhang05 Sep 10, 2024
0b731ac
Replace single statement switches with if
RZhang05 Sep 10, 2024
d4369cf
Revert breaking change, clean up code
RZhang05 Sep 11, 2024
adc3404
Add tests for resources, unwrap expected type
RZhang05 Sep 12, 2024
2945662
Add requested tests for optional boxing
RZhang05 Sep 13, 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
7 changes: 7 additions & 0 deletions runtime/interpreter/interpreter_expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,6 +1335,13 @@ func (interpreter *Interpreter) VisitCastingExpression(expression *ast.CastingEx
// thus this is the only place where it becomes necessary to "instantiate" the result of a map to its
// concrete outputs. In other places (e.g. interface conformance checks) we want to leave maps generic,
// so we don't substitute them.

// if the target is anystruct or anyresource we want to preserve optionals
unboxedExpectedType := sema.UnwrapOptionalType(expectedType)
if !(unboxedExpectedType == sema.AnyStructType || unboxedExpectedType == sema.AnyResourceType) {
// otherwise dynamic cast now always unboxes optionals
value = interpreter.Unbox(locationRange, value)
}
valueSemaType := interpreter.SubstituteMappedEntitlements(interpreter.MustSemaTypeOfValue(value))
valueStaticType := ConvertSemaToStaticType(interpreter, valueSemaType)
isSubType := interpreter.IsSubTypeOfSemaType(valueStaticType, expectedType)
Expand Down
Loading
Loading